diff --git a/include/Block.inl b/include/Block.inl
index ccb5400c..d113b1a0 100644
--- a/include/Block.inl
+++ b/include/Block.inl
@@ -22,6 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #pragma region Headers
 #include <cassert>
 #include <cstring> //For memcpy
+#include <stdexcept> //for std::invalid_argument
 #pragma endregion
 
 namespace PolyVox
diff --git a/include/Utility.h b/include/Utility.h
index 41f26ed6..741f09aa 100644
--- a/include/Utility.h
+++ b/include/Utility.h
@@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #ifndef __PolyVox_Utility_H__
 #define __PolyVox_Utility_H__
 
-#include "Typedef.h"
+#include "TypeDef.h"
 
 #include "boost/cstdint.hpp"
 
diff --git a/include/VolumeIterator.inl b/include/VolumeIterator.inl
index 45994265..f8809d1d 100644
--- a/include/VolumeIterator.inl
+++ b/include/VolumeIterator.inl
@@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 ******************************************************************************/
 #pragma endregion
 
-#include "block.h"
+#include "Block.h"
 #include "Volume.h"
 
 using namespace boost;
diff --git a/source/IndexedSurfacePatch.cpp b/source/IndexedSurfacePatch.cpp
index 03d40e19..c1848ad3 100644
--- a/source/IndexedSurfacePatch.cpp
+++ b/source/IndexedSurfacePatch.cpp
@@ -130,11 +130,11 @@ namespace PolyVox
 		assert(pos.z() <= POLYVOX_REGION_SIDE_LENGTH);
 
 		float xIntPart;
-		float xFracPart = modf(pos.x(), &xIntPart);
+		float xFracPart = std::modf(pos.x(), &xIntPart);
 		float yIntPart;
-		float yFracPart = modf(pos.y(), &yIntPart);
+		float yFracPart = std::modf(pos.y(), &yIntPart);
 		float zIntPart;
-		float zFracPart = modf(pos.z(), &zIntPart);
+		float zFracPart = std::modf(pos.z(), &zIntPart);
 
 		//Of all the fractional parts, two should be zero and one should have a value.
 		if(xFracPart > 0.000001f)
@@ -164,11 +164,11 @@ namespace PolyVox
 		assert(newIndex < 10000);
 
 		float xIntPart;
-		float xFracPart = modf(pos.x(), &xIntPart);
+		float xFracPart = std::modf(pos.x(), &xIntPart);
 		float yIntPart;
-		float yFracPart = modf(pos.y(), &yIntPart);
+		float yFracPart = std::modf(pos.y(), &yIntPart);
 		float zIntPart;
-		float zFracPart = modf(pos.z(), &zIntPart);
+		float zFracPart = std::modf(pos.z(), &zIntPart);
 
 		//Of all the fractional parts, two should be zero and one should have a value.
 		if(xFracPart > 0.000001f)