diff --git a/apple/OSX/platform.m b/apple/OSX/platform.m
index 3e92909530..f1e781d7be 100644
--- a/apple/OSX/platform.m
+++ b/apple/OSX/platform.m
@@ -19,7 +19,7 @@
 #include <objc/runtime.h>
 
 #import "../common/RetroArch_Apple.h"
-#include "../../input/apple_input.h"
+#include "../../input/drivers/apple_input.h"
 #include "../../frontend/frontend.h"
 #include "../../menu/menu.h"
 #include "../../retroarch.h"
diff --git a/apple/OSX/settings.m b/apple/OSX/settings.m
index 5dc2884ba2..4288ee0d2f 100644
--- a/apple/OSX/settings.m
+++ b/apple/OSX/settings.m
@@ -17,7 +17,7 @@
 #import <objc/runtime.h>
 #import "../common/RetroArch_Apple.h"
 #include "../../settings_data.h"
-#include "../../input/apple_input.h"
+#include "../../input/drivers/apple_input.h"
 
 #include "../../driver.h"
 #include "../../input/input_common.h"
diff --git a/apple/common/apple_gamecontroller.m b/apple/common/apple_gamecontroller.m
index fc94a4bcdd..eefed22215 100644
--- a/apple/common/apple_gamecontroller.m
+++ b/apple/common/apple_gamecontroller.m
@@ -17,7 +17,7 @@
 #include "RetroArch_Apple.h"
 #import <GameController/GameController.h>
 #include "apple_gamecontroller.h"
-#include "../../input/apple_input.h"
+#include "../../input/drivers/apple_input.h"
 
 static BOOL apple_gamecontroller_available(void)
 {
diff --git a/apple/iOS/menu.m b/apple/iOS/menu.m
index 1a6b5e7f0e..8e718757a7 100644
--- a/apple/iOS/menu.m
+++ b/apple/iOS/menu.m
@@ -18,7 +18,7 @@
 #include "../common/RetroArch_Apple.h"
 #include "../../input/input_common.h"
 #include "../../input/input_keymaps.h"
-#include "../../input/apple_input.h"
+#include "../../input/drivers/apple_input.h"
 #include <file/file_path.h>
 #include "menu.h"
 
diff --git a/apple/iOS/platform.m b/apple/iOS/platform.m
index 26d69520c6..3a02decdb8 100644
--- a/apple/iOS/platform.m
+++ b/apple/iOS/platform.m
@@ -17,7 +17,7 @@
 #include <string.h>
 
 #include "../common/RetroArch_Apple.h"
-#include "../../input/apple_input.h"
+#include "../../input/drivers/apple_input.h"
 #include "../../settings_data.h"
 #include "../common/apple_gamecontroller.h"
 #include "menu.h"
diff --git a/input/apple_joypad_hid.c b/input/apple_joypad_hid.c
index e8c5574d5e..c9e2eedbae 100644
--- a/input/apple_joypad_hid.c
+++ b/input/apple_joypad_hid.c
@@ -16,7 +16,7 @@
 
 #include <IOKit/hid/IOHIDManager.h>
 #include <IOKit/hid/IOHIDKeys.h>
-#include "apple_input.h"
+#include "drivers/apple_input.h"
 #include "input_autodetect.h"
 #include "input_common.h"
 #include "../general.h"
diff --git a/input/apple_joypad_ios.c b/input/apple_joypad_ios.c
index 01611fae8b..41e95b94b7 100644
--- a/input/apple_joypad_ios.c
+++ b/input/apple_joypad_ios.c
@@ -14,7 +14,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "apple_input.h"
+#include "drivers/apple_input.h"
 #include "input_autodetect.h"
 #include "input_common.h"
 #include "../general.h"
diff --git a/input/drivers/apple_keycode.h b/input/drivers/apple_keycode.h
index 4ca31391d5..92655fd5fa 100644
--- a/input/drivers/apple_keycode.h
+++ b/input/drivers/apple_keycode.h
@@ -156,7 +156,7 @@ enum
    KEY_RightGUI = 231
 };
 
-#include "input_common.h"
+#include "../input_common.h"
 
 struct apple_key_name_map_entry
 {
diff --git a/input/input_keymaps.c b/input/input_keymaps.c
index 3f9801c72c..061f9a5154 100644
--- a/input/input_keymaps.c
+++ b/input/input_keymaps.c
@@ -39,7 +39,7 @@
 #endif
 
 #ifdef __APPLE__
-#include "apple_keycode.h"
+#include "drivers/apple_keycode.h"
 #endif
 
 #ifdef __linux
diff --git a/input/keyboard_event_apple.c b/input/keyboard_event_apple.c
index 5beaa66a9f..9564029c2e 100644
--- a/input/keyboard_event_apple.c
+++ b/input/keyboard_event_apple.c
@@ -19,11 +19,11 @@
 
 #include "input_common.h"
 #include "input_keymaps.h"
-#include "apple_input.h"
+#include "drivers/apple_input.h"
 #include "../general.h"
 #include "../driver.h"
 
-#include "apple_keycode.h"
+#include "drivers/apple_keycode.h"
 
 #if defined(IOS)
 #define HIDKEY(X) X