diff --git a/project/vc2008_mfc/VBA2008.vcproj b/project/vc2008_mfc/VBA2008.vcproj
index 918f20fc..1c541161 100644
--- a/project/vc2008_mfc/VBA2008.vcproj
+++ b/project/vc2008_mfc/VBA2008.vcproj
@@ -244,221 +244,175 @@
 	</References>
 	<Files>
 		<Filter
-			Name="Source"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			Name="Resource"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+			<File
+				RelativePath="..\..\src\win32\resource.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\res\VBA.ico"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\VBA.rc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\res\VBA.rc2"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Documentation"
+			>
+			<File
+				RelativePath="..\..\doc\DevInfo.txt"
+				>
+			</File>
+			<File
+				RelativePath="..\..\doc\ReadMe.MFC.txt"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Core"
 			>
 			<Filter
-				Name="Filters"
+				Name="GB"
 				>
 				<File
-					RelativePath="..\..\src\2xSaI.cpp"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							WholeProgramOptimization="true"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\2xSaImmx.asm"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="NASM"
-							PreprocessorDefinitions="__DJGPP__"
-							GenerateDebugInfo="true"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="NASM"
-							Optimization="1"
-							PreprocessorDefinitions="__DJGPP__"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\admame.cpp"
+					RelativePath="..\..\src\dmg\gb.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\src\bilinear.cpp"
+					RelativePath="..\..\src\dmg\gb.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\src\interframe.cpp"
+					RelativePath="..\..\src\dmg\gbCheats.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\src\pixel.cpp"
+					RelativePath="..\..\src\dmg\gbCheats.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\src\win32\rpi.cpp"
+					RelativePath="..\..\src\dmg\gbCodes.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\src\scanline.cpp"
+					RelativePath="..\..\src\dmg\gbCodesCB.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\src\simpleFilter.cpp"
+					RelativePath="..\..\src\dmg\gbDis.cpp"
 					>
 				</File>
-				<Filter
-					Name="HQ"
+				<File
+					RelativePath="..\..\src\dmg\gbGfx.cpp"
 					>
-					<File
-						RelativePath="..\..\src\hq2x.cpp"
-						>
-					</File>
-					<Filter
-						Name="3x_4x_asm"
-						>
-						<File
-							RelativePath="..\..\src\hq\asm\hq3x_16.asm"
-							>
-							<FileConfiguration
-								Name="Debug|Win32"
-								>
-								<Tool
-									Name="NASM"
-									Optimization="1"
-									IncludePath="../../src/hq/asm/"
-									DisableOrphanLabelsWarning="true"
-									GenerateDebugInfo="true"
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Release|Win32"
-								>
-								<Tool
-									Name="NASM"
-									Optimization="1"
-									IncludePath="../../src/hq/asm/"
-									DisableOrphanLabelsWarning="true"
-								/>
-							</FileConfiguration>
-						</File>
-						<File
-							RelativePath="..\..\src\hq\asm\hq3x_32.asm"
-							>
-							<FileConfiguration
-								Name="Debug|Win32"
-								>
-								<Tool
-									Name="NASM"
-									Optimization="1"
-									IncludePath="../../src/hq/asm/"
-									DisableOrphanLabelsWarning="true"
-									GenerateDebugInfo="true"
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Release|Win32"
-								>
-								<Tool
-									Name="NASM"
-									Optimization="1"
-									IncludePath="../../src/hq/asm/"
-									DisableOrphanLabelsWarning="true"
-								/>
-							</FileConfiguration>
-						</File>
-						<File
-							RelativePath="..\..\src\hq\asm\hq4x_16.asm"
-							>
-							<FileConfiguration
-								Name="Debug|Win32"
-								>
-								<Tool
-									Name="NASM"
-									Optimization="1"
-									IncludePath="../../src/hq/asm/"
-									DisableOrphanLabelsWarning="true"
-									GenerateDebugInfo="true"
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Release|Win32"
-								>
-								<Tool
-									Name="NASM"
-									Optimization="1"
-									IncludePath="../../src/hq/asm/"
-									DisableOrphanLabelsWarning="true"
-								/>
-							</FileConfiguration>
-						</File>
-						<File
-							RelativePath="..\..\src\hq\asm\hq4x_32.asm"
-							>
-							<FileConfiguration
-								Name="Debug|Win32"
-								>
-								<Tool
-									Name="NASM"
-									Optimization="1"
-									IncludePath="../../src/hq/asm/"
-									DisableOrphanLabelsWarning="true"
-									GenerateDebugInfo="true"
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Release|Win32"
-								>
-								<Tool
-									Name="NASM"
-									Optimization="1"
-									IncludePath="../../src/hq/asm/"
-									DisableOrphanLabelsWarning="true"
-								/>
-							</FileConfiguration>
-						</File>
-						<File
-							RelativePath="..\..\src\hq\asm\macros.mac"
-							>
-						</File>
-					</Filter>
-				</Filter>
+				</File>
+				<File
+					RelativePath="..\..\src\dmg\gbGlobals.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\dmg\gbGlobals.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\dmg\gbMemory.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\dmg\gbMemory.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\dmg\gbPrinter.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\dmg\gbPrinter.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\dmg\gbSGB.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\dmg\gbSGB.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\dmg\gbSound.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\dmg\gbSound.h"
+					>
+				</File>
 			</Filter>
 			<Filter
