Project files: restructuring and cleanup

ease-of-use changes; abort on file copy errors.

10 files changed, 1021 insertions, 1029 deletions

diff --git a/generate/msvc9/AcpiBin.vcproj b/generate/msvc9/AcpiBin.vcproj
index 1e40fe153..acf477fd3 100755
--- a/generate/msvc9/AcpiBin.vcproj
+++ b/generate/msvc9/AcpiBin.vcproj
@@ -116,7 +116,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Copy AcpiBinDebug.exe to Libraries (DEBUG)"
-				CommandLine="copy .\acpibindebug\acpibin.exe ..\..\libraries\AcpiBinDebug.exe&#x0D;&#x0A;dir ..\..\libraries\acpibindebug.exe&#x0D;&#x0A;"
+				CommandLine="copy .\acpibindebug\acpibin.exe ..\..\libraries\AcpiBinDebug.exe&#x0D;&#x0A;&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@@ -219,7 +219,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Copy AcpiBin.exe to Libraries"
-				CommandLine="copy .\acpibin\acpibin.exe ..\..\libraries\AcpiBin.exe&#x0D;&#x0A;dir ..\..\libraries\acpibin.exe&#x0D;&#x0A;"
+				CommandLine="copy .\acpibin\acpibin.exe ..\..\libraries\AcpiBin.exe&#x0D;&#x0A;&#x0D;&#x0A;"
 			/>
 		</Configuration>
 	</Configurations>
@@ -227,21 +227,30 @@
 	</References>
 	<Files>
 		<Filter
-			Name="Source"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			Name="AcpiBin Headers"
+			Filter="h;hpp;hxx;hm;inl"
 			>
-			<Filter
-				Name="Local"
+			<File
+				RelativePath="..\..\source\tools\AcpiBin\acpibin.h"
 				>
-				<File
-					RelativePath="..\..\source\tools\AcpiBin\abcompare.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\tools\AcpiBin\abmain.c"
-					>
-				</File>
-			</Filter>
+			</File>
+		</Filter>
+		<Filter
+			Name="AcpiBin Source"
+			>
+			<File
+				RelativePath="..\..\source\tools\AcpiBin\abcompare.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\tools\AcpiBin\abmain.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Acpica Source"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
 			<Filter
 				Name="Common"
 				>
@@ -340,15 +349,6 @@
 				</File>
 			</Filter>
 		</Filter>
-		<Filter
-			Name="Local Headers"
-			Filter="h;hpp;hxx;hm;inl"
-			>
-			<File
-				RelativePath="..\..\source\tools\AcpiBin\acpibin.h"
-				>
-			</File>
-		</Filter>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/generate/msvc9/AcpiDump.vcproj b/generate/msvc9/AcpiDump.vcproj
index 48cfe3ac0..da0548636 100755
--- a/generate/msvc9/AcpiDump.vcproj
+++ b/generate/msvc9/AcpiDump.vcproj
@@ -116,7 +116,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Copy AcpiDumpDebug.exe to Libraries (DEBUG)"
-				CommandLine="copy .\AcpiDumpdebug\AcpiDump.exe ..\..\libraries\AcpiDumpDebug.exe&#x0D;&#x0A;dir ..\..\libraries\AcpiDumpdebug.exe&#x0D;&#x0A;"
+				CommandLine="copy .\AcpiDumpdebug\AcpiDump.exe ..\..\libraries\AcpiDumpDebug.exe&#x0D;&#x0A;&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@@ -219,7 +219,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Copy AcpiDump.exe to Libraries"
-				CommandLine="copy .\AcpiDump\AcpiDump.exe ..\..\libraries\AcpiDump.exe&#x0D;&#x0A;dir ..\..\libraries\AcpiDump.exe&#x0D;&#x0A;"
+				CommandLine="copy .\AcpiDump\AcpiDump.exe ..\..\libraries\AcpiDump.exe&#x0D;&#x0A;"
 			/>
 		</Configuration>
 	</Configurations>
@@ -227,25 +227,18 @@
 	</References>
 	<Files>
 		<Filter
-			Name="Source"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			Name="AcpiDump Headers"
+			Filter="h;hpp;hxx;hm;inl"
 			>
-			<Filter
-				Name="Local"
+			<File
+				RelativePath="..\..\source\tools\acpidump\acpidump.h"
 				>
-				<File
-					RelativePath="..\..\source\tools\acpidump\apdump.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\tools\acpidump\apfiles.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\tools\acpidump\apmain.c"
-					>
-				</File>
-			</Filter>
+			</File>
+		</Filter>
+		<Filter
+			Name="Acpica Source"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
 			<Filter
 				Name="Common"
 				>
@@ -361,11 +354,18 @@
 			</Filter>
 		</Filter>
 		<Filter
-			Name="Local Headers"
-			Filter="h;hpp;hxx;hm;inl"
+			Name="AcpiDump Source"
 			>
 			<File
-				RelativePath="..\..\source\tools\acpidump\acpidump.h"
+				RelativePath="..\..\source\tools\acpidump\apdump.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\tools\acpidump\apfiles.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\tools\acpidump\apmain.c"
 				>
 			</File>
 		</Filter>
diff --git a/generate/msvc9/AcpiExec.vcproj b/generate/msvc9/AcpiExec.vcproj
index 245286cf4..c6e480f33 100755
--- a/generate/msvc9/AcpiExec.vcproj
+++ b/generate/msvc9/AcpiExec.vcproj
@@ -119,7 +119,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Copy AcpiExecDebug.exe to Libraries (DEBUG)"
-				CommandLine="copy acpiexecdebug\acpiexec.exe ..\..\libraries\AcpiExecDebug.exe&#x0D;&#x0A;dir ..\..\libraries\acpiexecdebug.exe&#x0D;&#x0A;"
+				CommandLine="copy acpiexecdebug\acpiexec.exe ..\..\libraries\AcpiExecDebug.exe&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@@ -224,7 +224,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Copy AcpiExec.exe to Libraries"
-				CommandLine="copy acpiexec\acpiexec.exe ..\..\libraries\AcpiExec.exe&#x0D;&#x0A;dir ..\..\libraries\acpiexec.exe&#x0D;&#x0A;"
+				CommandLine="copy acpiexec\acpiexec.exe ..\..\libraries\AcpiExec.exe&#x0D;&#x0A;"
 			/>
 		</Configuration>
 	</Configurations>
