--- np2/win9x/np2vs2008.vcproj	2011/03/11 10:21:46	1.2
+++ np2/win9x/np2vs2008.vcproj	2011/03/16 03:31:20	1.3
@@ -37,6 +37,7 @@
 			/>
 			<Tool
 				Name="NASM"
+				IncludePaths=".\x86\;..\i286x\;..\io\x86\"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -121,6 +122,7 @@
 			/>
 			<Tool
 				Name="YASM"
+				IncludePaths=".\x64;..\i286c\x64;..\io\x64"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -149,6 +151,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_WIN64;_UNICODE;UNICODE"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -196,6 +199,7 @@
 			/>
 			<Tool
 				Name="NASM"
+				IncludePaths=".\x86\;..\i286x\;..\io\x86\"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -283,6 +287,7 @@
 			/>
 			<Tool
 				Name="YASM"
+				IncludePaths=".\x64;..\i286c\x64;..\io\x64"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -311,6 +316,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_WIN64;_UNICODE;UNICODE"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -1071,14 +1077,6 @@
 					RelativePath="..\i286x\memory.x86"
 					>
 					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="NASM"
-							IncludePaths=".\x86\;..\i286x\;..\io\x86\"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
 						Name="Debug|x64"
 						ExcludedFromBuild="true"
 						>
@@ -1087,14 +1085,6 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="NASM"
-							IncludePaths=".\x86\;..\i286x\;..\io\x86\"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
 						Name="Release|x64"
 						ExcludedFromBuild="true"
 						>
@@ -1898,14 +1888,6 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Debug|x64"
-							>
-							<Tool
-								Name="YASM"
-								IncludePaths=".\x64;..\i286c\x64;..\io\x64"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
 							Name="Release|Win32"
 							ExcludedFromBuild="true"
 							>
@@ -1913,14 +1895,6 @@
 								Name="YASM"
 							/>
 						</FileConfiguration>
-						<FileConfiguration
-							Name="Release|x64"
-							>
-							<Tool
-								Name="YASM"
-								IncludePaths=".\x64;..\i286c\x64;..\io\x64"
-							/>
-						</FileConfiguration>
 					</File>
 					<File
 						RelativePath=".\x64\parts.x64"
@@ -1990,14 +1964,6 @@
 						RelativePath="..\mem\x86\dmax86.x86"
 						>
 						<FileConfiguration
-							Name="Debug|Win32"
-							>
-							<Tool
-								Name="NASM"
-								IncludePaths=".\x86\;..\i286x\;..\io\x86\"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
 							Name="Debug|x64"
 							ExcludedFromBuild="true"
 							>
@@ -2006,14 +1972,6 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Win32"
-							>
-							<Tool
-								Name="NASM"
-								IncludePaths=".\x86\;..\i286x\;..\io\x86\"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
 							Name="Release|x64"
 							ExcludedFromBuild="true"
 							>
@@ -2026,14 +1984,6 @@
 						RelativePath=".\x86\makegrph.x86"
 						>
 						<FileConfiguration
-							Name="Debug|Win32"
-							>
-							<Tool
-								Name="NASM"
-								IncludePaths=".\x86\;..\i286x\;..\io\x86\"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
 							Name="Debug|x64"
 							ExcludedFromBuild="true"
 							>
@@ -2042,14 +1992,6 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Win32"
-							>
-							<Tool
-								Name="NASM"
-								IncludePaths=".\x86\;..\i286x\;..\io\x86\"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
 							Name="Release|x64"
 							ExcludedFromBuild="true"
 							>
@@ -2062,14 +2004,6 @@
 						RelativePath="..\mem\x86\memegc.x86"
 						>
 						<FileConfiguration
-							Name="Debug|Win32"
-							>
-							<Tool
-								Name="NASM"
-								IncludePaths=".\x86\;..\i286x\;..\io\x86\"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
 							Name="Debug|x64"
 							ExcludedFromBuild="true"
 							>
@@ -2078,14 +2012,6 @@
 							/>
 						</FileConfiguration>
 						<FileConfiguration
-							Name="Release|Win32"
-							>
-							<Tool
-								Name="NASM"
-								IncludePaths=".\x86\;..\i286x\;..\io\x86\"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
 							Name="Release|x64"
 							ExcludedFromBuild="true"
 							>