diff --git a/platform/win32/vcproj/about.dsc.vcproj b/platform/win32/vcproj/about.dsc.vcproj
index 969059643..4ac026547 100644
--- a/platform/win32/vcproj/about.dsc.vcproj
+++ b/platform/win32/vcproj/about.dsc.vcproj
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;../../../core"
+				AdditionalIncludeDirectories="..;../../../cpu/native;../../../core"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -115,7 +115,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..;../../../core"
+				AdditionalIncludeDirectories="..;../../../cpu/native;../../../core"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
 				RuntimeLibrary="2"
 				WarningLevel="3"
diff --git a/platform/win32/vcproj/about.prg.vcproj b/platform/win32/vcproj/about.prg.vcproj
index 430ce96c5..401fa81c2 100644
--- a/platform/win32/vcproj/about.prg.vcproj
+++ b/platform/win32/vcproj/about.prg.vcproj
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler"
+				AdditionalIncludeDirectories="..;../../../cpu/native;../../../core;../../../apps/program-handler"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PROCESS_LOADABLE;WITH_LOADER_ARCH"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -117,7 +117,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler"
+				AdditionalIncludeDirectories="..;../../../cpu/native;../../../core;../../../apps/program-handler"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PROCESS_LOADABLE;WITH_LOADER_ARCH"
 				RuntimeLibrary="2"
 				WarningLevel="3"
diff --git a/platform/win32/vcproj/calc.dsc.vcproj b/platform/win32/vcproj/calc.dsc.vcproj
index 84a2445a5..e3fbeb993 100644
--- a/platform/win32/vcproj/calc.dsc.vcproj
+++ b/platform/win32/vcproj/calc.dsc.vcproj
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;../../../core"
+				AdditionalIncludeDirectories="..;../../../cpu/native;../../../core"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -115,7 +115,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..;../../../core"
+				AdditionalIncludeDirectories="..;../../../cpu/native;../../../core"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
 				RuntimeLibrary="2"
 				WarningLevel="3"
diff --git a/platform/win32/vcproj/calc.prg.vcproj b/platform/win32/vcproj/calc.prg.vcproj
index e026b758a..5ab0f84c3 100644
--- a/platform/win32/vcproj/calc.prg.vcproj
+++ b/platform/win32/vcproj/calc.prg.vcproj
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler"
+				AdditionalIncludeDirectories="..;../../../cpu/native;../../../core;../../../apps/program-handler"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PROCESS_LOADABLE;WITH_LOADER_ARCH"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -117,7 +117,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler"
+				AdditionalIncludeDirectories="..;../../../cpu/native;../../../core;../../../apps/program-handler"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PROCESS_LOADABLE;WITH_LOADER_ARCH"
 				RuntimeLibrary="2"
 				WarningLevel="3"
diff --git a/platform/win32/vcproj/dhcp.dsc.vcproj b/platform/win32/vcproj/dhcp.dsc.vcproj
index 63161df01..df1c9b611 100644
--- a/platform/win32/vcproj/dhcp.dsc.vcproj
+++ b/platform/win32/vcproj/dhcp.dsc.vcproj
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;../../../core"
+				AdditionalIncludeDirectories="..;../../../cpu/native;../../../core"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -115,7 +115,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..;../../../core"
+				AdditionalIncludeDirectories="..;../../../cpu/native;../../../core"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
 				RuntimeLibrary="2"
 				WarningLevel="3"
diff --git a/platform/win32/vcproj/dhcp.prg.vcproj b/platform/win32/vcproj/dhcp.prg.vcproj
index 67509e33c..df1282160 100644
--- a/platform/win32/vcproj/dhcp.prg.vcproj
+++ b/platform/win32/vcproj/dhcp.prg.vcproj
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler"
+				AdditionalIncludeDirectories="..;../../../cpu/native;../../../core;../../../apps/program-handler"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PROCESS_LOADABLE;WITH_LOADER_ARCH"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -117,7 +117,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler"
+				AdditionalIncludeDirectories="..;../../../cpu/native;../../../core;../../../apps/program-handler"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PROCESS_LOADABLE;WITH_LOADER_ARCH"
 				RuntimeLibrary="2"
 				WarningLevel="3"