@@ -232,7 +232,7 @@
 	</References>
 	<Files>
 		<Filter
-			Name="Source"
+			Name="Acpica Source"
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 			>
 			<Filter
@@ -577,34 +577,6 @@
 				</File>
 			</Filter>
 			<Filter
-				Name="Local"
-				>
-				<File
-					RelativePath="..\..\source\Tools\AcpiExec\aeexec.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\tools\acpiexec\aehandlers.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\tools\acpiexec\aeinitfile.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\Tools\AcpiExec\aemain.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\tools\acpiexec\aeregion.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\tools\acpiexec\aetables.c"
-					>
-				</File>
-			</Filter>
-			<Filter
 				Name="Debugger"
 				Filter=".c"
 				>
@@ -1092,7 +1064,7 @@
 			</Filter>
 		</Filter>
 		<Filter
-			Name="Standard Headers"
+			Name="Acpica  Headers"
 			Filter="h;hpp;hxx;hm;inl"
 			>
 			<File
@@ -1253,7 +1225,7 @@
 			</File>
 		</Filter>
 		<Filter
-			Name="Local Headers"
+			Name="AcpiExec Headers"
 			>
 			<File
 				RelativePath="..\..\source\Tools\AcpiExec\aecommon.h"
@@ -1264,6 +1236,34 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="AcpiExec Source"
+			>
+			<File
+				RelativePath="..\..\source\Tools\AcpiExec\aeexec.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\tools\acpiexec\aehandlers.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\tools\acpiexec\aeinitfile.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\Tools\AcpiExec\aemain.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\tools\acpiexec\aeregion.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\tools\acpiexec\aetables.c"
+				>
+			</File>
+		</Filter>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/generate/msvc9/AcpiHelp.vcproj b/generate/msvc9/AcpiHelp.vcproj
index 3ea0e7644..05db023e9 100755
--- a/generate/msvc9/AcpiHelp.vcproj
+++ b/generate/msvc9/AcpiHelp.vcproj
@@ -114,7 +114,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Copy AcpiHelpDebug.exe to Libraries (DEBUG)"
-				CommandLine="copy AcpiHelpdebug\AcpiHelp.exe ..\..\libraries\AcpiHelpDebug.exe&#x0D;&#x0A;dir ..\..\libraries\AcpiHelpdebug.exe&#x0D;&#x0A;"
+				CommandLine="copy AcpiHelpdebug\AcpiHelp.exe ..\..\libraries\AcpiHelpDebug.exe&#x0D;&#x0A;&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@@ -214,7 +214,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Copy AcpiHelp.exe to Libraries"
-				CommandLine="copy AcpiHelp\AcpiHelp.exe ..\..\libraries\AcpiHelp.exe&#x0D;&#x0A;dir ..\..\libraries\AcpiHelp.exe&#x0D;&#x0A;"
+				CommandLine="copy AcpiHelp\AcpiHelp.exe ..\..\libraries\AcpiHelp.exe&#x0D;&#x0A;&#x0D;&#x0A;"
 			/>
 		</Configuration>
 	</Configurations>
@@ -222,47 +222,10 @@
 	</References>
 	<Files>
 		<Filter
-			Name="Source"
+			Name="Acpica Source"
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 			>
 			<Filter
-				Name="Local"
-				Filter=".c"
-				>
-				<File
-					RelativePath="..\..\source\tools\acpihelp\ahaml.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\tools\acpihelp\ahamlops.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\tools\acpihelp\ahasl.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\tools\acpihelp\ahaslkey.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\tools\acpihelp\ahaslops.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\tools\acpihelp\ahdecode.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\tools\acpihelp\ahgrammar.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\tools\acpihelp\ahmain.c"
-					>
-				</File>
-			</Filter>
-			<Filter
 				Name="Common"
 				Filter=".c"
 				>
@@ -345,7 +308,7 @@
 			</Filter>
 		</Filter>
 		<Filter
-			Name="Local Headers"
+			Name="AcpiHelp Headers"
 			Filter="h;hpp;hxx;hm;inl"
 			>
 			<File
@@ -354,13 +317,50 @@
 			</File>
 		</Filter>
 		<Filter
-			Name="Standard Headers"
+			Name="Acpica Headers"
 			>
 			<File
 				RelativePath="..\..\source\include\acuuid.h"
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="AcpiHelp Source"
+			Filter=".c"
+			>
+			<File
+				RelativePath="..\..\source\tools\acpihelp\ahaml.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\tools\acpihelp\ahamlops.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\tools\acpihelp\ahasl.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\tools\acpihelp\ahaslkey.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\tools\acpihelp\ahaslops.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\tools\acpihelp\ahdecode.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\tools\acpihelp\ahgrammar.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\tools\acpihelp\ahmain.c"
+				>
+			</File>
+		</Filter>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/generate/msvc9/AcpiNames.vcproj b/generate/msvc9/AcpiNames.vcproj
index 209a69d25..37c001dd3 100755
--- a/generate/msvc9/AcpiNames.vcproj
+++ b/generate/msvc9/AcpiNames.vcproj
@@ -223,7 +223,7 @@
 	</References>
 	<Files>
 		<Filter
-			Name="Source"
+			Name="Acpica Source"
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 			>
 			<Filter
@@ -610,25 +610,9 @@
 					>
 				</File>
 			</Filter>
