From 66ca7d8face0cdae661abfd5fddf38ba1078abef Mon Sep 17 00:00:00 2001
From: Davide Beatrici <davidebeatrici@gmail.com>
Date: Thu, 19 Apr 2018 05:10:38 +0200
Subject: [PATCH] Add Windows Driver Kit 7.1.0 directories to projects
 requiring ATL/MFC

---
 src/Ham/Ham.vcproj               |  4 ++++
 src/Neo/Neo.vcproj               |  8 ++++----
 src/Neo6/Neo6.vcproj             |  8 ++++----
 src/PenCore/PenCore.vcproj       |  1 +
 src/SeLow/SeLow.vcproj           |  8 ++++----
 src/See/See.vcproj               |  8 ++++----
 src/SeeDll/SeeDll.vcproj         |  2 ++
 src/Wfp/Wfp.vcproj               |  8 ++++----
 src/vpnbrand/vpnbrand.vcproj     |  4 ++++
 src/vpnbridge/vpnbridge.vcproj   |  4 ++++
 src/vpnclient/vpnclient.vcproj   |  4 ++++
 src/vpncmd/vpncmd.vcproj         |  4 ++++
 src/vpncmdsys/vpncmdsys.vcproj   |  2 ++
 src/vpncmgr/vpncmgr.vcproj       |  4 ++++
 src/vpndrvinst/vpndrvinst.vcproj |  2 ++
 src/vpninstall/vpninstall.vcproj |  2 ++
 src/vpnserver/vpnserver.vcproj   |  4 ++++
 src/vpnsetup/vpnsetup.vcproj     |  4 ++++
 src/vpnsmgr/vpnsmgr.vcproj       |  4 ++++
 src/vpnweb/vpnweb.vcproj         | 15 ++++++++-------
 20 files changed, 73 insertions(+), 27 deletions(-)

diff --git a/src/Ham/Ham.vcproj b/src/Ham/Ham.vcproj
index 0cf4a043..ce480143 100644
--- a/src/Ham/Ham.vcproj
+++ b/src/Ham/Ham.vcproj
@@ -63,6 +63,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="C:\WinDDK\7600.16385.1\inc\mfc42;$(IntDir)"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -155,6 +156,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="C:\WinDDK\7600.16385.1\inc\mfc42;$(IntDir)"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -250,6 +252,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="C:\WinDDK\7600.16385.1\inc\mfc42;$(IntDir)"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -351,6 +354,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="C:\WinDDK\7600.16385.1\inc\mfc42;$(IntDir)"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/src/Neo/Neo.vcproj b/src/Neo/Neo.vcproj
index 7996a607..ea1ae0cc 100644
--- a/src/Neo/Neo.vcproj
+++ b/src/Neo/Neo.vcproj
@@ -48,7 +48,7 @@
 				InlineFunctionExpansion="0"
 				EnableIntrinsicFunctions="false"
 				FavorSizeOrSpeed="0"
-				AdditionalIncludeDirectories="$(SolutionDir)Mayaqua\win32_inc;C:\WINDDK\7600.16385.0\inc\ddk;C:\WinDDK\7600.16385.0\inc\api;C:\WinDDK\7600.16385.0\inc\crt;$(SolutionDir)"
+				AdditionalIncludeDirectories="$(SolutionDir)Mayaqua\win32_inc;C:\WinDDK\7600.16385.1\inc\ddk;C:\WinDDK\7600.16385.1\inc\api;C:\WinDDK\7600.16385.1\inc\crt;$(SolutionDir)"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;NEO_EXPORTS;VPN_SPEED"
 				StringPooling="false"
 				ExceptionHandling="0"
@@ -81,7 +81,7 @@
 				AdditionalDependencies="wdm.lib ndis.lib wdmsec.lib &quot;$(SolutionDir)tmp\VersionResources\$(ProjectName)_$(PlatformName).res&quot;"
 				OutputFile="$(OutDir)\Neo_x86.sys"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="C:\WINDDK\7600.16385.0\lib\wnet\i386"
