diff --git a/Source/Glide64/Config.h b/Source/Glide64/Config.h
index c48d16a23..7b7f547ac 100644
--- a/Source/Glide64/Config.h
+++ b/Source/Glide64/Config.h
@@ -48,45 +48,6 @@ void ConfigInit(HINSTANCE hinst);
void ConfigCleanup(void);
#endif
-enum
-{
- // General Settings
- Set_CardId, Set_vsync, Set_ssformat, Set_clock,
- Set_clock_24_hr, Set_Rotate, Set_texenh_options, Set_hotkeys, Set_wrpVRAM,
- Set_wrpFBO, Set_wrpAnisotropic, Set_autodetect_ucode, Set_ucode, Set_wireframe,
- Set_wfmode, Set_logging, Set_log_clear, Set_elogging, Set_run_in_window,
- Set_filter_cache, Set_unk_as_red, Set_log_unk, Set_unk_clear, Set_ghq_fltr,
- Set_ghq_cmpr, Set_ghq_enht, Set_ghq_hirs, Set_ghq_enht_cmpr, Set_ghq_enht_tile,
- Set_ghq_enht_f16bpp, Set_ghq_enht_gz, Set_ghq_enht_nobg, Set_ghq_hirs_cmpr,
- Set_ghq_hirs_tile, Set_ghq_hirs_f16bpp, Set_ghq_hirs_gz, Set_ghq_hirs_altcrc,
- Set_ghq_cache_save, Set_ghq_cache_size, Set_ghq_hirs_let_texartists_fly,
- Set_ghq_hirs_dump,
-
-#ifndef ANDROID
- Set_Resolution, Set_wrpResolution,
-#endif
-
- // Default Game Settings
- Set_optimize_texrect_default, Set_filtering_default, Set_lodmode_default,
- Set_fog_default, Set_buff_clear_default, Set_swapmode_default,
- Set_aspect_default, Set_fb_smart_default, Set_fb_hires_default,
- Set_fb_read_always_default, Set_read_back_to_screen_default, Set_detect_cpu_write_default,
- Set_fb_get_info_default, Set_fb_render_default,
-
- //Game Settings
- Set_alt_tex_size, Set_use_sts1_only, Set_force_calc_sphere, Set_correct_viewport,
- Set_increase_texrect_edge, Set_decrease_fillrect_edge, Set_texture_correction,
- Set_pal230, Set_stipple_mode, Set_stipple_pattern, Set_force_microcheck, Set_force_quad3d,
- Set_clip_zmin, Set_clip_zmax, Set_fast_crc, Set_adjust_aspect, Set_zmode_compare_less,
- Set_old_style_adither, Set_n64_z_scale, Set_optimize_texrect, Set_ignore_aux_copy,
- Set_hires_buf_clear, Set_fb_read_alpha, Set_useless_is_useless, Set_fb_crc_mode,
- Set_filtering, Set_fog, Set_buff_clear, Set_swapmode, Set_aspect, Set_lodmode,
- Set_fb_smart, Set_fb_hires, Set_fb_read_always, Set_read_back_to_screen,
- Set_detect_cpu_write, Set_fb_get_info, Set_fb_render,
-
- //RDB Setting
- Set_ucodeLookup,
-};
extern short Set_basic_mode, Set_texture_dir, Set_log_dir, Set_log_flush;
diff --git a/Source/Glide64/Glide64.vcxproj b/Source/Glide64/Glide64.vcxproj
index 115009270..b0a685df9 100644
--- a/Source/Glide64/Glide64.vcxproj
+++ b/Source/Glide64/Glide64.vcxproj
@@ -49,6 +49,7 @@
+
diff --git a/Source/Glide64/Glide64.vcxproj.filters b/Source/Glide64/Glide64.vcxproj.filters
index 3ddaab3b0..ab172fc3c 100644
--- a/Source/Glide64/Glide64.vcxproj.filters
+++ b/Source/Glide64/Glide64.vcxproj.filters
@@ -129,6 +129,7 @@
+
diff --git a/Source/Glide64/Settings.cpp b/Source/Glide64/Settings.cpp
index 52427ffbc..971d8f2ce 100644
--- a/Source/Glide64/Settings.cpp
+++ b/Source/Glide64/Settings.cpp
@@ -1,4 +1,5 @@
#include "Gfx_1.3.h"
+#include "SettingsID.h"
#ifdef _WIN32
int GetCurrentResIndex(void);
diff --git a/Source/Glide64/SettingsID.h b/Source/Glide64/SettingsID.h
new file mode 100644
index 000000000..9dd224767
--- /dev/null
+++ b/Source/Glide64/SettingsID.h
@@ -0,0 +1,51 @@
+/****************************************************************************
+* *
+* Project 64 - A Nintendo 64 emulator. *
+* http://www.pj64-emu.com/ *
+* Copyright (C) 2012 Project64. All rights reserved. *
+* *
+* License: *
+* GNU/GPLv2 http://www.gnu.org/licenses/gpl-2.0.html *
+* *
+****************************************************************************/
+#pragma once
+
+enum
+{
+ // General Settings
+ Set_CardId, Set_vsync, Set_ssformat, Set_clock,
+ Set_clock_24_hr, Set_Rotate, Set_texenh_options, Set_hotkeys, Set_wrpVRAM,
+ Set_wrpFBO, Set_wrpAnisotropic, Set_autodetect_ucode, Set_ucode, Set_wireframe,
+ Set_wfmode, Set_logging, Set_log_clear, Set_elogging, Set_run_in_window,
+ Set_filter_cache, Set_unk_as_red, Set_log_unk, Set_unk_clear, Set_ghq_fltr,
+ Set_ghq_cmpr, Set_ghq_enht, Set_ghq_hirs, Set_ghq_enht_cmpr, Set_ghq_enht_tile,
+ Set_ghq_enht_f16bpp, Set_ghq_enht_gz, Set_ghq_enht_nobg, Set_ghq_hirs_cmpr,
+ Set_ghq_hirs_tile, Set_ghq_hirs_f16bpp, Set_ghq_hirs_gz, Set_ghq_hirs_altcrc,
+ Set_ghq_cache_save, Set_ghq_cache_size, Set_ghq_hirs_let_texartists_fly,
+ Set_ghq_hirs_dump,
+
+#ifndef ANDROID
+ Set_Resolution, Set_wrpResolution,
+#endif
+
+ // Default Game Settings
+ Set_optimize_texrect_default, Set_filtering_default, Set_lodmode_default,
+ Set_fog_default, Set_buff_clear_default, Set_swapmode_default,
+ Set_aspect_default, Set_fb_smart_default, Set_fb_hires_default,
+ Set_fb_read_always_default, Set_read_back_to_screen_default, Set_detect_cpu_write_default,
+ Set_fb_get_info_default, Set_fb_render_default,
+
+ //Game Settings
+ Set_alt_tex_size, Set_use_sts1_only, Set_force_calc_sphere, Set_correct_viewport,
+ Set_increase_texrect_edge, Set_decrease_fillrect_edge, Set_texture_correction,
+ Set_pal230, Set_stipple_mode, Set_stipple_pattern, Set_force_microcheck, Set_force_quad3d,
+ Set_clip_zmin, Set_clip_zmax, Set_fast_crc, Set_adjust_aspect, Set_zmode_compare_less,
+ Set_old_style_adither, Set_n64_z_scale, Set_optimize_texrect, Set_ignore_aux_copy,
+ Set_hires_buf_clear, Set_fb_read_alpha, Set_useless_is_useless, Set_fb_crc_mode,
+ Set_filtering, Set_fog, Set_buff_clear, Set_swapmode, Set_aspect, Set_lodmode,
+ Set_fb_smart, Set_fb_hires, Set_fb_read_always, Set_read_back_to_screen,
+ Set_detect_cpu_write, Set_fb_get_info, Set_fb_render,
+
+ //RDB Setting
+ Set_ucodeLookup,
+};
diff --git a/Source/Glide64/rdp.cpp b/Source/Glide64/rdp.cpp
index 772ba0582..a98e61754 100644
--- a/Source/Glide64/rdp.cpp
+++ b/Source/Glide64/rdp.cpp
@@ -51,6 +51,7 @@
#include "CRC.h"
#include
#include "trace.h"
+#include "SettingsID.h"
#ifdef _WIN32
#include