-			<Filter
-				Name="Local"
-				>
-				<File
-					RelativePath="..\..\source\tools\AcpiNames\anmain.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\tools\AcpiNames\anstubs.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\tools\AcpiNames\antables.c"
-					>
-				</File>
-			</Filter>
 		</Filter>
 		<Filter
-			Name="Local Headers"
+			Name="AcpiNames Headers"
 			Filter="h;hpp;hxx;hm;inl"
 			>
 			<File
@@ -636,6 +620,22 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="AcpiNames Source"
+			>
+			<File
+				RelativePath="..\..\source\tools\AcpiNames\anmain.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\tools\AcpiNames\anstubs.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\tools\AcpiNames\antables.c"
+				>
+			</File>
+		</Filter>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/generate/msvc9/AcpiSrc.vcproj b/generate/msvc9/AcpiSrc.vcproj
index 1028a4094..a3e0b022e 100755
--- a/generate/msvc9/AcpiSrc.vcproj
+++ b/generate/msvc9/AcpiSrc.vcproj
@@ -114,7 +114,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Copy AcpiSrcDebug.exe to Libraries (DEBUG)"
-				CommandLine="copy acpisrcdebug\acpisrc.exe ..\..\libraries\AcpiSrcDebug.exe&#x0D;&#x0A;dir ..\..\libraries\acpisrcdebug.exe&#x0D;&#x0A;"
+				CommandLine="copy acpisrcdebug\acpisrc.exe ..\..\libraries\AcpiSrcDebug.exe&#x0D;&#x0A;&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@@ -215,7 +215,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Copy AcpiSrc.exe to Libraries"
-				CommandLine="copy acpisrc\acpisrc.exe ..\..\libraries\AcpiSrc.exe&#x0D;&#x0A;dir ..\..\libraries\acpisrc.exe&#x0D;&#x0A;"
+				CommandLine="copy acpisrc\acpisrc.exe ..\..\libraries\AcpiSrc.exe&#x0D;&#x0A;&#x0D;&#x0A;"
 			/>
 		</Configuration>
 	</Configurations>
@@ -223,43 +223,10 @@
 	</References>
 	<Files>
 		<Filter
-			Name="Source"
+			Name="Acpica Source"
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 			>
 			<Filter
-				Name="Local"
-				Filter=".c"
-				>
-				<File
-					RelativePath="..\..\source\TOOLS\acpisrc\ascase.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\tools\AcpiSrc\asconvrt.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\tools\AcpiSrc\asfile.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\tools\AcpiSrc\asmain.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\TOOLS\acpisrc\asremove.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\tools\acpisrc\astable.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\tools\AcpiSrc\asutils.c"
-					>
-				</File>
-			</Filter>
-			<Filter
 				Name="Common"
 				Filter=".c"
 				>
@@ -338,7 +305,7 @@
 			</Filter>
 		</Filter>
 		<Filter
-			Name="Local Headers"
+			Name="AcpiSrc Headers"
 			Filter="h;hpp;hxx;hm;inl"
 			>
 			<File
@@ -346,6 +313,39 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="AcpiSrc Source"
+			Filter=".c"
+			>
+			<File
+				RelativePath="..\..\source\TOOLS\acpisrc\ascase.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\tools\AcpiSrc\asconvrt.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\tools\AcpiSrc\asfile.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\tools\AcpiSrc\asmain.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\TOOLS\acpisrc\asremove.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\tools\acpisrc\astable.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\tools\AcpiSrc\asutils.c"
+				>
+			</File>
+		</Filter>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/generate/msvc9/AcpiSubsystem.vcproj b/generate/msvc9/AcpiSubsystem.vcproj
index 7f5911f65..064872008 100755
--- a/generate/msvc9/AcpiSubsystem.vcproj
+++ b/generate/msvc9/AcpiSubsystem.vcproj
@@ -98,7 +98,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Copy ACPICA library to Libraries (DEBUG)"
-				CommandLine="copy AcpiSubsystemDebug\acpisubsystem.lib ..\..\libraries\Acpica_dbg.lib&#x0D;&#x0A;dir ..\..\libraries\acpica_dbg.lib&#x0D;&#x0A;"
+				CommandLine="copy AcpiSubsystemDebug\acpisubsystem.lib ..\..\libraries\Acpica_dbg.lib&#x0D;&#x0A;&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@@ -184,7 +184,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Copy ACPICA library to libraries"
-				CommandLine="copy AcpiSubsystem\acpisubsystem.lib ..\..\libraries\Acpica.lib&#x0D;&#x0A;dir ..\..\libraries\acpica.lib&#x0D;&#x0A;"
+				CommandLine="copy AcpiSubsystem\acpisubsystem.lib ..\..\libraries\Acpica.lib&#x0D;&#x0A;&#x0D;&#x0A;"
 			/>
 		</Configuration>
 	</Configurations>
@@ -192,7 +192,7 @@
 	</References>
 	<Files>
 		<Filter
-			Name="Source"
+			Name="Acpica Source"
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 			>
 			<Filter
@@ -1053,7 +1053,7 @@
 			</Filter>
 		</Filter>
 		<Filter
-			Name="Standard Headers"
+			Name="Acpica Headers"
 			Filter="h;hpp;hxx;hm;inl"
 			>
 			<File
diff --git a/generate/msvc9/AcpiXtract.vcproj b/generate/msvc9/AcpiXtract.vcproj
index 63cc95dca..bdec0f872 100755
--- a/generate/msvc9/AcpiXtract.vcproj
+++ b/generate/msvc9/AcpiXtract.vcproj
@@ -223,7 +223,7 @@
 	</References>
 	<Files>
 		<Filter
-			Name="Source"
+			Name="Acpica Source"
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 			>
 			<Filter
@@ -290,33 +290,28 @@
 					</FileConfiguration>
 				</File>
 			</Filter>
