diff --git a/desmume/src/windows/DeSmuME.dev b/desmume/src/windows/DeSmuME.dev
index a5ce62b72..ea44a5c71 100644
--- a/desmume/src/windows/DeSmuME.dev
+++ b/desmume/src/windows/DeSmuME.dev
@@ -1,7 +1,7 @@
 [Project]
 FileName=DeSmuME.dev
 Name=DeSmuME
-UnitCount=52
+UnitCount=56
 Type=0
 Ver=1
 ObjFiles=
@@ -288,16 +288,6 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit37]
-FileName=..\FIFO.cpp
-CompileCpp=1
-Folder=DeSmuME
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit41]
 FileName=..\MMU.cpp
 CompileCpp=1
 Folder=DeSmuME
@@ -307,67 +297,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit42]
-FileName=..\MMU.hpp
-CompileCpp=1
-Folder=DeSmuME
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit43]
-FileName=..\NDSSystem.cpp
-CompileCpp=1
-Folder=DeSmuME
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit46]
-FileName=..\thumb_instructions.h
-CompileCpp=1
-Folder=DeSmuME
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit35]
-FileName=..\Disassembler.cpp
-CompileCpp=1
-Folder=DeSmuME
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit40]
-FileName=..\GPU.hpp
-CompileCpp=1
-Folder=DeSmuME
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit44]
-FileName=..\NDSSystem.hpp
-CompileCpp=1
-Folder=DeSmuME
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit45]
+[Unit41]
 FileName=..\thumb_instructions.cpp
 CompileCpp=1
 Folder=DeSmuME
@@ -377,7 +307,17 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit47]
+[Unit42]
+FileName=..\thumb_instructions.h
+CompileCpp=1
+Folder=DeSmuME
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit43]
 FileName=resource.h
 CompileCpp=1
 Folder=DeSmuME
@@ -387,27 +327,7 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit48]
-FileName=saves.cpp
-CompileCpp=1
-Folder=DeSmuME
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit49]
-FileName=saves.hpp
-CompileCpp=1
-Folder=DeSmuME
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit50]
+[Unit46]
 FileName=cflash.h
 CompileCpp=1
 Folder=DeSmuME
@@ -417,7 +337,47 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit51]
+[Unit35]
+FileName=..\GPU.cpp
+CompileCpp=1
+Folder=DeSmuME
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit40]
+FileName=..\NDSSystem.hpp
+CompileCpp=1
+Folder=DeSmuME
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit44]
+FileName=saves.cpp
+CompileCpp=1
+Folder=DeSmuME
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit45]
+FileName=saves.hpp
+CompileCpp=1
+Folder=DeSmuME
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit47]
 FileName=fat.h
 CompileCpp=1
 Folder=DeSmuME
@@ -427,6 +387,46 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
+[Unit48]
+FileName=cflash.cpp
+CompileCpp=1
+Folder=DeSmuME
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit49]
+FileName=..\Disassembler.c
+CompileCpp=1
+Folder=DeSmuME
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit50]
+FileName=..\FIFO.c
+CompileCpp=1
+Folder=DeSmuME
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit51]
+FileName=..\Disassembler.h
+CompileCpp=1
+Folder=DeSmuME
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
 [Unit31]
 FileName=..\cp15.cpp
 CompileCpp=1
@@ -438,7 +438,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit36]
-FileName=..\Disassembler.hpp
+FileName=..\GPU.hpp
 CompileCpp=1
 Folder=DeSmuME
 Compile=1
@@ -448,7 +448,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit38]
-FileName=..\FIFO.hpp
+FileName=..\MMU.hpp
 CompileCpp=1
 Folder=DeSmuME
 Compile=1
@@ -458,7 +458,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit39]
-FileName=..\GPU.cpp
+FileName=..\NDSSystem.cpp
 CompileCpp=1
 Folder=DeSmuME
 Compile=1
@@ -468,7 +468,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit52]
-FileName=cflash.cpp
+FileName=..\FIFO.h
 CompileCpp=1
 Folder=DeSmuME
 Compile=1
@@ -478,7 +478,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit53]
-FileName=NDSSystem.cpp
+FileName=..\..\..\desmume1\src\windows\ConfigKeys.c
 CompileCpp=1
 Folder=DeSmuME
 Compile=1
@@ -488,7 +488,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit54]
-FileName=NDSSystem.hpp
+FileName=..\..\..\desmume1\src\windows\ConfigKeys.h
 CompileCpp=1
 Folder=DeSmuME
 Compile=1
@@ -498,7 +498,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit55]
-FileName=oamView.hpp
+FileName=..\fs-windows.c
 CompileCpp=1
 Folder=DeSmuME
 Compile=1
@@ -508,7 +508,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit56]
-FileName=palView.hpp
+FileName=..\fs.h
 CompileCpp=1
 Folder=DeSmuME
 Compile=1