diff --git a/CMakeLists.txt b/CMakeLists.txt
index eaa1781d7..b41090d5f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,6 +11,7 @@ if (APPLE)
 endif()
 
 set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_EXTENSIONS OFF)
 
 set(CMAKE_PROJECT_VERSION_MAJOR 0)
 set(CMAKE_PROJECT_VERSION_MINOR 6)
diff --git a/extern/SAASound/src/SAASound.h b/extern/SAASound/src/SAASound.h
index 7496cc360..d55e80a7d 100644
--- a/extern/SAASound/src/SAASound.h
+++ b/extern/SAASound/src/SAASound.h
@@ -53,7 +53,7 @@ typedef unsigned long SAAPARAM;
 #endif
 
 #ifdef _WIN32
-#define SAAAPI _stdcall
+#define SAAAPI __stdcall
 #else
 #define SAAAPI
 #endif
diff --git a/extern/SAASound/src/types.h b/extern/SAASound/src/types.h
index 8cce21247..2ed26ff74 100755
--- a/extern/SAASound/src/types.h
+++ b/extern/SAASound/src/types.h
@@ -30,7 +30,7 @@ typedef struct
 } ENVDATA;
 
 #ifdef WIN32
-extern "C" void _stdcall OutputDebugStringA (char*);
+extern "C" void __stdcall OutputDebugStringA (char*);
 #endif
 
 #endif
diff --git a/extern/igfd/ImGuiFileDialog.cpp b/extern/igfd/ImGuiFileDialog.cpp
index 98d6c909a..f4641e976 100644
--- a/extern/igfd/ImGuiFileDialog.cpp
+++ b/extern/igfd/ImGuiFileDialog.cpp
@@ -44,10 +44,7 @@ SOFTWARE.
 #if defined (__EMSCRIPTEN__) // EMSCRIPTEN
 	#include <emscripten.h>
 #endif // EMSCRIPTEN
-#if defined(__WIN32__) || defined(_WIN32)
-	#ifndef WIN32
-		#define WIN32
-	#endif // WIN32
+#ifdef WIN32
 	#define stat _stat
 	#define stricmp _stricmp
 	#include <cctype>
diff --git a/extern/igfd/ImGuiFileDialog.h b/extern/igfd/ImGuiFileDialog.h
index 016bd9a10..e5ba92d0c 100644
--- a/extern/igfd/ImGuiFileDialog.h
+++ b/extern/igfd/ImGuiFileDialog.h
@@ -581,6 +581,12 @@ ImGuiFontStudio is using also ImGuiFileDialog.
 #ifndef IMGUIFILEDIALOG_H
 #define IMGUIFILEDIALOG_H
 
+#if defined(__WIN32__) || defined(_WIN32)
+	#ifndef WIN32
+		#define WIN32
+	#endif // WIN32
+#endif // defined(__WIN32__) || defined(_WIN32)
+
 #define IMGUIFILEDIALOG_VERSION "v0.6.4"
 
 #ifndef CUSTOM_IMGUIFILEDIALOG_CONFIG