diff --git a/input/connect/connect_ps4.c b/input/connect/connect_ps4.c
index a55a8fe472..f7ab828f9f 100644
--- a/input/connect/connect_ps4.c
+++ b/input/connect/connect_ps4.c
@@ -19,6 +19,8 @@
 #include <stdlib.h>
 
 #include <boolean.h>
+
+#include "../../driver.h"
 #include "joypad_connection.h"
 
 enum connect_ps4_dpad_states
diff --git a/input/connect/connect_wii.c b/input/connect/connect_wii.c
index 1abc4619dc..cc04a9032c 100644
--- a/input/connect/connect_wii.c
+++ b/input/connect/connect_wii.c
@@ -15,10 +15,14 @@
  */
 
 #include <stdint.h>
-#include <string.h>
 #include <stdlib.h>
+#include <string.h>
+
 #include <boolean.h>
+
 #include <retro_endianness.h>
+#include <retro_miscellaneous.h>
+
 #include "joypad_connection.h"
 
 /* wiimote state flags*/
diff --git a/input/connect/joypad_connection.c b/input/connect/joypad_connection.c
index b8720ce60d..7000d46dd2 100644
--- a/input/connect/joypad_connection.c
+++ b/input/connect/joypad_connection.c
@@ -15,6 +15,9 @@
  */
 
 #include <string.h>
+
+#include "../input_config.h"
+
 #include "joypad_connection.h"
 
 int pad_connection_find_vacant_pad(joypad_connection_t *joyconn)
diff --git a/input/connect/joypad_connection.h b/input/connect/joypad_connection.h
index d1e5788882..60afc1bc04 100644
--- a/input/connect/joypad_connection.h
+++ b/input/connect/joypad_connection.h
@@ -19,7 +19,8 @@
 
 #include <stdint.h>
 #include <stddef.h>
-#include "../input_config.h"
+
+#include "../../libretro.h"
 
 typedef void (*send_control_t)(void *data, uint8_t *buf, size_t size);
 
diff --git a/input/drivers_hid/libusb_hid.c b/input/drivers_hid/libusb_hid.c
index 0400576bd3..5dea568c14 100644
--- a/input/drivers_hid/libusb_hid.c
+++ b/input/drivers_hid/libusb_hid.c
@@ -13,6 +13,9 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <stdlib.h>
+#include <string.h>
+
 #include <libusb-1.0/libusb.h>
 
 #include <rthreads/rthreads.h>
@@ -21,6 +24,8 @@
 
 #include "../connect/joypad_connection.h"
 #include "../input_autodetect.h"
+#include "../input_config.h"
+#include "../input_driver.h"
 #include "../input_hid_driver.h"
 #include "../../verbosity.h"