diff --git a/audio/audio_defines.h b/audio/audio_defines.h
new file mode 100644
index 0000000000..14693aa296
--- /dev/null
+++ b/audio/audio_defines.h
@@ -0,0 +1,88 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
+ *  Copyright (C) 2011-2017 - Daniel De Matteis
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __AUDIO_DEFINES__H
+#define __AUDIO_DEFINES__H
+
+#include <retro_common_api.h>
+
+RETRO_BEGIN_DECLS
+
+#define AUDIO_CHUNK_SIZE_BLOCKING      512
+
+/* So we don't get complete line-noise when fast-forwarding audio. */
+#define AUDIO_CHUNK_SIZE_NONBLOCKING   2048
+
+#define AUDIO_MAX_RATIO                16
+
+#define AUDIO_MIXER_MAX_STREAMS        16
+
+#define AUDIO_MIXER_MAX_SYSTEM_STREAMS (AUDIO_MIXER_MAX_STREAMS + 4)
+
+/* do not define more than (MAX_SYSTEM_STREAMS - MAX_STREAMS) */
+enum audio_mixer_system_slot
+{
+   AUDIO_MIXER_SYSTEM_SLOT_OK = AUDIO_MIXER_MAX_STREAMS,
+   AUDIO_MIXER_SYSTEM_SLOT_CANCEL,
+   AUDIO_MIXER_SYSTEM_SLOT_NOTICE,
+   AUDIO_MIXER_SYSTEM_SLOT_BGM
+};
+
+enum audio_action
+{
+   AUDIO_ACTION_NONE = 0,
+   AUDIO_ACTION_RATE_CONTROL_DELTA,
+   AUDIO_ACTION_MIXER_MUTE_ENABLE,
+   AUDIO_ACTION_MUTE_ENABLE,
+   AUDIO_ACTION_VOLUME_GAIN,
+   AUDIO_ACTION_MIXER_VOLUME_GAIN,
+   AUDIO_ACTION_MIXER
+};
+
+enum audio_mixer_slot_selection_type
+{
+   AUDIO_MIXER_SLOT_SELECTION_AUTOMATIC = 0,
+   AUDIO_MIXER_SLOT_SELECTION_MANUAL
+};
+
+enum audio_mixer_stream_type
+{
+   AUDIO_STREAM_TYPE_NONE = 0,
+   AUDIO_STREAM_TYPE_USER,
+   AUDIO_STREAM_TYPE_SYSTEM
+};
+
+enum audio_mixer_state
+{
+   AUDIO_STREAM_STATE_NONE = 0,
+   AUDIO_STREAM_STATE_STOPPED,
+   AUDIO_STREAM_STATE_PLAYING,
+   AUDIO_STREAM_STATE_PLAYING_LOOPED,
+   AUDIO_STREAM_STATE_PLAYING_SEQUENTIAL
+};
+
+typedef struct audio_statistics
+{
+   float average_buffer_saturation;
+   float std_deviation_percentage;
+   float close_to_underrun;
+   float close_to_blocking;
+   unsigned samples;
+} audio_statistics_t;
+
+RETRO_END_DECLS
+
+#endif
diff --git a/audio/audio_driver.h b/audio/audio_driver.h
index ca47d8d917..8f2ba905f0 100644
--- a/audio/audio_driver.h
+++ b/audio/audio_driver.h
@@ -26,61 +26,10 @@
 
 #include <audio/audio_mixer.h>
 
+#include "audio_defines.h"
+
 RETRO_BEGIN_DECLS
 