-			<Filter
-				Name="Local"
-				>
-				<File
-					RelativePath="..\..\source\tools\AcpiXtract\acpixtract.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\tools\acpixtract\axmain.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\tools\acpixtract\axutils.c"
-					>
-				</File>
-			</Filter>
 		</Filter>
 		<Filter
-			Name="Standard Headers"
-			Filter="h;hpp;hxx;hm;inl"
+			Name="AcpiXtract Headers"
 			>
+			<File
+				RelativePath="..\..\source\tools\acpixtract\acpixtract.h"
+				>
+			</File>
 		</Filter>
 		<Filter
-			Name="Local Headers"
+			Name="AcpiXtract Source"
 			>
 			<File
-				RelativePath="..\..\source\tools\acpixtract\acpixtract.h"
+				RelativePath="..\..\source\tools\AcpiXtract\acpixtract.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\tools\acpixtract\axmain.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\tools\acpixtract\axutils.c"
 				>
 			</File>
 		</Filter>
diff --git a/generate/msvc9/AslCompiler.vcproj b/generate/msvc9/AslCompiler.vcproj
index 84df9c505..ceb64555d 100755
--- a/generate/msvc9/AslCompiler.vcproj
+++ b/generate/msvc9/AslCompiler.vcproj
@@ -2,7 +2,7 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9.00"
-	Name="AslCompiler"
+	Name="iASL Compiler"
 	ProjectGUID="{567F2240-BCAA-48BE-BAB8-4E812BD273D8}"
 	RootNamespace="AslCompiler"
 	TargetFrameworkVersion="0"
@@ -118,7 +118,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Copy iasl.exe to Libraries"
-				CommandLine="copy AslCompiler\aslcompiler.exe ..\..\libraries\iasl.exe&#x0D;&#x0A;dir ..\..\libraries\iasl.exe&#x0D;&#x0A;"
+				CommandLine="copy AslCompiler\aslcompiler.exe ..\..\libraries\iasl.exe&#x0D;&#x0A;&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@@ -224,7 +224,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Copy iaslDebug.exe to Libraries (DEBUG)"
-				CommandLine="copy AslCompilerDebug\aslcompiler.exe ..\..\libraries\iaslDebug.exe&#x0D;&#x0A;dir ..\..\libraries\iasldebug.exe&#x0D;&#x0A;"
+				CommandLine="copy AslCompilerDebug\aslcompiler.exe ..\..\libraries\iaslDebug.exe&#x0D;&#x0A;&#x0D;&#x0A;"
 			/>
 		</Configuration>
 	</Configurations>
@@ -232,7 +232,7 @@
 	</References>
 	<Files>
 		<Filter
-			Name="ACPICA Source"
+			Name="Acpica Source"
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 			>
 			<Filter
@@ -764,7 +764,7 @@
 			</Filter>
 		</Filter>
 		<Filter
-			Name="Local Headers"
+			Name="Compiler Headers"
 			Filter="h;hpp;hxx;hm;inl"
 			>
 			<File
@@ -803,814 +803,810 @@
 		<Filter
 			Name="Compiler Source"
 			>
-			<Filter
-				Name="Compiler Parsers"
+			<File
+				RelativePath="..\..\source\compiler\aslanalyze.c"
 				>
-				<File
-					RelativePath="..\..\source\compiler\aslcstyle.y"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\aslhelpers.y"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\aslkeywords.y"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\aslparser.y"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-							Description="M4 Macro Preprocessor  ($(InputPath)) $(InputDir)"
-							CommandLine="c:\GnuWin32\bin\m4 -P -I../../source/compiler ../../source/compiler/$(InputName).y &gt; ./AslCompiler/AslCompiler.y&#x0D;&#x0A;"
-							AdditionalDependencies="$(InputDir)aslrules.y;$(InputDir)aslsupport.y;$(InputDir)asltokens.y;$(InputDir)asltypes.y;$(InputDir)aslcstyle.y;$(InputDir)aslcstructs.y;$(InputDir)aslresources.y;$(InputDir)aslprimaries.y;$(InputDir)aslkeywords.y;$(InputDir)aslhelpers.y"
-							Outputs=" ./AslCompiler/AslCompiler.y"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-							Description="M4 Macro Preprocessor  ($(InputPath)) &gt; AslCompilerDebug/AslCompilerDebug.y"
-							CommandLine="c:\GnuWin32\bin\m4 -P -I../../source/compiler $(InputPath) &gt; ./AslCompilerDebug/AslCompilerDebug.y&#x0D;&#x0A;"
-							AdditionalDependencies="$(InputDir)aslrules.y;$(InputDir)aslsupport.y;$(InputDir)asltokens.y;$(InputDir)asltypes.y;$(InputDir)aslcstyle.y;$(InputDir)aslcstructs.y;$(InputDir)aslresources.y;$(InputDir)aslprimaries.y;$(InputDir)aslkeywords.y;$(InputDir)aslhelpers.y"
-							Outputs=" ./AslCompilerDebug/AslCompilerDebug.y"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\aslprimaries.y"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\aslresources.y"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\aslrules.y"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\aslsupport.y"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\asltokens.y"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\asltypes.y"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\dtparser.y"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-							Description="Bison - Table compiler parser generation ($(InputPath))"
-							CommandLine="c:\GnuWin32\bin\bison -pDtParser -t -d -v --warnings=yacc -oAslCompiler/$(InputName).y.c ../../source/compiler/dtparser.y&#x0D;&#x0A;"
-							Outputs="AslCompiler\$(InputName).y.c;AslCompiler\$(InputName).y.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-							Description="Bison - Table compiler parser generation ($(InputPath)) DEBUG"
-							CommandLine="c:\GnuWin32\bin\bison -pDtParser -t -d -v --warnings=yacc -oAslCompilerDebug/DtParserDebug.y.c ../../source/compiler/dtparser.y&#x0D;&#x0A;copy /Y AslCompilerDebug\DtParserDebug.y.h AslCompilerDebug\DtParser.y.h&#x0D;&#x0A;"
-							Outputs="AslCompilerDebug\DtParserDebug.y.c;AslCompilerDebug\DtParserDebug.y.h"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\prparser.y"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-							Description="Bison - Preprocessor parser generation ($(InputPath))"
-							CommandLine="c:\GnuWin32\bin\bison -pPrParser -t -d -v --warnings=yacc -oAslCompiler/$(InputName).y.c ../../source/compiler/prparser.y&#x0D;&#x0A;"
-							Outputs="AslCompiler\$(InputName).y.c;AslCompiler\$(InputName).y.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-							Description="Bison - Preprocessor parser generation ($(InputPath)) DEBUG"
-							CommandLine="c:\GnuWin32\bin\bison -pPrParser -t -d -v --warnings=yacc -oAslCompilerDebug/PrParserDebug.y.c ../../source/compiler/prparser.y&#x0D;&#x0A;copy /Y AslCompilerDebug\PrParserDebug.y.h AslCompilerDebug\PrParser.y.h&#x0D;&#x0A;"
-							Outputs="AslCompilerDebug\PrParserDebug.y.c;AslCompilerDebug\PrParserDebug.y.h"
-						/>
-					</FileConfiguration>
-				</File>
-			</Filter>
-			<Filter
-				Name="Compiler Lexers"
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\aslascii.c"
 				>
