diff --git a/Source/Core/Common/CommonTypes.h b/Source/Core/Common/CommonTypes.h
index 68397c1c3f..2a9c164033 100644
--- a/Source/Core/Common/CommonTypes.h
+++ b/Source/Core/Common/CommonTypes.h
@@ -12,6 +12,9 @@
 
 #ifdef _WIN32
 #include <tchar.h>
+#if defined(__MINGW32__)
+#include <string>
+#endif
 #else
 // For using Windows lock code
 #define TCHAR char
diff --git a/Source/Core/Common/FileUtil.cpp b/Source/Core/Common/FileUtil.cpp
index 1dbbb4ac41..3cc8a7babb 100644
--- a/Source/Core/Common/FileUtil.cpp
+++ b/Source/Core/Common/FileUtil.cpp
@@ -35,6 +35,7 @@
 #include <direct.h>   // getcwd
 #include <io.h>
 #include <objbase.h>  // guid stuff
+#include <share.h>
 #include <shellapi.h>
 #else
 #include <libgen.h>
diff --git a/Source/Core/Common/IOFile.cpp b/Source/Core/Common/IOFile.cpp
index 9402da1a94..f68bd04547 100644
--- a/Source/Core/Common/IOFile.cpp
+++ b/Source/Core/Common/IOFile.cpp
@@ -8,7 +8,7 @@
 
 #ifdef _WIN32
 #include <io.h>
-
+#include <share.h>
 #include "Common/CommonFuncs.h"
 #include "Common/StringUtil.h"
 #else
diff --git a/Source/Core/Core/HW/EXI/BBA/BuiltIn.cpp b/Source/Core/Core/HW/EXI/BBA/BuiltIn.cpp
index ed9cd5b488..b59f97747f 100644
--- a/Source/Core/Core/HW/EXI/BBA/BuiltIn.cpp
+++ b/Source/Core/Core/HW/EXI/BBA/BuiltIn.cpp
@@ -9,7 +9,7 @@
 #include "SFML/Network/Socket.hpp"
 
 #ifdef _WIN32
-#include <ws2ipdef.h>
+#include <ws2tcpip.h>
 #else
 #include <sys/select.h>
 #include <sys/socket.h>
diff --git a/Source/Core/DolphinTool/ToolMain.cpp b/Source/Core/DolphinTool/ToolMain.cpp
index 95cc7c6aaa..9a785ac530 100644
--- a/Source/Core/DolphinTool/ToolMain.cpp
+++ b/Source/Core/DolphinTool/ToolMain.cpp
@@ -7,6 +7,10 @@
 #include <string_view>
 #include <vector>
 
+#ifdef _WIN32
+#include <windows.h>
+#endif
+
 #include <fmt/ostream.h>
 
 #include "DolphinTool/ConvertCommand.h"