+				AdditionalLibraryDirectories="C:\WinDDK\7600.16385.1\lib\wnet\i386"
 				GenerateManifest="false"
 				IgnoreAllDefaultLibraries="true"
 				GenerateDebugInformation="true"
@@ -153,7 +153,7 @@
 				InlineFunctionExpansion="0"
 				EnableIntrinsicFunctions="false"
 				FavorSizeOrSpeed="0"
-				AdditionalIncludeDirectories="$(SolutionDir)Mayaqua\win32_inc;C:\WINDDK\7600.16385.0\inc\ddk;C:\WinDDK\7600.16385.0\inc\api;C:\WinDDK\7600.16385.0\inc\crt;$(SolutionDir)"
+				AdditionalIncludeDirectories="$(SolutionDir)Mayaqua\win32_inc;C:\WinDDK\7600.16385.1\inc\ddk;C:\WinDDK\7600.16385.1\inc\api;C:\WinDDK\7600.16385.1\inc\crt;$(SolutionDir)"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;NEO_EXPORTS;VPN_SPEED;CPU_64"
 				StringPooling="false"
 				ExceptionHandling="0"
@@ -186,7 +186,7 @@
 				AdditionalDependencies="wdm.lib ndis.lib wdmsec.lib &quot;$(SolutionDir)tmp\VersionResources\$(ProjectName)_$(PlatformName).res&quot;"
 				OutputFile="$(OutDir)\Neo_x64.sys"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="C:\WINDDK\7600.16385.0\lib\wnet\amd64"
+				AdditionalLibraryDirectories="C:\WinDDK\7600.16385.1\lib\wnet\amd64"
 				GenerateManifest="false"
 				IgnoreAllDefaultLibraries="true"
 				GenerateDebugInformation="true"
diff --git a/src/Neo6/Neo6.vcproj b/src/Neo6/Neo6.vcproj
index 4fb2305c..fed00b07 100644
--- a/src/Neo6/Neo6.vcproj
+++ b/src/Neo6/Neo6.vcproj
@@ -48,7 +48,7 @@
 				InlineFunctionExpansion="0"
 				EnableIntrinsicFunctions="false"
 				FavorSizeOrSpeed="0"
-				AdditionalIncludeDirectories="$(SolutionDir)Mayaqua\win32_inc;C:\WINDDK\7600.16385.0\inc\ddk;C:\WinDDK\7600.16385.0\inc\api;C:\WinDDK\7600.16385.0\inc\crt;$(SolutionDir)"
+				AdditionalIncludeDirectories="$(SolutionDir)Mayaqua\win32_inc;C:\WinDDK\7600.16385.1\inc\ddk;C:\WinDDK\7600.16385.1\inc\api;C:\WinDDK\7600.16385.1\inc\crt;$(SolutionDir)"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;NEO_EXPORTS;VPN_SPEED"
 				StringPooling="false"
 				ExceptionHandling="0"
@@ -82,7 +82,7 @@
 				AdditionalDependencies="bufferoverflowK.lib wdm.lib ndis.lib ntoskrnl.lib fwpkclnt.lib &quot;$(SolutionDir)tmp\VersionResources\$(ProjectName)_$(PlatformName).res&quot;"
 				OutputFile="$(OutDir)\Neo6_x86_unsigned.sys"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="C:\WINDDK\7600.16385.0\lib\win7\i386"
+				AdditionalLibraryDirectories="C:\WinDDK\7600.16385.1\lib\win7\i386"
 				GenerateManifest="false"
 				IgnoreAllDefaultLibraries="true"
 				GenerateDebugInformation="true"
@@ -154,7 +154,7 @@
 				InlineFunctionExpansion="0"
 				EnableIntrinsicFunctions="false"
 				FavorSizeOrSpeed="0"
