diff --git a/camera/camera_driver.h b/camera/camera_driver.h
index a03f8833c9..ee11cfa324 100644
--- a/camera/camera_driver.h
+++ b/camera/camera_driver.h
@@ -47,6 +47,12 @@ typedef struct camera_driver
    const char *ident;
 } camera_driver_t;
 
+extern camera_driver_t camera_v4l2;
+extern camera_driver_t camera_android;
+extern camera_driver_t camera_rwebcam;
+extern camera_driver_t camera_apple;
+extern camera_driver_t camera_null;
+
 /**
  * driver_camera_start:
  *
@@ -112,12 +118,6 @@ void init_camera(void);
 
 void uninit_camera(void);
 
-extern camera_driver_t camera_v4l2;
-extern camera_driver_t camera_android;
-extern camera_driver_t camera_rwebcam;
-extern camera_driver_t camera_apple;
-extern camera_driver_t camera_null;
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/gfx/video_driver.h b/gfx/video_driver.h
index ebe6ecae1a..d03a1f3406 100644
--- a/gfx/video_driver.h
+++ b/gfx/video_driver.h
@@ -158,17 +158,6 @@ typedef struct video_driver
    unsigned (*wrap_type_to_enum)(enum gfx_wrap_type type);
 } video_driver_t;
 
-enum rarch_display_type
-{
-   /* Non-bindable types like consoles, KMS, VideoCore, etc. */
-   RARCH_DISPLAY_NONE = 0,
-   /* video_display => Display*, video_window => Window */
-   RARCH_DISPLAY_X11,
-   /* video_display => N/A, video_window => HWND */
-   RARCH_DISPLAY_WIN32,
-   RARCH_DISPLAY_OSX
-};
-
 extern video_driver_t video_gl;
 extern video_driver_t video_psp1;
 extern video_driver_t video_vita;
@@ -184,6 +173,17 @@ extern video_driver_t video_omap;
 extern video_driver_t video_exynos;
 extern video_driver_t video_null;
 
+enum rarch_display_type
+{
+   /* Non-bindable types like consoles, KMS, VideoCore, etc. */
+   RARCH_DISPLAY_NONE = 0,
+   /* video_display => Display*, video_window => Window */
+   RARCH_DISPLAY_X11,
+   /* video_display => N/A, video_window => HWND */
+   RARCH_DISPLAY_WIN32,
+   RARCH_DISPLAY_OSX
+};
+
 /**
  * video_driver_find_handle:
  * @index              : index of driver to get handle to.
diff --git a/location/location_driver.h b/location/location_driver.h
index f2c5c617ae..797a3d0322 100644
--- a/location/location_driver.h
+++ b/location/location_driver.h
@@ -40,6 +40,10 @@ typedef struct location_driver
    const char *ident;
 } location_driver_t;
 
+extern location_driver_t location_apple;
+extern location_driver_t location_android;
+extern location_driver_t location_null;
+
 /**
  * driver_location_start:
  *
@@ -122,10 +126,6 @@ void init_location(void);
 
 void uninit_location(void);
 
-extern location_driver_t location_apple;
-extern location_driver_t location_android;
-extern location_driver_t location_null;
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/osk/osk_driver.h b/osk/osk_driver.h
index 5d75be9ff0..c27f365879 100644
--- a/osk/osk_driver.h
+++ b/osk/osk_driver.h
@@ -39,6 +39,9 @@ typedef struct input_osk_driver
    const char *ident;
 } input_osk_driver_t;
 
+extern input_osk_driver_t input_ps3_osk;
+extern input_osk_driver_t input_null_osk;
+
 /**
  * osk_driver_find_handle:
  * @index              : index of driver to get handle to.
@@ -79,9 +82,6 @@ void init_osk(void);
 
 void uninit_osk(void);
 
-extern input_osk_driver_t input_ps3_osk;
-extern input_osk_driver_t input_null_osk;
-
 #ifdef __cplusplus
 }
 #endif