diff --git a/platform/win32/vcproj/directory.dsc.vcproj b/platform/win32/vcproj/directory.dsc.vcproj
index cb76e03ea..4b2b4e907 100644
--- a/platform/win32/vcproj/directory.dsc.vcproj
+++ b/platform/win32/vcproj/directory.dsc.vcproj
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;../../../core"
+				AdditionalIncludeDirectories="..;../../../cpu/native;../../../core"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -115,7 +115,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..;../../../core"
+				AdditionalIncludeDirectories="..;../../../cpu/native;../../../core"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
 				RuntimeLibrary="2"
 				WarningLevel="3"
diff --git a/platform/win32/vcproj/directory.prg.vcproj b/platform/win32/vcproj/directory.prg.vcproj
index 360138ae3..722357b5e 100644
--- a/platform/win32/vcproj/directory.prg.vcproj
+++ b/platform/win32/vcproj/directory.prg.vcproj
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler"
+				AdditionalIncludeDirectories="..;../../../cpu/native;../../../core;../../../apps/program-handler"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PROCESS_LOADABLE;WITH_LOADER_ARCH"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -117,7 +117,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler"
+				AdditionalIncludeDirectories="..;../../../cpu/native;../../../core;../../../apps/program-handler"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PROCESS_LOADABLE;WITH_LOADER_ARCH"
 				RuntimeLibrary="2"
 				WarningLevel="3"
diff --git a/platform/win32/vcproj/email.dsc.vcproj b/platform/win32/vcproj/email.dsc.vcproj
index 4ffddc24a..298618c8d 100644
--- a/platform/win32/vcproj/email.dsc.vcproj
+++ b/platform/win32/vcproj/email.dsc.vcproj
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;../../../core"
+				AdditionalIncludeDirectories="..;../../../cpu/native;../../../core"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -115,7 +115,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..;../../../core"
+				AdditionalIncludeDirectories="..;../../../cpu/native;../../../core"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
 				RuntimeLibrary="2"
 				WarningLevel="3"
diff --git a/platform/win32/vcproj/email.prg.vcproj b/platform/win32/vcproj/email.prg.vcproj
index 6dfeb8f88..ef4a78e3e 100644
--- a/platform/win32/vcproj/email.prg.vcproj
+++ b/platform/win32/vcproj/email.prg.vcproj
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler"
+				AdditionalIncludeDirectories="..;../../../cpu/native;../../../core;../../../apps/program-handler"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PROCESS_LOADABLE;WITH_LOADER_ARCH"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -117,7 +117,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler"
+				AdditionalIncludeDirectories="..;../../../cpu/native;../../../core;../../../apps/program-handler"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PROCESS_LOADABLE;WITH_LOADER_ARCH"
 				RuntimeLibrary="2"
 				WarningLevel="3"
diff --git a/platform/win32/vcproj/ftp.dsc.vcproj b/platform/win32/vcproj/ftp.dsc.vcproj
index f8997621b..d810edf06 100644
--- a/platform/win32/vcproj/ftp.dsc.vcproj
+++ b/platform/win32/vcproj/ftp.dsc.vcproj
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;../../../core"
+				AdditionalIncludeDirectories="..;../../../cpu/native;../../../core"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -115,7 +115,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..;../../../core"
+				AdditionalIncludeDirectories="..;../../../cpu/native;../../../core"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
 				RuntimeLibrary="2"
 				WarningLevel="3"
