diff --git a/libgambatte/Makefile b/libgambatte/Makefile
index 1a2c7ddeed..56452b0f38 100644
--- a/libgambatte/Makefile
+++ b/libgambatte/Makefile
@@ -30,6 +30,7 @@ SRCS = \
 	src/mem/cartridge.cpp \
 	src/mem/memptrs.cpp \
 	src/mem/rtc.cpp \
+	src/mem/time.cpp \
 	src/newstate.cpp \
 	src/sound.cpp \
 	src/sound/channel1.cpp \
diff --git a/libgambatte/libgambatte.vcxproj b/libgambatte/libgambatte.vcxproj
index 6612bff667..37d3a96a03 100644
--- a/libgambatte/libgambatte.vcxproj
+++ b/libgambatte/libgambatte.vcxproj
@@ -156,15 +156,12 @@
   <ItemGroup>
     <ClInclude Include="include\gambatte.h" />
     <ClInclude Include="include\gbint.h" />
+    <ClInclude Include="include\loadres.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" />
@@ -189,6 +186,7 @@
     <ClInclude Include="src\video.h" />
     <ClInclude Include="src\video\lyc_irq.h" />
     <ClInclude Include="src\video\ly_counter.h" />
+    <ClInclude Include="src\video\m0_irq.h" />
     <ClInclude Include="src\video\next_m0_time.h" />
     <ClInclude Include="src\video\ppu.h" />
     <ClInclude Include="src\video\sprite_mapper.h" />
diff --git a/libgambatte/libgambatte.vcxproj.filters b/libgambatte/libgambatte.vcxproj.filters
index f096a22f6b..b34a8d79f1 100644
--- a/libgambatte/libgambatte.vcxproj.filters
+++ b/libgambatte/libgambatte.vcxproj.filters
@@ -15,46 +15,58 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="src\cinterface.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="include\gambatte.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\video.h">
+    <ClInclude Include="include\gbint.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\loadres.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cinterface.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\counterdef.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cpu.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\initstate.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\insertion_sort.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\interruptrequester.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="src\memory.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\video\ppu.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\minkeeper.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="src\mem\cartridge.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="src\mem\memptrs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\cpu.h">
+    <ClInclude Include="src\mem\rtc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\mem\rtc.h">
+    <ClInclude Include="src\mem\time.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\minkeeper.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\newstate.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="src\savestate.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\common\array.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\interrupter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\file\stdfile.h">
+    <ClInclude Include="src\sound.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="src\sound\channel1.h">
@@ -69,39 +81,12 @@
     <ClInclude Include="src\sound\channel4.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\initstate.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\video\ly_counter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\video\lyc_irq.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\video\next_m0_time.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\tima.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\gbint.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\sound.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\counterdef.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="src\sound\duty_unit.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="src\sound\envelope_unit.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\interruptrequester.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="src\sound\length_counter.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -111,22 +96,31 @@
     <ClInclude Include="src\sound\sound_unit.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\video\sprite_mapper.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\common\uncopyable.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\insertion_sort.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\newstate.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="src\sound\static_output_tester.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\mem\time.h">
+    <ClInclude Include="src\tima.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\video.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\video\lyc_irq.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\video\ly_counter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\video\m0_irq.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\video\next_m0_time.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\video\ppu.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\video\sprite_mapper.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
@@ -134,37 +128,37 @@
     <ClCompile Include="src\cinterface.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\gambatte.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\video.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\video\ppu.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\cpu.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\mem\cartridge.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\memory.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\mem\memptrs.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\video\sprite_mapper.cpp">
+    <ClCompile Include="src\gambatte.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\initstate.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\interruptrequester.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\memory.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\mem\cartridge.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\mem\memptrs.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\mem\rtc.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\video\next_m0_time.cpp">
+    <ClCompile Include="src\mem\time.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\newstate.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\sound.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\sound\channel1.cpp">
@@ -185,28 +179,28 @@
     <ClCompile Include="src\sound\envelope_unit.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\interruptrequester.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\sound\length_counter.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\video\ly_counter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\video\lyc_irq.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\sound.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\tima.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\newstate.cpp">
+    <ClCompile Include="src\video.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\mem\time.cpp">
+    <ClCompile Include="src\video\lyc_irq.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\video\ly_counter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\video\next_m0_time.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\video\ppu.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\video\sprite_mapper.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>