diff --git a/libgambatte/libgambatte.vcxproj b/libgambatte/libgambatte.vcxproj
index 0af47e31bb..027a9db161 100644
--- a/libgambatte/libgambatte.vcxproj
+++ b/libgambatte/libgambatte.vcxproj
@@ -1,222 +1,231 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{5D630682-7BDA-474D-B387-0EB420DDC199}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>libgambatte</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBGAMBATTE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>include;src;src\common</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4244;4373;4800;4804</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBGAMBATTE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>include;src;src\common</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4244;4373;4800;4804</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBGAMBATTE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>include;src;src\common</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4244;4373;4800;4804</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBGAMBATTE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>include;src;src\common</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4244;4373;4800;4804</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="include\gambatte.h" />
-    <ClInclude Include="include\gbint.h" />
-    <ClInclude Include="src\cinterface.h" />
-    <ClInclude Include="src\common\array.h" />
-    <ClInclude Include="src\common\uncopyable.h" />
-    <ClInclude Include="src\counterdef.h" />
-    <ClInclude Include="src\cpu.h" />
-    <ClInclude Include="src\file\stdfile.h" />
-    <ClInclude Include="src\initstate.h" />
-    <ClInclude Include="src\insertion_sort.h" />
-    <ClInclude Include="src\interrupter.h" />
-    <ClInclude Include="src\interruptrequester.h" />
-    <ClInclude Include="src\memory.h" />
-    <ClInclude Include="src\mem\cartridge.h" />
-    <ClInclude Include="src\mem\memptrs.h" />
-    <ClInclude Include="src\mem\rtc.h" />
-    <ClInclude Include="src\minkeeper.h" />
-    <ClInclude Include="src\newstate.h" />
-    <ClInclude Include="src\savestate.h" />
-    <ClInclude Include="src\sound.h" />
-    <ClInclude Include="src\sound\channel1.h" />
-    <ClInclude Include="src\sound\channel2.h" />
-    <ClInclude Include="src\sound\channel3.h" />
-    <ClInclude Include="src\sound\channel4.h" />
-    <ClInclude Include="src\sound\duty_unit.h" />
-    <ClInclude Include="src\sound\envelope_unit.h" />
-    <ClInclude Include="src\sound\length_counter.h" />
-    <ClInclude Include="src\sound\master_disabler.h" />
-    <ClInclude Include="src\sound\sound_unit.h" />
-    <ClInclude Include="src\sound\static_output_tester.h" />
-    <ClInclude Include="src\tima.h" />
-    <ClInclude Include="src\video.h" />
-    <ClInclude Include="src\video\lyc_irq.h" />
-    <ClInclude Include="src\video\ly_counter.h" />
-    <ClInclude Include="src\video\next_m0_time.h" />
-    <ClInclude Include="src\video\ppu.h" />
-    <ClInclude Include="src\video\sprite_mapper.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="src\cinterface.cpp" />
-    <ClCompile Include="src\cpu.cpp" />
-    <ClCompile Include="src\gambatte.cpp" />
-    <ClCompile Include="src\initstate.cpp" />
-    <ClCompile Include="src\interrupter.cpp" />
-    <ClCompile Include="src\interruptrequester.cpp" />
-    <ClCompile Include="src\memory.cpp" />
-    <ClCompile Include="src\mem\cartridge.cpp" />
-    <ClCompile Include="src\mem\memptrs.cpp" />
-    <ClCompile Include="src\mem\rtc.cpp" />
-    <ClCompile Include="src\newstate.cpp" />
-    <ClCompile Include="src\sound.cpp" />
-    <ClCompile Include="src\sound\channel1.cpp" />
-    <ClCompile Include="src\sound\channel2.cpp" />
-    <ClCompile Include="src\sound\channel3.cpp" />
-    <ClCompile Include="src\sound\channel4.cpp" />
-    <ClCompile Include="src\sound\duty_unit.cpp" />
-    <ClCompile Include="src\sound\envelope_unit.cpp" />
-    <ClCompile Include="src\sound\length_counter.cpp" />
-    <ClCompile Include="src\tima.cpp" />
-    <ClCompile Include="src\video.cpp" />
-    <ClCompile Include="src\video\lyc_irq.cpp" />
-    <ClCompile Include="src\video\ly_counter.cpp" />
-    <ClCompile Include="src\video\next_m0_time.cpp" />
-    <ClCompile Include="src\video\ppu.cpp" />
-    <ClCompile Include="src\video\sprite_mapper.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{5D630682-7BDA-474D-B387-0EB420DDC199}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>libgambatte</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>..\output\dll</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>..\output\dll</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>..\output\dll</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>..\output\dll</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBGAMBATTE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>include;src;src\common</AdditionalIncludeDirectories>
+      <DisableSpecificWarnings>4244;4373;4800;4804</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBGAMBATTE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>include;src;src\common</AdditionalIncludeDirectories>
+      <DisableSpecificWarnings>4244;4373;4800;4804</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBGAMBATTE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>include;src;src\common</AdditionalIncludeDirectories>
+      <DisableSpecificWarnings>4244;4373;4800;4804</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBGAMBATTE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>include;src;src\common</AdditionalIncludeDirectories>
+      <DisableSpecificWarnings>4244;4373;4800;4804</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="include\gambatte.h" />
+    <ClInclude Include="include\gbint.h" />
+    <ClInclude Include="src\cinterface.h" />
+    <ClInclude Include="src\common\array.h" />
+    <ClInclude Include="src\common\uncopyable.h" />
+    <ClInclude Include="src\counterdef.h" />
+    <ClInclude Include="src\cpu.h" />
+    <ClInclude Include="src\file\stdfile.h" />
+    <ClInclude Include="src\initstate.h" />
+    <ClInclude Include="src\insertion_sort.h" />
+    <ClInclude Include="src\interrupter.h" />
+    <ClInclude Include="src\interruptrequester.h" />
+    <ClInclude Include="src\memory.h" />
+    <ClInclude Include="src\mem\cartridge.h" />
+    <ClInclude Include="src\mem\memptrs.h" />
+    <ClInclude Include="src\mem\rtc.h" />
+    <ClInclude Include="src\minkeeper.h" />
+    <ClInclude Include="src\newstate.h" />
+    <ClInclude Include="src\savestate.h" />
+    <ClInclude Include="src\sound.h" />
+    <ClInclude Include="src\sound\channel1.h" />
+    <ClInclude Include="src\sound\channel2.h" />
+    <ClInclude Include="src\sound\channel3.h" />
+    <ClInclude Include="src\sound\channel4.h" />
+    <ClInclude Include="src\sound\duty_unit.h" />
+    <ClInclude Include="src\sound\envelope_unit.h" />
+    <ClInclude Include="src\sound\length_counter.h" />
+    <ClInclude Include="src\sound\master_disabler.h" />
+    <ClInclude Include="src\sound\sound_unit.h" />
+    <ClInclude Include="src\sound\static_output_tester.h" />
+    <ClInclude Include="src\tima.h" />
+    <ClInclude Include="src\video.h" />
+    <ClInclude Include="src\video\lyc_irq.h" />
+    <ClInclude Include="src\video\ly_counter.h" />
+    <ClInclude Include="src\video\next_m0_time.h" />
+    <ClInclude Include="src\video\ppu.h" />
+    <ClInclude Include="src\video\sprite_mapper.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="src\cinterface.cpp" />
+    <ClCompile Include="src\cpu.cpp" />
+    <ClCompile Include="src\gambatte.cpp" />
+    <ClCompile Include="src\initstate.cpp" />
+    <ClCompile Include="src\interrupter.cpp" />
+    <ClCompile Include="src\interruptrequester.cpp" />
+    <ClCompile Include="src\memory.cpp" />
+    <ClCompile Include="src\mem\cartridge.cpp" />
+    <ClCompile Include="src\mem\memptrs.cpp" />
+    <ClCompile Include="src\mem\rtc.cpp" />
+    <ClCompile Include="src\newstate.cpp" />
+    <ClCompile Include="src\sound.cpp" />
+    <ClCompile Include="src\sound\channel1.cpp" />
+    <ClCompile Include="src\sound\channel2.cpp" />
+    <ClCompile Include="src\sound\channel3.cpp" />
+    <ClCompile Include="src\sound\channel4.cpp" />
+    <ClCompile Include="src\sound\duty_unit.cpp" />
+    <ClCompile Include="src\sound\envelope_unit.cpp" />
+    <ClCompile Include="src\sound\length_counter.cpp" />
+    <ClCompile Include="src\tima.cpp" />
+    <ClCompile Include="src\video.cpp" />
+    <ClCompile Include="src\video\lyc_irq.cpp" />
+    <ClCompile Include="src\video\ly_counter.cpp" />
+    <ClCompile Include="src\video\next_m0_time.cpp" />
+    <ClCompile Include="src\video\ppu.cpp" />
+    <ClCompile Include="src\video\sprite_mapper.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/libgambatte/src/memory.h b/libgambatte/src/memory.h
index af9758eab5..3ea2eec6ac 100644
--- a/libgambatte/src/memory.h
+++ b/libgambatte/src/memory.h
@@ -212,14 +212,19 @@ public:
 	unsigned read(const unsigned P, const unsigned long cycleCounter) {
 		if (readCallback)
 			readCallback(P, (cycleCounter - basetime) >> 1);
-		if(cdCallback)
-		{
-			CDMapResult map = CDMap(P);
-			if(map.type != eCDLog_AddrType_None)
-				cdCallback(map.addr,map.type,eCDLog_Flags_Data);
+		bool biosRange = ((!gbIsCgb_ && P < 0x100) || (gbIsCgb_ && P < 0x900 && (P < 0x100 || P >= 0x200)));
+		if(biosMode) {
+			if (biosRange)
+				return readBios(P);
 		}
-		if (biosMode && ((!gbIsCgb_ && P < 0x100) || (gbIsCgb_ && P < 0x900 && (P < 0x100 || P >= 0x200)))) {
-			return readBios(P);
+		else
+		{
+			if(cdCallback)
+			{
+				CDMapResult map = CDMap(P);
+				if(map.type != eCDLog_AddrType_None)
+					cdCallback(map.addr,map.type,eCDLog_Flags_Data);
+			}
 		}
 		return cart.rmem(P >> 12) ? cart.rmem(P >> 12)[P] : nontrivial_read(P, cycleCounter);
 	}
@@ -227,14 +232,19 @@ public:
 	unsigned read_excb(const unsigned P, const unsigned long cycleCounter, bool first) {
 		if (execCallback)
 			execCallback(P, (cycleCounter - basetime) >> 1);
-		if(cdCallback)
-		{
-			CDMapResult map = CDMap(P);
-			if(map.type != eCDLog_AddrType_None)
-				cdCallback(map.addr,map.type,first?eCDLog_Flags_ExecFirst : eCDLog_Flags_ExecOperand);
+		bool biosRange = ((!gbIsCgb_ && P < 0x100) || (gbIsCgb_ && P < 0x900 && (P < 0x100 || P >= 0x200)));
+		if (biosMode) {
+			if(biosRange)
+				return readBios(P);
 		}
-		if (biosMode && ((!gbIsCgb_ && P < 0x100) || (gbIsCgb_ && P < 0x900 && (P < 0x100 || P >= 0x200)))) {
-			return readBios(P);
+		else
+		{
+			if(cdCallback)
+			{
+				CDMapResult map = CDMap(P);
+				if(map.type != eCDLog_AddrType_None)
+					cdCallback(map.addr,map.type,first?eCDLog_Flags_ExecFirst : eCDLog_Flags_ExecOperand);
+			}
 		}
 		return cart.rmem(P >> 12) ? cart.rmem(P >> 12)[P] : nontrivial_read(P, cycleCounter);
 	}
@@ -260,7 +270,7 @@ public:
 			nontrivial_write(P, data, cycleCounter);
 		if (writeCallback)
 			writeCallback(P, (cycleCounter - basetime) >> 1);
-		if(cdCallback)
+		if(cdCallback && !biosMode)
 		{
 			CDMapResult map = CDMap(P);
 			if(map.type != eCDLog_AddrType_None)
@@ -275,7 +285,7 @@ public:
 			nontrivial_ff_write(P, data, cycleCounter);
 		if (writeCallback)
 			writeCallback(P, (cycleCounter - basetime) >> 1);
-		if(cdCallback)
+		if(cdCallback && !biosMode)
 		{
 			CDMapResult map = CDMap(P);
 			if(map.type != eCDLog_AddrType_None)
diff --git a/output/dll/libgambatte.dll b/output/dll/libgambatte.dll
index 79c5fccd1b..29bf3927f0 100644
Binary files a/output/dll/libgambatte.dll and b/output/dll/libgambatte.dll differ