diff --git a/Makefile.ctr b/Makefile.ctr
index f23dc5fc96..2395f456c5 100644
--- a/Makefile.ctr
+++ b/Makefile.ctr
@@ -50,7 +50,6 @@ else
 	OBJS += gfx/video_context_driver.o
 	OBJS += gfx/drivers_context/gfx_null_ctx.o
 	OBJS += gfx/image/image.o
-	OBJS += gfx/video_texture.o
 	OBJS += libretro-common/formats/tga/rtga.o
 	OBJS += libretro-common/formats/png/rpng.o
 	OBJS += libretro-common/formats/png/rpng_encode.o
@@ -59,18 +58,15 @@ else
 	OBJS += libretro-common/gfx/math/matrix_3x3.o
 	OBJS += gfx/drivers/ctr_gfx.o
 	OBJS += gfx/drivers/nullgfx.o
-	OBJS += gfx/font_renderer_driver.o
-	OBJS += gfx/drivers_font_renderer/bitmapfont.o
 	OBJS += gfx/font_driver.o
+	OBJS += gfx/drivers_font_renderer/bitmapfont.o
 	OBJS += input/input_autodetect.o
 	OBJS += input/input_joypad_driver.o
-	OBJS += input/input_joypad.o
 	OBJS += input/input_hid_driver.o
-	OBJS += input/input_common.o
+	OBJS += input/input_config.o
 	OBJS += input/input_keymaps.o
 	OBJS += input/input_remapping.o
-	OBJS += input/input_sensor.o
-	OBJS += input/keyboard_line.o
+   OBJS += input/input_keyboard.o
 	OBJS += input/drivers/ctr_input.o
 	OBJS += input/drivers_joypad/ctr_joypad.o
 	OBJS += input/autoconf/builtin_ctr.o
@@ -95,7 +91,6 @@ else
 	OBJS += audio/audio_driver.o
 	OBJS += camera/camera_driver.o
 	OBJS += location/location_driver.o
-	OBJS += menu/menu_driver.o
 	OBJS += driver.o
 	OBJS += libretro-common/gfx/scaler/scaler_filter.o
 	OBJS += libretro-common/gfx/scaler/pixconv.o
@@ -151,11 +146,7 @@ else
 	OBJS += frontend/frontend.o
 	OBJS += libretro_version_1.o
 	OBJS += retroarch.o
-	OBJS += retroarch_info.o
 	OBJS += runloop.o
-	OBJS += runloop_data.o
-	OBJS += runloop_msg.o
-	OBJS += system.o
 	OBJS += tasks/tasks.o
 	OBJS += msg_hash.o
 	OBJS += intl/msg_hash_de.o
@@ -170,10 +161,11 @@ else
 	OBJS += movie.o
 	OBJS += record/record_driver.o
 	OBJS += record/drivers/record_null.o
+   OBJS += tasks/task_decompress.o
 	OBJS += tasks/task_file_transfer.o
 	OBJS += screenshot.o
 	OBJS += playlist.o
-	OBJS += menu/menu.o
+	OBJS += menu/menu_driver.o
 	OBJS += menu/menu_hash.o
 	OBJS += menu/menu_input.o
 	OBJS += menu/menu_entry.o
diff --git a/audio/drivers/ctr_csnd_audio.c b/audio/drivers/ctr_csnd_audio.c
index 542b73dbc1..073370a251 100644
--- a/audio/drivers/ctr_csnd_audio.c
+++ b/audio/drivers/ctr_csnd_audio.c
@@ -19,6 +19,7 @@
 #include "../audio_driver.h"
 #include "../../configuration.h"
 #include "../../performance.h"
+#include "../../runloop.h"
 
 typedef struct
 {
diff --git a/audio/drivers/ctr_dsp_audio.c b/audio/drivers/ctr_dsp_audio.c
index 616f20349a..b46642fc20 100644
--- a/audio/drivers/ctr_dsp_audio.c
+++ b/audio/drivers/ctr_dsp_audio.c
@@ -19,6 +19,7 @@
 #include "../audio_driver.h"
 #include "../../configuration.h"
 #include "../../performance.h"
+#include "../../runloop.h"
 #include "../../ctr/ctr_debug.h"
 
 typedef struct
diff --git a/command_event.c b/command_event.c
index ce62ed42df..bb7a36d155 100644
--- a/command_event.c
+++ b/command_event.c
@@ -41,6 +41,8 @@
 #include "cheevos.h"
 #endif
 
+#include "libretro_private.h"
+#include "libretro_version_1.h"
 #include "verbosity.h"
 #include "runloop.h"
 #include "configuration.h"
diff --git a/dynamic.c b/dynamic.c
index f7856b2da6..b08e73ef1c 100644
--- a/dynamic.c
+++ b/dynamic.c
@@ -38,6 +38,7 @@
 
 #include "libretro_private.h"
 #include "cores/internal_cores.h"
+#include "frontend/frontend_driver.h"
 #include "retroarch.h"
 #include "configuration.h"
 #include "general.h"
diff --git a/frontend/drivers/platform_ctr.c b/frontend/drivers/platform_ctr.c
index 0832cea4a7..74145cc31f 100644
--- a/frontend/drivers/platform_ctr.c
+++ b/frontend/drivers/platform_ctr.c
@@ -27,6 +27,7 @@
 #endif
 
 #include "../frontend_driver.h"
+#include "../../verbosity.h"
 #include "../../defaults.h"
 #include "retroarch.h"
 #include "audio/audio_driver.h"
diff --git a/input/drivers_joypad/ctr_joypad.c b/input/drivers_joypad/ctr_joypad.c
index 55b8607544..51c70fe385 100644
--- a/input/drivers_joypad/ctr_joypad.c
+++ b/input/drivers_joypad/ctr_joypad.c
@@ -20,6 +20,7 @@
 #include "../../general.h"
 #include "../../configuration.h"
 #include "../../retroarch.h"
+#include "../../command_event.h"
 #include "string.h"
 #include "3ds.h"
 
diff --git a/libretro_version_1.c b/libretro_version_1.c
index de5874bbe6..bceafa3b4e 100644
--- a/libretro_version_1.c
+++ b/libretro_version_1.c
@@ -25,6 +25,7 @@
 #include <boolean.h>
 
 #include "libretro.h"
+#include "libretro_version_1.h"
 #include "general.h"
 #include "rewind.h"
 #include "gfx/video_driver.h"