Common: Remove other Common prefixed headers from Common.h

19 files changed, 29 insertions, 9 deletions

diff --git a/Source/Core/Common/ChunkFile.h b/Source/Core/Common/ChunkFile.h
index d3babbb11d..ddbdbf702b 100644
--- a/Source/Core/Common/ChunkFile.h
+++ b/Source/Core/Common/ChunkFile.h
@@ -25,6 +25,7 @@
 #include <vector>
 
 #include "Common/Assert.h"
+#include "Common/Common.h"
 #include "Common/CommonTypes.h"
 #include "Common/FileUtil.h"
 #include "Common/Flag.h"
diff --git a/Source/Core/Common/Common.h b/Source/Core/Common/Common.h
index 27427d3011..55bf530143 100644
--- a/Source/Core/Common/Common.h
+++ b/Source/Core/Common/Common.h
@@ -91,8 +91,3 @@ enum EMUSTATE_CHANGE
 	EMUSTATE_CHANGE_PAUSE,
 	EMUSTATE_CHANGE_STOP
 };
-
-#include "Common/CommonTypes.h" // IWYU pragma: export
-#include "Common/CommonFuncs.h" // IWYU pragma: export // NOLINT
-#include "Common/MsgHandler.h" // IWYU pragma: export
-#include "Common/Logging/Log.h" // IWYU pragma: export
diff --git a/Source/Core/Common/FileUtil.cpp b/Source/Core/Common/FileUtil.cpp
index cd20316bbe..5fdac9e0ac 100644
--- a/Source/Core/Common/FileUtil.cpp
+++ b/Source/Core/Common/FileUtil.cpp
@@ -12,9 +12,11 @@
 #include <vector>
 #include <sys/stat.h>
 
+#include "Common/CommonFuncs.h"
 #include "Common/CommonPaths.h"
 #include "Common/CommonTypes.h"
 #include "Common/FileUtil.h"
+#include "Common/Logging/Log.h"
 
 #ifdef _WIN32
 #include <commdlg.h>   // for GetSaveFileName
diff --git a/Source/Core/Common/FileUtil.h b/Source/Core/Common/FileUtil.h
index 4bb8bf63a8..3deb91dcd1 100644
--- a/Source/Core/Common/FileUtil.h
+++ b/Source/Core/Common/FileUtil.h
@@ -10,7 +10,7 @@
 #include <string>
 #include <vector>
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/NonCopyable.h"
 
 #ifdef _WIN32
diff --git a/Source/Core/Common/GL/GLInterface/EGL.cpp b/Source/Core/Common/GL/GLInterface/EGL.cpp
index 92f778eb66..a7ee39639b 100644
--- a/Source/Core/Common/GL/GLInterface/EGL.cpp
+++ b/Source/Core/Common/GL/GLInterface/EGL.cpp
@@ -3,6 +3,7 @@
 // Refer to the license.txt file included.
 
 #include "Common/GL/GLInterface/EGL.h"
+#include "Common/Logging/Log.h"
 
 // Show the current FPS
 void cInterfaceEGL::Swap()
diff --git a/Source/Core/Common/GL/GLInterface/EGLX11.cpp b/Source/Core/Common/GL/GLInterface/EGLX11.cpp
index 3859a23706..e2e5d7b51b 100644
--- a/Source/Core/Common/GL/GLInterface/EGLX11.cpp
+++ b/Source/Core/Common/GL/GLInterface/EGLX11.cpp
@@ -3,6 +3,7 @@
 // Refer to the license.txt file included.
 
 #include "Common/GL/GLInterface/EGLX11.h"
