diff --git a/input/connect/joypad_connection.h b/input/connect/joypad_connection.h
index bb1b12158a..62a454609a 100644
--- a/input/connect/joypad_connection.h
+++ b/input/connect/joypad_connection.h
@@ -64,8 +64,6 @@ typedef struct pad_connection_interface
    bool         (*button)(void *data, uint16_t joykey);
 } pad_connection_interface_t;
 
-typedef struct joypad_connection joypad_connection_t;
-
 extern pad_connection_interface_t pad_connection_wii;
 extern pad_connection_interface_t pad_connection_wiiupro;
 extern pad_connection_interface_t pad_connection_ps3;
diff --git a/input/input_driver.h b/input/input_driver.h
index 1fe417bd78..f47e8830eb 100644
--- a/input/input_driver.h
+++ b/input/input_driver.h
@@ -38,23 +38,11 @@
 
 #include "../msg_hash.h"
 #include "include/hid_types.h"
+#include "include/hid_driver.h"
 #include "include/gamepad.h"
 
 RETRO_BEGIN_DECLS
 
-typedef struct
-{
-   uint32_t data[8];
-   uint16_t analogs[8];
-} input_bits_t;
-
-typedef struct rarch_joypad_driver input_device_driver_t;
-
-typedef struct hid_driver hid_driver_t;
-
-/* Keyboard line reader. Handles textual input in a direct fashion. */
-typedef struct input_keyboard_line input_keyboard_line_t;
-
 enum input_device_type
 {
    INPUT_DEVICE_TYPE_NONE = 0,
@@ -621,6 +609,9 @@ const char *input_joypad_name(const input_device_driver_t *driver,
 bool input_config_get_bind_idx(unsigned port, unsigned *joy_idx_real);
 
 #ifdef HAVE_HID
+
+#include "include/hid_driver.h"
+
 /**
  * hid_driver_find_handle:
  * @index              : index of driver to get handle to.
diff --git a/input/input_types.h b/input/input_types.h
index 4c36861866..0c1e2edcf1 100644
--- a/input/input_types.h
+++ b/input/input_types.h
@@ -22,5 +22,10 @@ typedef struct input_keyboard_line input_keyboard_line_t;
 typedef struct rarch_joypad_info rarch_joypad_info_t;
 typedef struct input_driver input_driver_t;
 typedef struct input_keyboard_ctx_wait input_keyboard_ctx_wait_t;
+typedef struct {
+   uint32_t data[8];
+   uint16_t analogs[8];
+} input_bits_t;
+typedef struct joypad_connection joypad_connection_t;
 
 #endif /* __INPUT_TYPES__H */