diff --git a/src/Format/Format.vcproj b/src/Format/Format.vcproj
index 4ab6287c..b5b6a4ad 100644
--- a/src/Format/Format.vcproj
+++ b/src/Format/Format.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\Common;..\Crypto;..\;$(PKCS11_INC)"
+				AdditionalIncludeDirectories="..\Common;..\Crypto;..\;..\PKCS11"
 				PreprocessorDefinitions="VOLFORMAT;WIN32;DEBUG;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -132,7 +132,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/w34189"
 				Optimization="2"
-				AdditionalIncludeDirectories="..\Common;..\Crypto;..\;$(PKCS11_INC)"
+				AdditionalIncludeDirectories="..\Common;..\Crypto;..\;..\PKCS11"
 				PreprocessorDefinitions="VOLFORMAT;WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS"
 				RuntimeLibrary="0"
 				BufferSecurityCheck="true"
@@ -220,7 +220,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\Common;..\Crypto;..\;$(PKCS11_INC)"
+				AdditionalIncludeDirectories="..\Common;..\Crypto;..\;..\PKCS11"
 				PreprocessorDefinitions="VOLFORMAT;WIN32;DEBUG;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -307,7 +307,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/w34189"
 				Optimization="2"
-				AdditionalIncludeDirectories="..\Common;..\Crypto;..\;$(PKCS11_INC)"
+				AdditionalIncludeDirectories="..\Common;..\Crypto;..\;..\PKCS11"
 				PreprocessorDefinitions="VOLFORMAT;WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS"
 				RuntimeLibrary="0"
 				BufferSecurityCheck="true"
diff --git a/src/Mount/Mount.vcproj b/src/Mount/Mount.vcproj
index 2f630f56..1f8e6a6c 100644
--- a/src/Mount/Mount.vcproj
+++ b/src/Mount/Mount.vcproj
@@ -48,7 +48,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\Common;..\Crypto;..\;$(PKCS11_INC)"
+				AdditionalIncludeDirectories="..\Common;..\Crypto;..\;..\PKCS11"
 				PreprocessorDefinitions="TCMOUNT;WIN32;DEBUG;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS"
 				MinimalRebuild="true"
 				ExceptionHandling="1"
@@ -140,7 +140,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/w34189"
 				Optimization="2"
-				AdditionalIncludeDirectories="..\Common;..\Crypto;..\;$(PKCS11_INC)"
+				AdditionalIncludeDirectories="..\Common;..\Crypto;..\;..\PKCS11"
 				PreprocessorDefinitions="TCMOUNT;WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS"
 				RuntimeLibrary="0"
 				BufferSecurityCheck="true"
@@ -230,7 +230,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\Common;..\Crypto;..\;$(PKCS11_INC)"
+				AdditionalIncludeDirectories="..\Common;..\Crypto;..\;..\PKCS11"
 				PreprocessorDefinitions="TCMOUNT;WIN32;DEBUG;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS"
 				MinimalRebuild="true"
 				ExceptionHandling="1"
@@ -323,7 +323,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/w34189"
 				Optimization="2"
-				AdditionalIncludeDirectories="..\Common;..\Crypto;..\;$(PKCS11_INC)"
+				AdditionalIncludeDirectories="..\Common;..\Crypto;..\;..\PKCS11"
 				PreprocessorDefinitions="TCMOUNT;WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS"
 				RuntimeLibrary="0"
 				BufferSecurityCheck="true"
diff --git a/src/Setup/Setup.vcproj b/src/Setup/Setup.vcproj
index cd27eac2..d44c3ed5 100644
--- a/src/Setup/Setup.vcproj
+++ b/src/Setup/Setup.vcproj
@@ -42,7 +42,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\Common;..\Crypto;..\;$(PKCS11_INC)"
+				AdditionalIncludeDirectories="..\Common;..\Crypto;..\;..\PKCS11"
 				PreprocessorDefinitions="SETUP;WIN32;DEBUG;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -129,7 +129,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/w34189"
 				Optimization="2"
-				AdditionalIncludeDirectories="..\Common;..\Crypto;..\;$(PKCS11_INC)"
+				AdditionalIncludeDirectories="..\Common;..\Crypto;..\;..\PKCS11"
 				PreprocessorDefinitions="SETUP;WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS"
 				RuntimeLibrary="0"
 				BufferSecurityCheck="true"