+#include "Common/Logging/Log.h"
 
 EGLDisplay cInterfaceEGLX11::OpenDisplay()
 {
diff --git a/Source/Core/Common/GL/GLInterface/WGL.cpp b/Source/Core/Common/GL/GLInterface/WGL.cpp
index 56017a89b4..c6fa90ebd3 100644
--- a/Source/Core/Common/GL/GLInterface/WGL.cpp
+++ b/Source/Core/Common/GL/GLInterface/WGL.cpp
@@ -5,6 +5,7 @@
 #include <string>
 #include <windows.h>
 
+#include "Common/MsgHandler.h"
 #include "Common/GL/GLInterface/WGL.h"
 #include "Common/Logging/Log.h"
 
diff --git a/Source/Core/Common/IniFile.h b/Source/Core/Common/IniFile.h
index 3847eeb9e5..6c4cf113ac 100644
--- a/Source/Core/Common/IniFile.h
+++ b/Source/Core/Common/IniFile.h
@@ -10,6 +10,7 @@
 #include <string>
 #include <vector>
 
+#include "Common/CommonFuncs.h"
 #include "Common/CommonTypes.h"
 #include "Common/StringUtil.h"
 
diff --git a/Source/Core/Common/Logging/ConsoleListenerNix.cpp b/Source/Core/Common/Logging/ConsoleListenerNix.cpp
index b891b29090..6d01fbf706 100644
--- a/Source/Core/Common/Logging/ConsoleListenerNix.cpp
+++ b/Source/Core/Common/Logging/ConsoleListenerNix.cpp
@@ -9,6 +9,7 @@
 #endif
 
 #include "Common/Logging/ConsoleListener.h"
+#include "Common/Logging/Log.h"
 
 ConsoleListener::ConsoleListener()
 {
diff --git a/Source/Core/Common/Logging/LogManager.h b/Source/Core/Common/Logging/LogManager.h
index af2ad40cc0..e48f05e928 100644
--- a/Source/Core/Common/Logging/LogManager.h
+++ b/Source/Core/Common/Logging/LogManager.h
@@ -10,8 +10,9 @@
 #include <set>
 #include <string>
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/NonCopyable.h"
+#include "Common/Logging/Log.h"
 
 #define MAX_MESSAGES 8000
 #define MAX_MSGLEN  1024
diff --git a/Source/Core/Common/MemArena.cpp b/Source/Core/Common/MemArena.cpp
index 31ed7f9c8f..1f8fa6a4ec 100644
--- a/Source/Core/Common/MemArena.cpp
+++ b/Source/Core/Common/MemArena.cpp
@@ -9,7 +9,9 @@
 
 #include "Common/CommonTypes.h"
 #include "Common/MemArena.h"
+#include "Common/MsgHandler.h"
 #include "Common/StringUtil.h"
+#include "Common/Logging/Log.h"
 
 #ifdef _WIN32
 #include <windows.h>
diff --git a/Source/Core/Common/MsgHandler.cpp b/Source/Core/Common/MsgHandler.cpp
index 5688c400ba..dc8527eb78 100644
--- a/Source/Core/Common/MsgHandler.cpp
+++ b/Source/Core/Common/MsgHandler.cpp
@@ -7,7 +7,9 @@
 #include <string>
 
 #include "Common/CommonTypes.h"
+#include "Common/MsgHandler.h"
 #include "Common/StringUtil.h"
+#include "Common/Logging/Log.h"
 
 bool DefaultMsgHandler(const char* caption, const char* text, bool yes_no, int Style);
 static MsgAlertHandler msg_handler = DefaultMsgHandler;
diff --git a/Source/Core/Common/NandPaths.cpp b/Source/Core/Common/NandPaths.cpp
index 6037137410..d4c9f8a151 100644
--- a/Source/Core/Common/NandPaths.cpp
+++ b/Source/Core/Common/NandPaths.cpp
@@ -7,11 +7,13 @@
 #include <string>
 #include <utility>
 
+#include "Common/CommonFuncs.h"
 #include "Common/CommonPaths.h"
 #include "Common/CommonTypes.h"
 #include "Common/FileUtil.h"
 #include "Common/NandPaths.h"
 #include "Common/StringUtil.h"
+#include "Common/Logging/Log.h"
 
 namespace Common
 {
diff --git a/Source/Core/Common/SDCardUtil.cpp b/Source/Core/Common/SDCardUtil.cpp
index fe49202a59..84083ece2f 100644
--- a/Source/Core/Common/SDCardUtil.cpp
+++ b/Source/Core/Common/SDCardUtil.cpp
@@ -39,9 +39,11 @@
 #include <ctime>
 #include <string>
 
+#include "Common/CommonFuncs.h"
 #include "Common/CommonTypes.h"
 #include "Common/FileUtil.h"
 #include "Common/SDCardUtil.h"
+#include "Common/Logging/Log.h"
 
 #ifndef _WIN32
 #include <unistd.h> // for unlink()
diff --git a/Source/Core/Common/StringUtil.cpp b/Source/Core/Common/StringUtil.cpp
index ac6c24bdfb..9fdbd9f801 100644
--- a/Source/Core/Common/StringUtil.cpp
+++ b/Source/Core/Common/StringUtil.cpp
@@ -14,9 +14,11 @@
 #include <string>
 #include <vector>
 
+#include "Common/CommonFuncs.h"
 #include "Common/CommonPaths.h"
 #include "Common/CommonTypes.h"
 #include "Common/StringUtil.h"
+#include "Common/Logging/Log.h"
 
 #ifdef _WIN32
 	#include <Windows.h>
diff --git a/Source/Core/Common/StringUtil.h b/Source/Core/Common/StringUtil.h
index ac4cbc7369..2516561a5a 100644
--- a/Source/Core/Common/StringUtil.h
+++ b/Source/Core/Common/StringUtil.h
@@ -11,7 +11,7 @@
 #include <string>
 #include <vector>
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 
 std::string StringFromFormatV(const char* format, va_list args);
 
diff --git a/Source/Core/Common/SysConf.cpp b/Source/Core/Common/SysConf.cpp
index 047114774a..7fe267cadf 100644
--- a/Source/Core/Common/SysConf.cpp
+++ b/Source/Core/Common/SysConf.cpp
@@ -8,10 +8,12 @@
 #include <string>
 #include <vector>
 
+#include "Common/CommonFuncs.h"
 #include "Common/CommonPaths.h"
 #include "Common/CommonTypes.h"
 #include "Common/FileUtil.h"
 #include "Common/SysConf.h"
+#include "Common/Logging/Log.h"
 
 SysConf::SysConf()
 	: m_IsValid(false)
diff --git a/Source/Core/Common/SysConf.h b/Source/Core/Common/SysConf.h
index 9234636318..639a8b0eda 100644
--- a/Source/Core/Common/SysConf.h
+++ b/Source/Core/Common/SysConf.h
@@ -10,7 +10,9 @@
 #include <string>
 #include <vector>
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
+#include "Common/MsgHandler.h"
+#include "Common/Logging/Log.h"
 
 // This class is meant to edit the values in a given Wii SYSCONF file
 // It currently does not add/remove/rearrange sections,
diff --git a/Source/Core/Common/TraversalClient.cpp b/Source/Core/Common/TraversalClient.cpp
index f17ce0d921..002c8834aa 100644
--- a/Source/Core/Common/TraversalClient.cpp
+++ b/Source/Core/Common/TraversalClient.cpp
@@ -1,7 +1,9 @@
 // This file is public domain, in case it's useful to anyone. -comex
 
+#include "Common/MsgHandler.h"
 #include "Common/Timer.h"
 #include "Common/TraversalClient.h"
+#include "Common/Logging/Log.h"
 
 static void GetRandomishBytes(u8* buf, size_t size)
 {