diff --git a/input/apple_joypad.c b/input/apple_joypad.c
index f2125cab49..5c296d46ad 100644
--- a/input/apple_joypad.c
+++ b/input/apple_joypad.c
@@ -158,9 +158,9 @@ static void append_matching_dictionary(CFMutableArrayRef array, uint32_t page, u
 }
 #endif
 
-#include "../apple/common/hidpad/wiimote.c"
-#include "../apple/common/hidpad/apple_ps3_pad.c"
-#include "../apple/common/hidpad/apple_wii_pad.c"
+#include "wiimote.c"
+#include "apple_joypad_ps3.c"
+#include "apple_joypad_wii.c"
 
 typedef struct
 {
diff --git a/apple/common/hidpad/apple_ps3_pad.c b/input/apple_joypad_ps3.c
similarity index 98%
rename from apple/common/hidpad/apple_ps3_pad.c
rename to input/apple_joypad_ps3.c
index 0058b3f38e..da8b01e29e 100644
--- a/apple/common/hidpad/apple_ps3_pad.c
+++ b/input/apple_joypad_ps3.c
@@ -17,8 +17,8 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "../../../boolean.h"
-#include "../../../input/apple_input.h"
+#include "../boolean.h"
+#include "apple_input.h"
 
 struct hidpad_ps3_data
 {
diff --git a/apple/common/hidpad/apple_wii_pad.c b/input/apple_joypad_wii.c
similarity index 99%
rename from apple/common/hidpad/apple_wii_pad.c
rename to input/apple_joypad_wii.c
index 5c018f2b7a..66dd14f34c 100644
--- a/apple/common/hidpad/apple_wii_pad.c
+++ b/input/apple_joypad_wii.c
@@ -17,8 +17,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "../../../boolean.h"
-
+#include "../boolean.h"
 #include "wiimote.h"
 
 static void* hidpad_wii_connect(struct apple_pad_connection* connection, uint32_t slot)
diff --git a/apple/common/hidpad/wiimote.c b/input/wiimote.c
similarity index 99%
rename from apple/common/hidpad/wiimote.c
rename to input/wiimote.c
index e54b277489..df733c988a 100644
--- a/apple/common/hidpad/wiimote.c
+++ b/input/wiimote.c
@@ -43,7 +43,7 @@
 #include <string.h>
 #include <math.h>
 #include <unistd.h>
-#include "../../../boolean.h"
+#include "../boolean.h"
 
 #include "wiimote.h"
 
diff --git a/apple/common/hidpad/wiimote.h b/input/wiimote.h
similarity index 100%
rename from apple/common/hidpad/wiimote.h
rename to input/wiimote.h