-				AdditionalIncludeDirectories="$(SolutionDir)Mayaqua\win32_inc;C:\WINDDK\7600.16385.0\inc\ddk;C:\WinDDK\7600.16385.0\inc\api;C:\WinDDK\7600.16385.0\inc\crt;$(SolutionDir)"
+				AdditionalIncludeDirectories="$(SolutionDir)Mayaqua\win32_inc;C:\WinDDK\7600.16385.1\inc\ddk;C:\WinDDK\7600.16385.1\inc\api;C:\WinDDK\7600.16385.1\inc\crt;$(SolutionDir)"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;NEO_EXPORTS;VPN_SPEED;CPU_64"
 				StringPooling="false"
 				ExceptionHandling="0"
@@ -188,7 +188,7 @@
 				AdditionalDependencies="wdm.lib ndis.lib wdmsec.lib ntoskrnl.lib fwpkclnt.lib &quot;$(SolutionDir)tmp\VersionResources\$(ProjectName)_$(PlatformName).res&quot;"
 				OutputFile="$(OutDir)\Neo6_x64_unsigned.sys"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="C:\WINDDK\7600.16385.0\lib\win7\amd64"
+				AdditionalLibraryDirectories="C:\WinDDK\7600.16385.1\lib\win7\amd64"
 				GenerateManifest="false"
 				IgnoreAllDefaultLibraries="true"
 				GenerateDebugInformation="true"
diff --git a/src/PenCore/PenCore.vcproj b/src/PenCore/PenCore.vcproj
index 902f786d..9fca4750 100644
--- a/src/PenCore/PenCore.vcproj
+++ b/src/PenCore/PenCore.vcproj
@@ -63,6 +63,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="C:\WinDDK\7600.16385.1\inc\mfc42;$(IntDir)"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/src/SeLow/SeLow.vcproj b/src/SeLow/SeLow.vcproj
index ad8d53b9..6af61bb6 100644
--- a/src/SeLow/SeLow.vcproj
+++ b/src/SeLow/SeLow.vcproj
@@ -48,7 +48,7 @@
 				InlineFunctionExpansion="0"
 				EnableIntrinsicFunctions="false"
 				FavorSizeOrSpeed="0"
-				AdditionalIncludeDirectories="$(SolutionDir)Mayaqua\win32_inc;C:\WINDDK\7600.16385.0\inc\ddk;C:\WinDDK\7600.16385.0\inc\api;C:\WinDDK\7600.16385.0\inc\crt;$(SolutionDir)"
+				AdditionalIncludeDirectories="$(SolutionDir)Mayaqua\win32_inc;C:\WinDDK\7600.16385.1\inc\ddk;C:\WinDDK\7600.16385.1\inc\api;C:\WinDDK\7600.16385.1\inc\crt;$(SolutionDir)"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;VPN_SPEED"
 				StringPooling="false"
 				ExceptionHandling="0"
@@ -82,7 +82,7 @@
 				AdditionalDependencies="bufferoverflowK.lib wdm.lib ndis.lib wdmsec.lib ntoskrnl.lib fwpkclnt.lib &quot;$(SolutionDir)tmp\VersionResources\$(ProjectName)_$(PlatformName).res&quot;"
 				OutputFile="$(OutDir)\SeLow_x86_unsigned.sys"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="C:\WINDDK\7600.16385.0\lib\win7\i386"
+				AdditionalLibraryDirectories="C:\WinDDK\7600.16385.1\lib\win7\i386"
 				GenerateManifest="false"
 				IgnoreAllDefaultLibraries="true"
 				GenerateDebugInformation="true"
@@ -154,7 +154,7 @@
 				InlineFunctionExpansion="0"
 				EnableIntrinsicFunctions="false"
 				FavorSizeOrSpeed="0"
