diff --git a/desmume/src/windows/DeSmuME_2008.vcproj b/desmume/src/windows/DeSmuME_2008.vcproj
index e31b5273a..39cab23d4 100644
--- a/desmume/src/windows/DeSmuME_2008.vcproj
+++ b/desmume/src/windows/DeSmuME_2008.vcproj
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="Windows-1252"?>
+<?xml version="1.0" encoding="shift_jis"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="DeSmuME_VS2008"
 	ProjectGUID="{9F5F72A1-D3A5-4918-B460-E076B16D10A9}"
 	RootNamespace="DeSmuME"
@@ -582,463 +582,7 @@
 	</References>
 	<Files>
 		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<Filter
-				Name="core"
-				>
-				<File
-					RelativePath="..\addons.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\aggdraw.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\arm_instructions.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\armcpu.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\bios.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\cheatSystem.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\commandline.cpp"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							CallingConvention="0"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release FastBuild|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							CallingConvention="0"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							CallingConvention="0"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release FastBuild|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							CallingConvention="0"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\common.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\cp15.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\debug.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\Disassembler.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\emufile.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\FIFO.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\fs-windows.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\gfx3d.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\GPU.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\GPU_OSD.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\lua-engine.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\matrix.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\mc.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\MMU.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\movie.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\NDSSystem.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\OGLRender.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\rasterize.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\readwrite.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\render3D.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\ROMReader.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\rtc.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\saves.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\SPU.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\texcache.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\thumb_instructions.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\wifi.cpp"
-					>
-				</File>
-				<Filter
-					Name="utils"
-					>
-					<File
-						RelativePath="..\utils\ConvertUTF.c"
-						>
-					</File>
-					<File
-						RelativePath="..\utils\ConvertUTF.h"
-						>
-					</File>
-					<File
-						RelativePath="..\utils\guid.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\utils\guid.h"
-						>
-					</File>
-					<File
-						RelativePath="..\utils\md5.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\utils\md5.h"
-						>
-					</File>
-					<File
-						RelativePath="..\utils\valuearray.h"
-						>
-					</File>
-					<File
-						RelativePath="..\utils\xstring.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\utils\xstring.h"
-						>
-					</File>
-					<Filter
-						Name="decrypt"
-						>
-						<File
-							RelativePath="..\utils\decrypt\crc.cpp"
-							>
-						</File>
-						<File
-							RelativePath="..\utils\decrypt\crc.h"
-							>
-						</File>
-						<File
-							RelativePath="..\utils\decrypt\decrypt.cpp"
-							>
-						</File>
-						<File
-							RelativePath="..\utils\decrypt\decrypt.h"
-							>
-						</File>
-						<File
-							RelativePath="..\utils\decrypt\header.cpp"
-							>
-						</File>
-						<File
-							RelativePath="..\utils\decrypt\header.h"
-							>
-						</File>
-					</Filter>
-				</Filter>
-				<Filter
-					Name="addons"
-					>
-					<File
-						RelativePath="..\addons\compactFlash.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\addons\expMemory.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\addons\gbagame.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\addons\guitarGrip.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\addons\none.cpp"
-						>
-					</File>
-					<File
-						RelativePath="..\addons\rumblepak.cpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="gdbstub"
-					>
-					<File
-						RelativePath="..\gdbstub\gdbstub.cpp"
-						>
-					</File>
-				</Filter>
-			</Filter>
-			<Filter
-				Name="windows"
-				>
-				<File
-					RelativePath=".\7zip.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\7zip.h"
-					>
-				</File>
-				<File
-					RelativePath=".\7zipstreams.h"
-					>
-				</File>
-				<File
-					RelativePath=".\AboutBox.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\aviout.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\cheatsWin.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\colorctrl.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\console.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\CWindow.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\FirmConfig.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\gbaslot_config.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\ginfo.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\hotkey.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\inputdx.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\luaconsole.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\main.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\mic.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\ogl.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\OpenArchive.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\OpenArchive.h"
-					>
-				</File>
-				<File
-					RelativePath=".\pathsettings.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\replay.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\snddx.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\throttle.cpp"
-					>
-				</File>
-				<Filter
-					Name="filters"
-					>
-					<File
-						RelativePath=".\filter\2xsai.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\filter\bilinear.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\filter\hq2x.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\filter\scanline.cpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="tools"
-					>
-					<File
-						RelativePath=".\disView.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\IORegView.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\lightView.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\mapView.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\matrixView.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\memView.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\oamView.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\palView.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\ram_search.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\ramwatch.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\soundView.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\tileView.cpp"
-						>
-					</File>
-				</Filter>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			Name="Instruction tables"
 			>
 			<File
 				RelativePath="..\instruction_tabdef.inc"
