diff --git a/apple/OSX/hid_pad.c b/apple/OSX/hid_pad.c
index ee995352b2..9ba15c0cf2 100644
--- a/apple/OSX/hid_pad.c
+++ b/apple/OSX/hid_pad.c
@@ -14,7 +14,7 @@
  */
 
 #include <IOKit/hid/IOHIDManager.h>
-#include "../common/apple_input.h"
+#include "../../input/apple_input.h"
 
 struct apple_pad_connection
 {
diff --git a/apple/OSX/platform.m b/apple/OSX/platform.m
index 138f7f69de..bfa842148b 100644
--- a/apple/OSX/platform.m
+++ b/apple/OSX/platform.m
@@ -19,7 +19,7 @@
 
 #import "../common/RetroArch_Apple.h"
 #include "../common/rarch_wrapper.h"
-#include "../common/apple_input.h"
+#include "../../input/apple_input.h"
 
 #include "../../file.h"
 
diff --git a/apple/OSX/settings.m b/apple/OSX/settings.m
index e285064962..e4350f2040 100644
--- a/apple/OSX/settings.m
+++ b/apple/OSX/settings.m
@@ -16,7 +16,7 @@
 #import <objc/runtime.h>
 #import "../common/RetroArch_Apple.h"
 #include "../common/setting_data.h"
-#include "../common/apple_input.h"
+#include "../../input/apple_input.h"
 
 #include "../../driver.h"
 #include "../../input/input_common.h"
diff --git a/apple/common/RAGameView.m b/apple/common/RAGameView.m
index 843c25931c..55bb8a5e19 100644
--- a/apple/common/RAGameView.m
+++ b/apple/common/RAGameView.m
@@ -97,7 +97,7 @@ static bool newFrame = false;
 
 #elif defined(OSX)
 
-#include "apple_input.h"
+#include "../../input/apple_input.h"
 
 static bool g_has_went_fullscreen;
 static NSOpenGLPixelFormat* g_format;
diff --git a/apple/common/apple_gamecontroller.m b/apple/common/apple_gamecontroller.m
index faf6cd683f..2ab833105d 100644
--- a/apple/common/apple_gamecontroller.m
+++ b/apple/common/apple_gamecontroller.m
@@ -24,7 +24,7 @@
 #define IS_PRESSED(x) (x.value > .01f)
 
 #import <GameController/GameController.h>
-#include "apple_input.h"
+#include "../../input/apple_input.h"
 
 static void apple_gamecontroller_poll(GCController* controller)
 {
diff --git a/apple/common/hidpad/apple_ps3_pad.c b/apple/common/hidpad/apple_ps3_pad.c
index 743d790839..1c40222c74 100644
--- a/apple/common/hidpad/apple_ps3_pad.c
+++ b/apple/common/hidpad/apple_ps3_pad.c
@@ -18,7 +18,7 @@
 #include <stdlib.h>
 
 #include "../../../boolean.h"
-#include "../apple_input.h"
+#include "../../../input/apple_input.h"
 
 struct hidpad_ps3_data
 {
diff --git a/apple/common/main.m b/apple/common/main.m
index a4212c1247..f453d3a691 100644
--- a/apple/common/main.m
+++ b/apple/common/main.m
@@ -20,7 +20,7 @@
 #include "rarch_wrapper.h"
 #include "../../frontend/frontend.h"
 
-#include "apple_input.h"
+#include "../../input/apple_input.h"
 
 #include "../../file.h"
 
diff --git a/apple/common/setting_data.h b/apple/common/setting_data.h
index 8198f43625..7f7306298a 100644
--- a/apple/common/setting_data.h
+++ b/apple/common/setting_data.h
@@ -126,6 +126,6 @@ void setting_data_load_current(void);
 const rarch_setting_t* setting_data_get_list(void);
 
 // Keyboard
-#include "keycode.h"
+#include "../../input/apple_keycode.h"
 
 #endif
diff --git a/apple/iOS/menu.m b/apple/iOS/menu.m
index 25f33f0ff8..563c2e684c 100644
--- a/apple/iOS/menu.m
+++ b/apple/iOS/menu.m
@@ -15,7 +15,7 @@
 
 #include <objc/runtime.h>
 #include "apple/common/RetroArch_Apple.h"
-#include "apple/common/apple_input.h"
+#include "../../input/apple_input.h"
 #include "menu.h"
 
 /*********************************************/
diff --git a/apple/iOS/platform.m b/apple/iOS/platform.m
index eae25ae3db..451a8cecdf 100644
--- a/apple/iOS/platform.m
+++ b/apple/iOS/platform.m
@@ -18,7 +18,7 @@
 #import "RetroArch_Apple.h"
 #include "rarch_wrapper.h"
 
-#include "apple/common/apple_input.h"
+#include "../../input/apple_input.h"
 #include "apple/common/setting_data.h"
 #include "apple/common/apple_gamecontroller.h"
 #include "menu.h"