diff --git a/audio/audio_driver.h b/audio/audio_driver.h
index 86d12ddc83..d1097377e0 100644
--- a/audio/audio_driver.h
+++ b/audio/audio_driver.h
@@ -27,6 +27,33 @@
 extern "C" {
 #endif
 
+enum rarch_audio_ctl_state
+{
+   RARCH_AUDIO_CTL_NONE = 0,
+   RARCH_AUDIO_CTL_INIT,
+   RARCH_AUDIO_CTL_DEINIT,
+   RARCH_AUDIO_CTL_DESTROY,
+   RARCH_AUDIO_CTL_DESTROY_DATA,
+   RARCH_AUDIO_CTL_START,
+   RARCH_AUDIO_CTL_STOP,
+   RARCH_AUDIO_CTL_FIND_DRIVER,
+   RARCH_AUDIO_CTL_SETUP_REWIND,
+   /* Sets audio monitor refresh rate to new value. */
+   RARCH_AUDIO_CTL_MONITOR_SET_REFRESH_RATE,
+   RARCH_AUDIO_CTL_MONITOR_ADJUST_SYSTEM_RATES,
+   RARCH_AUDIO_CTL_MUTE_TOGGLE,
+   RARCH_AUDIO_CTL_CALLBACK,
+   RARCH_AUDIO_CTL_HAS_CALLBACK,
+   RARCH_AUDIO_CTL_ALIVE,
+   RARCH_AUDIO_CTL_FRAME_IS_REVERSE,
+   RARCH_AUDIO_CTL_SET_OWN_DRIVER,
+   RARCH_AUDIO_CTL_UNSET_OWN_DRIVER,
+   RARCH_AUDIO_CTL_OWNS_DRIVER,
+   RARCH_AUDIO_CTL_SET_ACTIVE,
+   RARCH_AUDIO_CTL_UNSET_ACTIVE,
+   RARCH_AUDIO_CTL_IS_ACTIVE
+};
+
 typedef struct audio_driver
 {
    /* Creates and initializes handle to audio driver.
@@ -72,32 +99,6 @@ typedef struct audio_driver
    size_t (*buffer_size)(void *data);
 } audio_driver_t;
 
-enum rarch_audio_ctl_state
-{
-   RARCH_AUDIO_CTL_NONE = 0,
-   RARCH_AUDIO_CTL_INIT,
-   RARCH_AUDIO_CTL_DEINIT,
-   RARCH_AUDIO_CTL_DESTROY,
-   RARCH_AUDIO_CTL_DESTROY_DATA,
-   RARCH_AUDIO_CTL_START,
-   RARCH_AUDIO_CTL_STOP,
-   RARCH_AUDIO_CTL_FIND_DRIVER,
-   RARCH_AUDIO_CTL_SETUP_REWIND,
-   /* Sets audio monitor refresh rate to new value. */
-   RARCH_AUDIO_CTL_MONITOR_SET_REFRESH_RATE,
-   RARCH_AUDIO_CTL_MONITOR_ADJUST_SYSTEM_RATES,
-   RARCH_AUDIO_CTL_MUTE_TOGGLE,
-   RARCH_AUDIO_CTL_CALLBACK,
-   RARCH_AUDIO_CTL_HAS_CALLBACK,
-   RARCH_AUDIO_CTL_ALIVE,
-   RARCH_AUDIO_CTL_FRAME_IS_REVERSE,
-   RARCH_AUDIO_CTL_SET_OWN_DRIVER,
-   RARCH_AUDIO_CTL_UNSET_OWN_DRIVER,
-   RARCH_AUDIO_CTL_OWNS_DRIVER,
-   RARCH_AUDIO_CTL_SET_ACTIVE,
-   RARCH_AUDIO_CTL_UNSET_ACTIVE,
-   RARCH_AUDIO_CTL_IS_ACTIVE
-};
 
 bool audio_driver_ctl(enum rarch_audio_ctl_state state, void *data);
 
diff --git a/gfx/video_driver.h b/gfx/video_driver.h
index aa58242aa3..4c8bce6d8c 100644
--- a/gfx/video_driver.h
+++ b/gfx/video_driver.h
@@ -42,6 +42,111 @@ enum texture_filter_type
    TEXTURE_FILTER_MIPMAP_NEAREST
 };
 