diff --git a/platform/win32/vcproj/ftp.prg.vcproj b/platform/win32/vcproj/ftp.prg.vcproj
index a39179fb5..a882071d5 100644
--- a/platform/win32/vcproj/ftp.prg.vcproj
+++ b/platform/win32/vcproj/ftp.prg.vcproj
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler"
+				AdditionalIncludeDirectories="..;../../../cpu/native;../../../core;../../../apps/program-handler"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PROCESS_LOADABLE;WITH_LOADER_ARCH"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -117,7 +117,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler"
+				AdditionalIncludeDirectories="..;../../../cpu/native;../../../core;../../../apps/program-handler"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PROCESS_LOADABLE;WITH_LOADER_ARCH"
 				RuntimeLibrary="2"
 				WarningLevel="3"
diff --git a/platform/win32/vcproj/irc.dsc.vcproj b/platform/win32/vcproj/irc.dsc.vcproj
index 3f84242d6..97229351a 100644
--- a/platform/win32/vcproj/irc.dsc.vcproj
+++ b/platform/win32/vcproj/irc.dsc.vcproj
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;../../../core"
+				AdditionalIncludeDirectories="..;../../../cpu/native;../../../core"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -115,7 +115,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..;../../../core"
+				AdditionalIncludeDirectories="..;../../../cpu/native;../../../core"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
 				RuntimeLibrary="2"
 				WarningLevel="3"
diff --git a/platform/win32/vcproj/irc.prg.vcproj b/platform/win32/vcproj/irc.prg.vcproj
index 451570828..f9e12dd1c 100644
--- a/platform/win32/vcproj/irc.prg.vcproj
+++ b/platform/win32/vcproj/irc.prg.vcproj
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler"
+				AdditionalIncludeDirectories="..;../../../cpu/native;../../../core;../../../apps/program-handler"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PROCESS_LOADABLE;WITH_LOADER_ARCH"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -117,7 +117,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler"
+				AdditionalIncludeDirectories="..;../../../cpu/native;../../../core;../../../apps/program-handler"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PROCESS_LOADABLE;WITH_LOADER_ARCH"
 				RuntimeLibrary="2"
 				WarningLevel="3"
diff --git a/platform/win32/vcproj/netconf.dsc.vcproj b/platform/win32/vcproj/netconf.dsc.vcproj
index 43911b39e..94cc72125 100644
--- a/platform/win32/vcproj/netconf.dsc.vcproj
+++ b/platform/win32/vcproj/netconf.dsc.vcproj
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;../../../core"
+				AdditionalIncludeDirectories="..;../../../cpu/native;../../../core"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -115,7 +115,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..;../../../core"
+				AdditionalIncludeDirectories="..;../../../cpu/native;../../../core"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
 				RuntimeLibrary="2"
 				WarningLevel="3"
diff --git a/platform/win32/vcproj/netconf.prg.vcproj b/platform/win32/vcproj/netconf.prg.vcproj
index 5e8079ac5..04600dec8 100644
--- a/platform/win32/vcproj/netconf.prg.vcproj
+++ b/platform/win32/vcproj/netconf.prg.vcproj
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler"
+				AdditionalIncludeDirectories="..;../../../cpu/native;../../../core;../../../apps/program-handler"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PROCESS_LOADABLE;WITH_LOADER_ARCH"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -117,7 +117,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler"
+				AdditionalIncludeDirectories="..;../../../cpu/native;../../../core;../../../apps/program-handler"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PROCESS_LOADABLE;WITH_LOADER_ARCH"
 				RuntimeLibrary="2"
 				WarningLevel="3"
diff --git a/platform/win32/vcproj/processes.dsc.vcproj b/platform/win32/vcproj/processes.dsc.vcproj
index a583be5c3..8684714b4 100644
--- a/platform/win32/vcproj/processes.dsc.vcproj
+++ b/platform/win32/vcproj/processes.dsc.vcproj
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;../../../core"
+				AdditionalIncludeDirectories="..;../../../cpu/native;../../../core"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -115,7 +115,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..;../../../core"
+				AdditionalIncludeDirectories="..;../../../cpu/native;../../../core"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
 				RuntimeLibrary="2"
 				WarningLevel="3"