-				<File
-					RelativePath="..\..\source\compiler\aslcompiler.l"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-							Description="Flex - Main compiler lexer generation ($(InputPath))"
-							CommandLine="c:\GnuWin32\bin\flex.exe -PAslCompiler -i -s -oAslCompiler\$(InputName).l.c $(InputPath)&#x0D;&#x0A;"
-							AdditionalDependencies="$(InputDir)aslsupport.l"
-							Outputs="AslCompiler\$(InputName).l.c"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-							Description="Flex - Main compiler lexer generation ($(InputPath)) DEBUG"
-							CommandLine="c:\GnuWin32\bin\flex.exe -PAslCompiler -i -s -oAslCompilerDebug\AslCompilerDebug.l.c $(InputPath)&#x0D;&#x0A;"
-							AdditionalDependencies="$(InputDir)aslsupport.l"
-							Outputs="AslCompilerDebug\AslCompilerDebug.l.c "
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\aslsupport.l"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\dtparser.l"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-							Description="Flex - Table compiler lexer generation ($(InputPath))"
-							CommandLine="c:\GnuWin32\bin\flex.exe -PDtParser -i -s -oAslCompiler\$(InputName).l.c $(InputPath)&#x0D;&#x0A;"
-							Outputs="AslCompiler\$(InputName).l.c "
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-							Description="Flex - Table compiler lexer generation ($(InputPath)) DEBUG"
-							CommandLine="c:\GnuWin32\bin\flex.exe -PDtParser -i -s -oAslCompilerDebug\DtParserDebug.l.c $(InputPath)&#x0D;&#x0A;"
-							Outputs="AslCompilerDebug\DtParserDebug.l.c "
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\prparser.l"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-							Description="Flex - Preprocessor lexer generation ($(InputPath))"
-							CommandLine="c:\GnuWin32\bin\flex.exe -PPrParser -i -s -oAslCompiler\$(InputName).l.c $(InputPath)&#x0D;&#x0A;"
-							Outputs="AslCompiler\$(InputName).l.c "
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-							Description="Flex - Preprocessor lexer generation ($(InputPath)) DEBUG"
-							CommandLine="c:\GnuWin32\bin\flex.exe -PPrParser -i -s -oAslCompilerDebug\PrParserDebug.l.c $(InputPath)&#x0D;&#x0A;"
-							Outputs="AslCompilerDebug\PrParserDebug.l.c "
-						/>
-					</FileConfiguration>
-				</File>
-			</Filter>
-			<Filter
-				Name="ASL Compiler"
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\aslbtypes.c"
 				>
-				<File
-					RelativePath="..\..\source\compiler\aslanalyze.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\aslascii.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\aslbtypes.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\aslcodegen.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\aslcompile.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\asldebug.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\aslerror.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\aslexternal.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\aslfileio.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\aslfiles.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\aslfold.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\aslhelp.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\aslhex.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\asllength.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\asllisting.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\asllistsup.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\aslload.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\asllookup.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\aslmain.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\aslmap.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\aslmapenter.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\aslmapoutput.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\aslmaputils.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\aslmessages.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\aslmethod.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\aslnamesp.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\asloffset.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\aslopcodes.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\asloperands.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\aslopt.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\asloptions.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\aslpld.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\aslpredef.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\aslprepkg.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\aslprintf.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\aslprune.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\aslresource.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\aslrestype1.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\aslrestype1i.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\aslrestype2.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\aslrestype2d.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\aslrestype2e.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\aslrestype2q.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\aslrestype2s.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\aslrestype2w.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\aslstartup.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\aslstubs.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\asltransform.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\asltree.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\aslutils.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\asluuid.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\aslwalks.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\aslxref.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\aslxrefout.c"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Data Table Compiler"
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\aslcodegen.c"
 				>
-				<File
-					RelativePath="..\..\source\compiler\dtcompile.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\dtexpress.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\dtfield.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\dtio.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\dtsubtable.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\dttable.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\dttable1.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\dttable2.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\dttemplate.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\dtutils.c"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Intermediate Output"
-				Filter="*.c, *.h"
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\aslcompile.c"
 				>
