diff --git a/src/common/Logging.cpp b/src/common/Logging.cpp
index 7cf2d943c..8e4814bf0 100644
--- a/src/common/Logging.cpp
+++ b/src/common/Logging.cpp
@@ -251,19 +251,19 @@ void CxbxPopupMessageEx(CXBXR_MODULE cxbxr_module, LOG_LEVEL level, CxbxMsgDlgIc
     UINT uType = MB_OK | MB_TOPMOST | MB_SETFOREGROUND;
 
     switch (icon) {
-        case CxbxMsgDlgIcon_Warn: {
+        case CxbxMsgDlgIcon::Warn: {
             uType |= MB_ICONWARNING;
             break;
         }
-        case CxbxMsgDlgIcon_Error: {
+        case CxbxMsgDlgIcon::Error: {
             uType |= MB_ICONERROR;
             break;
         }
-        case CxbxMsgDlgIcon_Info: {
+        case CxbxMsgDlgIcon::Info: {
             uType |= MB_ICONINFORMATION;
             break;
         }
-        case CxbxMsgDlgIcon_Unknown:
+        case CxbxMsgDlgIcon::Unknown:
         default: {
             uType |= MB_ICONQUESTION;
             break;
diff --git a/src/common/Logging.h b/src/common/Logging.h
index 99d06ba74..2a4df8d8d 100644
--- a/src/common/Logging.h
+++ b/src/common/Logging.h
@@ -130,9 +130,9 @@ extern inline void log_sync_config();
 
 void log_set_config(int LogLevel, unsigned int* LoggedModules, bool LogPopupTestcase);
 
-void log_generate_active_filter_output(const CXBXR_MODULE cxbxr_module);
+void log_generate_active_filter_output(const CXBXR_MODULE cxbxr_module);
 
-typedef enum _CxbxMsgDlgIcon {
+typedef enum class _CxbxMsgDlgIcon {
 	Info = 0,
 	Warn,
 	Error,
diff --git a/src/core/hle/D3D8/Direct3D9/Direct3D9.cpp b/src/core/hle/D3D8/Direct3D9/Direct3D9.cpp
index b522a5d34..dd136ba97 100644
--- a/src/core/hle/D3D8/Direct3D9/Direct3D9.cpp
+++ b/src/core/hle/D3D8/Direct3D9/Direct3D9.cpp
@@ -600,7 +600,7 @@ VOID CxbxInitWindow(bool bFullInit)
 		if (hRenderWindowThread == NULL) {
 			char szBuffer[1024] = { 0 };
 			sprintf(szBuffer, "Creating EmuRenderWindowThread Failed: %08X", GetLastError());
-			CxbxPopupMessage(LOG_LEVEL::FATAL, CxbxMsgDlgIcon_Error, szBuffer);
+			CxbxPopupMessage(LOG_LEVEL::FATAL, CxbxMsgDlgIcon::Error, szBuffer);
 			EmuShared::Cleanup();
 			ExitProcess(0);
 		}
diff --git a/src/core/kernel/exports/EmuKrnlRtl.cpp b/src/core/kernel/exports/EmuKrnlRtl.cpp
index a0bf86782..d1d3a6ba5 100644
--- a/src/core/kernel/exports/EmuKrnlRtl.cpp
+++ b/src/core/kernel/exports/EmuKrnlRtl.cpp
@@ -243,7 +243,7 @@ XBSYSAPI EXPORTNUM(264) xboxkrnl::VOID NTAPI xboxkrnl::RtlAssert
 
 	ss << ")";
 
-	CxbxPopupMessage(LOG_LEVEL::WARNING, CxbxMsgDlgIcon_Warn, ss.str().c_str());
+	CxbxPopupMessage(LOG_LEVEL::WARNING, CxbxMsgDlgIcon::Warn, ss.str().c_str());
 }
 
 // ******************************************************************