-				Name="Functionality"
+				Name="GB APU"
 				>
 				<File
-					RelativePath="..\..\src\armdis.cpp"
+					RelativePath="..\..\src\dmg\gb_apu\blargg_common.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\src\Cheats.cpp"
+					RelativePath="..\..\src\dmg\gb_apu\blargg_config.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\src\CheatSearch.cpp"
+					RelativePath="..\..\src\dmg\gb_apu\blargg_source.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\src\agb\gbafilter.cpp"
+					RelativePath="..\..\src\dmg\gb_apu\Blip_Buffer.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\src\memgzio.c"
+					RelativePath="..\..\src\dmg\gb_apu\Blip_Buffer.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\src\win32\protect.c"
+					RelativePath="..\..\src\dmg\gb_apu\Effects_Buffer.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\src\Util.cpp"
+					RelativePath="..\..\src\dmg\gb_apu\Effects_Buffer.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\dmg\gb_apu\Gb_Apu.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\dmg\gb_apu\Gb_Apu.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\dmg\gb_apu\Gb_Apu_State.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\dmg\gb_apu\Gb_Oscs.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\dmg\gb_apu\Gb_Oscs.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\dmg\gb_apu\Multi_Buffer.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\dmg\gb_apu\Multi_Buffer.h"
 					>
 				</File>
 			</Filter>
@@ -469,22 +423,42 @@
 					RelativePath="..\..\src\agb\agbprint.cpp"
 					>
 				</File>
+				<File
+					RelativePath="..\..\src\agb\agbprint.h"
+					>
+				</File>
 				<File
 					RelativePath="..\..\src\bios.cpp"
 					>
 				</File>
+				<File
+					RelativePath="..\..\src\bios.h"
+					>
+				</File>
 				<File
 					RelativePath="..\..\src\EEprom.cpp"
 					>
 				</File>
+				<File
+					RelativePath="..\..\src\EEprom.h"
+					>
+				</File>
 				<File
 					RelativePath="..\..\src\elf.cpp"
 					>
 				</File>
+				<File
+					RelativePath="..\..\src\elf.h"
+					>
+				</File>
 				<File
 					RelativePath="..\..\src\Flash.cpp"
 					>
 				</File>
+				<File
+					RelativePath="..\..\src\Flash.h"
+					>
+				</File>
 				<File
 					RelativePath="..\..\src\agb\gba-arm.cpp"
 					>
@@ -497,14 +471,38 @@
 					RelativePath="..\..\src\agb\gba.cpp"
 					>
 				</File>
+				<File
+					RelativePath="..\..\src\agb\gba.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\agb\GBAcpu.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\agb\gbafilter.h"
+					>
+				</File>
 				<File
 					RelativePath="..\..\src\agb\gbagfx.cpp"
 					>
 				</File>