-#define AUDIO_CHUNK_SIZE_BLOCKING      512
-
-/* So we don't get complete line-noise when fast-forwarding audio. */
-#define AUDIO_CHUNK_SIZE_NONBLOCKING   2048
-
-#define AUDIO_MAX_RATIO                16
-
-#define AUDIO_MIXER_MAX_STREAMS        16
-
-#define AUDIO_MIXER_MAX_SYSTEM_STREAMS (AUDIO_MIXER_MAX_STREAMS + 4)
-
-/* do not define more than (MAX_SYSTEM_STREAMS - MAX_STREAMS) */
-enum audio_mixer_system_slot
-{
-   AUDIO_MIXER_SYSTEM_SLOT_OK = AUDIO_MIXER_MAX_STREAMS,
-   AUDIO_MIXER_SYSTEM_SLOT_CANCEL,
-   AUDIO_MIXER_SYSTEM_SLOT_NOTICE,
-   AUDIO_MIXER_SYSTEM_SLOT_BGM
-};
-
-enum audio_action
-{
-   AUDIO_ACTION_NONE = 0,
-   AUDIO_ACTION_RATE_CONTROL_DELTA,
-   AUDIO_ACTION_MIXER_MUTE_ENABLE,
-   AUDIO_ACTION_MUTE_ENABLE,
-   AUDIO_ACTION_VOLUME_GAIN,
-   AUDIO_ACTION_MIXER_VOLUME_GAIN,
-   AUDIO_ACTION_MIXER
-};
-
-enum audio_mixer_slot_selection_type
-{
-   AUDIO_MIXER_SLOT_SELECTION_AUTOMATIC = 0,
-   AUDIO_MIXER_SLOT_SELECTION_MANUAL
-};
-
-enum audio_mixer_stream_type
-{
-   AUDIO_STREAM_TYPE_NONE = 0,
-   AUDIO_STREAM_TYPE_USER,
-   AUDIO_STREAM_TYPE_SYSTEM
-};
-
-enum audio_mixer_state
-{
-   AUDIO_STREAM_STATE_NONE = 0,
-   AUDIO_STREAM_STATE_STOPPED,
-   AUDIO_STREAM_STATE_PLAYING,
-   AUDIO_STREAM_STATE_PLAYING_LOOPED,
-   AUDIO_STREAM_STATE_PLAYING_SEQUENTIAL
-};
-
 typedef struct audio_mixer_stream
 {
    audio_mixer_sound_t *handle;
@@ -95,14 +44,19 @@ typedef struct audio_mixer_stream
    size_t bufsize;
 } audio_mixer_stream_t;
 
-typedef struct audio_statistics
+typedef struct audio_mixer_stream_params
 {
-   float average_buffer_saturation;
-   float std_deviation_percentage;
-   float close_to_underrun;
-   float close_to_blocking;
-   unsigned samples;
-} audio_statistics_t;
+   float volume;
+   enum audio_mixer_slot_selection_type slot_selection_type;
+   unsigned slot_selection_idx;
+   enum audio_mixer_stream_type  stream_type;
+   enum audio_mixer_type  type;
+   enum audio_mixer_state state;
+   void *buf;
+   char *basename;
+   size_t bufsize;
+   audio_mixer_stop_cb_t cb;
+} audio_mixer_stream_params_t;
 
 typedef struct audio_driver
 {
@@ -186,20 +140,6 @@ typedef struct audio_driver
    size_t (*buffer_size)(void *data);
 } audio_driver_t;
 
-typedef struct audio_mixer_stream_params
-{
-   float volume;
-   enum audio_mixer_slot_selection_type slot_selection_type;
-   unsigned slot_selection_idx;
-   enum audio_mixer_stream_type  stream_type;
-   enum audio_mixer_type  type;
-   enum audio_mixer_state state;
-   void *buf;
-   char *basename;
-   size_t bufsize;
-   audio_mixer_stop_cb_t cb;
-} audio_mixer_stream_params_t;
-
 void audio_driver_destroy_data(void);
 
 void audio_driver_set_own_driver(void);