diff --git a/platform/win32/vcproj/processes.prg.vcproj b/platform/win32/vcproj/processes.prg.vcproj
index 87b4d5154..7f5037fad 100644
--- a/platform/win32/vcproj/processes.prg.vcproj
+++ b/platform/win32/vcproj/processes.prg.vcproj
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler"
+				AdditionalIncludeDirectories="..;../../../cpu/native;../../../core;../../../apps/program-handler"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PROCESS_LOADABLE;WITH_LOADER_ARCH"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -117,7 +117,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler"
+				AdditionalIncludeDirectories="..;../../../cpu/native;../../../core;../../../apps/program-handler"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PROCESS_LOADABLE;WITH_LOADER_ARCH"
 				RuntimeLibrary="2"
 				WarningLevel="3"
diff --git a/platform/win32/vcproj/shell.dsc.vcproj b/platform/win32/vcproj/shell.dsc.vcproj
index 9edfcca2e..15132d537 100644
--- a/platform/win32/vcproj/shell.dsc.vcproj
+++ b/platform/win32/vcproj/shell.dsc.vcproj
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;../../../core"
+				AdditionalIncludeDirectories="..;../../../cpu/native;../../../core"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -115,7 +115,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..;../../../core"
+				AdditionalIncludeDirectories="..;../../../cpu/native;../../../core"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
 				RuntimeLibrary="2"
 				WarningLevel="3"
diff --git a/platform/win32/vcproj/shell.prg.vcproj b/platform/win32/vcproj/shell.prg.vcproj
index dcb4d698b..505aa11e8 100644
--- a/platform/win32/vcproj/shell.prg.vcproj
+++ b/platform/win32/vcproj/shell.prg.vcproj
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler"
+				AdditionalIncludeDirectories="..;../../../cpu/native;../../../core;../../../apps/program-handler"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PROCESS_LOADABLE;WITH_LOADER_ARCH"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -117,7 +117,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler"
+				AdditionalIncludeDirectories="..;../../../cpu/native;../../../core;../../../apps/program-handler"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PROCESS_LOADABLE;WITH_LOADER_ARCH"
 				RuntimeLibrary="2"
 				WarningLevel="3"
diff --git a/platform/win32/vcproj/telnet.dsc.vcproj b/platform/win32/vcproj/telnet.dsc.vcproj
index 226e2fb95..4d4fd728d 100644
--- a/platform/win32/vcproj/telnet.dsc.vcproj
+++ b/platform/win32/vcproj/telnet.dsc.vcproj
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;../../../core"
+				AdditionalIncludeDirectories="..;../../../cpu/native;../../../core"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -115,7 +115,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..;../../../core"
+				AdditionalIncludeDirectories="..;../../../cpu/native;../../../core"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
 				RuntimeLibrary="2"
 				WarningLevel="3"
diff --git a/platform/win32/vcproj/telnet.prg.vcproj b/platform/win32/vcproj/telnet.prg.vcproj
index d1d2c7f00..4e623281f 100644
--- a/platform/win32/vcproj/telnet.prg.vcproj
+++ b/platform/win32/vcproj/telnet.prg.vcproj
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler"
+				AdditionalIncludeDirectories="..;../../../cpu/native;../../../core;../../../apps/program-handler"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PROCESS_LOADABLE;WITH_LOADER_ARCH"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -117,7 +117,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler"
+				AdditionalIncludeDirectories="..;../../../cpu/native;../../../core;../../../apps/program-handler"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PROCESS_LOADABLE;WITH_LOADER_ARCH"
 				RuntimeLibrary="2"
 				WarningLevel="3"
diff --git a/platform/win32/vcproj/telnetd.dsc.vcproj b/platform/win32/vcproj/telnetd.dsc.vcproj
index 626125cc8..9a6187d5f 100644
--- a/platform/win32/vcproj/telnetd.dsc.vcproj
+++ b/platform/win32/vcproj/telnetd.dsc.vcproj
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;../../../core"
+				AdditionalIncludeDirectories="..;../../../cpu/native;../../../core"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -115,7 +115,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..;../../../core"
+				AdditionalIncludeDirectories="..;../../../cpu/native;../../../core"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
 				RuntimeLibrary="2"
 				WarningLevel="3"