@@ -1048,342 +592,6 @@
 				RelativePath="..\thumb_tabdef.inc"
 				>
 			</File>
-			<Filter
-				Name="windows"
-				>
-				<File
-					RelativePath=".\AboutBox.h"
-					>
-				</File>
-				<File
-					RelativePath=".\aviout.h"
-					>
-				</File>
-				<File
-					RelativePath=".\cheatsWin.h"
-					>
-				</File>
-				<File
-					RelativePath=".\colorctrl.h"
-					>
-				</File>
-				<File
-					RelativePath=".\console.h"
-					>
-				</File>
-				<File
-					RelativePath=".\CWindow.h"
-					>
-				</File>
-				<File
-					RelativePath=".\disView.h"
-					>
-				</File>
-				<File
-					RelativePath=".\FirmConfig.h"
-					>
-				</File>
-				<File
-					RelativePath=".\gbaslot_config.h"
-					>
-				</File>
-				<File
-					RelativePath=".\ginfo.h"
-					>
-				</File>
-				<File
-					RelativePath=".\hotkey.h"
-					>
-				</File>
-				<File
-					RelativePath=".\inputdx.h"
-					>
-				</File>
-				<File
-					RelativePath=".\IORegView.h"
-					>
-				</File>
-				<File
-					RelativePath=".\lightView.h"
-					>
-				</File>
-				<File
-					RelativePath=".\main.h"
-					>
-				</File>
-				<File
-					RelativePath=".\mapView.h"
-					>
-				</File>
-				<File
-					RelativePath=".\matrixView.h"
-					>
-				</File>
-				<File
-					RelativePath=".\memView.h"
-					>
-				</File>
-				<File
-					RelativePath=".\oamView.h"
-					>
-				</File>
-				<File
-					RelativePath=".\palView.h"
-					>
-				</File>
-				<File
-					RelativePath=".\pathsettings.h"
-					>
-				</File>
-				<File
-					RelativePath=".\ram_search.h"
-					>
-				</File>
-				<File
-					RelativePath=".\ramwatch.h"
-					>
-				</File>
-				<File
-					RelativePath=".\replay.h"
-					>
-				</File>
-				<File
-					RelativePath=".\resource.h"
-					>
-				</File>
-				<File
-					RelativePath=".\snddx.h"
-					>
-				</File>
-				<File
-					RelativePath=".\soundView.h"
-					>
-				</File>
-				<File
-					RelativePath=".\throttle.h"
-					>
-				</File>
-				<File
-					RelativePath=".\tileView.h"
-					>
-				</File>
-				<Filter
-					Name="userconfig"
-					>
-					<File
-						RelativePath=".\userconfig\userconfig.h"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="filters"
-					>
-					<File
-						RelativePath=".\filter\filter.h"
-						>
-					</File>
-				</Filter>
-			</Filter>
-			<Filter
-				Name="core"
-				>
-				<File
-					RelativePath="..\addons.h"
-					>
-				</File>
-				<File
-					RelativePath="..\arm_instructions.h"
-					>
-				</File>
-				<File
-					RelativePath="..\armcpu.h"
-					>
-				</File>
-				<File
-					RelativePath="..\bios.h"
-					>
-				</File>
-				<File
-					RelativePath="..\bits.h"
-					>
-				</File>
-				<File
-					RelativePath="..\cheatSystem.h"
-					>
-				</File>
-				<File
-					RelativePath="..\commandline.h"
-					>
-				</File>
-				<File
-					RelativePath="..\common.h"
-					>
-				</File>
-				<File
-					RelativePath="..\cp15.h"
-					>
-				</File>
-				<File
-					RelativePath="..\debug.h"
-					>
-				</File>
-				<File
-					RelativePath="..\Disassembler.h"
-					>
-				</File>
-				<File
-					RelativePath="..\driver.h"
-					>
-				</File>
-				<File
-					RelativePath="..\emufile.h"
-					>
-				</File>
-				<File
-					RelativePath="..\fat.h"
-					>
-				</File>
-				<File
-					RelativePath="..\FIFO.h"
-					>
-				</File>
-				<File
-					RelativePath="..\fs.h"
-					>
-				</File>
-				<File
-					RelativePath="..\gdbstub.h"
-					>
-				</File>
-				<File
-					RelativePath="..\gfx3d.h"
-					>
-				</File>
-				<File
-					RelativePath="..\gl_vertex.h"
-					>
-				</File>
-				<File
-					RelativePath="..\GPU.h"
-					>
-				</File>
-				<File
-					RelativePath="..\GPU_osd.h"
-					>
-				</File>
-				<File
-					RelativePath="..\lua-engine.h"
-					>
-				</File>
-				<File
-					RelativePath="..\matrix.h"
-					>
-				</File>
-				<File
-					RelativePath="..\mc.h"
-					>
-				</File>
-				<File
-					RelativePath="..\mem.h"
-					>
-				</File>
-				<File
-					RelativePath="..\mic.h"
-					>
-				</File>
-				<File
-					RelativePath="..\MMU.h"
-					>
-				</File>
-				<File
-					RelativePath="..\movie.h"
-					>
-				</File>
-				<File
-					RelativePath="..\NDSSystem.h"
-					>
-				</File>
-				<File
-					RelativePath="..\OGLRender.h"
-					>
-				</File>
-				<File
-					RelativePath="..\path.h"
-					>
-				</File>
-				<File
-					RelativePath="..\rasterize.h"
-					>
-				</File>
-				<File
-					RelativePath="..\readwrite.h"
-					>
-				</File>
-				<File
-					RelativePath="..\registers.h"
-					>
-				</File>
-				<File
-					RelativePath="..\render3D.h"
-					>
-				</File>
-				<File
-					RelativePath="..\ROMReader.h"
-					>
-				</File>
-				<File
-					RelativePath="..\rtc.h"
-					>
-				</File>
-				<File
-					RelativePath="..\saves.h"
-					>
-				</File>
-				<File
-					RelativePath="..\shaders.h"
-					>
-				</File>
-				<File
-					RelativePath="..\softrender.h"
-					>
-				</File>
-				<File
-					RelativePath="..\softrender_config.h"
-					>
-				</File>
-				<File
-					RelativePath="..\softrender_desmumefont.h"
-					>
-				</File>
-				<File
-					RelativePath="..\softrender_v3sysfont.h"
-					>
-				</File>
-				<File
-					RelativePath="..\SPU.h"
-					>
-				</File>
-				<File
-					RelativePath="..\texcache.h"
-					>
-				</File>
-				<File
-					RelativePath="..\thumb_instructions.h"
-					>
-				</File>
-				<File
-					RelativePath="..\types.h"
-					>
-				</File>
-				<File
-					RelativePath="..\version.h"
-					>
-				</File>
-				<File
-					RelativePath="..\wifi.h"
-					>
-				</File>
-			</Filter>
 		</Filter>
 		<Filter
 			Name="Resource Files"
