diff --git a/desmume/src/MMU.cpp b/desmume/src/MMU.cpp
index bd743caf9..4300ee5f5 100644
--- a/desmume/src/MMU.cpp
+++ b/desmume/src/MMU.cpp
@@ -25,7 +25,6 @@
 
 #include "utils/bits.h"
 #include "armcpu.h"
-#include "common.h"
 #include "debug.h"
 #include "driver.h"
 #include "NDSSystem.h"
diff --git a/desmume/src/armcpu.cpp b/desmume/src/armcpu.cpp
index 817c281a9..f73d62e11 100644
--- a/desmume/src/armcpu.cpp
+++ b/desmume/src/armcpu.cpp
@@ -22,7 +22,6 @@
 #include <algorithm>
 
 #include "armcpu.h"
-#include "common.h"
 #include "instructions.h"
 #include "cp15.h"
 #include "bios.h"
diff --git a/desmume/src/cheatSystem.cpp b/desmume/src/cheatSystem.cpp
index 70690ece0..8b709b931 100644
--- a/desmume/src/cheatSystem.cpp
+++ b/desmume/src/cheatSystem.cpp
@@ -19,7 +19,6 @@
 #include "utils/bits.h"
 
 #include "NDSSystem.h"
-#include "common.h"
 #include "mem.h"
 #include "MMU.h"
 #include "debug.h"
diff --git a/desmume/src/frontend/windows/ginfo.cpp b/desmume/src/frontend/windows/ginfo.cpp
index 4749b4eb8..53852cd0c 100644
--- a/desmume/src/frontend/windows/ginfo.cpp
+++ b/desmume/src/frontend/windows/ginfo.cpp
@@ -21,7 +21,6 @@
 #include <stdio.h>
 #include <commctrl.h>
 
-#include "common.h"
 #include "MMU.h"
 #include "NDSSystem.h"
 
diff --git a/desmume/src/frontend/windows/inputdx.cpp b/desmume/src/frontend/windows/inputdx.cpp
index c1e9cf8e5..f1ddeba10 100644
--- a/desmume/src/frontend/windows/inputdx.cpp
+++ b/desmume/src/frontend/windows/inputdx.cpp
@@ -42,7 +42,6 @@
 #endif
 
 #include "types.h"
-#include "common.h"
 #include "NDSSystem.h"
 #include "slot2.h"
 #include "debug.h"
diff --git a/desmume/src/frontend/windows/main.cpp b/desmume/src/frontend/windows/main.cpp
index 82975bec2..0040c7c4d 100644
--- a/desmume/src/frontend/windows/main.cpp
+++ b/desmume/src/frontend/windows/main.cpp
@@ -39,7 +39,6 @@
 #include <stdio.h>
 
 //emulator core
-#include "common.h" //wtf this needs to disappear
 #include "MMU.h"
 #include "armcpu.h"
 #include "NDSSystem.h"
diff --git a/desmume/src/frontend/windows/memView.cpp b/desmume/src/frontend/windows/memView.cpp
index c29bdcec5..5bf31718a 100644
--- a/desmume/src/frontend/windows/memView.cpp
+++ b/desmume/src/frontend/windows/memView.cpp
@@ -22,7 +22,6 @@
 #include <windowsx.h>
 #include <commctrl.h>
 
-#include "common.h"
 #include "NDSSystem.h"
 #include "emufile.h"
 #include "MMU.h"
diff --git a/desmume/src/frontend/windows/ogl.cpp b/desmume/src/frontend/windows/ogl.cpp
index 38119fb22..100d8e5b1 100644
--- a/desmume/src/frontend/windows/ogl.cpp
+++ b/desmume/src/frontend/windows/ogl.cpp
@@ -16,7 +16,6 @@
 */
 
 #define WIN32_LEAN_AND_MEAN
-#include "common.h"
 #include "debug.h"
 
 //in case we ever need glew
diff --git a/desmume/src/frontend/windows/pathsettings.cpp b/desmume/src/frontend/windows/pathsettings.cpp
index d394464f7..c4eac4402 100644
--- a/desmume/src/frontend/windows/pathsettings.cpp
+++ b/desmume/src/frontend/windows/pathsettings.cpp
@@ -17,7 +17,6 @@
 */
 
 
-#include "common.h"
 #include <windowsx.h>
 #include <shlwapi.h>
 #include <shlobj.h>
diff --git a/desmume/src/frontend/windows/ram_search.cpp b/desmume/src/frontend/windows/ram_search.cpp
index e9ca52889..f6248256d 100644
--- a/desmume/src/frontend/windows/ram_search.cpp
+++ b/desmume/src/frontend/windows/ram_search.cpp
@@ -55,7 +55,6 @@
 #include <list>
 #include <vector>
 
-#include "common.h"
 #include "NDSSystem.h"
 #include "MMU.h"
 