diff --git a/menu/menu_defines.h b/menu/menu_defines.h
new file mode 100644
index 0000000000..c64b778c66
--- /dev/null
+++ b/menu/menu_defines.h
@@ -0,0 +1,310 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
+ *  Copyright (C) 2011-2017 - Daniel De Matteis
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __MENU_DEFINES__H
+#define __MENU_DEFINES__H
+
+#include <retro_common_api.h>
+
+#include "../audio/audio_defines.h"
+
+RETRO_BEGIN_DECLS
+
+#define MENU_SETTINGS_AUDIO_MIXER_MAX_STREAMS        (AUDIO_MIXER_MAX_SYSTEM_STREAMS-1)
+
+
+enum menu_image_type
+{
+   MENU_IMAGE_NONE = 0,
+   MENU_IMAGE_WALLPAPER,
+   MENU_IMAGE_THUMBNAIL,
+   MENU_IMAGE_LEFT_THUMBNAIL,
+   MENU_IMAGE_SAVESTATE_THUMBNAIL
+};
+
+enum menu_environ_cb
+{
+   MENU_ENVIRON_NONE = 0,
+   MENU_ENVIRON_RESET_HORIZONTAL_LIST,
+   MENU_ENVIRON_ENABLE_MOUSE_CURSOR,
+   MENU_ENVIRON_DISABLE_MOUSE_CURSOR,
+   MENU_ENVIRON_LAST
+};
+
+enum menu_state_changes
+{
+   MENU_STATE_RENDER_FRAMEBUFFER = 0,
+   MENU_STATE_RENDER_MESSAGEBOX,
+   MENU_STATE_BLIT,
+   MENU_STATE_POP_STACK,
+   MENU_STATE_POST_ITERATE
+};
+
+enum rarch_menu_ctl_state
+{
+   RARCH_MENU_CTL_NONE = 0,
+   RARCH_MENU_CTL_SET_PENDING_QUICK_MENU,
+   RARCH_MENU_CTL_SET_PENDING_QUIT,
+   RARCH_MENU_CTL_SET_PENDING_SHUTDOWN,
+   RARCH_MENU_CTL_DEINIT,
+   RARCH_MENU_CTL_SET_PREVENT_POPULATE,
+   RARCH_MENU_CTL_UNSET_PREVENT_POPULATE,
+   RARCH_MENU_CTL_IS_PREVENT_POPULATE,
+   RARCH_MENU_CTL_IS_TOGGLE,
+   RARCH_MENU_CTL_SET_TOGGLE,
+   RARCH_MENU_CTL_UNSET_TOGGLE,
+   RARCH_MENU_CTL_SET_OWN_DRIVER,
+   RARCH_MENU_CTL_UNSET_OWN_DRIVER,
+   RARCH_MENU_CTL_OWNS_DRIVER,
+   RARCH_MENU_CTL_FIND_DRIVER,
+   RARCH_MENU_CTL_LIST_FREE,
+   RARCH_MENU_CTL_ENVIRONMENT,
+   RARCH_MENU_CTL_DRIVER_DATA_GET,
+   RARCH_MENU_CTL_POINTER_TAP,
+   RARCH_MENU_CTL_POINTER_DOWN,
+   RARCH_MENU_CTL_POINTER_UP,
+   RARCH_MENU_CTL_OSK_PTR_AT_POS,
+   RARCH_MENU_CTL_BIND_INIT,
+   RARCH_MENU_CTL_UPDATE_THUMBNAIL_PATH,
+   RARCH_MENU_CTL_UPDATE_THUMBNAIL_IMAGE,
+   RARCH_MENU_CTL_UPDATE_SAVESTATE_THUMBNAIL_PATH,
+   RARCH_MENU_CTL_UPDATE_SAVESTATE_THUMBNAIL_IMAGE,
+   MENU_NAVIGATION_CTL_CLEAR,
+   MENU_NAVIGATION_CTL_INCREMENT,
+   MENU_NAVIGATION_CTL_DECREMENT,
+   MENU_NAVIGATION_CTL_SET_LAST,
+   MENU_NAVIGATION_CTL_DESCEND_ALPHABET,
+   MENU_NAVIGATION_CTL_ASCEND_ALPHABET,
+   MENU_NAVIGATION_CTL_CLEAR_SCROLL_INDICES,
+   MENU_NAVIGATION_CTL_ADD_SCROLL_INDEX,
+   MENU_NAVIGATION_CTL_SET_SCROLL_ACCEL,
+   MENU_NAVIGATION_CTL_GET_SCROLL_ACCEL
+};
+
+enum rgui_color_theme
+{
+   RGUI_THEME_CUSTOM = 0,
+   RGUI_THEME_CLASSIC_RED,
+   RGUI_THEME_CLASSIC_ORANGE,
+   RGUI_THEME_CLASSIC_YELLOW,
+   RGUI_THEME_CLASSIC_GREEN,
+   RGUI_THEME_CLASSIC_BLUE,
+   RGUI_THEME_CLASSIC_VIOLET,
+   RGUI_THEME_CLASSIC_GREY,
+   RGUI_THEME_LEGACY_RED,
+   RGUI_THEME_DARK_PURPLE,
+   RGUI_THEME_MIDNIGHT_BLUE,
+   RGUI_THEME_GOLDEN,
+   RGUI_THEME_ELECTRIC_BLUE,
+   RGUI_THEME_APPLE_GREEN,
+   RGUI_THEME_VOLCANIC_RED,
+   RGUI_THEME_LAGOON,
+   RGUI_THEME_BROGRAMMER,
+   RGUI_THEME_DRACULA,
+   RGUI_THEME_FAIRYFLOSS,
+   RGUI_THEME_FLATUI,
+   RGUI_THEME_GRUVBOX_DARK,
+   RGUI_THEME_GRUVBOX_LIGHT,
+   RGUI_THEME_HACKING_THE_KERNEL,
+   RGUI_THEME_NORD,
+   RGUI_THEME_NOVA,
+   RGUI_THEME_ONE_DARK,
+   RGUI_THEME_PALENIGHT,
+   RGUI_THEME_SOLARIZED_DARK,
+   RGUI_THEME_SOLARIZED_LIGHT,
+   RGUI_THEME_TANGO_DARK,
+   RGUI_THEME_TANGO_LIGHT,
+   RGUI_THEME_ZENBURN,
+   RGUI_THEME_ANTI_ZENBURN,
+   RGUI_THEME_LAST
+};
+
+enum materialui_color_theme
+{
+   MATERIALUI_THEME_BLUE = 0,
+   MATERIALUI_THEME_BLUE_GREY,
+   MATERIALUI_THEME_DARK_BLUE,
+   MATERIALUI_THEME_GREEN,
+   MATERIALUI_THEME_RED,
+   MATERIALUI_THEME_YELLOW,
+   MATERIALUI_THEME_NVIDIA_SHIELD,
+   MATERIALUI_THEME_LAST
+};
+
+enum xmb_color_theme
+{
+   XMB_THEME_LEGACY_RED  = 0,
+   XMB_THEME_DARK_PURPLE,
+   XMB_THEME_MIDNIGHT_BLUE,
+   XMB_THEME_GOLDEN,
+   XMB_THEME_ELECTRIC_BLUE,
+   XMB_THEME_APPLE_GREEN,
+   XMB_THEME_UNDERSEA,
+   XMB_THEME_VOLCANIC_RED,
+   XMB_THEME_DARK,
+   XMB_THEME_LIGHT,
+   XMB_THEME_WALLPAPER,
+   XMB_THEME_MORNING_BLUE,
+   XMB_THEME_LAST
+};
+
+enum xmb_icon_theme
+{
+   XMB_ICON_THEME_MONOCHROME = 0,
+   XMB_ICON_THEME_FLATUI,
+   XMB_ICON_THEME_RETROACTIVE,
+   XMB_ICON_THEME_PIXEL,
+   XMB_ICON_THEME_NEOACTIVE,
+   XMB_ICON_THEME_SYSTEMATIC,
+   XMB_ICON_THEME_DOTART,
+   XMB_ICON_THEME_CUSTOM,
+   XMB_ICON_THEME_RETROSYSTEM,
+   XMB_ICON_THEME_MONOCHROME_INVERTED,
+   XMB_ICON_THEME_AUTOMATIC,
+   XMB_ICON_THEME_LAST
+};
+
+enum xmb_shader_pipeline
+{
+   XMB_SHADER_PIPELINE_WALLPAPER = 0,
+   XMB_SHADER_PIPELINE_SIMPLE_RIBBON,
+   XMB_SHADER_PIPELINE_RIBBON,
+   XMB_SHADER_PIPELINE_SIMPLE_SNOW,
+   XMB_SHADER_PIPELINE_SNOW,
+   XMB_SHADER_PIPELINE_BOKEH,
+   XMB_SHADER_PIPELINE_SNOWFLAKE,
+   XMB_SHADER_PIPELINE_LAST
+};
+
+enum menu_display_prim_type
+{
+   MENU_DISPLAY_PRIM_NONE = 0,
+   MENU_DISPLAY_PRIM_TRIANGLESTRIP,
+   MENU_DISPLAY_PRIM_TRIANGLES
+};
+
+enum menu_display_driver_type
+{
+   MENU_VIDEO_DRIVER_GENERIC = 0,
+   MENU_VIDEO_DRIVER_OPENGL,
+   MENU_VIDEO_DRIVER_VULKAN,
+   MENU_VIDEO_DRIVER_METAL,
+   MENU_VIDEO_DRIVER_DIRECT3D8,
+   MENU_VIDEO_DRIVER_DIRECT3D9,
+   MENU_VIDEO_DRIVER_DIRECT3D10,
+   MENU_VIDEO_DRIVER_DIRECT3D11,
+   MENU_VIDEO_DRIVER_DIRECT3D12,
+   MENU_VIDEO_DRIVER_VITA2D,
+   MENU_VIDEO_DRIVER_CTR,
+   MENU_VIDEO_DRIVER_WIIU,
+   MENU_VIDEO_DRIVER_CACA,
+   MENU_VIDEO_DRIVER_SIXEL,
+   MENU_VIDEO_DRIVER_GDI,
+   MENU_VIDEO_DRIVER_SWITCH,
+   MENU_VIDEO_DRIVER_VGA
+};
+
+enum menu_toggle_reason
+{
+  MENU_TOGGLE_REASON_NONE = 0,
+  MENU_TOGGLE_REASON_USER,
+  MENU_TOGGLE_REASON_MESSAGE
+};
+
+enum rgui_thumbnail_scaler
+{
+   RGUI_THUMB_SCALE_POINT = 0,
+   RGUI_THUMB_SCALE_BILINEAR,
+   RGUI_THUMB_SCALE_SINC,
+   RGUI_THUMB_SCALE_LAST
+};
+
+enum menu_action
+{
+   MENU_ACTION_NOOP = 0,
+   MENU_ACTION_UP,
+   MENU_ACTION_DOWN,
+   MENU_ACTION_LEFT,
+   MENU_ACTION_RIGHT,
+   MENU_ACTION_OK,
+   MENU_ACTION_SEARCH,
+   MENU_ACTION_SCAN,
+   MENU_ACTION_CANCEL,
+   MENU_ACTION_INFO,
+   MENU_ACTION_SELECT,
+   MENU_ACTION_START,
+   MENU_ACTION_SCROLL_DOWN,
+   MENU_ACTION_SCROLL_UP,
+   MENU_ACTION_TOGGLE,
+   MENU_ACTION_POINTER_MOVED,
+   MENU_ACTION_POINTER_PRESSED,
+   MENU_ACTION_QUIT
+};
+
+enum menu_input_pointer_state
+{
+   MENU_POINTER_X_AXIS = 0,
+   MENU_POINTER_Y_AXIS,
+   MENU_POINTER_DELTA_X_AXIS,
+   MENU_POINTER_DELTA_Y_AXIS,
+   MENU_POINTER_PRESSED
+};
+
+enum menu_input_mouse_state
+{
+   MENU_MOUSE_X_AXIS = 0,
+   MENU_MOUSE_Y_AXIS,
+   MENU_MOUSE_LEFT_BUTTON,
+   MENU_MOUSE_RIGHT_BUTTON,
+   MENU_MOUSE_WHEEL_UP,
+   MENU_MOUSE_WHEEL_DOWN,
+   MENU_MOUSE_HORIZ_WHEEL_UP,
+   MENU_MOUSE_HORIZ_WHEEL_DOWN
+};
+
+enum menu_input_ctl_state
+{
+   MENU_INPUT_CTL_NONE = 0,
+   MENU_INPUT_CTL_MOUSE_PTR,
+   MENU_INPUT_CTL_POINTER_PTR,
+   MENU_INPUT_CTL_POINTER_ACCEL_READ,
+   MENU_INPUT_CTL_POINTER_ACCEL_WRITE,
+   MENU_INPUT_CTL_IS_POINTER_DRAGGED,
+   MENU_INPUT_CTL_SET_POINTER_DRAGGED,
+   MENU_INPUT_CTL_UNSET_POINTER_DRAGGED,
+   MENU_INPUT_CTL_DEINIT
+};
+
+typedef uintptr_t menu_texture_item;
+
+typedef struct menu_display_ctx_clearcolor
+{
+   float r;
+   float g;
+   float b;
+   float a;
+} menu_display_ctx_clearcolor_t;
+
+typedef struct menu_display_frame_info
+{
+   bool shadows_enable;
+} menu_display_frame_info_t;
+
+typedef struct menu_display_ctx_draw menu_display_ctx_draw_t;
+
+RETRO_END_DECLS
+
+#endif
diff --git a/menu/menu_driver.h b/menu/menu_driver.h
index 2148e928ad..6035746856 100644
--- a/menu/menu_driver.h
+++ b/menu/menu_driver.h
@@ -28,10 +28,12 @@
 #include <retro_common_api.h>
 #include <gfx/math/matrix_4x4.h>
 
