diff --git a/common/cli/terminal_color.hpp b/common/cli/terminal_color.hpp
index 90bc57071..e9ec96fa6 100644
--- a/common/cli/terminal_color.hpp
+++ b/common/cli/terminal_color.hpp
@@ -51,7 +51,7 @@
 #   include <unistd.h>
 #elif defined(TERMCOLOR_OS_WINDOWS)
 #   include <io.h>
-#   include <windows.h>
+#   include "common/platform/win/include_windows.h"
 #endif
 
 
diff --git a/common/dbcore.h b/common/dbcore.h
index 981957335..09bad28de 100644
--- a/common/dbcore.h
+++ b/common/dbcore.h
@@ -21,6 +21,7 @@
 #include "common/types.h"
 
 #include "mysql.h"
+#include <memory>
 #include <mutex>
 
 #define CR_SERVER_GONE_ERROR    2006
diff --git a/common/eqemu_logsys.cpp b/common/eqemu_logsys.cpp
index 7b5e218eb..1704bab4a 100644
--- a/common/eqemu_logsys.cpp
+++ b/common/eqemu_logsys.cpp
@@ -33,10 +33,8 @@
 #include <sys/stat.h>
 
 #ifdef _WINDOWS
-#include <conio.h>
+#include "common/platform/platform.h"
 #include <direct.h>
-#include <process.h>
-#include <windows.h>
 #else
 #include <sys/stat.h>
 #include <thread>
diff --git a/common/net/tcp_connection.h b/common/net/tcp_connection.h
index 7c421c204..fc0f86f5a 100644
--- a/common/net/tcp_connection.h
+++ b/common/net/tcp_connection.h
@@ -19,7 +19,9 @@
 
 #include "common/net/tcp_connection_pooling.h"
 
+#include "common/platform/platform.h"
 #include "uv.h"
+
 #include <functional>
 #include <memory>
 #include <string>
diff --git a/common/platform/win/include_winsock2.h b/common/platform/win/include_winsock2.h
index 0aaf30931..e5410094e 100644
--- a/common/platform/win/include_winsock2.h
+++ b/common/platform/win/include_winsock2.h
@@ -19,6 +19,7 @@
 
 #ifdef _WINDOWS
 
+#include "common/platform/win/include_windows.h"
 #include <WinSock2.h>
 
 #endif // _WINDOWS