Remove special rules for Windows.h and library includes

3 files changed, 3 insertions, 1 deletions

diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp
index 7a21962cc..14cbcac6b 100644
--- a/src/common/file_util.cpp
+++ b/src/common/file_util.cpp
@@ -10,6 +10,7 @@
 
 #ifdef _WIN32
 #include <windows.h>
+// windows.h needs to be included before other windows headers
 #include <commdlg.h> // for GetSaveFileName
 #include <direct.h>  // getcwd
 #include <io.h>
diff --git a/src/common/memory_util.cpp b/src/common/memory_util.cpp
index e19d7202a..c19729b21 100644
--- a/src/common/memory_util.cpp
+++ b/src/common/memory_util.cpp
@@ -7,6 +7,7 @@
 
 #ifdef _WIN32
 #include <windows.h>
+// Windows.h needs to be included before psapi.h
 #include <psapi.h>
 #include "common/common_funcs.h"
 #include "common/string_util.h"
diff --git a/src/common/string_util.cpp b/src/common/string_util.cpp
index ca97e8ab4..596ae01bf 100644
--- a/src/common/string_util.cpp
+++ b/src/common/string_util.cpp
@@ -12,8 +12,8 @@
 #include "common/logging/log.h"
 #include "common/string_util.h"
 #ifdef _MSC_VER
-#include <Windows.h>
 #include <codecvt>
+#include <Windows.h>
 #include "common/common_funcs.h"
 #else
 #include <iconv.h>