-				<File
-					RelativePath="AslCompiler\AslCompiler.l.c"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
-							WarningLevel="3"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
-							WarningLevel="3"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\AslCompiler\AslCompiler.y"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-							Description="Bison - Main compiler parser generation ($(InputPath))"
-							CommandLine="c:\GnuWin32\bin\bison -pAslCompiler -t -d -v --warnings=yacc -oAslCompiler/$(InputName).y.c ./AslCompiler/aslcompiler.y&#x0D;&#x0A;"
-							AdditionalDependencies="$(InputDir)aslcstructs.y;$(InputDir)aslcstyle.y;$(InputDir)aslhelpers.y;$(InputDir)aslkeywords.y;$(InputDir)aslparser.y;$(InputDir)aslprimaries.y;$(InputDir)aslrules.y;$(InputDir)aslsupport.y;$(InputDir)asltokens.y;$(InputDir)asltypes.y;$(InputDir)aslresources.y"
-							Outputs="./AslCompiler/$(InputName).y.c;./AslCompiler/$(InputName).y.h"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-							Description="Bison - Main compiler parser generation ($(InputPath))"
-							CommandLine=""
-							Outputs=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="AslCompiler\AslCompiler.y.c"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-							WarningLevel="3"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-							WarningLevel="3"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\AslCompiler\AslCompiler.y.output"
-					>
-				</File>
-				<File
-					RelativePath="AslCompilerDebug\AslCompilerDebug.l.c"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
-							WarningLevel="3"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
-							WarningLevel="3"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\AslCompilerDebug\AslCompilerDebug.y"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-							Description="Bison - Main compiler parser generation ($(InputPath))"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-							Description="Bison - Main compiler parser generation ($(InputPath)) DEBUG"
-							CommandLine="c:\GnuWin32\bin\bison -pAslCompiler -t -d -v --warnings=yacc -oAslCompilerDebug/AslCompilerDebug.y.c  AslCompilerDebug/AslCompilerDebug.y&#x0D;&#x0A;copy /Y AslCompilerDebug\AslCompilerDebug.y.h AslCompilerDebug\AslCompiler.y.h&#x0D;&#x0A;"
-							AdditionalDependencies="$(InputDir)aslcstructs.y;$(InputDir)aslcstyle.y;$(InputDir)aslhelpers.y;$(InputDir)aslkeywords.y;$(InputDir)aslparser.y;$(InputDir)aslprimaries.y;$(InputDir)aslrules.y;$(InputDir)aslsupport.y;$(InputDir)asltokens.y;$(InputDir)asltypes.y;$(InputDir)aslresources.y"
-							Outputs="AslCompilerDebug\AslCompilerDebug.y.c;AslCompilerDebug\AslCompilerDebug.y.h"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="AslCompilerDebug\AslCompilerDebug.y.c"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-							WarningLevel="3"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-							WarningLevel="3"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\AslCompiler\dtparser.l.c"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
-							WarningLevel="3"
-							Detect64BitPortabilityProblems="false"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\AslCompiler\dtparser.y.c"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
-							WarningLevel="3"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\AslCompilerDebug\DtParserDebug.l.c"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
-							WarningLevel="3"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\AslCompilerDebug\DtParserDebug.y.c"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
-							WarningLevel="3"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\AslCompiler\prparser.l.c"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
-							WarningLevel="3"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\AslCompiler\prparser.y.c"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
-							WarningLevel="3"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\AslCompilerDebug\PrParserDebug.l.c"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
-							WarningLevel="3"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\AslCompilerDebug\PrParserDebug.y.c"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
-							WarningLevel="3"
-						/>
-					</FileConfiguration>
-				</File>
-			</Filter>
-			<Filter
-				Name="Preprocessor"
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\asldebug.c"
 				>