+enum aspect_ratio
+{
+   ASPECT_RATIO_4_3 = 0,
+   ASPECT_RATIO_16_9,
+   ASPECT_RATIO_16_10,
+   ASPECT_RATIO_16_15,
+   ASPECT_RATIO_1_1,
+   ASPECT_RATIO_2_1,
+   ASPECT_RATIO_3_2,
+   ASPECT_RATIO_3_4,
+   ASPECT_RATIO_4_1,
+   ASPECT_RATIO_4_4,
+   ASPECT_RATIO_5_4,
+   ASPECT_RATIO_6_5,
+   ASPECT_RATIO_7_9,
+   ASPECT_RATIO_8_3,
+   ASPECT_RATIO_8_7,
+   ASPECT_RATIO_19_12,
+   ASPECT_RATIO_19_14,
+   ASPECT_RATIO_30_17,
+   ASPECT_RATIO_32_9,
+   ASPECT_RATIO_CONFIG,
+   ASPECT_RATIO_SQUARE,
+   ASPECT_RATIO_CORE,
+   ASPECT_RATIO_CUSTOM,
+
+   ASPECT_RATIO_END
+};
+
+enum rotation
+{
+   ORIENTATION_NORMAL = 0,
+   ORIENTATION_VERTICAL,
+   ORIENTATION_FLIPPED,
+   ORIENTATION_FLIPPED_ROTATED,
+   ORIENTATION_END
+};
+
+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
+};
+
+enum rarch_display_ctl_state
+{
+   RARCH_DISPLAY_CTL_NONE = 0,
+   RARCH_DISPLAY_CTL_INIT,
+   RARCH_DISPLAY_CTL_DEINIT,
+   RARCH_DISPLAY_CTL_DESTROY,
+   RARCH_DISPLAY_CTL_DESTROY_DATA,
+   RARCH_DISPLAY_CTL_SUPPORTS_RGBA,
+   RARCH_DISPLAY_CTL_SET_RGBA,
+   RARCH_DISPLAY_CTL_UNSET_RGBA,
+   RARCH_DISPLAY_CTL_DEFAULT_SETTINGS,
+   RARCH_DISPLAY_CTL_LOAD_SETTINGS,
+   RARCH_DISPLAY_CTL_SAVE_SETTINGS,
+   RARCH_DISPLAY_CTL_MONITOR_RESET,
+   RARCH_DISPLAY_CTL_MONITOR_ADJUST_SYSTEM_RATES,
+   RARCH_DISPLAY_CTL_APPLY_STATE_CHANGES,
+   RARCH_DISPLAY_CTL_FIND_DRIVER,
+   RARCH_DISPLAY_CTL_FRAME_FILTER_ALIVE,
+   RARCH_DISPLAY_CTL_FRAME_FILTER_IS_32BIT,
+   RARCH_DISPLAY_CTL_GET_PREV_VIDEO_OUT,
+   RARCH_DISPLAY_CTL_GET_NEXT_VIDEO_OUT,
+   RARCH_DISPLAY_CTL_HAS_WINDOWED,
+   RARCH_DISPLAY_CTL_SUPPORTS_RECORDING,
+   RARCH_DISPLAY_CTL_SUPPORTS_VIEWPORT_READ,
+   RARCH_DISPLAY_CTL_SUPPORTS_READ_FRAME_RAW,
+   RARCH_DISPLAY_CTL_IS_FOCUSED,
+   RARCH_DISPLAY_CTL_IS_ALIVE,
+   RARCH_DISPLAY_CTL_SET_ASPECT_RATIO,
+   /* Sets viewport to aspect ratio set by core. */
+   RARCH_DISPLAY_CTL_SET_VIEWPORT_CORE,
+   /* Sets viewport to config aspect ratio. */
+   RARCH_DISPLAY_CTL_SET_VIEWPORT_CONFIG,
+   /* Sets viewport to square pixel aspect ratio based on width/height. */ 
+   RARCH_DISPLAY_CTL_SET_VIEWPORT_SQUARE_PIXEL,
+   RARCH_DISPLAY_CTL_RESET_CUSTOM_VIEWPORT,
+   RARCH_DISPLAY_CTL_READ_VIEWPORT,
+   RARCH_DISPLAY_CTL_SET_NONBLOCK_STATE,
+   /* Renders the current video frame. */
+   RARCH_DISPLAY_CTL_CACHED_FRAME_RENDER,
+   RARCH_DISPLAY_CTL_CACHED_FRAME_HAS_VALID_FB,
+   RARCH_DISPLAY_CTL_SHOW_MOUSE,
+   RARCH_DISPLAY_CTL_GET_FRAME_COUNT,
+   RARCH_DISPLAY_CTL_SET_OWN_DRIVER,
+   RARCH_DISPLAY_CTL_UNSET_OWN_DRIVER,
+   RARCH_DISPLAY_CTL_OWNS_DRIVER,
+   RARCH_DISPLAY_CTL_SET_VIDEO_CACHE_CONTEXT,
+   RARCH_DISPLAY_CTL_UNSET_VIDEO_CACHE_CONTEXT,
+   RARCH_DISPLAY_CTL_IS_VIDEO_CACHE_CONTEXT,
+   RARCH_DISPLAY_CTL_SET_VIDEO_CACHE_CONTEXT_ACK,
+   RARCH_DISPLAY_CTL_UNSET_VIDEO_CACHE_CONTEXT_ACK,
+   RARCH_DISPLAY_CTL_IS_VIDEO_CACHE_CONTEXT_ACK,
+   RARCH_DISPLAY_CTL_SET_ACTIVE,
+   RARCH_DISPLAY_CTL_UNSET_ACTIVE,
+   RARCH_DISPLAY_CTL_IS_ACTIVE
+};
+
 typedef struct video_info
 {
    unsigned width;
@@ -175,45 +280,9 @@ typedef struct video_driver
    unsigned (*wrap_type_to_enum)(enum gfx_wrap_type type);
 } video_driver_t;
 
