diff --git a/desmume/src/frontend/windows/DeSmuME.vcxproj b/desmume/src/frontend/windows/DeSmuME.vcxproj
index c5c5c8566..dba678b60 100644
--- a/desmume/src/frontend/windows/DeSmuME.vcxproj
+++ b/desmume/src/frontend/windows/DeSmuME.vcxproj
@@ -346,13 +346,21 @@
     <ClInclude Include="..\..\addons\slot1comp_protocol.h" />
     <ClInclude Include="..\..\addons\slot1comp_rom.h" />
     <ClInclude Include="..\..\Database.h" />
+    <ClInclude Include="..\..\filter\filter.h" />
+    <ClInclude Include="..\..\filter\xbrz.h" />
     <ClInclude Include="..\..\gdbstub.h" />
+    <ClInclude Include="..\..\libretro-common\include\compat\getopt.h" />
+    <ClInclude Include="..\..\libretro-common\include\compat\msvc.h" />
     <ClInclude Include="..\..\libretro-common\include\encodings\utf.h" />
     <ClInclude Include="..\..\libretro-common\include\features\features_cpu.h" />
+    <ClInclude Include="..\..\libretro-common\include\formats\image.h" />
+    <ClInclude Include="..\..\libretro-common\include\formats\rbmp.h" />
+    <ClInclude Include="..\..\libretro-common\include\formats\rpng.h" />
     <ClInclude Include="..\..\libretro-common\include\libretro.h" />
+    <ClInclude Include="..\..\libretro-common\include\rthreads\rthreads.h" />
+    <ClInclude Include="..\..\metaspu\SoundTouch\FIRFilter.h" />
     <ClInclude Include="..\..\types.h" />
     <ClInclude Include="..\..\utils\bits.h" />
-    <ClInclude Include="..\..\utils\xstring.h" />
     <ClInclude Include="..\..\version.h" />
     <ClInclude Include="..\..\armcpu.h" />
     <ClInclude Include="..\..\arm_jit.h" />
@@ -366,27 +374,15 @@
     <ClInclude Include="..\..\emufile.h" />
     <ClInclude Include="..\..\encrypt.h" />
     <ClInclude Include="..\..\FIFO.h" />
-    <ClInclude Include="..\..\filter\filter.h" />
-    <ClInclude Include="..\..\filter\hq2x.h" />
-    <ClInclude Include="..\..\filter\interp.h" />
-    <ClInclude Include="..\..\filter\lq2x.h" />
-    <ClInclude Include="..\..\filter\xbrz.h" />
     <ClInclude Include="..\..\firmware.h" />
     <ClInclude Include="..\..\frontend\modules\ImageOut.h" />
     <ClInclude Include="..\..\gfx3d.h" />
     <ClInclude Include="..\..\GPU.h" />
     <ClInclude Include="..\..\instructions.h" />
     <ClInclude Include="..\..\instruction_attributes.h" />
-    <ClInclude Include="..\..\libretro-common\formats\png\rpng_internal.h" />
     <ClInclude Include="..\..\libretro-common\include\boolean.h" />
-    <ClInclude Include="..\..\libretro-common\include\compat\getopt.h" />
-    <ClInclude Include="..\..\libretro-common\include\compat\msvc.h" />
-    <ClInclude Include="..\..\libretro-common\include\formats\image.h" />
-    <ClInclude Include="..\..\libretro-common\include\formats\rbmp.h" />
-    <ClInclude Include="..\..\libretro-common\include\formats\rpng.h" />
     <ClInclude Include="..\..\libretro-common\include\retro_inline.h" />
     <ClInclude Include="..\..\libretro-common\include\retro_miscellaneous.h" />
-    <ClInclude Include="..\..\libretro-common\include\rthreads\rthreads.h" />
     <ClInclude Include="..\..\lua-engine.h" />
     <ClInclude Include="..\..\matrix.h" />
     <ClInclude Include="..\..\mc.h" />
@@ -479,7 +475,6 @@
     <ClInclude Include="..\..\utils\vfat.h" />
     <ClInclude Include="..\modules\Disassembler.h" />
     <ClInclude Include="..\..\wifi.h" />
-    <ClInclude Include="..\..\utils\xstring.h" />
     <ClInclude Include="..\..\utils\guid.h" />
     <ClInclude Include="..\..\utils\task.h" />
     <ClInclude Include="..\..\utils\decrypt\crc.h" />
