diff --git a/config.def.h b/config.def.h
index 7297fbe501..7eb3ff226d 100644
--- a/config.def.h
+++ b/config.def.h
@@ -812,18 +812,18 @@ static const bool playlist_fuzzy_archive_match = false;
 /* Show Menu start-up screen on boot. */
 static const bool default_menu_show_start_screen = true;
 
-static const bool menu_dpi_override_enable = false;
+#define DEFAULT_MENU_DPI_OVERRIDE_ENABLE false
 
 #ifdef RARCH_MOBILE
-static const unsigned menu_dpi_override_value = 72;
+#define DEFAULT_MENU_DPI_OVERRIDE_VALUE 72
 #elif defined(__CELLOS_LV2__)
-static const unsigned menu_dpi_override_value = 360;
+#define DEFAULT_MENU_DPI_OVERRIDE_VALUE 360
 #else
-static const unsigned menu_dpi_override_value = 200;
+#define DEFAULT_MENU_DPI_OVERRIDE_VALUE 200
 #endif
 
 /* Log level for libretro cores (GET_LOG_INTERFACE). */
-static const unsigned libretro_log_level = 1;
+#define DEFAULT_LIBRETRO_LOG_LEVEL 1
 
 #ifndef RARCH_DEFAULT_PORT
 #define RARCH_DEFAULT_PORT 55435
diff --git a/configuration.c b/configuration.c
index 15b8f494ca..44bdf83bf3 100644
--- a/configuration.c
+++ b/configuration.c
@@ -1442,7 +1442,7 @@ static struct config_bool_setting *populate_settings_bool(settings_t *settings,
    SETTING_BOOL("menu_throttle_framerate",       &settings->bools.menu_throttle_framerate, true, true, false);
    SETTING_BOOL("menu_linear_filter",            &settings->bools.menu_linear_filter, true, true, false);
    SETTING_BOOL("menu_horizontal_animation",     &settings->bools.menu_horizontal_animation, true, true, false);
-   SETTING_BOOL("dpi_override_enable",           &settings->bools.menu_dpi_override_enable, true, menu_dpi_override_enable, false);
+   SETTING_BOOL("dpi_override_enable",           &settings->bools.menu_dpi_override_enable, true, DEFAULT_MENU_DPI_OVERRIDE_ENABLE, false);
    SETTING_BOOL("menu_pause_libretro",           &settings->bools.menu_pause_libretro, true, true, false);
    SETTING_BOOL("menu_savestate_resume",         &settings->bools.menu_savestate_resume, true, menu_savestate_resume, false);
    SETTING_BOOL("menu_mouse_enable",             &settings->bools.menu_mouse_enable, true, DEFAULT_MOUSE_ENABLE, false);
@@ -1699,7 +1699,7 @@ static struct config_uint_setting *populate_settings_uint(settings_t *settings,
    SETTING_UINT("rewind_granularity",           &settings->uints.rewind_granularity, true, DEFAULT_REWIND_GRANULARITY, false);
    SETTING_UINT("rewind_buffer_size_step",      &settings->uints.rewind_buffer_size_step, true, DEFAULT_REWIND_BUFFER_SIZE_STEP, false);
    SETTING_UINT("autosave_interval",            &settings->uints.autosave_interval,  true, DEFAULT_AUTOSAVE_INTERVAL, false);
-   SETTING_UINT("libretro_log_level",           &settings->uints.libretro_log_level, true, libretro_log_level, false);
+   SETTING_UINT("libretro_log_level",           &settings->uints.libretro_log_level, true, DEFAULT_LIBRETRO_LOG_LEVEL, false);
    SETTING_UINT("keyboard_gamepad_mapping_type",&settings->uints.input_keyboard_gamepad_mapping_type, true, 1, false);
    SETTING_UINT("input_poll_type_behavior",     &settings->uints.input_poll_type_behavior, true, 2, false);
    SETTING_UINT("video_monitor_index",          &settings->uints.video_monitor_index, true, DEFAULT_MONITOR_INDEX, false);
@@ -1721,7 +1721,7 @@ static struct config_uint_setting *populate_settings_uint(settings_t *settings,
    SETTING_UINT("video_overscan_correction_bottom", &settings->uints.video_overscan_correction_bottom, true, DEFAULT_VIDEO_OVERSCAN_CORRECTION_BOTTOM, false);
 #endif
 #ifdef HAVE_MENU
-   SETTING_UINT("dpi_override_value",           &settings->uints.menu_dpi_override_value, true, menu_dpi_override_value, false);
+   SETTING_UINT("dpi_override_value",           &settings->uints.menu_dpi_override_value, true, DEFAULT_MENU_DPI_OVERRIDE_VALUE, false);
    SETTING_UINT("menu_thumbnails",              &settings->uints.menu_thumbnails, true, menu_thumbnails_default, false);
    SETTING_UINT("menu_left_thumbnails",         &settings->uints.menu_left_thumbnails, true, menu_left_thumbnails_default, false);
    SETTING_UINT("menu_thumbnail_upscale_threshold", &settings->uints.menu_thumbnail_upscale_threshold, true, menu_thumbnail_upscale_threshold, false);
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 842dc36002..9cb7cd4ec9 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -7549,7 +7549,7 @@ static bool setting_append_list(
                   &settings->uints.libretro_log_level,
                   MENU_ENUM_LABEL_LIBRETRO_LOG_LEVEL,
                   MENU_ENUM_LABEL_VALUE_LIBRETRO_LOG_LEVEL,
-                  libretro_log_level,
+                  DEFAULT_LIBRETRO_LOG_LEVEL,
                   &group_info,
                   &subgroup_info,
                   parent_group,
@@ -11609,7 +11609,7 @@ static bool setting_append_list(
                   &settings->bools.menu_dpi_override_enable,
                   MENU_ENUM_LABEL_DPI_OVERRIDE_ENABLE,
                   MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_ENABLE,
-                  menu_dpi_override_enable,
+                  DEFAULT_MENU_DPI_OVERRIDE_ENABLE,
                   MENU_ENUM_LABEL_VALUE_OFF,
                   MENU_ENUM_LABEL_VALUE_ON,
                   &group_info,
@@ -11624,7 +11624,7 @@ static bool setting_append_list(
                   &settings->uints.menu_dpi_override_value,
                   MENU_ENUM_LABEL_DPI_OVERRIDE_VALUE,
                   MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_VALUE,
-                  menu_dpi_override_value,
+                  DEFAULT_MENU_DPI_OVERRIDE_VALUE,
                   &group_info,
                   &subgroup_info,
                   parent_group,