-				AdditionalIncludeDirectories="$(SolutionDir)Mayaqua\win32_inc;C:\WINDDK\7600.16385.0\inc\ddk;C:\WinDDK\7600.16385.0\inc\api;C:\WinDDK\7600.16385.0\inc\crt;$(SolutionDir)"
+				AdditionalIncludeDirectories="$(SolutionDir)Mayaqua\win32_inc;C:\WinDDK\7600.16385.1\inc\ddk;C:\WinDDK\7600.16385.1\inc\api;C:\WinDDK\7600.16385.1\inc\crt;$(SolutionDir)"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;VPN_SPEED;CPU_64"
 				StringPooling="false"
 				ExceptionHandling="0"
@@ -188,7 +188,7 @@
 				AdditionalDependencies="bufferoverflowK.lib wdm.lib ndis.lib wdmsec.lib ntoskrnl.lib fwpkclnt.lib &quot;$(SolutionDir)tmp\VersionResources\$(ProjectName)_$(PlatformName).res&quot;"
 				OutputFile="$(OutDir)\SeLow_x64_unsigned.sys"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="C:\WINDDK\7600.16385.0\lib\win7\amd64"
+				AdditionalLibraryDirectories="C:\WinDDK\7600.16385.1\lib\win7\amd64"
 				GenerateManifest="false"
 				IgnoreAllDefaultLibraries="true"
 				GenerateDebugInformation="true"
diff --git a/src/See/See.vcproj b/src/See/See.vcproj
index ff83992c..8366bf72 100644
--- a/src/See/See.vcproj
+++ b/src/See/See.vcproj
@@ -48,7 +48,7 @@
 				InlineFunctionExpansion="0"
 				EnableIntrinsicFunctions="false"
 				FavorSizeOrSpeed="0"
-				AdditionalIncludeDirectories="$(SolutionDir)Mayaqua\win32_inc;C:\WINDDK\7600.16385.0\inc\ddk;C:\WinDDK\7600.16385.0\inc\api;C:\WinDDK\7600.16385.0\inc\crt;$(SolutionDir)"
+				AdditionalIncludeDirectories="$(SolutionDir)Mayaqua\win32_inc;C:\WinDDK\7600.16385.1\inc\ddk;C:\WinDDK\7600.16385.1\inc\api;C:\WinDDK\7600.16385.1\inc\crt;$(SolutionDir)"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;NEO_EXPORTS;VPN_SPEED;WIN_NT_DRIVER;_X86_=1;NDIS50;NTKERNEL"
 				StringPooling="false"
 				ExceptionHandling="0"
@@ -79,7 +79,7 @@
 				AdditionalDependencies="ntoskrnl.lib hal.lib wmilib.lib ndis.lib &quot;$(SolutionDir)tmp\VersionResources\$(ProjectName)_$(PlatformName).res&quot;"
 				OutputFile="$(OutDir)\See_x86.sys"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="C:\WINDDK\7600.16385.0\lib\wnet\i386"
+				AdditionalLibraryDirectories="C:\WinDDK\7600.16385.1\lib\wnet\i386"
 				GenerateManifest="false"
 				IgnoreAllDefaultLibraries="true"
 				GenerateDebugInformation="true"
@@ -152,7 +152,7 @@
 				InlineFunctionExpansion="0"
 				EnableIntrinsicFunctions="false"
 				FavorSizeOrSpeed="0"
-				AdditionalIncludeDirectories="$(SolutionDir)Mayaqua\win32_inc;C:\WINDDK\7600.16385.0\inc\ddk;C:\WinDDK\7600.16385.0\inc\api;C:\WinDDK\7600.16385.0\inc\crt;$(SolutionDir)"
+				AdditionalIncludeDirectories="$(SolutionDir)Mayaqua\win32_inc;C:\WinDDK\7600.16385.1\inc\ddk;C:\WinDDK\7600.16385.1\inc\api;C:\WinDDK\7600.16385.1\inc\crt;$(SolutionDir)"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;NEO_EXPORTS;VPN_SPEED;WIN_NT_DRIVER;NDIS50;WIN32_EXT;__NPF_AMD64__;_AMD64_;AMD64;_WIN64;NTKERNEL;CPU_64"
 				StringPooling="false"
 				ExceptionHandling="0"