+				<File
+					RelativePath="..\..\src\agb\gbagfx.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\agb\gbainline.h"
+					>
+				</File>
 				<File
 					RelativePath="..\..\src\Globals.cpp"
 					>
 				</File>
+				<File
+					RelativePath="..\..\src\Globals.h"
+					>
+				</File>
 				<File
 					RelativePath="..\..\src\Mode0.cpp"
 					>
@@ -537,552 +535,22 @@
 					RelativePath="..\..\src\RTC.cpp"
 					>
 				</File>
-				<File
-					RelativePath="..\..\src\Sound.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\Sram.cpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="GB"
-				>
-				<File
-					RelativePath="..\..\src\dmg\gb.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\dmg\gbCheats.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\dmg\gbDis.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\dmg\gbGfx.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\dmg\gbGlobals.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\dmg\gbMemory.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\dmg\gbPrinter.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\dmg\gbSGB.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\dmg\gbSound.cpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="UI"
-				>
-				<File
-					RelativePath="..\..\src\win32\AboutDialog.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\AccelEditor.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\AcceleratorManager.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\Associate.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\AudioCoreSettingsDlg.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\AVIWrite.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\BIOSDialog.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\BitmapControl.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\CmdAccelOb.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\ColorButton.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\ColorControl.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\Commands.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\Directories.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\Disassemble.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\ExportGSASnapshot.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\FileDlg.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\FullscreenSettings.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\GameOverrides.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\GBACheats.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\GDBConnection.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\GSACodeSelect.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\Hyperlink.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\IOViewer.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\Joypad.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\KeyboardEdit.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\LangSelect.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\Logging.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\MainWnd.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\MainWndCheats.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\MainWndFile.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\MainWndHelp.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\MainWndOptions.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\MainWndTools.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\MapView.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\MaxScale.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\MemoryViewer.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\MemoryViewerAddressSize.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\MemoryViewerDlg.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\OALConfig.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\OamView.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\PaletteView.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\PaletteViewControl.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\Reg.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\ResizeDlg.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\RewindInterval.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\RomInfo.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\SelectPlugin.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\StringTokenizer.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\Throttle.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\TileView.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\WavWriter.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\WinResUtil.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\XAudio2_Config.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\ZoomControl.cpp"
-					>
-				</File>
-				<Filter
-					Name="GB"
-					>
-					<File
-						RelativePath="..\..\src\win32\GBCheatsDlg.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\src\win32\GBColorDlg.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\src\win32\GBDisassemble.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\src\win32\GBMapView.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\src\win32\GBMemoryViewerDlg.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\src\win32\GBOamView.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\src\win32\GBPaletteView.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\src\win32\GBPrinterDlg.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\..\src\win32\GBTileView.cpp"
-						>
-					</File>
-				</Filter>
-			</Filter>
-			<Filter
-				Name="Main"
-				>
-				<File
-					RelativePath="..\..\src\win32\stdafx.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\VBA.cpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="IO"
-				>
-				<File
-					RelativePath="..\..\src\win32\Direct3D.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\DirectInput.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\DirectSound.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\glfont.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							CompileAs="1"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							CompileAs="1"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\LoadOAL.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\OpenAL.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\OpenGL.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\XAudio2.cpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Linking"
-				>
-				<File
-					RelativePath="..\..\src\agb\gbalink.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\LinkOptions.cpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="GB APU"
-				>
-				<File
-					RelativePath="..\..\src\dmg\gb_apu\Blip_Buffer.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\dmg\gb_apu\Effects_Buffer.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\dmg\gb_apu\Gb_Apu.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\dmg\gb_apu\Gb_Apu_State.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\dmg\gb_apu\Gb_Oscs.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\dmg\gb_apu\Multi_Buffer.cpp"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Header"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<Filter
-				Name="GB"
-				>
-				<File
-					RelativePath="..\..\src\dmg\gb.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\dmg\gbCheats.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\dmg\gbCodes.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\dmg\gbCodesCB.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\dmg\gbGlobals.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\dmg\gbMemory.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\dmg\gbPrinter.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\dmg\gbSGB.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\dmg\gbSound.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Filters"
-				>
-				<File
-					RelativePath="..\..\src\win32\rpi.h"
-					>
-				</File>
-				<Filter
-					Name="HQ"
-					>
-					<File
-						RelativePath="..\..\src\hq2x.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\src\interp.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\src\lq2x.h"
-						>
-					</File>
-					<Filter
-						Name="3x_4x_asm"
-						>
-						<File
-							RelativePath="..\..\src\hq\asm\hq3x32.cpp"
-							>
-						</File>
-					</Filter>
-				</Filter>
-			</Filter>
-			<Filter
-				Name="GBA"
-				>
-				<File
-					RelativePath="..\..\src\agb\agbprint.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\bios.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\EEprom.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\elf.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\Flash.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\agb\gba.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\agb\GBAcpu.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\agb\gbafilter.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\agb\gbagfx.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\agb\gbainline.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\Globals.h"
-					>
-				</File>
 				<File
 					RelativePath="..\..\src\RTC.h"
 					>
 				</File>