-enum aspect_ratio
-{
-   ASPECT_RATIO_4_3 = 0,
-   ASPECT_RATIO_16_9,
-   ASPECT_RATIO_16_10,
-   ASPECT_RATIO_16_15,
-   ASPECT_RATIO_1_1,
-   ASPECT_RATIO_2_1,
-   ASPECT_RATIO_3_2,
-   ASPECT_RATIO_3_4,
-   ASPECT_RATIO_4_1,
-   ASPECT_RATIO_4_4,
-   ASPECT_RATIO_5_4,
-   ASPECT_RATIO_6_5,
-   ASPECT_RATIO_7_9,
-   ASPECT_RATIO_8_3,
-   ASPECT_RATIO_8_7,
-   ASPECT_RATIO_19_12,
-   ASPECT_RATIO_19_14,
-   ASPECT_RATIO_30_17,
-   ASPECT_RATIO_32_9,
-   ASPECT_RATIO_CONFIG,
-   ASPECT_RATIO_SQUARE,
-   ASPECT_RATIO_CORE,
-   ASPECT_RATIO_CUSTOM,
-
-   ASPECT_RATIO_END
-};
 
 #define LAST_ASPECT_RATIO ASPECT_RATIO_CUSTOM
 
-enum rotation
-{
-   ORIENTATION_NORMAL = 0,
-   ORIENTATION_VERTICAL,
-   ORIENTATION_FLIPPED,
-   ORIENTATION_FLIPPED_ROTATED,
-   ORIENTATION_END
-};
 
 extern char rotation_lut[4][32];
 
@@ -239,72 +308,6 @@ struct aspect_ratio_elem
 
 extern struct aspect_ratio_elem aspectratio_lut[ASPECT_RATIO_END];
 