@@ -493,7 +488,6 @@
     <ClInclude Include="..\..\metaspu\SoundTouch\cpu_detect.h" />
     <ClInclude Include="..\..\metaspu\SoundTouch\FIFOSampleBuffer.h" />
     <ClInclude Include="..\..\metaspu\SoundTouch\FIFOSamplePipe.h" />
-    <ClInclude Include="..\..\metaspu\SoundTouch\FIRFilter.h" />
     <ClInclude Include="..\..\metaspu\SoundTouch\RateTransposer.h" />
     <ClInclude Include="..\..\metaspu\SoundTouch\SoundTouch.h" />
     <ClInclude Include="..\..\metaspu\SoundTouch\STTypes.h" />
@@ -606,7 +600,6 @@
     <ClInclude Include="tileView.h" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\filter\hq4x.dat" />
     <None Include="..\instruction_tabdef.inc" />
     <None Include="..\modules\osd\agg\agg2d.inl" />
     <None Include="..\thumb_tabdef.inc" />
diff --git a/desmume/src/frontend/windows/DeSmuME.vcxproj.filters b/desmume/src/frontend/windows/DeSmuME.vcxproj.filters
index 905ec8470..3a28bef52 100644
--- a/desmume/src/frontend/windows/DeSmuME.vcxproj.filters
+++ b/desmume/src/frontend/windows/DeSmuME.vcxproj.filters
@@ -953,9 +953,6 @@
     <ClInclude Include="..\..\metaspu\SoundTouch\FIFOSamplePipe.h">
       <Filter>metaspu\SoundTouch</Filter>
     </ClInclude>
-    <ClInclude Include="..\metaspu\SoundTouch\FIRFilter.h">
-      <Filter>metaspu\SoundTouch</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\metaspu\SoundTouch\RateTransposer.h">
       <Filter>metaspu\SoundTouch</Filter>
     </ClInclude>
@@ -1478,13 +1475,9 @@
     <ClInclude Include="..\..\utils\colorspacehandler\colorspacehandler.h">
       <Filter>utils\colorspacehandler</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\utils\xstring.h">
-      <Filter>utils</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\libretro-common\include\features\features_cpu.h">
       <Filter>libretro-common\include\features</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\utils\xstring.h" />
     <ClInclude Include="..\..\arm_jit.h" />
     <ClInclude Include="..\..\armcpu.h" />
     <ClInclude Include="..\..\bios.h" />
@@ -1525,14 +1518,12 @@
     <ClInclude Include="..\..\slot2.h" />
     <ClInclude Include="..\..\SPU.h" />
     <ClInclude Include="..\..\texcache.h" />
-    <ClInclude Include="..\..\utils\xstring.h" />
     <ClInclude Include="..\..\libretro-common\include\libretro.h">
       <Filter>libretro-common\include</Filter>
     </ClInclude>
     <ClInclude Include="..\..\libretro-common\include\encodings\utf.h">
       <Filter>libretro-common\include\encodings</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\utils\xstring.h" />
     <ClInclude Include="..\..\addons\slot1comp_mc.h">
       <Filter>addons</Filter>
     </ClInclude>
@@ -1545,35 +1536,62 @@
     <ClInclude Include="..\..\Database.h" />
     <ClInclude Include="..\..\types.h" />
     <ClInclude Include="..\..\version.h" />
-    <ClInclude Include="..\..\filter\filter.h" />
-    <ClInclude Include="..\..\filter\hq2x.h" />
-    <ClInclude Include="..\..\filter\interp.h" />
-    <ClInclude Include="..\..\filter\lq2x.h" />
-    <ClInclude Include="..\..\filter\xbrz.h" />
-    <ClInclude Include="..\..\frontend\modules\ImageOut.h" />
-    <ClInclude Include="..\..\libretro-common\formats\png\rpng_internal.h" />
-    <ClInclude Include="..\..\libretro-common\include\boolean.h" />
-    <ClInclude Include="..\..\libretro-common\include\compat\getopt.h" />
-    <ClInclude Include="..\..\libretro-common\include\compat\msvc.h" />
-    <ClInclude Include="..\..\libretro-common\include\formats\image.h" />
-    <ClInclude Include="..\..\libretro-common\include\formats\rbmp.h" />
-    <ClInclude Include="..\..\libretro-common\include\formats\rpng.h" />
-    <ClInclude Include="..\..\libretro-common\include\retro_inline.h" />
-    <ClInclude Include="..\..\libretro-common\include\retro_miscellaneous.h" />
-    <ClInclude Include="..\..\libretro-common\include\rthreads\rthreads.h" />
     <ClInclude Include="..\..\wifi.h" />