-				<File
-					RelativePath="..\..\source\compiler\prexpress.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\prmacros.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\prscan.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\compiler\prutils.c"
-					>
-				</File>
-			</Filter>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\aslerror.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\aslexternal.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\aslfileio.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\aslfiles.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\aslfold.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\aslhelp.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\aslhex.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\asllength.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\asllisting.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\asllistsup.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\aslload.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\asllookup.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\aslmain.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\aslmap.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\aslmapenter.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\aslmapoutput.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\aslmaputils.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\aslmessages.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\aslmethod.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\aslnamesp.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\asloffset.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\aslopcodes.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\asloperands.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\aslopt.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\asloptions.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\aslpld.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\aslpredef.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\aslprepkg.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\aslprintf.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\aslprune.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\aslresource.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\aslrestype1.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\aslrestype1i.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\aslrestype2.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\aslrestype2d.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\aslrestype2e.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\aslrestype2q.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\aslrestype2s.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\aslrestype2w.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\aslstartup.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\aslstubs.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\asltransform.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\asltree.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\aslutils.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\asluuid.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\aslwalks.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\aslxref.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\aslxrefout.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Compiler Lexers"
+			>
+			<File
+				RelativePath="..\..\source\compiler\aslcompiler.l"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Flex - Main compiler lexer generation ($(InputPath))"
+						CommandLine="c:\GnuWin32\bin\flex.exe -PAslCompiler -i -s -oAslCompiler\$(InputName).l.c $(InputPath)&#x0D;&#x0A;"
+						AdditionalDependencies="$(InputDir)aslsupport.l"
+						Outputs="AslCompiler\$(InputName).l.c"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Flex - Main compiler lexer generation ($(InputPath)) DEBUG"
+						CommandLine="c:\GnuWin32\bin\flex.exe -PAslCompiler -i -s -oAslCompilerDebug\AslCompilerDebug.l.c $(InputPath)&#x0D;&#x0A;"
+						AdditionalDependencies="$(InputDir)aslsupport.l"
+						Outputs="AslCompilerDebug\AslCompilerDebug.l.c "
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\aslsupport.l"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\dtparser.l"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Flex - Table compiler lexer generation ($(InputPath))"
+						CommandLine="c:\GnuWin32\bin\flex.exe -PDtParser -i -s -oAslCompiler\$(InputName).l.c $(InputPath)&#x0D;&#x0A;"
+						Outputs="AslCompiler\$(InputName).l.c "
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Flex - Table compiler lexer generation ($(InputPath)) DEBUG"
+						CommandLine="c:\GnuWin32\bin\flex.exe -PDtParser -i -s -oAslCompilerDebug\DtParserDebug.l.c $(InputPath)&#x0D;&#x0A;"
+						Outputs="AslCompilerDebug\DtParserDebug.l.c "
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\prparser.l"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Flex - Preprocessor lexer generation ($(InputPath))"
+						CommandLine="c:\GnuWin32\bin\flex.exe -PPrParser -i -s -oAslCompiler\$(InputName).l.c $(InputPath)&#x0D;&#x0A;"
+						Outputs="AslCompiler\$(InputName).l.c "
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Flex - Preprocessor lexer generation ($(InputPath)) DEBUG"
+						CommandLine="c:\GnuWin32\bin\flex.exe -PPrParser -i -s -oAslCompilerDebug\PrParserDebug.l.c $(InputPath)&#x0D;&#x0A;"
+						Outputs="AslCompilerDebug\PrParserDebug.l.c "
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Compiler Parsers"
+			>
+			<File
+				RelativePath="..\..\source\compiler\aslcstyle.y"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\aslhelpers.y"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\aslkeywords.y"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\aslparser.y"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="M4 Macro Preprocessor  ($(InputPath)) $(InputDir)"
+						CommandLine="c:\GnuWin32\bin\m4 -P -I../../source/compiler ../../source/compiler/$(InputName).y &gt; ./AslCompiler/AslCompiler.y&#x0D;&#x0A;"
+						AdditionalDependencies="$(InputDir)aslrules.y;$(InputDir)aslsupport.y;$(InputDir)asltokens.y;$(InputDir)asltypes.y;$(InputDir)aslcstyle.y;$(InputDir)aslcstructs.y;$(InputDir)aslresources.y;$(InputDir)aslprimaries.y;$(InputDir)aslkeywords.y;$(InputDir)aslhelpers.y"
+						Outputs=" ./AslCompiler/AslCompiler.y"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="M4 Macro Preprocessor  ($(InputPath)) &gt; AslCompilerDebug/AslCompilerDebug.y"
+						CommandLine="c:\GnuWin32\bin\m4 -P -I../../source/compiler $(InputPath) &gt; ./AslCompilerDebug/AslCompilerDebug.y&#x0D;&#x0A;"
+						AdditionalDependencies="$(InputDir)aslrules.y;$(InputDir)aslsupport.y;$(InputDir)asltokens.y;$(InputDir)asltypes.y;$(InputDir)aslcstyle.y;$(InputDir)aslcstructs.y;$(InputDir)aslresources.y;$(InputDir)aslprimaries.y;$(InputDir)aslkeywords.y;$(InputDir)aslhelpers.y"
+						Outputs=" ./AslCompilerDebug/AslCompilerDebug.y"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\aslprimaries.y"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\aslresources.y"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\aslrules.y"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\aslsupport.y"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\asltokens.y"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\asltypes.y"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\dtparser.y"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Bison - Table compiler parser generation ($(InputPath))"
+						CommandLine="c:\GnuWin32\bin\bison -pDtParser -t -d -v --warnings=yacc -oAslCompiler/$(InputName).y.c ../../source/compiler/dtparser.y&#x0D;&#x0A;"
+						Outputs="AslCompiler\$(InputName).y.c;AslCompiler\$(InputName).y.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Bison - Table compiler parser generation ($(InputPath)) DEBUG"
+						CommandLine="c:\GnuWin32\bin\bison -pDtParser -t -d -v --warnings=yacc -oAslCompilerDebug/DtParserDebug.y.c ../../source/compiler/dtparser.y&#x0D;&#x0A;copy /Y AslCompilerDebug\DtParserDebug.y.h AslCompilerDebug\DtParser.y.h&#x0D;&#x0A;"
+						Outputs="AslCompilerDebug\DtParserDebug.y.c;AslCompilerDebug\DtParserDebug.y.h"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\prparser.y"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Bison - Preprocessor parser generation ($(InputPath))"
+						CommandLine="c:\GnuWin32\bin\bison -pPrParser -t -d -v --warnings=yacc -oAslCompiler/$(InputName).y.c ../../source/compiler/prparser.y&#x0D;&#x0A;"
+						Outputs="AslCompiler\$(InputName).y.c;AslCompiler\$(InputName).y.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Bison - Preprocessor parser generation ($(InputPath)) DEBUG"
+						CommandLine="c:\GnuWin32\bin\bison -pPrParser -t -d -v --warnings=yacc -oAslCompilerDebug/PrParserDebug.y.c ../../source/compiler/prparser.y&#x0D;&#x0A;copy /Y AslCompilerDebug\PrParserDebug.y.h AslCompilerDebug\PrParser.y.h&#x0D;&#x0A;"
+						Outputs="AslCompilerDebug\PrParserDebug.y.c;AslCompilerDebug\PrParserDebug.y.h"
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Intermediate Temp Output"
+			Filter="*.c, *.h"
+			>
+			<File
+				RelativePath="AslCompiler\AslCompiler.l.c"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
+						WarningLevel="3"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
+						WarningLevel="3"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath=".\AslCompiler\AslCompiler.y"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Bison - Main compiler parser generation ($(InputPath))"
+						CommandLine="c:\GnuWin32\bin\bison -pAslCompiler -t -d -v --warnings=yacc -oAslCompiler/$(InputName).y.c ./AslCompiler/aslcompiler.y&#x0D;&#x0A;"
+						AdditionalDependencies="$(InputDir)aslcstructs.y;$(InputDir)aslcstyle.y;$(InputDir)aslhelpers.y;$(InputDir)aslkeywords.y;$(InputDir)aslparser.y;$(InputDir)aslprimaries.y;$(InputDir)aslrules.y;$(InputDir)aslsupport.y;$(InputDir)asltokens.y;$(InputDir)asltypes.y;$(InputDir)aslresources.y"
+						Outputs="./AslCompiler/$(InputName).y.c;./AslCompiler/$(InputName).y.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Bison - Main compiler parser generation ($(InputPath))"
+						CommandLine=""
+						Outputs=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="AslCompiler\AslCompiler.y.c"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						WarningLevel="3"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						WarningLevel="3"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath=".\AslCompiler\AslCompiler.y.output"
+				>
+			</File>
+			<File
+				RelativePath="AslCompilerDebug\AslCompilerDebug.l.c"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
+						WarningLevel="3"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
+						WarningLevel="3"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath=".\AslCompilerDebug\AslCompilerDebug.y"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Bison - Main compiler parser generation ($(InputPath))"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Bison - Main compiler parser generation ($(InputPath)) DEBUG"
+						CommandLine="c:\GnuWin32\bin\bison -pAslCompiler -t -d -v --warnings=yacc -oAslCompilerDebug/AslCompilerDebug.y.c  AslCompilerDebug/AslCompilerDebug.y&#x0D;&#x0A;copy /Y AslCompilerDebug\AslCompilerDebug.y.h AslCompilerDebug\AslCompiler.y.h&#x0D;&#x0A;"
+						AdditionalDependencies="$(InputDir)aslcstructs.y;$(InputDir)aslcstyle.y;$(InputDir)aslhelpers.y;$(InputDir)aslkeywords.y;$(InputDir)aslparser.y;$(InputDir)aslprimaries.y;$(InputDir)aslrules.y;$(InputDir)aslsupport.y;$(InputDir)asltokens.y;$(InputDir)asltypes.y;$(InputDir)aslresources.y"
+						Outputs="AslCompilerDebug\AslCompilerDebug.y.c;AslCompilerDebug\AslCompilerDebug.y.h"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="AslCompilerDebug\AslCompilerDebug.y.c"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						WarningLevel="3"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						WarningLevel="3"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath=".\AslCompiler\dtparser.l.c"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
+						WarningLevel="3"
+						Detect64BitPortabilityProblems="false"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath=".\AslCompiler\dtparser.y.c"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
+						WarningLevel="3"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath=".\AslCompilerDebug\DtParserDebug.l.c"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
+						WarningLevel="3"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath=".\AslCompilerDebug\DtParserDebug.y.c"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
+						WarningLevel="3"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath=".\AslCompiler\prparser.l.c"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
+						WarningLevel="3"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath=".\AslCompiler\prparser.y.c"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
+						WarningLevel="3"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath=".\AslCompilerDebug\PrParserDebug.l.c"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
+						WarningLevel="3"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath=".\AslCompilerDebug\PrParserDebug.y.c"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
+						WarningLevel="3"
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Preprocessor Source"
+			>
+			<File
+				RelativePath="..\..\source\compiler\prexpress.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\prmacros.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\prscan.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\prutils.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="TableCompiler Source"
+			>
+			<File
+				RelativePath="..\..\source\compiler\dtcompile.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\dtexpress.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\dtfield.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\dtio.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\dtsubtable.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\dttable.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\dttable1.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\dttable2.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\dttemplate.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\compiler\dtutils.c"
+				>
+			</File>
 		</Filter>
 	</Files>
 	<Globals>
