diff --git a/visualc/VS2010/PolarSSL.vcxproj b/visualc/VS2010/PolarSSL.vcxproj
index 529794a..f06b280 100644
--- a/visualc/VS2010/PolarSSL.vcxproj
+++ b/visualc/VS2010/PolarSSL.vcxproj
@@ -153,10 +153,11 @@
     <ClInclude Include="..\..\include\polarssl\bn_mul.h" />
     <ClInclude Include="..\..\include\polarssl\camellia.h" />
     <ClInclude Include="..\..\include\polarssl\certs.h" />
+    <ClInclude Include="..\..\include\polarssl\check_config.h" />
     <ClInclude Include="..\..\include\polarssl\cipher.h" />
     <ClInclude Include="..\..\include\polarssl\cipher_wrap.h" />
+    <ClInclude Include="..\..\include\polarssl\compat-1.2.h" />
     <ClInclude Include="..\..\include\polarssl\config.h" />
-    <ClInclude Include="..\..\include\polarssl\check_config.h" />
     <ClInclude Include="..\..\include\polarssl\ctr_drbg.h" />
     <ClInclude Include="..\..\include\polarssl\debug.h" />
     <ClInclude Include="..\..\include\polarssl\des.h" />
@@ -170,10 +171,10 @@
     <ClInclude Include="..\..\include\polarssl\gcm.h" />
     <ClInclude Include="..\..\include\polarssl\havege.h" />
     <ClInclude Include="..\..\include\polarssl\hmac_drbg.h" />
+    <ClInclude Include="..\..\include\polarssl\md.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" />
@@ -183,27 +184,27 @@
     <ClInclude Include="..\..\include\polarssl\padlock.h" />
     <ClInclude Include="..\..\include\polarssl\pbkdf2.h" />
     <ClInclude Include="..\..\include\polarssl\pem.h" />
+    <ClInclude Include="..\..\include\polarssl\pk.h" />
+    <ClInclude Include="..\..\include\polarssl\pk_wrap.h" />
     <ClInclude Include="..\..\include\polarssl\pkcs11.h" />
     <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" />
     <ClInclude Include="..\..\include\polarssl\sha256.h" />
     <ClInclude Include="..\..\include\polarssl\sha512.h" />
+    <ClInclude Include="..\..\include\polarssl\ssl.h" />
     <ClInclude Include="..\..\include\polarssl\ssl_cache.h" />
     <ClInclude Include="..\..\include\polarssl\ssl_ciphersuites.h" />
-    <ClInclude Include="..\..\include\polarssl\ssl.h" />
     <ClInclude Include="..\..\include\polarssl\threading.h" />
     <ClInclude Include="..\..\include\polarssl\timing.h" />
     <ClInclude Include="..\..\include\polarssl\version.h" />
+    <ClInclude Include="..\..\include\polarssl\x509.h" />
     <ClInclude Include="..\..\include\polarssl\x509_crl.h" />
     <ClInclude Include="..\..\include\polarssl\x509_crt.h" />
     <ClInclude Include="..\..\include\polarssl\x509_csr.h" />
-    <ClInclude Include="..\..\include\polarssl\x509.h" />
     <ClInclude Include="..\..\include\polarssl\xtea.h" />
   </ItemGroup>
   <ItemGroup>
@@ -233,10 +234,10 @@
     <ClCompile Include="..\..\library\gcm.c" />
     <ClCompile Include="..\..\library\havege.c" />
     <ClCompile Include="..\..\library\hmac_drbg.c" />
+    <ClCompile Include="..\..\library\md.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\net.c" />
@@ -245,11 +246,11 @@
     <ClCompile Include="..\..\library\pbkdf2.c" />
     <ClCompile Include="..\..\library\pem.c" />
     <ClCompile Include="..\..\library\pk.c" />
+    <ClCompile Include="..\..\library\pk_wrap.c" />
     <ClCompile Include="..\..\library\pkcs11.c" />
     <ClCompile Include="..\..\library\pkcs12.c" />
     <ClCompile Include="..\..\library\pkcs5.c" />
     <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" />
diff --git a/visualc/VS6/polarssl.dsp b/visualc/VS6/polarssl.dsp
index 71dfd7f..45f5dde 100644
--- a/visualc/VS6/polarssl.dsp
+++ b/visualc/VS6/polarssl.dsp
@@ -74,7 +74,7 @@
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
 
-!ENDIF 
+!ENDIF
 
 # Begin Target
 
@@ -189,6 +189,10 @@
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\library\md.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\library\md2.c
 # End Source File
 # Begin Source File
@@ -201,10 +205,6 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\library\md.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\library\md_wrap.c
 # End Source File
 # Begin Source File
@@ -237,6 +237,10 @@
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\library\pk_wrap.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\library\pkcs11.c
 # End Source File
 # Begin Source File
@@ -253,10 +257,6 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\library\pk_wrap.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\library\pkwrite.c
 # End Source File
 # Begin Source File
@@ -329,10 +329,6 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\library\x509_create.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\library\x509_crl.c
 # End Source File
 # Begin Source File
@@ -405,6 +401,10 @@
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\polarssl\check_config.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\polarssl\cipher.h
 # End Source File
 # Begin Source File
@@ -413,11 +413,11 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\polarssl\config.h
+SOURCE=..\..\include\polarssl\compat-1.2.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\polarssl\check_config.h
+SOURCE=..\..\include\polarssl\config.h
 # End Source File
 # Begin Source File
 
@@ -473,6 +473,10 @@
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\polarssl\md.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\polarssl\md2.h
 # End Source File
 # Begin Source File
@@ -485,19 +489,15 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\polarssl\md.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\include\polarssl\md_wrap.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\polarssl\memory_buffer_alloc.h
+SOURCE=..\..\include\polarssl\memory.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\polarssl\memory.h
+SOURCE=..\..\include\polarssl\memory_buffer_alloc.h
 # End Source File
 # Begin Source File
 
@@ -525,6 +525,14 @@
 # End Source File
 # Begin Source File
 
+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\pkcs11.h
 # End Source File
 # Begin Source File
@@ -537,14 +545,6 @@
 # End Source File
 # Begin Source File
 
-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
@@ -569,6 +569,10 @@
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\polarssl\ssl.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\polarssl\ssl_cache.h
 # End Source File
 # Begin Source File
@@ -577,10 +581,6 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\polarssl\ssl.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\include\polarssl\threading.h
 # End Source File
 # Begin Source File
@@ -593,6 +593,10 @@
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\polarssl\x509.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\polarssl\x509_crl.h
 # End Source File
 # Begin Source File
@@ -605,10 +609,6 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\polarssl\x509.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\include\polarssl\xtea.h
 # End Source File
 # End Group