diff --git a/desmume/src/frontend/windows/ramwatch.cpp b/desmume/src/frontend/windows/ramwatch.cpp
index 88457fb8d..529127aaf 100644
--- a/desmume/src/frontend/windows/ramwatch.cpp
+++ b/desmume/src/frontend/windows/ramwatch.cpp
@@ -26,7 +26,6 @@
 #include <commctrl.h>
 #include <string>
 
-#include "common.h"
 #include "NDSSystem.h"
 #include "path.h"
 #include "MMU.h"
diff --git a/desmume/src/frontend/windows/recentroms.cpp b/desmume/src/frontend/windows/recentroms.cpp
index bf351c988..bf5b25e9b 100644
--- a/desmume/src/frontend/windows/recentroms.cpp
+++ b/desmume/src/frontend/windows/recentroms.cpp
@@ -21,7 +21,6 @@
 #include <string>
 #include <shlwapi.h>
 
-#include "common.h"
 
 #include "resource.h"
 #include "winutil.h"
diff --git a/desmume/src/frontend/windows/soundView.cpp b/desmume/src/frontend/windows/soundView.cpp
index 52783e844..f970e6e00 100644
--- a/desmume/src/frontend/windows/soundView.cpp
+++ b/desmume/src/frontend/windows/soundView.cpp
@@ -23,7 +23,6 @@
 #include <windowsx.h>
 #include <algorithm>
 
-#include "common.h"
 #include "NDSSystem.h"
 #include "debug.h"
 #include "matrix.h"
diff --git a/desmume/src/frontend/windows/winutil.cpp b/desmume/src/frontend/windows/winutil.cpp
index 7bd6d7105..dc04691fe 100644
--- a/desmume/src/frontend/windows/winutil.cpp
+++ b/desmume/src/frontend/windows/winutil.cpp
@@ -15,7 +15,6 @@
 	along with the this software.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "common.h"
 #include "path.h"
 #include "winutil.h"
 #include <stdio.h>
diff --git a/desmume/src/gfx3d.cpp b/desmume/src/gfx3d.cpp
index 4281143cd..9ec2fd43b 100644
--- a/desmume/src/gfx3d.cpp
+++ b/desmume/src/gfx3d.cpp
@@ -37,7 +37,6 @@
 #include <queue>
 
 #include "armcpu.h"
-#include "common.h"
 #include "debug.h"
 #include "driver.h"
 #include "emufile.h"
diff --git a/desmume/src/lua-engine.cpp b/desmume/src/lua-engine.cpp
index 1d1409423..62e4c5458 100644
--- a/desmume/src/lua-engine.cpp
+++ b/desmume/src/lua-engine.cpp
@@ -24,9 +24,9 @@
 	typedef HMENU PlatformMenu;    // hMenu
 	#define MAX_MENU_COUNT (IDC_LUAMENU_RESERVE_END - IDC_LUAMENU_RESERVE_START + 1)
 
-	#include "windows/main.h"
-	#include "windows/video.h"
-	#include "windows/resource.h"
+	#include "frontend/windows/main.h"
+	#include "frontend/windows/video.h"
+	#include "frontend/windows/resource.h"
 #else
 	// TODO: define appropriate types for menu
 	typedef void* PlatformMenu;
diff --git a/desmume/src/movie.cpp b/desmume/src/movie.cpp
index f6eb30a98..acc5cc427 100644
--- a/desmume/src/movie.cpp
+++ b/desmume/src/movie.cpp
@@ -34,7 +34,6 @@
 #include "debug.h"
 #include "driver.h"
 #include "rtc.h"
-#include "common.h"
 #include "mic.h"
 #include "version.h"
 #include "GPU_osd.h"
diff --git a/desmume/src/rasterize.cpp b/desmume/src/rasterize.cpp
index de34fde29..0c4b3d1d0 100644
--- a/desmume/src/rasterize.cpp
+++ b/desmume/src/rasterize.cpp
@@ -49,7 +49,6 @@
 #include <emmintrin.h>
 #endif
 
-#include "common.h"
 #include "matrix.h"
 #include "render3D.h"
 #include "gfx3d.h"
diff --git a/desmume/src/render3D.cpp b/desmume/src/render3D.cpp
index 894b61701..725a1536b 100644
--- a/desmume/src/render3D.cpp
+++ b/desmume/src/render3D.cpp
@@ -25,7 +25,6 @@
 #endif
 
 #include "utils/bits.h"
-#include "common.h"
 #include "gfx3d.h"
 #include "MMU.h"
 #include "texcache.h"
diff --git a/desmume/src/rtc.cpp b/desmume/src/rtc.cpp
index 2f5eac80c..3beaec4a9 100644
--- a/desmume/src/rtc.cpp
+++ b/desmume/src/rtc.cpp
@@ -20,13 +20,12 @@
 // TODO: interrupt handler
 
 #include "rtc.h"
-#include "common.h"
 #include "debug.h"
 #include "armcpu.h"
 #include <string.h>
 #include "saves.h"
 #ifdef WIN32
-#include "windows/main.h"
+#include "frontend/windows/main.h"
 #endif
 #include "movie.h"