-#include "widgets/menu_entry.h"
+#include "menu_defines.h"
 #include "menu_input.h"
 #include "menu_entries.h"
 
+#include "widgets/menu_entry.h"
+
 #include "../audio/audio_driver.h"
 #include "../file_path_special.h"
 #include "../gfx/font_driver.h"
@@ -58,76 +60,6 @@ RETRO_BEGIN_DECLS
 
 extern float osk_dark[16];
 
-enum menu_image_type
-{
-   MENU_IMAGE_NONE = 0,
-   MENU_IMAGE_WALLPAPER,
-   MENU_IMAGE_THUMBNAIL,
-   MENU_IMAGE_LEFT_THUMBNAIL,
-   MENU_IMAGE_SAVESTATE_THUMBNAIL
-};
-
-enum menu_environ_cb
-{
-   MENU_ENVIRON_NONE = 0,
-   MENU_ENVIRON_RESET_HORIZONTAL_LIST,
-   MENU_ENVIRON_ENABLE_MOUSE_CURSOR,
-   MENU_ENVIRON_DISABLE_MOUSE_CURSOR,
-   MENU_ENVIRON_LAST
-};
-
-enum menu_state_changes
-{
-   MENU_STATE_RENDER_FRAMEBUFFER = 0,
-   MENU_STATE_RENDER_MESSAGEBOX,
-   MENU_STATE_BLIT,
-   MENU_STATE_POP_STACK,
-   MENU_STATE_POST_ITERATE
-};
-
-enum rarch_menu_ctl_state
-{
-   RARCH_MENU_CTL_NONE = 0,
-   RARCH_MENU_CTL_SET_PENDING_QUICK_MENU,
-   RARCH_MENU_CTL_SET_PENDING_QUIT,
-   RARCH_MENU_CTL_SET_PENDING_SHUTDOWN,
-   RARCH_MENU_CTL_DEINIT,
-   RARCH_MENU_CTL_SET_PREVENT_POPULATE,
-   RARCH_MENU_CTL_UNSET_PREVENT_POPULATE,
-   RARCH_MENU_CTL_IS_PREVENT_POPULATE,
-   RARCH_MENU_CTL_IS_TOGGLE,
-   RARCH_MENU_CTL_SET_TOGGLE,
-   RARCH_MENU_CTL_UNSET_TOGGLE,
-   RARCH_MENU_CTL_SET_OWN_DRIVER,
-   RARCH_MENU_CTL_UNSET_OWN_DRIVER,
-   RARCH_MENU_CTL_OWNS_DRIVER,
-   RARCH_MENU_CTL_FIND_DRIVER,
-   RARCH_MENU_CTL_LIST_FREE,
-   RARCH_MENU_CTL_ENVIRONMENT,
-   RARCH_MENU_CTL_DRIVER_DATA_GET,
-   RARCH_MENU_CTL_POINTER_TAP,
-   RARCH_MENU_CTL_POINTER_DOWN,
-   RARCH_MENU_CTL_POINTER_UP,
-   RARCH_MENU_CTL_OSK_PTR_AT_POS,
-   RARCH_MENU_CTL_BIND_INIT,
-   RARCH_MENU_CTL_UPDATE_THUMBNAIL_PATH,
-   RARCH_MENU_CTL_UPDATE_THUMBNAIL_IMAGE,
-   RARCH_MENU_CTL_UPDATE_SAVESTATE_THUMBNAIL_PATH,
-   RARCH_MENU_CTL_UPDATE_SAVESTATE_THUMBNAIL_IMAGE,
-   MENU_NAVIGATION_CTL_CLEAR,
-   MENU_NAVIGATION_CTL_INCREMENT,
-   MENU_NAVIGATION_CTL_DECREMENT,
-   MENU_NAVIGATION_CTL_SET_LAST,
-   MENU_NAVIGATION_CTL_DESCEND_ALPHABET,
-   MENU_NAVIGATION_CTL_ASCEND_ALPHABET,
-   MENU_NAVIGATION_CTL_CLEAR_SCROLL_INDICES,
-   MENU_NAVIGATION_CTL_ADD_SCROLL_INDEX,
-   MENU_NAVIGATION_CTL_SET_SCROLL_ACCEL,
-   MENU_NAVIGATION_CTL_GET_SCROLL_ACCEL
-};
-
-#define MENU_SETTINGS_AUDIO_MIXER_MAX_STREAMS        (AUDIO_MIXER_MAX_SYSTEM_STREAMS-1)
-
 enum menu_settings_type
 {
    MENU_SETTINGS_NONE       = FILE_TYPE_LAST + 1,
@@ -252,161 +184,6 @@ enum menu_settings_type
    MENU_SETTINGS_LAST
 };
 