+				<File
+					RelativePath="..\..\src\Sound.cpp"
+					>
+				</File>
 				<File
 					RelativePath="..\..\src\Sound.h"
 					>
 				</File>
+				<File
+					RelativePath="..\..\src\Sram.cpp"
+					>
+				</File>
 				<File
 					RelativePath="..\..\src\Sram.h"
 					>
@@ -1092,416 +560,892 @@
 					>
 				</File>
 			</Filter>
+		</Filter>
+		<Filter
+			Name="Pixel Filter"
+			>
+			<File
+				RelativePath="..\..\src\2xSaI.cpp"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						WholeProgramOptimization="true"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\2xSaImmx.asm"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="NASM"
+						PreprocessorDefinitions="__DJGPP__"
+						GenerateDebugInfo="true"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="NASM"
+						Optimization="1"
+						PreprocessorDefinitions="__DJGPP__"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\admame.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\bilinear.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\interframe.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\pixel.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\rpi.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\rpi.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\scanline.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\simpleFilter.cpp"
+				>
+			</File>
 			<Filter
-				Name="Functionality"
+				Name="HQ"
 				>
 				<File
-					RelativePath="..\..\src\armdis.h"
+					RelativePath="..\..\src\hq2x.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\src\Cheats.h"
+					RelativePath="..\..\src\hq2x.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\src\CheatSearch.h"
+					RelativePath="..\..\src\interp.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\src\getopt.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\memgzio.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\NLS.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\Port.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\protect.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\Text.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\unzip.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\Util.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="UI"
-				>
-				<File
-					RelativePath="..\..\src\win32\AboutDialog.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\AccelEditor.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\AcceleratorManager.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\Associate.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\AudioCoreSettingsDlg.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\AVIWrite.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\BitmapControl.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\CmdAccelOb.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\ColorButton.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\ColorControl.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\Directories.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\Disassemble.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\ExportGSASnapshot.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\FileDlg.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\FullscreenSettings.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\GBACheats.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\GDBConnection.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\GSACodeSelect.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\Hyperlink.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\IOViewer.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\IOViewerRegs.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\IUpdate.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\Joypad.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\KeyboardEdit.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\LangSelect.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\Logging.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\MainWnd.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\MapView.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\MaxScale.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\MemoryViewer.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\MemoryViewerAddressSize.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\MemoryViewerDlg.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\OALConfig.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\OamView.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\PaletteView.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\PaletteViewControl.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\Reg.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\ResizeDlg.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\RewindInterval.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\RomInfo.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\SelectPlugin.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\StringTokenizer.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\Throttle.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\TileView.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\WavWriter.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\WinHelper.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\WinResUtil.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\XAudio2_Config.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\ZoomControl.h"
+					RelativePath="..\..\src\lq2x.h"
 					>
 				</File>
 				<Filter
-					Name="GB"
+					Name="3x_4x_asm"
 					>
 					<File
-						RelativePath="..\..\src\win32\GBCheatsDlg.h"
+						RelativePath="..\..\src\hq\asm\hq3x32.cpp"
 						>
 					</File>
 					<File