@@ -183,7 +183,7 @@
 				AdditionalDependencies="ntoskrnl.lib hal.lib wmilib.lib ndis.lib &quot;$(SolutionDir)tmp\VersionResources\$(ProjectName)_$(PlatformName).res&quot;"
 				OutputFile="$(OutDir)\See_x64.sys"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="C:\WINDDK\7600.16385.0\lib\wnet\amd64"
+				AdditionalLibraryDirectories="C:\WinDDK\7600.16385.1\lib\wnet\amd64"
 				GenerateManifest="false"
 				IgnoreAllDefaultLibraries="true"
 				GenerateDebugInformation="true"
diff --git a/src/SeeDll/SeeDll.vcproj b/src/SeeDll/SeeDll.vcproj
index eee9e345..e2ac3550 100644
--- a/src/SeeDll/SeeDll.vcproj
+++ b/src/SeeDll/SeeDll.vcproj
@@ -67,6 +67,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="C:\WinDDK\7600.16385.1\inc\mfc42;$(IntDir)"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -166,6 +167,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="C:\WinDDK\7600.16385.1\inc\mfc42;$(IntDir)"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/src/Wfp/Wfp.vcproj b/src/Wfp/Wfp.vcproj
index bf9781fd..fc331741 100644
--- a/src/Wfp/Wfp.vcproj
+++ b/src/Wfp/Wfp.vcproj
@@ -48,7 +48,7 @@
 				InlineFunctionExpansion="0"
 				EnableIntrinsicFunctions="false"
 				FavorSizeOrSpeed="0"
-				AdditionalIncludeDirectories="$(SolutionDir)Mayaqua\win32_inc;C:\WINDDK\7600.16385.0\inc\ddk;C:\WinDDK\7600.16385.0\inc\api;C:\WinDDK\7600.16385.0\inc\crt;$(SolutionDir)"
+				AdditionalIncludeDirectories="$(SolutionDir)Mayaqua\win32_inc;C:\WinDDK\7600.16385.1\inc\ddk;C:\WinDDK\7600.16385.1\inc\api;C:\WinDDK\7600.16385.1\inc\crt;$(SolutionDir)"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WFP_EXPORTS;VPN_SPEED"
 				GeneratePreprocessedFile="0"
 				KeepComments="false"
@@ -82,7 +82,7 @@
 				AdditionalDependencies="bufferoverflowK.lib wdm.lib ndis.lib wdmsec.lib ntoskrnl.lib fwpkclnt.lib &quot;$(SolutionDir)tmp\VersionResources\$(ProjectName)_$(PlatformName).res&quot;"
 				OutputFile="$(OutDir)\pxwfp_x86_unsigned.sys"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="C:\WINDDK\7600.16385.0\lib\wlh\i386"
+				AdditionalLibraryDirectories="C:\WinDDK\7600.16385.1\lib\wlh\i386"
 				GenerateManifest="false"
 				IgnoreAllDefaultLibraries="true"
 				GenerateDebugInformation="true"
@@ -154,7 +154,7 @@
 				InlineFunctionExpansion="0"
 				EnableIntrinsicFunctions="false"
 				FavorSizeOrSpeed="0"
-				AdditionalIncludeDirectories="$(SolutionDir)Mayaqua\win32_inc;C:\WINDDK\7600.16385.0\inc\ddk;C:\WinDDK\7600.16385.0\inc\api;C:\WinDDK\7600.16385.0\inc\crt;$(SolutionDir)"
+				AdditionalIncludeDirectories="$(SolutionDir)Mayaqua\win32_inc;C:\WinDDK\7600.16385.1\inc\ddk;C:\WinDDK\7600.16385.1\inc\api;C:\WinDDK\7600.16385.1\inc\crt;$(SolutionDir)"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WFP_EXPORTS;VPN_SPEED;CPU_64"
 				StringPooling="false"
 				ExceptionHandling="0"