-enum rgui_color_theme
-{
-   RGUI_THEME_CUSTOM = 0,
-   RGUI_THEME_CLASSIC_RED,
-   RGUI_THEME_CLASSIC_ORANGE,
-   RGUI_THEME_CLASSIC_YELLOW,
-   RGUI_THEME_CLASSIC_GREEN,
-   RGUI_THEME_CLASSIC_BLUE,
-   RGUI_THEME_CLASSIC_VIOLET,
-   RGUI_THEME_CLASSIC_GREY,
-   RGUI_THEME_LEGACY_RED,
-   RGUI_THEME_DARK_PURPLE,
-   RGUI_THEME_MIDNIGHT_BLUE,
-   RGUI_THEME_GOLDEN,
-   RGUI_THEME_ELECTRIC_BLUE,
-   RGUI_THEME_APPLE_GREEN,
-   RGUI_THEME_VOLCANIC_RED,
-   RGUI_THEME_LAGOON,
-   RGUI_THEME_BROGRAMMER,
-   RGUI_THEME_DRACULA,
-   RGUI_THEME_FAIRYFLOSS,
-   RGUI_THEME_FLATUI,
-   RGUI_THEME_GRUVBOX_DARK,
-   RGUI_THEME_GRUVBOX_LIGHT,
-   RGUI_THEME_HACKING_THE_KERNEL,
-   RGUI_THEME_NORD,
-   RGUI_THEME_NOVA,
-   RGUI_THEME_ONE_DARK,
-   RGUI_THEME_PALENIGHT,
-   RGUI_THEME_SOLARIZED_DARK,
-   RGUI_THEME_SOLARIZED_LIGHT,
-   RGUI_THEME_TANGO_DARK,
-   RGUI_THEME_TANGO_LIGHT,
-   RGUI_THEME_ZENBURN,
-   RGUI_THEME_ANTI_ZENBURN,
-   RGUI_THEME_LAST
-};
-
-enum materialui_color_theme
-{
-   MATERIALUI_THEME_BLUE = 0,
-   MATERIALUI_THEME_BLUE_GREY,
-   MATERIALUI_THEME_DARK_BLUE,
-   MATERIALUI_THEME_GREEN,
-   MATERIALUI_THEME_RED,
-   MATERIALUI_THEME_YELLOW,
-   MATERIALUI_THEME_NVIDIA_SHIELD,
-   MATERIALUI_THEME_LAST
-};
-
-enum xmb_color_theme
-{
-   XMB_THEME_LEGACY_RED  = 0,
-   XMB_THEME_DARK_PURPLE,
-   XMB_THEME_MIDNIGHT_BLUE,
-   XMB_THEME_GOLDEN,
-   XMB_THEME_ELECTRIC_BLUE,
-   XMB_THEME_APPLE_GREEN,
-   XMB_THEME_UNDERSEA,
-   XMB_THEME_VOLCANIC_RED,
-   XMB_THEME_DARK,
-   XMB_THEME_LIGHT,
-   XMB_THEME_WALLPAPER,
-   XMB_THEME_MORNING_BLUE,
-   XMB_THEME_LAST
-};
-
-enum xmb_icon_theme
-{
-   XMB_ICON_THEME_MONOCHROME = 0,
-   XMB_ICON_THEME_FLATUI,
-   XMB_ICON_THEME_RETROACTIVE,
-   XMB_ICON_THEME_PIXEL,
-   XMB_ICON_THEME_NEOACTIVE,
-   XMB_ICON_THEME_SYSTEMATIC,
-   XMB_ICON_THEME_DOTART,
-   XMB_ICON_THEME_CUSTOM,
-   XMB_ICON_THEME_RETROSYSTEM,
-   XMB_ICON_THEME_MONOCHROME_INVERTED,
-   XMB_ICON_THEME_AUTOMATIC,
-   XMB_ICON_THEME_LAST
-};
-
-enum xmb_shader_pipeline
-{
-   XMB_SHADER_PIPELINE_WALLPAPER = 0,
-   XMB_SHADER_PIPELINE_SIMPLE_RIBBON,
-   XMB_SHADER_PIPELINE_RIBBON,
-   XMB_SHADER_PIPELINE_SIMPLE_SNOW,
-   XMB_SHADER_PIPELINE_SNOW,
-   XMB_SHADER_PIPELINE_BOKEH,
-   XMB_SHADER_PIPELINE_SNOWFLAKE,
-   XMB_SHADER_PIPELINE_LAST
-};
-
-enum menu_display_prim_type
-{
-   MENU_DISPLAY_PRIM_NONE = 0,
-   MENU_DISPLAY_PRIM_TRIANGLESTRIP,
-   MENU_DISPLAY_PRIM_TRIANGLES
-};
-
-enum menu_display_driver_type
-{
-   MENU_VIDEO_DRIVER_GENERIC = 0,
-   MENU_VIDEO_DRIVER_OPENGL,
-   MENU_VIDEO_DRIVER_VULKAN,
-   MENU_VIDEO_DRIVER_METAL,
-   MENU_VIDEO_DRIVER_DIRECT3D8,
-   MENU_VIDEO_DRIVER_DIRECT3D9,
-   MENU_VIDEO_DRIVER_DIRECT3D10,
-   MENU_VIDEO_DRIVER_DIRECT3D11,
-   MENU_VIDEO_DRIVER_DIRECT3D12,
-   MENU_VIDEO_DRIVER_VITA2D,
-   MENU_VIDEO_DRIVER_CTR,
-   MENU_VIDEO_DRIVER_WIIU,
-   MENU_VIDEO_DRIVER_CACA,
-   MENU_VIDEO_DRIVER_SIXEL,
-   MENU_VIDEO_DRIVER_GDI,
-   MENU_VIDEO_DRIVER_SWITCH,
-   MENU_VIDEO_DRIVER_VGA
-};
-
-enum menu_toggle_reason
-{
-  MENU_TOGGLE_REASON_NONE = 0,
-  MENU_TOGGLE_REASON_USER,
-  MENU_TOGGLE_REASON_MESSAGE
-};
-
-enum rgui_thumbnail_scaler
-{
-   RGUI_THUMB_SCALE_POINT = 0,
-   RGUI_THUMB_SCALE_BILINEAR,
-   RGUI_THUMB_SCALE_SINC,
-   RGUI_THUMB_SCALE_LAST
-};
-
-typedef uintptr_t menu_texture_item;
-
-typedef struct menu_display_ctx_clearcolor
-{
-   float r;
-   float g;
-   float b;
-   float a;
-} menu_display_ctx_clearcolor_t;
-
-typedef struct menu_display_frame_info
-{
-   bool shadows_enable;
-} menu_display_frame_info_t;
-
-typedef struct menu_display_ctx_draw menu_display_ctx_draw_t;
-
 typedef struct menu_display_ctx_driver
 {
    /* Draw graphics to the screen. */
diff --git a/menu/menu_input.h b/menu/menu_input.h
index b612b0fe42..84ad26e319 100644
--- a/menu/menu_input.h
+++ b/menu/menu_input.h
@@ -24,66 +24,11 @@
 #include <retro_common_api.h>
 #include <libretro.h>
 
+#include "menu_defines.h"
 #include "../input/input_types.h"
 
 RETRO_BEGIN_DECLS
 
-enum menu_action
-{
-   MENU_ACTION_NOOP = 0,
-   MENU_ACTION_UP,
-   MENU_ACTION_DOWN,
-   MENU_ACTION_LEFT,
-   MENU_ACTION_RIGHT,
-   MENU_ACTION_OK,
-   MENU_ACTION_SEARCH,
-   MENU_ACTION_SCAN,
-   MENU_ACTION_CANCEL,
-   MENU_ACTION_INFO,
-   MENU_ACTION_SELECT,
-   MENU_ACTION_START,
-   MENU_ACTION_SCROLL_DOWN,
-   MENU_ACTION_SCROLL_UP,
-   MENU_ACTION_TOGGLE,
-   MENU_ACTION_POINTER_MOVED,
-   MENU_ACTION_POINTER_PRESSED,
-   MENU_ACTION_QUIT
-};
-
-enum menu_input_pointer_state
-{
-   MENU_POINTER_X_AXIS = 0,
-   MENU_POINTER_Y_AXIS,
-   MENU_POINTER_DELTA_X_AXIS,
-   MENU_POINTER_DELTA_Y_AXIS,
-   MENU_POINTER_PRESSED
-};
-
-enum menu_input_mouse_state
-{
-   MENU_MOUSE_X_AXIS = 0,
-   MENU_MOUSE_Y_AXIS,
-   MENU_MOUSE_LEFT_BUTTON,
-   MENU_MOUSE_RIGHT_BUTTON,
-   MENU_MOUSE_WHEEL_UP,
-   MENU_MOUSE_WHEEL_DOWN,
-   MENU_MOUSE_HORIZ_WHEEL_UP,
-   MENU_MOUSE_HORIZ_WHEEL_DOWN
-};
-
-enum menu_input_ctl_state
-{
-   MENU_INPUT_CTL_NONE = 0,
-   MENU_INPUT_CTL_MOUSE_PTR,
-   MENU_INPUT_CTL_POINTER_PTR,
-   MENU_INPUT_CTL_POINTER_ACCEL_READ,
-   MENU_INPUT_CTL_POINTER_ACCEL_WRITE,
-   MENU_INPUT_CTL_IS_POINTER_DRAGGED,
-   MENU_INPUT_CTL_SET_POINTER_DRAGGED,
-   MENU_INPUT_CTL_UNSET_POINTER_DRAGGED,
-   MENU_INPUT_CTL_DEINIT
-};
-
 typedef struct menu_input
 {
    struct
diff --git a/retroarch.h b/retroarch.h
index 419ef9072b..1fb5a2232a 100644
--- a/retroarch.h
+++ b/retroarch.h
@@ -28,7 +28,7 @@
 #include "core.h"
 
 #ifdef HAVE_MENU
-#include "menu/menu_input.h"
+#include "menu/menu_defines.h"
 #endif
 
 RETRO_BEGIN_DECLS