-						RelativePath="..\..\src\win32\GBColorDlg.h"
+						RelativePath="..\..\src\hq\asm\hq3x_16.asm"
 						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="NASM"
+								Optimization="1"
+								IncludePath="../../src/hq/asm/"
+								DisableOrphanLabelsWarning="true"
+								GenerateDebugInfo="true"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="NASM"
+								Optimization="1"
+								IncludePath="../../src/hq/asm/"
+								DisableOrphanLabelsWarning="true"
+							/>
+						</FileConfiguration>
 					</File>
 					<File
-						RelativePath="..\..\src\win32\GBDisassemble.h"
+						RelativePath="..\..\src\hq\asm\hq3x_32.asm"
 						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="NASM"
+								Optimization="1"
+								IncludePath="../../src/hq/asm/"
+								DisableOrphanLabelsWarning="true"
+								GenerateDebugInfo="true"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="NASM"
+								Optimization="1"
+								IncludePath="../../src/hq/asm/"
+								DisableOrphanLabelsWarning="true"
+							/>
+						</FileConfiguration>
 					</File>
 					<File
-						RelativePath="..\..\src\win32\GBMapView.h"
+						RelativePath="..\..\src\hq\asm\hq4x_16.asm"
 						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="NASM"
+								Optimization="1"
+								IncludePath="../../src/hq/asm/"
+								DisableOrphanLabelsWarning="true"
+								GenerateDebugInfo="true"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="NASM"
+								Optimization="1"
+								IncludePath="../../src/hq/asm/"
+								DisableOrphanLabelsWarning="true"
+							/>
+						</FileConfiguration>
 					</File>
 					<File
-						RelativePath="..\..\src\win32\GBMemoryViewerDlg.h"
+						RelativePath="..\..\src\hq\asm\hq4x_32.asm"
 						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="NASM"
+								Optimization="1"
+								IncludePath="../../src/hq/asm/"
+								DisableOrphanLabelsWarning="true"
+								GenerateDebugInfo="true"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="NASM"
+								Optimization="1"
+								IncludePath="../../src/hq/asm/"
+								DisableOrphanLabelsWarning="true"
+							/>
+						</FileConfiguration>
 					</File>
 					<File
-						RelativePath="..\..\src\win32\GBOamView.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\src\win32\GBPaletteView.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\src\win32\GBPrinterDlg.h"
-						>
-					</File>
-					<File
-						RelativePath="..\..\src\win32\GBTileView.h"
+						RelativePath="..\..\src\hq\asm\macros.mac"
 						>
 					</File>
 				</Filter>
 			</Filter>
-			<Filter
-				Name="IO"
-				>
-				<File
-					RelativePath="..\..\src\win32\Display.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\glfont.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\gzglfont.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\Input.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\Sound.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Main"
-				>
-				<File
-					RelativePath="..\..\src\win32\stdafx.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\targetver.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\VBA.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Linking"
-				>
-				<File
-					RelativePath="..\..\src\agb\gbalink.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\win32\LinkOptions.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="GB APU"
-				>
-				<File
-					RelativePath="..\..\src\dmg\gb_apu\blargg_common.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\dmg\gb_apu\blargg_config.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\dmg\gb_apu\blargg_source.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\dmg\gb_apu\Blip_Buffer.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\dmg\gb_apu\Effects_Buffer.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\dmg\gb_apu\Gb_Apu.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\dmg\gb_apu\Gb_Oscs.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\src\dmg\gb_apu\Multi_Buffer.h"
-					>
-				</File>
-			</Filter>
 		</Filter>
 		<Filter
-			Name="Resources"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			Name="Functionality"
 			>
 			<File
-				RelativePath="..\..\src\win32\resource.h"
+				RelativePath="..\..\src\armdis.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\win32\res\VBA.ico"
+				RelativePath="..\..\src\armdis.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\win32\VBA.rc"
+				RelativePath="..\..\src\Cheats.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\win32\res\VBA.rc2"
+				RelativePath="..\..\src\Cheats.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\CheatSearch.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\CheatSearch.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\agb\gbafilter.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\getopt.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\memgzio.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\memgzio.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\NLS.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\Port.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\protect.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\protect.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\Text.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\unzip.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\Util.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\Util.h"
 				>
 			</File>
 		</Filter>
 		<Filter
