diff --git a/config.def.h b/config.def.h
index 49d29f4a8f..4efd18cda2 100644
--- a/config.def.h
+++ b/config.def.h
@@ -54,9 +54,9 @@
 #endif
 
 #if defined(RARCH_MOBILE) || defined(HAVE_LIBNX)
-static const bool pointer_enable = true;
+#define DEFAULT_POINTER_ENABLE true
 #else
-static const bool pointer_enable = false;
+#define DEFAULT_POINTER_ENABLE false
 #endif
 
 /* Certain platforms might have assets stored in the bundle that
@@ -64,9 +64,9 @@ static const bool pointer_enable = false;
  *
  * Examples include: Android, iOS/OSX) */
 #if defined(ANDROID) || defined(IOS)
-static bool bundle_assets_extract_enable = true;
+#define DEFAULT_BUNDLE_ASSETS_EXTRACT_ENABLE true
 #else
-static bool bundle_assets_extract_enable = false;
+#define DEFAULT_BUNDLE_ASSETS_EXTRACT_ENABLE false
 #endif
 
 #ifdef HAVE_MATERIALUI
@@ -191,14 +191,14 @@ static unsigned swap_interval = 1;
  * at the cost of worse synchronization and latency.
  */
 #if defined(HAVE_LIBNX)
-static const bool video_threaded = true;
+#define DEFAULT_VIDEO_THREADED true
 #else
-static const bool video_threaded = false;
+#define DEFAULT_VIDEO_THREADED false
 #endif
 
 #if defined(HAVE_THREADS)
 #if defined(GEKKO) || defined(PSP) || defined(PS2)
-/* For single-core consoles right now it's better to have this be disabled. */
+/* For single-core consoles right now it's best to have this be disabled. */
 static const bool threaded_data_runloop_enable = false;
 #else
 static const bool threaded_data_runloop_enable = true;
diff --git a/configuration.c b/configuration.c
index 325b423bc4..c40a477a9a 100644
--- a/configuration.c
+++ b/configuration.c
@@ -1414,12 +1414,12 @@ static struct config_bool_setting *populate_settings_bool(settings_t *settings,
    SETTING_BOOL("video_scale_integer",           &settings->bools.video_scale_integer, true, scale_integer, false);
    SETTING_BOOL("video_smooth",                  &settings->bools.video_smooth, true, video_smooth, false);
    SETTING_BOOL("video_force_aspect",            &settings->bools.video_force_aspect, true, force_aspect, false);
-   SETTING_BOOL("video_threaded",                video_driver_get_threaded(), true, video_threaded, false);
+   SETTING_BOOL("video_threaded",                video_driver_get_threaded(), true, DEFAULT_VIDEO_THREADED, false);
    SETTING_BOOL("video_shared_context",          &settings->bools.video_shared_context, true, video_shared_context, false);
    SETTING_BOOL("auto_screenshot_filename",      &settings->bools.auto_screenshot_filename, true, auto_screenshot_filename, false);
    SETTING_BOOL("video_force_srgb_disable",      &settings->bools.video_force_srgb_disable, true, false, false);
    SETTING_BOOL("video_fullscreen",              &settings->bools.video_fullscreen, true, fullscreen, false);
-   SETTING_BOOL("bundle_assets_extract_enable",  &settings->bools.bundle_assets_extract_enable, true, bundle_assets_extract_enable, false);
+   SETTING_BOOL("bundle_assets_extract_enable",  &settings->bools.bundle_assets_extract_enable, true, DEFAULT_BUNDLE_ASSETS_EXTRACT_ENABLE, false);
    SETTING_BOOL("video_vsync",                   &settings->bools.video_vsync, true, vsync, false);
    SETTING_BOOL("video_adaptive_vsync",          &settings->bools.video_adaptive_vsync, true, adaptive_vsync, false);
    SETTING_BOOL("video_hard_sync",               &settings->bools.video_hard_sync, true, hard_sync, false);
@@ -1465,7 +1465,7 @@ static struct config_bool_setting *populate_settings_bool(settings_t *settings,
    SETTING_BOOL("dpi_override_enable",           &settings->bools.menu_dpi_override_enable, true, menu_dpi_override_enable, false);
    SETTING_BOOL("menu_pause_libretro",           &settings->bools.menu_pause_libretro, true, true, false);
    SETTING_BOOL("menu_mouse_enable",             &settings->bools.menu_mouse_enable, true, def_mouse_enable, false);
-   SETTING_BOOL("menu_pointer_enable",           &settings->bools.menu_pointer_enable, true, pointer_enable, false);
+   SETTING_BOOL("menu_pointer_enable",           &settings->bools.menu_pointer_enable, true, DEFAULT_POINTER_ENABLE, false);
    SETTING_BOOL("menu_timedate_enable",          &settings->bools.menu_timedate_enable, true, true, false);
    SETTING_BOOL("menu_battery_level_enable",     &settings->bools.menu_battery_level_enable, true, true, false);
    SETTING_BOOL("menu_core_enable",              &settings->bools.menu_core_enable, true, true, false);
@@ -2040,7 +2040,7 @@ void config_set_defaults(void)
 #endif
    settings->floats.video_scale                = scale;
 
-   if (g_defaults.settings.video_threaded_enable != video_threaded)
+   if (g_defaults.settings.video_threaded_enable != DEFAULT_VIDEO_THREADED)
       video_driver_set_threaded(g_defaults.settings.video_threaded_enable);
 
    settings->floats.video_msg_color_r          = ((message_color >> 16) & 0xff) / 255.0f;
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index e5ad9cb943..df6fa76b1f 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -8804,7 +8804,7 @@ static bool setting_append_list(
                   video_driver_get_threaded(),
                   MENU_ENUM_LABEL_VIDEO_THREADED,
                   MENU_ENUM_LABEL_VALUE_VIDEO_THREADED,
-                  video_threaded,
+                  DEFAULT_VIDEO_THREADED,
                   MENU_ENUM_LABEL_VALUE_OFF,
                   MENU_ENUM_LABEL_VALUE_ON,
                   &group_info,
@@ -10933,7 +10933,7 @@ static bool setting_append_list(
                &settings->bools.menu_pointer_enable,
                MENU_ENUM_LABEL_POINTER_ENABLE,
                MENU_ENUM_LABEL_VALUE_POINTER_ENABLE,
-               pointer_enable,
+               DEFAULT_POINTER_ENABLE,
                MENU_ENUM_LABEL_VALUE_OFF,
                MENU_ENUM_LABEL_VALUE_ON,
                &group_info,