diff --git a/driver.h b/driver.h
index 1029638617..b7d34fb8da 100644
--- a/driver.h
+++ b/driver.h
@@ -29,6 +29,7 @@
 #include "gfx/filters/softfilter.h"
 #include "gfx/shader/shader_parse.h"
 #include "audio/dsp_filter.h"
+#include "input/input_context.h"
 #include "input/overlay.h"
 #include "frontend/frontend_context.h"
 #include <retro_miscellaneous.h>
@@ -240,8 +241,6 @@ enum analog_dpad_mode
    ANALOG_DPAD_LAST
 };
 
-typedef struct rarch_joypad_driver rarch_joypad_driver_t;
-
 typedef struct input_driver
 {
    void *(*init)(void);
diff --git a/input/input_context.h b/input/input_context.h
index 3461373743..f135e2d070 100644
--- a/input/input_context.h
+++ b/input/input_context.h
@@ -24,7 +24,6 @@ extern "C" {
 #include <stdint.h>
 #include <boolean.h>
 
-typedef struct rarch_joypad_driver rarch_joypad_driver_t;
 enum retro_rumble_effect;
 
 struct rarch_joypad_driver
@@ -40,6 +39,8 @@ struct rarch_joypad_driver
 
    const char *ident;
 };
+    
+typedef struct rarch_joypad_driver rarch_joypad_driver_t;
 
 /* If ident points to NULL or a zero-length string,
  * equivalent to calling input_joypad_init_first(). */