-			Name="Documentation"
+			Name="IO"
 			>
 			<File
-				RelativePath="..\..\doc\DevInfo.txt"
+				RelativePath="..\..\src\win32\Direct3D.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\doc\ReadMe.txt"
+				RelativePath="..\..\src\win32\DirectInput.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\win32\DirectSound.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\Display.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\glfont.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						CompileAs="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						CompileAs="1"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\glfont.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\gzglfont.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\Input.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\LoadOAL.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\OpenAL.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\OpenGL.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\Sound.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\XAudio2.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Linking"
+			>
+			<File
+				RelativePath="..\..\src\agb\gbalink.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\agb\gbalink.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\LinkOptions.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\LinkOptions.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Main"
+			>
+			<File
+				RelativePath="..\..\src\win32\stdafx.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\stdafx.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\targetver.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\VBA.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\VBA.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="MFC"
+			>
+			<File
+				RelativePath="..\..\src\win32\AboutDialog.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\AboutDialog.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\AccelEditor.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\AccelEditor.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\AcceleratorManager.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\AcceleratorManager.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\Associate.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\Associate.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\AudioCoreSettingsDlg.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\AudioCoreSettingsDlg.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\AVIWrite.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\AVIWrite.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\BIOSDialog.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\BitmapControl.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\BitmapControl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\CmdAccelOb.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\CmdAccelOb.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\ColorButton.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\ColorButton.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\ColorControl.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\ColorControl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\Commands.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\Directories.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\Directories.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\Disassemble.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\Disassemble.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\ExportGSASnapshot.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\ExportGSASnapshot.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\FileDlg.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\FileDlg.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\FullscreenSettings.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\FullscreenSettings.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\GameOverrides.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\GBACheats.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\GBACheats.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\GDBConnection.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\GDBConnection.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\GSACodeSelect.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\GSACodeSelect.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\Hyperlink.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\Hyperlink.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\IOViewer.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\IOViewer.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\IOViewerRegs.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\IUpdate.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\Joypad.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\Joypad.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\KeyboardEdit.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\KeyboardEdit.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\LangSelect.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\LangSelect.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\Logging.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\Logging.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\MainWnd.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\MainWnd.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\MainWndCheats.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\MainWndFile.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\MainWndHelp.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\MainWndOptions.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\MainWndTools.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\MapView.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\MapView.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\MaxScale.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\MaxScale.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\MemoryViewer.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\MemoryViewer.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\MemoryViewerAddressSize.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\MemoryViewerAddressSize.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\MemoryViewerDlg.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\MemoryViewerDlg.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\OALConfig.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\OALConfig.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\OamView.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\OamView.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\PaletteView.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\PaletteView.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\PaletteViewControl.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\PaletteViewControl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\Reg.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\Reg.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\ResizeDlg.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\ResizeDlg.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\RewindInterval.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\RewindInterval.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\RomInfo.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\RomInfo.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\SelectPlugin.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\SelectPlugin.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\StringTokenizer.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\StringTokenizer.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\Throttle.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\Throttle.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\TileView.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\TileView.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\WavWriter.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\WavWriter.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\WinHelper.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\WinResUtil.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\WinResUtil.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\XAudio2_Config.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\XAudio2_Config.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\ZoomControl.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\win32\ZoomControl.h"
+				>
+			</File>
+			<Filter
+				Name="GB"
+				>
+				<File
+					RelativePath="..\..\src\win32\GBCheatsDlg.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\GBCheatsDlg.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\GBColorDlg.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\GBColorDlg.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\GBDisassemble.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\GBDisassemble.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\GBMapView.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\GBMapView.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\GBMemoryViewerDlg.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\GBMemoryViewerDlg.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\GBOamView.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\GBOamView.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\GBPaletteView.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\GBPaletteView.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\GBPrinterDlg.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\GBPrinterDlg.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\GBTileView.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\win32\GBTileView.h"
+					>
+				</File>
+			</Filter>
 		</Filter>
 	</Files>
 	<Globals>