-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
-};
-
-enum rarch_display_ctl_state
-{
-   RARCH_DISPLAY_CTL_NONE = 0,
-   RARCH_DISPLAY_CTL_INIT,
-   RARCH_DISPLAY_CTL_DEINIT,
-   RARCH_DISPLAY_CTL_DESTROY,
-   RARCH_DISPLAY_CTL_DESTROY_DATA,
-   RARCH_DISPLAY_CTL_SUPPORTS_RGBA,
-   RARCH_DISPLAY_CTL_SET_RGBA,
-   RARCH_DISPLAY_CTL_UNSET_RGBA,
-   RARCH_DISPLAY_CTL_DEFAULT_SETTINGS,
-   RARCH_DISPLAY_CTL_LOAD_SETTINGS,
-   RARCH_DISPLAY_CTL_SAVE_SETTINGS,
-   RARCH_DISPLAY_CTL_MONITOR_RESET,
-   RARCH_DISPLAY_CTL_MONITOR_ADJUST_SYSTEM_RATES,
-   RARCH_DISPLAY_CTL_APPLY_STATE_CHANGES,
-   RARCH_DISPLAY_CTL_FIND_DRIVER,
-   RARCH_DISPLAY_CTL_FRAME_FILTER_ALIVE,
-   RARCH_DISPLAY_CTL_FRAME_FILTER_IS_32BIT,
-   RARCH_DISPLAY_CTL_GET_PREV_VIDEO_OUT,
-   RARCH_DISPLAY_CTL_GET_NEXT_VIDEO_OUT,
-   RARCH_DISPLAY_CTL_HAS_WINDOWED,
-   RARCH_DISPLAY_CTL_SUPPORTS_RECORDING,
-   RARCH_DISPLAY_CTL_SUPPORTS_VIEWPORT_READ,
-   RARCH_DISPLAY_CTL_SUPPORTS_READ_FRAME_RAW,
-   RARCH_DISPLAY_CTL_IS_FOCUSED,
-   RARCH_DISPLAY_CTL_IS_ALIVE,
-   RARCH_DISPLAY_CTL_SET_ASPECT_RATIO,
-   /* Sets viewport to aspect ratio set by core. */
-   RARCH_DISPLAY_CTL_SET_VIEWPORT_CORE,
-   /* Sets viewport to config aspect ratio. */
-   RARCH_DISPLAY_CTL_SET_VIEWPORT_CONFIG,
-   /* Sets viewport to square pixel aspect ratio based on width/height. */ 
-   RARCH_DISPLAY_CTL_SET_VIEWPORT_SQUARE_PIXEL,
-   RARCH_DISPLAY_CTL_RESET_CUSTOM_VIEWPORT,
-   RARCH_DISPLAY_CTL_READ_VIEWPORT,
-   RARCH_DISPLAY_CTL_SET_NONBLOCK_STATE,
-   /* Renders the current video frame. */
-   RARCH_DISPLAY_CTL_CACHED_FRAME_RENDER,
-   RARCH_DISPLAY_CTL_CACHED_FRAME_HAS_VALID_FB,
-   RARCH_DISPLAY_CTL_SHOW_MOUSE,
-   RARCH_DISPLAY_CTL_GET_FRAME_COUNT,
-   RARCH_DISPLAY_CTL_SET_OWN_DRIVER,
-   RARCH_DISPLAY_CTL_UNSET_OWN_DRIVER,
-   RARCH_DISPLAY_CTL_OWNS_DRIVER,
-   RARCH_DISPLAY_CTL_SET_VIDEO_CACHE_CONTEXT,
-   RARCH_DISPLAY_CTL_UNSET_VIDEO_CACHE_CONTEXT,
-   RARCH_DISPLAY_CTL_IS_VIDEO_CACHE_CONTEXT,
-   RARCH_DISPLAY_CTL_SET_VIDEO_CACHE_CONTEXT_ACK,
-   RARCH_DISPLAY_CTL_UNSET_VIDEO_CACHE_CONTEXT_ACK,
-   RARCH_DISPLAY_CTL_IS_VIDEO_CACHE_CONTEXT_ACK,
-   RARCH_DISPLAY_CTL_SET_ACTIVE,
-   RARCH_DISPLAY_CTL_UNSET_ACTIVE,
-   RARCH_DISPLAY_CTL_IS_ACTIVE
-};
 
 bool video_driver_ctl(enum rarch_display_ctl_state state, void *data);