diff --git a/CASA-auth-token/non-java/client/authtokenclient_msm/authtokenclient_msm.vdproj b/CASA-auth-token/non-java/client/authtokenclient_msm/authtokenclient_msm.vdproj
index 50793d33..5fcee0ac 100644
--- a/CASA-auth-token/non-java/client/authtokenclient_msm/authtokenclient_msm.vdproj
+++ b/CASA-auth-token/non-java/client/authtokenclient_msm/authtokenclient_msm.vdproj
@@ -28,13 +28,7 @@
         "Entry"
         {
         "MsmKey" = "8:_313DE095D13281AF91A64E3F3D472413"
-        "OwnerKey" = "8:_F0358243F2B34E40852F2185663C5B71"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_35590D5026504A138951C430142FECBA"
-        "OwnerKey" = "8:_8292EFFD84EF46C6BD2F1F3E20808684"
+        "OwnerKey" = "8:_EBD9DA1C34EA4666B638163C28BCA74B"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -69,13 +63,19 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_EDA39B5CAD864AF0821AAFC9783DFF12"
+        "MsmKey" = "8:_A2DC4131C0394DE9A11C5C9454847F1E"
+        "OwnerKey" = "8:_8292EFFD84EF46C6BD2F1F3E20808684"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_EBD9DA1C34EA4666B638163C28BCA74B"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_F0358243F2B34E40852F2185663C5B71"
+        "MsmKey" = "8:_EDA39B5CAD864AF0821AAFC9783DFF12"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -404,7 +404,7 @@
         }
         "MergeModule"
         {
-            "{35A69C6E-5BA4-440D-803D-762B59A45393}:_35590D5026504A138951C430142FECBA"
+            "{35A69C6E-5BA4-440D-803D-762B59A45393}:_A2DC4131C0394DE9A11C5C9454847F1E"
             {
             "UseDynamicProperties" = "11:FALSE"
             "IsDependency" = "11:TRUE"
@@ -432,7 +432,7 @@
         {
             "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_3986DA1502244FFBB04A66472E74633B"
             {
-            "SourcePath" = "8:..\\mechanisms\\pwd\\windows\\Release\\pwmech.dll"
+            "SourcePath" = "8:..\\mechanisms\\pwd\\windows\\Debug\\pwmech.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_F5F5F604B81645F8B6463F7A7D6A53AD"
@@ -460,7 +460,7 @@
             }
             "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_8292EFFD84EF46C6BD2F1F3E20808684"
             {
-            "SourcePath" = "8:..\\csharp\\Novell.Casa.Authtoken\\obj\\Release\\Novell.Casa.Client.Auth.dll"
+            "SourcePath" = "8:..\\csharp\\Novell.Casa.Authtoken\\obj\\Debug\\Novell.Casa.Client.Auth.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_8E0BBDD021EA45308BD98380F28EB7F6"
@@ -486,9 +486,9 @@
                 {
                 }
             }
-            "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_F0358243F2B34E40852F2185663C5B71"
+            "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_EBD9DA1C34EA4666B638163C28BCA74B"
             {
-            "SourcePath" = "8:..\\mechanisms\\krb5\\windows\\Release\\krb5mech.dll"
+            "SourcePath" = "8:..\\mechanisms\\krb5\\windows\\Debug\\krb5mech.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_F5F5F604B81645F8B6463F7A7D6A53AD"
diff --git a/CASA-auth-token/non-java/client/mechanisms/krb5/windows/krb5.vcproj b/CASA-auth-token/non-java/client/mechanisms/krb5/windows/krb5.vcproj
index a3c3d8f8..37a4152c 100644
--- a/CASA-auth-token/non-java/client/mechanisms/krb5/windows/krb5.vcproj
+++ b/CASA-auth-token/non-java/client/mechanisms/krb5/windows/krb5.vcproj
@@ -20,7 +20,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="-DSECURITY_WIN32"
 				Optimization="0"
-				AdditionalIncludeDirectories=""C:\Dev\casa\CASA-auth-token\non-java\client\mechanisms\krb5\windows";"C:\Dev\casa\CASA-auth-token\non-java\client\mechanisms\krb5";"C:\Dev\casa\CASA-auth-token\non-java\client";"C:\Program Files\novell\CASA\include";"C:\Dev\casa\CASA-auth-token\non-java\include""
+				AdditionalIncludeDirectories=".\;..\;..\..\..;..\..\..\..\include;"..\..\..\..\..\..\..\Expat-2.0.0\source\lib";"c:\Program Files\Novell\CASA\include""
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -80,7 +80,7 @@ copy $(OutDir)\krb5mech.dll \"Program Files"\novell\casa\lib\krb5mech.
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="-DSECURITY_WIN32"
-				AdditionalIncludeDirectories="&quot;C:\Dev\casa\CASA-auth-token\non-java\client\mechanisms\krb5\windows&quot;;&quot;C:\Dev\casa\CASA-auth-token\non-java\client\mechanisms\krb5&quot;;&quot;C:\Dev\casa\CASA-auth-token\non-java\client&quot;;&quot;C:\Program Files\novell\CASA\include&quot;;&quot;C:\Dev\casa\CASA-auth-token\non-java\include&quot;"
+				AdditionalIncludeDirectories=".\;..\;..\..\..;..\..\..\..\include;&quot;..\..\..\..\..\..\..\Expat-2.0.0\source\lib&quot;;&quot;c:\Program Files\Novell\CASA\include&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				RuntimeLibrary="4"
 				UsePrecompiledHeader="0"
diff --git a/CASA-auth-token/non-java/client/mechanisms/pwd/windows/pwd.vcproj b/CASA-auth-token/non-java/client/mechanisms/pwd/windows/pwd.vcproj
index 561aa858..6502266e 100644
--- a/CASA-auth-token/non-java/client/mechanisms/pwd/windows/pwd.vcproj
+++ b/CASA-auth-token/non-java/client/mechanisms/pwd/windows/pwd.vcproj
@@ -19,7 +19,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;&quot;C:\Dev\casa\CASA-auth-token\non-java\client\mechanisms\pwd\windows&quot;;&quot;C:\Dev\casa\CASA-auth-token\non-java\client\mechanisms\pwd&quot;;&quot;C:\Dev\casa\CASA-auth-token\non-java\client&quot;;&quot;C:\Program Files\novell\CASA\include&quot;;&quot;C:\Dev\Expat-2.0.0\Source\lib&quot;"
+				AdditionalIncludeDirectories=".\;..\;..\..\..;..\..\..\..\include;&quot;..\..\..\..\..\..\..\Expat-2.0.0\source\lib&quot;;&quot;c:\Program Files\Novell\CASA\include&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -79,7 +79,7 @@ copy $(OutDir)\pwmech.dll \&quot;Program Files&quot;\novell\casa\lib\pwmech.dll
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".;&quot;C:\Dev\casa\CASA-auth-token\non-java\client\mechanisms\pwd\windows&quot;;&quot;C:\Dev\casa\CASA-auth-token\non-java\client\mechanisms\pwd&quot;;&quot;C:\Dev\casa\CASA-auth-token\non-java\client&quot;;&quot;C:\Program Files\novell\CASA\include&quot;;&quot;C:\Dev\Expat-2.0.0\Source\lib&quot;"
+				AdditionalIncludeDirectories=".\;..\;..\..\..;..\..\..\..\include;&quot;..\..\..\..\..\..\..\Expat-2.0.0\source\lib&quot;;&quot;c:\Program Files\Novell\CASA\include&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				RuntimeLibrary="4"
 				UsePrecompiledHeader="0"
diff --git a/CASA-auth-token/non-java/client/test/windows/platform.h b/CASA-auth-token/non-java/client/test/windows/platform.h
index 49b31447..be4b3d33 100644
--- a/CASA-auth-token/non-java/client/test/windows/platform.h
+++ b/CASA-auth-token/non-java/client/test/windows/platform.h
@@ -26,4 +26,4 @@
 #include <windows.h>
 #include "casa_c_authtoken.h"
 
-#define errno WSAGetLastError()
+//#define errno WSAGetLastError()
diff --git a/CASA-auth-token/non-java/client/test/windows/test.vcproj b/CASA-auth-token/non-java/client/test/windows/test.vcproj
index 08a0fc43..bf016d2e 100644
--- a/CASA-auth-token/non-java/client/test/windows/test.vcproj
+++ b/CASA-auth-token/non-java/client/test/windows/test.vcproj
@@ -19,7 +19,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;C:\Dev\casa\CASA-auth-token\non-java\client\test\windows&quot;;&quot;C:\Dev\casa\CASA-auth-token\non-java\include&quot;;&quot;C:\Program Files\novell\CASA\include&quot;"
+				AdditionalIncludeDirectories=".\;..\..\..\include;&quot;C:\Program Files\novell\CASA\include&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -44,7 +44,7 @@
 				Name="VCMIDLTool"/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="copy ..\windows\debug\authtoken.dll debug\authtoken.dll"/>
+				CommandLine="copy ..\..\windows\debug\authtoken.dll debug\authtoken.dll"/>
 			<Tool
 				Name="VCPreBuildEventTool"/>
 			<Tool
@@ -70,7 +70,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;C:\Dev\casa\CASA-auth-token\non-java\client\test\windows&quot;;&quot;C:\Dev\casa\CASA-auth-token\non-java\include&quot;;&quot;C:\Program Files\novell\CASA\include&quot;"
+				AdditionalIncludeDirectories=".\;..\..\..\include;&quot;C:\Program Files\novell\CASA\include&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="4"
 				UsePrecompiledHeader="0"