diff --git a/library/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.h b/library/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.h
index e6fceddf..7b86d8bc 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.h
@@ -29,14 +29,10 @@ freely, subject to the following restrictions:
 
 #include "PolyVoxCore/Array.h"
 
+#include <functional>
 #include <list>
 #include <stdexcept> //For runtime_error
 
-namespace std {
-template<class _Signature >
-class function;
-}
-
 namespace PolyVox
 {
 	const float sqrt_1 = 1.0f;
diff --git a/library/PolyVoxCore/include/PolyVoxCore/DefaultIsQuadNeeded.h b/library/PolyVoxCore/include/PolyVoxCore/DefaultIsQuadNeeded.h
index 81ddb9e5..fcaebe7b 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/DefaultIsQuadNeeded.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/DefaultIsQuadNeeded.h
@@ -26,6 +26,8 @@ freely, subject to the following restrictions:
 
 #include "PolyVoxCore/Impl/TypeDef.h"
 
+#include <cstdint>
+
 namespace PolyVox
 {
 	template<typename VoxelType>
diff --git a/library/PolyVoxCore/include/PolyVoxCore/Impl/SubArray.h b/library/PolyVoxCore/include/PolyVoxCore/Impl/SubArray.h
index 3e1b305f..3e70a02c 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/Impl/SubArray.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/Impl/SubArray.h
@@ -26,6 +26,8 @@ freely, subject to the following restrictions:
 
 #include "PolyVoxCore/Impl/TypeDef.h"
 
+#include <cstdint>
+
 namespace PolyVox
 {
 	template <uint32_t noOfDims, typename ElementType> class Array;
diff --git a/library/PolyVoxCore/include/PolyVoxCore/Impl/Utility.h b/library/PolyVoxCore/include/PolyVoxCore/Impl/Utility.h
index b46df744..71dc7b83 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/Impl/Utility.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/Impl/Utility.h
@@ -26,6 +26,8 @@ freely, subject to the following restrictions:
 
 #include "PolyVoxCore/Impl/TypeDef.h"
 
+#include <cstdint>
+
 namespace PolyVox
 {
 	POLYVOX_API uint8_t logBase2(uint32_t uInput);