@@ -1403,6 +611,778 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Core"
+			>
+			<File
+				RelativePath="..\addons.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\addons.h"
+				>
+			</File>
+			<File
+				RelativePath="..\aggdraw.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\arm_instructions.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\arm_instructions.h"
+				>
+			</File>
+			<File
+				RelativePath="..\armcpu.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\armcpu.h"
+				>
+			</File>
+			<File
+				RelativePath="..\bios.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\bios.h"
+				>
+			</File>
+			<File
+				RelativePath="..\bits.h"
+				>
+			</File>
+			<File
+				RelativePath="..\cheatSystem.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\cheatSystem.h"
+				>
+			</File>
+			<File
+				RelativePath="..\commandline.cpp"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						CallingConvention="0"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release FastBuild|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						CallingConvention="0"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						CallingConvention="0"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release FastBuild|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						CallingConvention="0"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\commandline.h"
+				>
+			</File>
+			<File
+				RelativePath="..\common.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\common.h"
+				>
+			</File>
+			<File
+				RelativePath="..\cp15.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\cp15.h"
+				>
+			</File>
+			<File
+				RelativePath="..\debug.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\debug.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Disassembler.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\Disassembler.h"
+				>
+			</File>
+			<File
+				RelativePath="..\driver.h"
+				>
+			</File>
+			<File
+				RelativePath="..\emufile.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\emufile.h"
+				>
+			</File>
+			<File
+				RelativePath="..\fat.h"
+				>
+			</File>
+			<File
+				RelativePath="..\FIFO.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\FIFO.h"
+				>
+			</File>
+			<File
+				RelativePath="..\fs-windows.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\fs.h"
+				>
+			</File>
+			<File
+				RelativePath="..\gdbstub.h"
+				>
+			</File>
+			<File
+				RelativePath="..\gfx3d.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\gfx3d.h"
+				>
+			</File>
+			<File
+				RelativePath="..\gl_vertex.h"
+				>
+			</File>
+			<File
+				RelativePath="..\GPU.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\GPU.h"
+				>
+			</File>
+			<File
+				RelativePath="..\GPU_OSD.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\GPU_osd.h"
+				>
+			</File>
+			<File
+				RelativePath="..\lua-engine.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\lua-engine.h"
+				>
+			</File>
+			<File
+				RelativePath="..\matrix.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\matrix.h"
+				>
+			</File>
+			<File
+				RelativePath="..\mc.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\mc.h"
+				>
+			</File>
+			<File
+				RelativePath="..\mem.h"
+				>
+			</File>
+			<File
+				RelativePath="..\mic.h"
+				>
+			</File>
+			<File
+				RelativePath="..\MMU.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\MMU.h"
+				>
+			</File>
+			<File
+				RelativePath="..\movie.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\movie.h"
+				>
+			</File>
+			<File
+				RelativePath="..\NDSSystem.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\NDSSystem.h"
+				>
+			</File>
+			<File
+				RelativePath="..\OGLRender.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\OGLRender.h"
+				>
+			</File>
+			<File
+				RelativePath="..\path.h"
+				>
+			</File>
+			<File
+				RelativePath="..\rasterize.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\rasterize.h"
+				>
+			</File>
+			<File
+				RelativePath="..\readwrite.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\readwrite.h"
+				>
+			</File>
+			<File
+				RelativePath="..\registers.h"
+				>
+			</File>
+			<File
+				RelativePath="..\render3D.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\render3D.h"
+				>
+			</File>
+			<File
+				RelativePath="..\ROMReader.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\ROMReader.h"
+				>
+			</File>
+			<File
+				RelativePath="..\rtc.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\rtc.h"
+				>
+			</File>
+			<File
+				RelativePath="..\saves.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\saves.h"
+				>
+			</File>
+			<File
+				RelativePath="..\shaders.h"
+				>
+			</File>
+			<File
+				RelativePath="..\softrender.h"
+				>
+			</File>
+			<File
+				RelativePath="..\softrender_config.h"
+				>
+			</File>
+			<File
+				RelativePath="..\softrender_desmumefont.h"
+				>
+			</File>
+			<File
+				RelativePath="..\softrender_v3sysfont.h"
+				>
+			</File>
+			<File
+				RelativePath="..\SPU.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\SPU.h"
+				>
+			</File>
+			<File
+				RelativePath="..\texcache.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\texcache.h"
+				>
+			</File>
+			<File
+				RelativePath="..\thumb_instructions.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\thumb_instructions.h"
+				>
+			</File>
+			<File
+				RelativePath="..\types.h"
+				>
+			</File>
+			<File
+				RelativePath="..\version.h"
+				>
+			</File>
+			<File
+				RelativePath="..\wifi.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\wifi.h"
+				>
+			</File>
+			<Filter
+				Name="addons"
+				>
+				<File
+					RelativePath="..\addons\compactFlash.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\addons\expMemory.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\addons\gbagame.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\addons\guitarGrip.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\addons\none.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\addons\rumblepak.cpp"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="gdbstub"
+				>
+				<File
+					RelativePath="..\gdbstub\gdbstub.cpp"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="utils"
+				>
+				<File
+					RelativePath="..\utils\ConvertUTF.c"
+					>
+				</File>
+				<File
+					RelativePath="..\utils\ConvertUTF.h"
+					>
+				</File>
+				<File
+					RelativePath="..\utils\guid.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\utils\guid.h"
+					>
+				</File>
+				<File
+					RelativePath="..\utils\md5.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\utils\md5.h"
+					>
+				</File>
+				<File
+					RelativePath="..\utils\valuearray.h"
+					>
+				</File>
+				<File
+					RelativePath="..\utils\xstring.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\utils\xstring.h"
+					>
+				</File>
+				<Filter
+					Name="decrypt"
+					>
+					<File
+						RelativePath="..\utils\decrypt\crc.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\utils\decrypt\crc.h"
+						>
+					</File>
+					<File
+						RelativePath="..\utils\decrypt\decrypt.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\utils\decrypt\decrypt.h"
+						>
+					</File>
+					<File
+						RelativePath="..\utils\decrypt\header.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\utils\decrypt\header.h"
+						>
+					</File>
+				</Filter>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="Windows"
+			>
+			<File
+				RelativePath=".\7zip.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\7zip.h"
+				>
+			</File>
+			<File
+				RelativePath=".\7zipstreams.h"
+				>
+			</File>
+			<File
+				RelativePath=".\AboutBox.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\AboutBox.h"
+				>
+			</File>
+			<File
+				RelativePath=".\aviout.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\aviout.h"
+				>
+			</File>
+			<File
+				RelativePath=".\cheatsWin.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\cheatsWin.h"
+				>
+			</File>
+			<File
+				RelativePath=".\colorctrl.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\colorctrl.h"
+				>
+			</File>
+			<File
+				RelativePath=".\console.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\console.h"
+				>
+			</File>
+			<File
+				RelativePath=".\CWindow.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\CWindow.h"
+				>
+			</File>
+			<File
+				RelativePath=".\FirmConfig.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\FirmConfig.h"
+				>
+			</File>
+			<File
+				RelativePath=".\gbaslot_config.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\gbaslot_config.h"
+				>
+			</File>
+			<File
+				RelativePath=".\ginfo.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\ginfo.h"
+				>
+			</File>
+			<File
+				RelativePath=".\hotkey.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\hotkey.h"
+				>
+			</File>
+			<File
+				RelativePath=".\inputdx.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\inputdx.h"
+				>
+			</File>
+			<File
+				RelativePath=".\luaconsole.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\main.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\main.h"
+				>
+			</File>
+			<File
+				RelativePath=".\mic.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\ogl.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\OpenArchive.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\OpenArchive.h"
+				>
+			</File>
+			<File
+				RelativePath=".\pathsettings.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\pathsettings.h"
+				>
+			</File>
+			<File
+				RelativePath=".\replay.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\replay.h"
+				>
+			</File>
+			<File
+				RelativePath=".\resource.h"
+				>
+			</File>
+			<File
+				RelativePath=".\snddx.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\snddx.h"
+				>
+			</File>
+			<File
+				RelativePath=".\throttle.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\throttle.h"
+				>
+			</File>
+			<Filter
+				Name="filters"
+				>
+				<File
+					RelativePath=".\filter\2xsai.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\filter\bilinear.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\filter\filter.h"
+					>
+				</File>
+				<File
+					RelativePath=".\filter\hq2x.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\filter\scanline.cpp"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="userconfig"
+				>
+				<File
+					RelativePath=".\userconfig\userconfig.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="tools"
+				>
+				<File
+					RelativePath=".\disView.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\disView.h"
+					>
+				</File>
+				<File
+					RelativePath=".\IORegView.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\IORegView.h"
+					>
+				</File>
+				<File
+					RelativePath=".\lightView.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\lightView.h"
+					>
+				</File>
+				<File
+					RelativePath=".\mapView.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\mapView.h"
+					>
+				</File>
+				<File
+					RelativePath=".\matrixView.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\matrixView.h"
+					>
+				</File>
+				<File
+					RelativePath=".\memView.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\memView.h"
+					>
+				</File>
+				<File
+					RelativePath=".\oamView.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\oamView.h"
+					>
+				</File>
+				<File
+					RelativePath=".\palView.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\palView.h"
+					>
+				</File>
+				<File
+					RelativePath=".\ram_search.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\ram_search.h"
+					>
+				</File>
+				<File
+					RelativePath=".\ramwatch.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\ramwatch.h"
+					>
+				</File>
+				<File
+					RelativePath=".\soundView.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\soundView.h"
+					>
+				</File>
+				<File
+					RelativePath=".\tileView.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\tileView.h"
+					>
+				</File>
+			</Filter>
+		</Filter>
 	</Files>
 	<Globals>
 		<Global