-    <ClInclude Include="..\..\utils\xstring.h" />
     <ClInclude Include="..\..\utils\bits.h">
       <Filter>utils</Filter>
     </ClInclude>
     <ClInclude Include="..\modules\Disassembler.h">
       <Filter>frontend\modules</Filter>
     </ClInclude>
-    <ClInclude Include="..\modules\osd\agg\agg2d.h" />
-    <ClInclude Include="..\modules\osd\agg\aggdraw.h" />
-    <ClInclude Include="..\modules\osd\agg\agg_osd.h" />
-    <ClInclude Include="..\..\utils\xstring.h" />
     <ClInclude Include="..\..\gdbstub.h" />
+    <ClInclude Include="..\modules\osd\agg\aggdraw.h">
+      <Filter>frontend\modules\osd\agg</Filter>
+    </ClInclude>
+    <ClInclude Include="..\modules\osd\agg\agg2d.h">
+      <Filter>frontend\modules\osd\agg</Filter>
+    </ClInclude>
+    <ClInclude Include="..\modules\osd\agg\agg_osd.h">
+      <Filter>frontend\modules\osd\agg</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\metaspu\SoundTouch\FIRFilter.h">
+      <Filter>metaspu\SoundTouch</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\frontend\modules\ImageOut.h">
+      <Filter>frontend\modules</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\libretro-common\include\compat\msvc.h">
+      <Filter>libretro-common\include\compat</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\filter\xbrz.h">
+      <Filter>filter</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\libretro-common\include\boolean.h">
+      <Filter>libretro-common\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\filter\filter.h">
+      <Filter>filter</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\libretro-common\include\retro_miscellaneous.h">
+      <Filter>libretro-common\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\libretro-common\include\retro_inline.h">
+      <Filter>libretro-common\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\libretro-common\include\formats\rbmp.h">
+      <Filter>libretro-common\include\formats</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\libretro-common\include\formats\image.h">
+      <Filter>libretro-common\include\formats</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\libretro-common\include\formats\rpng.h">
+      <Filter>libretro-common\include\formats</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\libretro-common\include\rthreads\rthreads.h">
+      <Filter>libretro-common\include\rthreads</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\libretro-common\include\compat\getopt.h">
+      <Filter>libretro-common\include\compat</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="bitmap1.bmp">
@@ -1582,9 +1600,6 @@
     <None Include="DeSmuME.ico">
       <Filter>frontend\Windows\resources</Filter>
     </None>
-    <None Include="..\filter\hq4x.dat">
-      <Filter>filter</Filter>
-    </None>
     <None Include="..\..\utils\AsmJit\COPYING.txt">
       <Filter>utils\AsmJit</Filter>
     </None>
diff --git a/desmume/src/mem.h b/desmume/src/mem.h
index 00f3a426d..1aaf11afe 100644
--- a/desmume/src/mem.h
+++ b/desmume/src/mem.h
@@ -69,7 +69,6 @@ static INLINE u32 T1ReadLong_guaranteedAligned(u8* const  mem, const u32 addr)
 #endif
 }
 
-
 static INLINE u32 T1ReadLong(u8* const  mem, u32 addr)
 {
    addr &= ~3;
@@ -136,46 +135,16 @@ static INLINE void T1WriteQuad(u8* const mem, const u32 addr, const u64 val)
 #endif
 }
 
-//static INLINE u8 T2ReadByte(u8* const  mem, const u32 addr)
-//{
-//#ifdef MSB_FIRST
-//   return mem[addr ^ 1];
-//#else
-//   return mem[addr];
-//#endif
-//}
-//
-
 static INLINE u16 HostReadWord(u8* const mem, const u32 addr)
 {
    return *((u16 *) (mem + addr));
 }
 
-//
-//static INLINE u32 T2ReadLong(u8* const mem, const u32 addr)
-//{
-//#ifdef MSB_FIRST
-//   return *((u16 *) (mem + addr + 2)) << 16 | *((u16 *) (mem + addr));
-//#else
-//   return *((u32 *) (mem + addr));
-//#endif
-//}
-//
-//static INLINE void T2WriteByte(u8* const mem, const u32 addr, const u8 val)
-//{
-//#ifdef MSB_FIRST
-//   mem[addr ^ 1] = val;
-//#else
-//   mem[addr] = val;
-//#endif
-//}
-
 static INLINE void HostWriteWord(u8* const mem, const u32 addr, const u16 val)
 {
    *((u16 *) (mem + addr)) = val;
 }
 
-
 static INLINE void HostWriteLong(u8* const mem, const u32 addr, const u32 val)
 {
    *((u32 *) (mem + addr)) = val;