diff --git a/platform/win32/vcproj/telnetd.prg.vcproj b/platform/win32/vcproj/telnetd.prg.vcproj
index e369cb4c6..b97b9a1d0 100644
--- a/platform/win32/vcproj/telnetd.prg.vcproj
+++ b/platform/win32/vcproj/telnetd.prg.vcproj
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler;../../../apps/shell"
+				AdditionalIncludeDirectories="..;../../../cpu/native;../../../core;../../../apps/program-handler;../../../apps/shell"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PROCESS_LOADABLE;WITH_LOADER_ARCH"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -117,7 +117,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler;../../../apps/shell"
+				AdditionalIncludeDirectories="..;../../../cpu/native;../../../core;../../../apps/program-handler;../../../apps/shell"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PROCESS_LOADABLE;WITH_LOADER_ARCH"
 				RuntimeLibrary="2"
 				WarningLevel="3"
diff --git a/platform/win32/vcproj/webserver.dsc.vcproj b/platform/win32/vcproj/webserver.dsc.vcproj
index 7ff2d2d0b..6e1811737 100644
--- a/platform/win32/vcproj/webserver.dsc.vcproj
+++ b/platform/win32/vcproj/webserver.dsc.vcproj
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;../../../core"
+				AdditionalIncludeDirectories="..;../../../cpu/native;../../../core"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -115,7 +115,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..;../../../core"
+				AdditionalIncludeDirectories="..;../../../cpu/native;../../../core"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
 				RuntimeLibrary="2"
 				WarningLevel="3"
diff --git a/platform/win32/vcproj/webserver.prg.vcproj b/platform/win32/vcproj/webserver.prg.vcproj
index 4fa4c3909..d4aecd590 100644
--- a/platform/win32/vcproj/webserver.prg.vcproj
+++ b/platform/win32/vcproj/webserver.prg.vcproj
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler"
+				AdditionalIncludeDirectories="..;../../../cpu/native;../../../core;../../../apps/program-handler"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PROCESS_LOADABLE;WITH_LOADER_ARCH"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -117,7 +117,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler"
+				AdditionalIncludeDirectories="..;../../../cpu/native;../../../core;../../../apps/program-handler"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PROCESS_LOADABLE;WITH_LOADER_ARCH"
 				RuntimeLibrary="2"
 				WarningLevel="3"
diff --git a/platform/win32/vcproj/www.dsc.vcproj b/platform/win32/vcproj/www.dsc.vcproj
index 0ab3324e9..eb98a439e 100644
--- a/platform/win32/vcproj/www.dsc.vcproj
+++ b/platform/win32/vcproj/www.dsc.vcproj
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;../../../core"
+				AdditionalIncludeDirectories="..;../../../cpu/native;../../../core"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -115,7 +115,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..;../../../core"
+				AdditionalIncludeDirectories="..;../../../cpu/native;../../../core"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
 				RuntimeLibrary="2"
 				WarningLevel="3"
diff --git a/platform/win32/vcproj/www.prg.vcproj b/platform/win32/vcproj/www.prg.vcproj
index ee14c476a..486e01dee 100644
--- a/platform/win32/vcproj/www.prg.vcproj
+++ b/platform/win32/vcproj/www.prg.vcproj
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler"
+				AdditionalIncludeDirectories="..;../../../cpu/native;../../../core;../../../apps/program-handler"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PROCESS_LOADABLE;WITH_LOADER_ARCH"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -117,7 +117,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler"
+				AdditionalIncludeDirectories="..;../../../cpu/native;../../../core;../../../apps/program-handler"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PROCESS_LOADABLE;WITH_LOADER_ARCH"
 				RuntimeLibrary="2"
 				WarningLevel="3"