diff --git a/input/drivers_hid/wiiu_hid.c b/input/drivers_hid/wiiu_hid.c
index c37a0511a8..ca15e41249 100644
--- a/input/drivers_hid/wiiu_hid.c
+++ b/input/drivers_hid/wiiu_hid.c
@@ -14,8 +14,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "wiiu/hid.h"
-#include "wiiu/os/atomic.h"
+#include "../include/wiiu/hid.h"
+#include <wiiu/os/atomic.h>
 
 static wiiu_event_list events;
 static wiiu_adapter_list adapters;
diff --git a/input/drivers_joypad/wiiu/hidpad_driver.c b/input/drivers_joypad/wiiu/hidpad_driver.c
index 652c13a4be..cfaa795c92 100644
--- a/input/drivers_joypad/wiiu/hidpad_driver.c
+++ b/input/drivers_joypad/wiiu/hidpad_driver.c
@@ -14,7 +14,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "wiiu/input.h"
+#include "../../include/wiiu/input.h"
 
 static bool hidpad_init(void *data);
 static bool hidpad_query_pad(unsigned pad);
diff --git a/input/drivers_joypad/wiiu/kpad_driver.c b/input/drivers_joypad/wiiu/kpad_driver.c
index 6de9906def..611bd8e8ae 100644
--- a/input/drivers_joypad/wiiu/kpad_driver.c
+++ b/input/drivers_joypad/wiiu/kpad_driver.c
@@ -20,7 +20,7 @@
  * controllers.
  */
 
-#include "wiiu/input.h"
+#include "../../include/wiiu/input.h"
 
 static bool kpad_init(void *data);
 static bool kpad_query_pad(unsigned pad);
diff --git a/input/drivers_joypad/wiiu/wpad_driver.c b/input/drivers_joypad/wiiu/wpad_driver.c
index 4f427ab430..3f008342c7 100644
--- a/input/drivers_joypad/wiiu/wpad_driver.c
+++ b/input/drivers_joypad/wiiu/wpad_driver.c
@@ -21,7 +21,7 @@
  * - For HID controllers, see hid_driver.c
  */
 
-#include "wiiu/input.h"
+#include "../../include/wiiu/input.h"
 
 #define PANIC_BUTTON_MASK (VPAD_BUTTON_R | VPAD_BUTTON_L | VPAD_BUTTON_STICK_R | VPAD_BUTTON_STICK_L)
 
diff --git a/input/drivers_joypad/wiiu_joypad.c b/input/drivers_joypad/wiiu_joypad.c
index 64675dcb4f..12151519ef 100644
--- a/input/drivers_joypad/wiiu_joypad.c
+++ b/input/drivers_joypad/wiiu_joypad.c
@@ -14,7 +14,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "wiiu/input.h"
+#include "../include/wiiu/input.h"
 
 #include "wiiu_dbg.h"
 
diff --git a/input/include/wiiu/hid.h b/input/include/wiiu/hid.h
index e282074dcc..66999d41be 100644
--- a/input/include/wiiu/hid.h
+++ b/input/include/wiiu/hid.h
@@ -17,9 +17,9 @@
 #ifndef __WIIU_HID__H
 #define __WIIU_HID__H
 
-#include "wiiu/hid_types.h"
-#include "wiiu/input.h"
-#include "input/common/hid/hid_device_driver.h"
+#include "hid_types.h"
+#include "input.h"
+#include "../../common/hid/hid_device_driver.h"
 
 #define DEVICE_UNUSED 0
 #define DEVICE_USED   1
diff --git a/input/include/wiiu/input.h b/input/include/wiiu/input.h
index a0034b3528..5aee72ef30 100644
--- a/input/include/wiiu/input.h
+++ b/input/include/wiiu/input.h
@@ -21,28 +21,29 @@
 #include <malloc.h>
 #include <unistd.h>
 
-#include "wiiu/hid_types.h"
-#include "gamepad.h"
+#include "hid_types.h"
+#include "../gamepad.h"
+
+#include <wiiu/os.h>
+#include <wiiu/syshid.h>
+#include <wiiu/vpad.h>
+#include <wiiu/kpad.h>
+#include <wiiu/pad_strings.h>
+#include "hid.h"
+
+#include "../../input_driver.h"
+#include "../../common/hid/hid_device_driver.h"
+#include "../../connect/joypad_connection.h"
+#include "../../../retroarch.h"
+#include "../../../verbosity.h"
+#include "../../../command.h"
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "../../../config.h"
 #endif /* HAVE_CONFIG_H */
 
-#include "wiiu/os.h"
-#include "wiiu/syshid.h"
-#include "wiiu/vpad.h"
-#include "wiiu/kpad.h"
-#include "wiiu/pad_strings.h"
-#include "wiiu/hid.h"
-
-#include "input/input_driver.h"
-#include "input/common/hid/hid_device_driver.h"
-#include "tasks/tasks_internal.h"
-#include "input/connect/joypad_connection.h"
-#include "retroarch.h"
-#include "verbosity.h"
-#include "command.h"
-#include "gfx/video_driver.h"
+#include "../../../gfx/video_driver.h"
+#include "../../../tasks/tasks_internal.h"
 
 #define WIIMOTE_TYPE_WIIPLUS 0x00
 #define WIIMOTE_TYPE_NUNCHUK 0x01
diff --git a/wiiu/main.c b/wiiu/main.c
index c1aa889b31..5a2a2e698e 100644
--- a/wiiu/main.c
+++ b/wiiu/main.c
@@ -31,12 +31,12 @@
 #include "system/memory.h"
 #include "system/exception_handler.h"
 
-#include "wiiu/gx2.h"
-#include "wiiu/ios.h"
-#include "wiiu/kpad.h"
-#include "wiiu/os.h"
-#include "wiiu/procui.h"
-#include "wiiu/sysapp.h"
+#include <wiiu/gx2.h>
+#include <wiiu/ios.h>
+#include <wiiu/kpad.h>
+#include <wiiu/os.h>
+#include <wiiu/procui.h>
+#include <wiiu/sysapp.h>
 
 /**
  * This file contains the main entrypoints for the Wii U executable that