diff --git a/include/PolyVox/Vector.h b/include/PolyVox/Vector.h
index 695ce8c0..d8918516 100644
--- a/include/PolyVox/Vector.h
+++ b/include/PolyVox/Vector.h
@@ -29,10 +29,12 @@ freely, subject to the following restrictions:
 
 #include "PolyVoxForwardDeclarations.h"
 
+#include <algorithm>
 #include <cmath>
 #include <cstring>
 #include <functional>
 #include <iostream>
+#include <memory>
 
 namespace PolyVox
 {
diff --git a/include/PolyVox/Vector.inl b/include/PolyVox/Vector.inl
index d03ae025..562c0fca 100644
--- a/include/PolyVox/Vector.inl
+++ b/include/PolyVox/Vector.inl
@@ -39,10 +39,7 @@ namespace PolyVox
     template <uint32_t Size,typename StorageType, typename OperationType>
 	Vector<Size,StorageType,OperationType>::Vector(StorageType tFillValue)
     {
-		for(uint32_t ct = 0; ct < Size; ct++)
-		{
-			m_tElements[ct] = tFillValue;
-		}
+		std::fill(m_tElements, m_tElements + Size, tFillValue);
     }
 
     /**