@@ -186,7 +186,7 @@
 				AdditionalDependencies="bufferoverflowK.lib wdm.lib ndis.lib wdmsec.lib ntoskrnl.lib fwpkclnt.lib &quot;$(SolutionDir)tmp\VersionResources\$(ProjectName)_$(PlatformName).res&quot;"
 				OutputFile="$(OutDir)\pxwfp_x64_unsigned.sys"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="C:\WINDDK\7600.16385.0\lib\wlh\amd64"
+				AdditionalLibraryDirectories="C:\WinDDK\7600.16385.1\lib\wlh\amd64"
 				GenerateManifest="false"
 				IgnoreAllDefaultLibraries="true"
 				GenerateDebugInformation="true"
diff --git a/src/vpnbrand/vpnbrand.vcproj b/src/vpnbrand/vpnbrand.vcproj
index 77a81636..f991bfe4 100644
--- a/src/vpnbrand/vpnbrand.vcproj
+++ b/src/vpnbrand/vpnbrand.vcproj
@@ -62,6 +62,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="C:\WinDDK\7600.16385.1\inc\mfc42;$(IntDir)"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -149,6 +150,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="C:\WinDDK\7600.16385.1\inc\mfc42;$(IntDir)"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -240,6 +242,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="C:\WinDDK\7600.16385.1\inc\mfc42;$(IntDir)"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -336,6 +339,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="C:\WinDDK\7600.16385.1\inc\mfc42;$(IntDir)"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/src/vpnbridge/vpnbridge.vcproj b/src/vpnbridge/vpnbridge.vcproj
index 3a059dd9..e12f6ff5 100644
--- a/src/vpnbridge/vpnbridge.vcproj
+++ b/src/vpnbridge/vpnbridge.vcproj
@@ -62,6 +62,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="C:\WinDDK\7600.16385.1\inc\mfc42;$(IntDir)"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -150,6 +151,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="C:\WinDDK\7600.16385.1\inc\mfc42;$(IntDir)"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -241,6 +243,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="C:\WinDDK\7600.16385.1\inc\mfc42;$(IntDir)"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -337,6 +340,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="C:\WinDDK\7600.16385.1\inc\mfc42;$(IntDir)"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/src/vpnclient/vpnclient.vcproj b/src/vpnclient/vpnclient.vcproj
index 6e27a5b5..205f19cc 100644
--- a/src/vpnclient/vpnclient.vcproj
+++ b/src/vpnclient/vpnclient.vcproj
@@ -63,6 +63,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="C:\WinDDK\7600.16385.1\inc\mfc42;$(IntDir)"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -152,6 +153,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="C:\WinDDK\7600.16385.1\inc\mfc42;$(IntDir)"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -243,6 +245,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="C:\WinDDK\7600.16385.1\inc\mfc42;$(IntDir)"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -339,6 +342,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="C:\WinDDK\7600.16385.1\inc\mfc42;$(IntDir)"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/src/vpncmd/vpncmd.vcproj b/src/vpncmd/vpncmd.vcproj
index feeea3e8..dd071840 100644
--- a/src/vpncmd/vpncmd.vcproj
+++ b/src/vpncmd/vpncmd.vcproj
@@ -64,6 +64,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="C:\WinDDK\7600.16385.1\inc\mfc42;$(IntDir)"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -153,6 +154,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="C:\WinDDK\7600.16385.1\inc\mfc42;$(IntDir)"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -245,6 +247,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="C:\WinDDK\7600.16385.1\inc\mfc42;$(IntDir)"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -342,6 +345,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="C:\WinDDK\7600.16385.1\inc\mfc42;$(IntDir)"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/src/vpncmdsys/vpncmdsys.vcproj b/src/vpncmdsys/vpncmdsys.vcproj
index cfdcfdc0..0913f06c 100644
--- a/src/vpncmdsys/vpncmdsys.vcproj
+++ b/src/vpncmdsys/vpncmdsys.vcproj
@@ -67,6 +67,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="C:\WinDDK\7600.16385.1\inc\mfc42;$(IntDir)"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -162,6 +163,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="C:\WinDDK\7600.16385.1\inc\mfc42;$(IntDir)"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/src/vpncmgr/vpncmgr.vcproj b/src/vpncmgr/vpncmgr.vcproj
index b382f5c4..68ff75af 100644
--- a/src/vpncmgr/vpncmgr.vcproj
+++ b/src/vpncmgr/vpncmgr.vcproj
@@ -63,6 +63,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="C:\WinDDK\7600.16385.1\inc\mfc42;$(IntDir)"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -151,6 +152,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="C:\WinDDK\7600.16385.1\inc\mfc42;$(IntDir)"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -242,6 +244,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="C:\WinDDK\7600.16385.1\inc\mfc42;$(IntDir)"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -338,6 +341,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="C:\WinDDK\7600.16385.1\inc\mfc42;$(IntDir)"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/src/vpndrvinst/vpndrvinst.vcproj b/src/vpndrvinst/vpndrvinst.vcproj
index 58bb9067..5af3e921 100644
--- a/src/vpndrvinst/vpndrvinst.vcproj
+++ b/src/vpndrvinst/vpndrvinst.vcproj
@@ -67,6 +67,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="C:\WinDDK\7600.16385.1\inc\mfc42;$(IntDir)"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -168,6 +169,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="C:\WinDDK\7600.16385.1\inc\mfc42;$(IntDir)"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/src/vpninstall/vpninstall.vcproj b/src/vpninstall/vpninstall.vcproj
index ce9eb58a..ae5a1469 100644
--- a/src/vpninstall/vpninstall.vcproj
+++ b/src/vpninstall/vpninstall.vcproj
@@ -60,6 +60,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="C:\WinDDK\7600.16385.1\inc\mfc42;$(IntDir)"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -151,6 +152,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="C:\WinDDK\7600.16385.1\inc\mfc42;$(IntDir)"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/src/vpnserver/vpnserver.vcproj b/src/vpnserver/vpnserver.vcproj
index c6152bc5..d35922a9 100644
--- a/src/vpnserver/vpnserver.vcproj
+++ b/src/vpnserver/vpnserver.vcproj
@@ -63,6 +63,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="C:\WinDDK\7600.16385.1\inc\mfc42;$(IntDir)"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -152,6 +153,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="C:\WinDDK\7600.16385.1\inc\mfc42;$(IntDir)"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -244,6 +246,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="C:\WinDDK\7600.16385.1\inc\mfc42;$(IntDir)"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -341,6 +344,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="C:\WinDDK\7600.16385.1\inc\mfc42;$(IntDir)"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/src/vpnsetup/vpnsetup.vcproj b/src/vpnsetup/vpnsetup.vcproj
index 8afaf0a1..ab9f05a6 100644
--- a/src/vpnsetup/vpnsetup.vcproj
+++ b/src/vpnsetup/vpnsetup.vcproj
@@ -63,6 +63,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="C:\WinDDK\7600.16385.1\inc\mfc42;$(IntDir)"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -151,6 +152,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="C:\WinDDK\7600.16385.1\inc\mfc42;$(IntDir)"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -242,6 +244,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="C:\WinDDK\7600.16385.1\inc\mfc42;$(IntDir)"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -338,6 +341,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="C:\WinDDK\7600.16385.1\inc\mfc42;$(IntDir)"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/src/vpnsmgr/vpnsmgr.vcproj b/src/vpnsmgr/vpnsmgr.vcproj
index 991cd14f..4ad7ea04 100644
--- a/src/vpnsmgr/vpnsmgr.vcproj
+++ b/src/vpnsmgr/vpnsmgr.vcproj
@@ -63,6 +63,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="C:\WinDDK\7600.16385.1\inc\mfc42;$(IntDir)"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -151,6 +152,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="C:\WinDDK\7600.16385.1\inc\mfc42;$(IntDir)"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -242,6 +244,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="C:\WinDDK\7600.16385.1\inc\mfc42;$(IntDir)"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -338,6 +341,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="C:\WinDDK\7600.16385.1\inc\mfc42;$(IntDir)"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/src/vpnweb/vpnweb.vcproj b/src/vpnweb/vpnweb.vcproj
index 5945f2aa..3effcc46 100644
--- a/src/vpnweb/vpnweb.vcproj
+++ b/src/vpnweb/vpnweb.vcproj
@@ -50,8 +50,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)Mayaqua\win32_inc;.;$(SolutionDir)"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USE_32BIT_TIME_T;_USRDLL"
+				AdditionalIncludeDirectories="$(SolutionDir)Mayaqua\win32_inc;C:\WinDDK\7600.16385.1\inc\atl71;.;$(SolutionDir)"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL"
 				MinimalRebuild="true"
 				ExceptionHandling="1"
 				BasicRuntimeChecks="3"