diff --git a/generate/msvc9/Examples.vcproj b/generate/msvc9/Examples.vcproj
index 8d9ad3c27..7749add9f 100755
--- a/generate/msvc9/Examples.vcproj
+++ b/generate/msvc9/Examples.vcproj
@@ -2,8 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9.00"
-	Name="Examples"
+	Name="Acpica Examples"
 	ProjectGUID="{D086AEFC-5004-4D97-B68B-F884F7C75436}"
+	RootNamespace="Acpica Examples"
 	TargetFrameworkVersion="0"
 	>
 	<Platforms>
@@ -114,7 +115,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Copy ExamplesDebug.exe to Libraries (DEBUG)"
-				CommandLine="copy examplesDebug\examples.exe ..\..\libraries\ExamplesDebug.exe&#x0D;&#x0A;dir ..\..\libraries\examplesDebug.exe&#x0D;&#x0A;"
+				CommandLine="copy examplesDebug\examples.exe ..\..\libraries\ExamplesDebug.exe&#x0D;&#x0A;&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@@ -218,7 +219,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Copy Examples.exe to Libraries"
-				CommandLine="copy examples\examples.exe ..\..\libraries\Examples.exe&#x0D;&#x0A;dir ..\..\libraries\examples.exe&#x0D;&#x0A;"
+				CommandLine="copy examples\examples.exe ..\..\libraries\Examples.exe&#x0D;&#x0A;&#x0D;&#x0A;"
 			/>
 		</Configuration>
 	</Configurations>
@@ -226,7 +227,7 @@
 	</References>
 	<Files>
 		<Filter
-			Name="Source"
+			Name="Acpica Source"
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 			>
 			<Filter
@@ -254,22 +255,6 @@
 				</File>
 			</Filter>
 			<Filter
-				Name="Local"
-				>
-				<File
-					RelativePath="..\..\source\tools\examples\examples.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\tools\examples\exstubs.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\source\tools\examples\extables.c"
-					>
-				</File>
-			</Filter>
-			<Filter
 				Name="Utilities"
 				>
 				<File
@@ -783,7 +768,7 @@
 			</Filter>
 		</Filter>
 		<Filter
-			Name="Local Headers"
+			Name="Examples Headers"
 			Filter="h;hpp;hxx;hm;inl"
 			>
 			<File
@@ -791,6 +776,22 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Examples Source"
+			>
+			<File
+				RelativePath="..\..\source\tools\examples\examples.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\tools\examples\exstubs.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\source\tools\examples\extables.c"
+				>
+			</File>
+		</Filter>
 	</Files>
 	<Globals>
 	</Globals>