diff --git a/desmume/src/frontend/windows/main.cpp b/desmume/src/frontend/windows/main.cpp
index ec07f6ad1..5f9b4f8c6 100644
--- a/desmume/src/frontend/windows/main.cpp
+++ b/desmume/src/frontend/windows/main.cpp
@@ -1864,7 +1864,7 @@ class WinDriver : public BaseDriver
 static void RefreshMicSettings()
 {
 	Mic_DeInit_Physical();
-	if(CommonSettings.micMode == TCommonSettings::Sample)
+	if(CommonSettings.micMode == MicMode_Sample)
 	{
 		if(!LoadSamples(MicSampleName))
 		{
@@ -1878,7 +1878,7 @@ static void RefreshMicSettings()
 	else
 	{
 		LoadSamples(nullptr);
-		if(CommonSettings.micMode == TCommonSettings::Physical)
+		if(CommonSettings.micMode == MicMode_Physical)
 		{
 			Mic_Init_Physical();
 		}
@@ -2024,7 +2024,7 @@ int _main()
 	CommonSettings.hud.ShowMicrophone = GetPrivateProfileBool("Display","Display Microphone", false, IniName);
 	CommonSettings.hud.ShowRTC = GetPrivateProfileBool("Display","Display RTC", false, IniName);
 
-	CommonSettings.micMode = (TCommonSettings::MicMode)GetPrivateProfileInt("MicSettings", "MicMode", (int)TCommonSettings::InternalNoise, IniName);
+	CommonSettings.micMode = (MicMode)GetPrivateProfileInt("MicSettings", "MicMode", (int)MicMode_InternalNoise, IniName);
 	GetPrivateProfileString("MicSettings", "MicSampleFile", "micsample.raw", MicSampleName, MAX_PATH, IniName);
 	RefreshMicSettings();
 	
@@ -6216,15 +6216,15 @@ LRESULT CALLBACK MicrophoneSettingsDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam,
 		{
 			HWND cur;
 
-			CommonSettings.micMode = (TCommonSettings::MicMode)GetPrivateProfileInt("MicSettings", "MicMode", (int)TCommonSettings::InternalNoise, IniName);
-			CheckDlgButton(hDlg, IDC_USEMICSAMPLE, ((CommonSettings.micMode == TCommonSettings::Sample) ? BST_CHECKED : BST_UNCHECKED));
-			CheckDlgButton(hDlg, IDC_USEMICRAND, ((CommonSettings.micMode == TCommonSettings::Random) ? BST_CHECKED : BST_UNCHECKED));
-			CheckDlgButton(hDlg, IDC_USENOISE, ((CommonSettings.micMode == TCommonSettings::InternalNoise) ? BST_CHECKED : BST_UNCHECKED));
-			CheckDlgButton(hDlg, IDC_USEPHYSICAL, ((CommonSettings.micMode == TCommonSettings::Physical) ? BST_CHECKED : BST_UNCHECKED));
+			CommonSettings.micMode = (MicMode)GetPrivateProfileInt("MicSettings", "MicMode", (int)MicMode_InternalNoise, IniName);
+			CheckDlgButton(hDlg, IDC_USEMICSAMPLE, ((CommonSettings.micMode == MicMode_Sample) ? BST_CHECKED : BST_UNCHECKED));
+			CheckDlgButton(hDlg, IDC_USEMICRAND, ((CommonSettings.micMode == MicMode_Random) ? BST_CHECKED : BST_UNCHECKED));
+			CheckDlgButton(hDlg, IDC_USENOISE, ((CommonSettings.micMode == MicMode_InternalNoise) ? BST_CHECKED : BST_UNCHECKED));
+			CheckDlgButton(hDlg, IDC_USEPHYSICAL, ((CommonSettings.micMode == MicMode_Physical) ? BST_CHECKED : BST_UNCHECKED));
 			GetPrivateProfileString("MicSettings", "MicSampleFile", "micsample.raw", MicSampleName, MAX_PATH, IniName);
 			SetDlgItemText(hDlg, IDC_MICSAMPLE, MicSampleName);
 
-			if(CommonSettings.micMode != TCommonSettings::Sample)
+			if(CommonSettings.micMode != MicMode_Sample)
 			{
 				cur = GetDlgItem(hDlg, IDC_MICSAMPLE);
 				EnableWindow(cur, FALSE);
@@ -6245,13 +6245,13 @@ LRESULT CALLBACK MicrophoneSettingsDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam,
 					HWND cur;
 
 					if(IsDlgCheckboxChecked(hDlg, IDC_USEMICSAMPLE))
-						CommonSettings.micMode = TCommonSettings::Sample;
+						CommonSettings.micMode = MicMode_Sample;
 					else if(IsDlgCheckboxChecked(hDlg, IDC_USEMICRAND))
-						CommonSettings.micMode = TCommonSettings::Random;
+						CommonSettings.micMode = MicMode_Random;
 					else if(IsDlgCheckboxChecked(hDlg, IDC_USENOISE))
-						CommonSettings.micMode = TCommonSettings::InternalNoise;
+						CommonSettings.micMode = MicMode_InternalNoise;
 					else if(IsDlgCheckboxChecked(hDlg, IDC_USEPHYSICAL))
-						CommonSettings.micMode = TCommonSettings::Physical;
+						CommonSettings.micMode = MicMode_Physical;
 
 					cur = GetDlgItem(hDlg, IDC_MICSAMPLE);
 					GetWindowText(cur, MicSampleName, 256);
diff --git a/desmume/src/frontend/windows/mic-win.cpp b/desmume/src/frontend/windows/mic-win.cpp
index c74db3393..66b621743 100644
--- a/desmume/src/frontend/windows/mic-win.cpp
+++ b/desmume/src/frontend/windows/mic-win.cpp
@@ -388,7 +388,7 @@ u8 Mic_ReadSample()
 {
 	u8 ret;
 	u8 tmp;
-	if (CommonSettings.micMode == TCommonSettings::Physical)
+	if (CommonSettings.micMode == MicMode_Physical)
 	{
 		if (movieMode == MOVIEMODE_INACTIVE)
 		{
@@ -433,7 +433,7 @@ u8 Mic_ReadSample()
 			else
 			{
 				//use the "random" values
-				if (CommonSettings.micMode == TCommonSettings::InternalNoise)
+				if (CommonSettings.micMode == MicMode_InternalNoise)
 					tmp = random[micReadSamplePos >> 1];
 				else tmp = rand();
 				micReadSamplePos++;
diff --git a/desmume/src/mic.cpp b/desmume/src/mic.cpp
index 9eeea629e..fc412a33a 100644
--- a/desmume/src/mic.cpp
+++ b/desmume/src/mic.cpp
@@ -121,7 +121,7 @@ u8 Mic_ReadSample(void)
 {
 	// All mic modes other than Physical must have the mic hotkey pressed in order
 	// to work.
-	if (CommonSettings.micMode != TCommonSettings::Physical && !Mic_GetActivate()) {
+	if (CommonSettings.micMode != MicMode_Physical && !Mic_GetActivate()) {
 		return MIC_NULL_SAMPLE_VALUE;
 	}
 
@@ -180,9 +180,9 @@ void Mic_DoNoise(BOOL noise)
 
 	if (!noise) {
 		generator = &Mic_GenerateNullSample;
-	} else if (CommonSettings.micMode == TCommonSettings::InternalNoise) {
+	} else if (CommonSettings.micMode == MicMode_InternalNoise) {
 		generator = &Mic_GenerateInternalNoiseSample;
-	} else if (CommonSettings.micMode == TCommonSettings::Random) {
+	} else if (CommonSettings.micMode == MicMode_Random) {
 		generator = &Mic_GenerateWhiteNoiseSample;
 	}