@@ -68,7 +68,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)Mayaqua\win32_inc;$(IntDir)"
+				AdditionalIncludeDirectories="$(SolutionDir)Mayaqua\win32_inc;C:\WinDDK\7600.16385.1\inc\mfc42;$(IntDir)"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -80,6 +80,7 @@
 				AdditionalDependencies="&quot;$(SolutionDir)tmp\VersionResources\$(ProjectName)_$(PlatformName).res&quot;"
 				OutputFile="$(OutDir)\not_signed\vpnweb.ocx"
 				LinkIncremental="2"
+				AdditionalLibraryDirectories="&quot;C:\WinDDK\7600.16385.1\lib\ATL\i386&quot;"
 				GenerateManifest="false"
 				AdditionalManifestDependencies="type=&apos;win32&apos; name=&apos;Microsoft.Windows.Common-Controls&apos; version=&apos;6.0.0.0&apos; processorArchitecture=&apos;amd64&apos;  publicKeyToken=&apos;6595b64144ccf1df&apos; language=&apos;*&apos;"
 				ModuleDefinitionFile="vpnweb.def"
@@ -153,8 +154,8 @@
 				InlineFunctionExpansion="0"
 				EnableIntrinsicFunctions="false"
 				FavorSizeOrSpeed="0"
-				AdditionalIncludeDirectories="$(SolutionDir)Mayaqua\win32_inc;.;$(SolutionDir)"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USE_32BIT_TIME_T;VPN_SPEED;_USRDLL"
+				AdditionalIncludeDirectories="$(SolutionDir)Mayaqua\win32_inc;C:\WinDDK\7600.16385.1\inc\atl71;.;$(SolutionDir)"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;VPN_SPEED;_USRDLL"
 				StringPooling="false"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -173,7 +174,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
