diff --git a/visualc/VS2010/PolarSSL.vcxproj b/visualc/VS2010/PolarSSL.vcxproj
index 84beb62de..c944e3c11 100644
--- a/visualc/VS2010/PolarSSL.vcxproj
+++ b/visualc/VS2010/PolarSSL.vcxproj
@@ -143,7 +143,7 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="..\..\include\polarssl\aes.h" />
-    <ClInclude Include="..\..\include\polarssl\aesni.h" />
+    <ClInclude Include="..\..\include\polarssl\aesni.h" />
     <ClInclude Include="..\..\include\polarssl\arc4.h" />
     <ClInclude Include="..\..\include\polarssl\asn1.h" />
     <ClInclude Include="..\..\include\polarssl\asn1write.h" />
@@ -168,13 +168,14 @@
     <ClInclude Include="..\..\include\polarssl\error.h" />
     <ClInclude Include="..\..\include\polarssl\gcm.h" />
     <ClInclude Include="..\..\include\polarssl\havege.h" />
-    <ClInclude Include="..\..\include\polarssl\hmac_drbg.h" />
+    <ClInclude Include="..\..\include\polarssl\hmac_drbg.h" />
     <ClInclude Include="..\..\include\polarssl\md2.h" />
     <ClInclude Include="..\..\include\polarssl\md4.h" />
     <ClInclude Include="..\..\include\polarssl\md5.h" />
     <ClInclude Include="..\..\include\polarssl\md.h" />
     <ClInclude Include="..\..\include\polarssl\md_wrap.h" />
     <ClInclude Include="..\..\include\polarssl\memory.h" />
+    <ClInclude Include="..\..\include\polarssl\memory_buffer_alloc.h" />
     <ClInclude Include="..\..\include\polarssl\net.h" />
     <ClInclude Include="..\..\include\polarssl\oid.h" />
     <ClInclude Include="..\..\include\polarssl\openssl.h" />
@@ -185,6 +186,8 @@
     <ClInclude Include="..\..\include\polarssl\pkcs12.h" />
     <ClInclude Include="..\..\include\polarssl\pkcs5.h" />
     <ClInclude Include="..\..\include\polarssl\pk.h" />
+    <ClInclude Include="..\..\include\polarssl\pk_wrap.h" />
+    <ClInclude Include="..\..\include\polarssl\platform.h" />
     <ClInclude Include="..\..\include\polarssl\ripemd160.h" />
     <ClInclude Include="..\..\include\polarssl\rsa.h" />
     <ClInclude Include="..\..\include\polarssl\sha1.h" />
@@ -204,7 +207,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\library\aes.c" />
-    <ClCompile Include="..\..\library\aesni.c" />
+    <ClCompile Include="..\..\library\aesni.c" />
     <ClCompile Include="..\..\library\arc4.c" />
     <ClCompile Include="..\..\library\asn1parse.c" />
     <ClCompile Include="..\..\library\asn1write.c" />
@@ -222,20 +225,19 @@
     <ClCompile Include="..\..\library\ecdh.c" />
     <ClCompile Include="..\..\library\ecdsa.c" />
     <ClCompile Include="..\..\library\ecp.c" />
-    <ClCompile Include="..\..\library\ecp_curves.c" />
+    <ClCompile Include="..\..\library\ecp_curves.c" />
     <ClCompile Include="..\..\library\entropy.c" />
     <ClCompile Include="..\..\library\entropy_poll.c" />
     <ClCompile Include="..\..\library\error.c" />
     <ClCompile Include="..\..\library\gcm.c" />
     <ClCompile Include="..\..\library\havege.c" />
-    <ClCompile Include="..\..\library\hmac_drbg.c" />
+    <ClCompile Include="..\..\library\hmac_drbg.c" />
     <ClCompile Include="..\..\library\md2.c" />
     <ClCompile Include="..\..\library\md4.c" />
     <ClCompile Include="..\..\library\md5.c" />
     <ClCompile Include="..\..\library\md.c" />
     <ClCompile Include="..\..\library\md_wrap.c" />
     <ClCompile Include="..\..\library\memory_buffer_alloc.c" />
-    <ClCompile Include="..\..\library\memory.c" />
     <ClCompile Include="..\..\library\net.c" />
     <ClCompile Include="..\..\library\oid.c" />
     <ClCompile Include="..\..\library\padlock.c" />
@@ -248,6 +250,7 @@
     <ClCompile Include="..\..\library\pkparse.c" />
     <ClCompile Include="..\..\library\pk_wrap.c" />
     <ClCompile Include="..\..\library\pkwrite.c" />
+    <ClCompile Include="..\..\library\platform.c" />
     <ClCompile Include="..\..\library\ripemd160.c" />
     <ClCompile Include="..\..\library\rsa.c" />
     <ClCompile Include="..\..\library\sha1.c" />
diff --git a/visualc/VS6/polarssl.dsp b/visualc/VS6/polarssl.dsp
index f763caaeb..38b33f8f2 100644
--- a/visualc/VS6/polarssl.dsp
+++ b/visualc/VS6/polarssl.dsp
@@ -89,10 +89,10 @@ SOURCE=..\..\library\aes.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\library\aesni.c
-# End Source File
-# Begin Source File
-
+SOURCE=..\..\library\aesni.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\library\arc4.c
 # End Source File
 # Begin Source File
@@ -161,10 +161,10 @@ SOURCE=..\..\library\ecp.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\library\ecp_curves.c
-# End Source File
-# Begin Source File
-
+SOURCE=..\..\library\ecp_curves.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\library\entropy.c
 # End Source File
 # Begin Source File
@@ -185,10 +185,10 @@ SOURCE=..\..\library\havege.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\library\hmac_drbg.c
-# End Source File
-# Begin Source File
-
+SOURCE=..\..\library\hmac_drbg.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\library\md2.c
 # End Source File
 # Begin Source File
@@ -213,10 +213,6 @@ SOURCE=..\..\library\memory_buffer_alloc.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\library\memory.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\library\net.c
 # End Source File
 # Begin Source File
@@ -265,6 +261,10 @@ SOURCE=..\..\library\pkwrite.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\library\platform.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\library\ripemd160.c
 # End Source File
 # Begin Source File
@@ -361,10 +361,10 @@ SOURCE=..\..\include\polarssl\aes.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\polarssl\aesni.h
-# End Source File
-# Begin Source File
-
+SOURCE=..\..\include\polarssl\aesni.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\polarssl\arc4.h
 # End Source File
 # Begin Source File
@@ -461,10 +461,10 @@ SOURCE=..\..\include\polarssl\havege.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\polarssl\hmac_drbg.h
-# End Source File
-# Begin Source File
-
+SOURCE=..\..\include\polarssl\hmac_drbg.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\polarssl\md2.h
 # End Source File
 # Begin Source File
@@ -485,6 +485,10 @@ SOURCE=..\..\include\polarssl\md_wrap.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\polarssl\memory_buffer_alloc.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\polarssl\memory.h
 # End Source File
 # Begin Source File
@@ -529,6 +533,14 @@ SOURCE=..\..\include\polarssl\pk.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\polarssl\pk_wrap.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\polarssl\platform.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\polarssl\ripemd160.h
 # End Source File
 # Begin Source File