-				AdditionalIncludeDirectories="$(SolutionDir)Mayaqua\win32_inc;$(IntDir)"
+				AdditionalIncludeDirectories="$(SolutionDir)Mayaqua\win32_inc;C:\WinDDK\7600.16385.1\inc\mfc42;$(IntDir)"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -185,7 +186,7 @@
 				AdditionalDependencies="&quot;$(SolutionDir)tmp\VersionResources\$(ProjectName)_$(PlatformName).res&quot;"
 				OutputFile="$(OutDir)\not_signed\vpnweb.ocx"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;C:\Program Files (x86)\Microsoft Visual Studio 8\VC\lib&quot;"
+				AdditionalLibraryDirectories="&quot;C:\WinDDK\7600.16385.1\lib\ATL\i386&quot;;&quot;C:\Program Files (x86)\Microsoft Visual Studio 8\VC\lib&quot;"
 				GenerateManifest="false"
 				AdditionalManifestDependencies="type=&apos;win32&apos; name=&apos;Microsoft.Windows.Common-Controls&apos; version=&apos;6.0.0.0&apos; processorArchitecture=&apos;x86&apos;  publicKeyToken=&apos;6595b64144ccf1df&apos; language=&apos;*&apos;"
 				ModuleDefinitionFile="vpnweb.def"