Fix more header sorting issues in Common/ (now check-includes clean).

13 files changed, 35 insertions, 36 deletions

diff --git a/Source/Core/Common/ColorUtil.cpp b/Source/Core/Common/ColorUtil.cpp
index ffd44f3d96..0930668fe4 100644
--- a/Source/Core/Common/ColorUtil.cpp
+++ b/Source/Core/Common/ColorUtil.cpp
@@ -2,8 +2,8 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "Common/Common.h"
 #include "Common/ColorUtil.h"
+#include "Common/Common.h"
 
 namespace ColorUtil
 {
diff --git a/Source/Core/Common/Common.h b/Source/Core/Common/Common.h
index 4486972077..b5d78bafd7 100644
--- a/Source/Core/Common/Common.h
+++ b/Source/Core/Common/Common.h
@@ -7,9 +7,9 @@
 // DO NOT EVER INCLUDE <windows.h> directly _or indirectly_ from this file
 // since it slows down the build a lot.
 
-#include <cstdlib>
 #include <cstdio>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 // SVN version number
 extern const char *scm_desc_str;
@@ -45,10 +45,6 @@ private:
 };
 #endif
 
-#include "Common/Log.h"
-#include "Common/CommonTypes.h"
-#include "Common/MsgHandler.h"
-
 #ifdef __APPLE__
 // The Darwin ABI requires that stack frames be aligned to 16-byte boundaries.
 // This is only needed on i386 gcc - x86_64 already aligns to 16 bytes.
@@ -172,4 +168,7 @@ enum EMUSTATE_CHANGE
 	EMUSTATE_CHANGE_STOP
 };
 
-#include "Common/CommonFuncs.h"
+#include "Common/CommonTypes.h"
+#include "Common/CommonFuncs.h" // NOLINT: needs to be included after CommonTypes
+#include "Common/Log.h"
+#include "Common/MsgHandler.h"
diff --git a/Source/Core/Common/CommonTypes.h b/Source/Core/Common/CommonTypes.h
index 56210da18f..6ec7045c42 100644
--- a/Source/Core/Common/CommonTypes.h
+++ b/Source/Core/Common/CommonTypes.h
@@ -9,8 +9,8 @@
 
 #pragma once
 
-#include <cstdint>
 #include <cstddef>
+#include <cstdint>
 
 #ifdef _WIN32
 
diff --git a/Source/Core/Common/FileUtil.cpp b/Source/Core/Common/FileUtil.cpp
index ca36bad966..561435fb16 100644
--- a/Source/Core/Common/FileUtil.cpp
+++ b/Source/Core/Common/FileUtil.cpp
@@ -3,32 +3,32 @@
 // Refer to the license.txt file included.
 
 #include <algorithm>
+#include <fcntl.h>
 #include <sys/stat.h>
 
 #include "Common/CommonPaths.h"
 #include "Common/FileUtil.h"
 
 #ifdef _WIN32
-#include <windows.h>
-#include <shlobj.h>    // for SHGetFolderPath
-#include <shellapi.h>
 #include <commdlg.h>   // for GetSaveFileName
-#include <io.h>
 #include <direct.h>    // getcwd
+#include <io.h>
+#include <shellapi.h>
+#include <shlobj.h>    // for SHGetFolderPath
+#include <windows.h>
 #else
-#include <sys/param.h>
-#include <sys/types.h>
 #include <dirent.h>
 #include <errno.h>
-#include <stdlib.h>
 #include <libgen.h>
+#include <stdlib.h>
+#include <sys/param.h>
+#include <sys/types.h>
 #endif
-#include <fcntl.h>
 
 #if defined(__APPLE__)
+#include <CoreFoundation/CFBundle.h>
 #include <CoreFoundation/CFString.h>
 #include <CoreFoundation/CFURL.h>
-#include <CoreFoundation/CFBundle.h>
 #endif
 
 #ifndef S_ISDIR
diff --git a/Source/Core/Common/IniFile.cpp b/Source/Core/Common/IniFile.cpp
index 7c4ec737e5..8430f01e5e 100644
--- a/Source/Core/Common/IniFile.cpp
+++ b/Source/Core/Common/IniFile.cpp
@@ -6,8 +6,8 @@
 // see IniFile.h
 
 #include <algorithm>
-#include <cstdlib>
 #include <cstdio>
+#include <cstdlib>
 #include <fstream>
 #include <iostream>
 #include <string>
diff --git a/Source/Core/Common/LogManager.cpp b/Source/Core/Common/LogManager.cpp
index 31a6d8c9cf..a880b66268 100644
--- a/Source/Core/Common/LogManager.cpp
+++ b/Source/Core/Common/LogManager.cpp
@@ -9,8 +9,8 @@
 #endif
 #include "Common/FileUtil.h"
 #include "Common/LogManager.h"
-#include "Common/Timer.h"
 #include "Common/Thread.h"
+#include "Common/Timer.h"
 
 void GenericLog(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type,
 		const char *file, int line, const char* fmt, ...)
diff --git a/Source/Core/Common/SDCardUtil.cpp b/Source/Core/Common/SDCardUtil.cpp
index 16a9b13f4c..e73aa26204 100644
--- a/Source/Core/Common/SDCardUtil.cpp
+++ b/Source/Core/Common/SDCardUtil.cpp
@@ -29,10 +29,10 @@
 // Modified for Dolphin.
 
 #include <cinttypes>
-#include <ctime>
 #include <cstdio>
 #include <cstdlib>
-#include <string.h>
+#include <cstring>
+#include <ctime>
 #include <errno.h>
 
 #include "Common/FileUtil.h"
diff --git a/Source/Core/Common/SettingsHandler.cpp b/Source/Core/Common/SettingsHandler.cpp
index beeaa82da9..b7a7aeedbd 100644
--- a/Source/Core/Common/SettingsHandler.cpp
+++ b/Source/Core/Common/SettingsHandler.cpp
@@ -4,20 +4,20 @@
 
 // Thanks to Treeki for writing the original class - 29/01/2012
 
-#include "Common/CommonPaths.h"
-#include "Common/SettingsHandler.h"
-#include "Common/Timer.h"
-
-#include <time.h>
+#include <ctime>
 
 #ifdef _WIN32
-#include <Windows.h>
 #include <mmsystem.h>
 #include <sys/timeb.h>
+#include <windows.h>
 #else
 #include <sys/time.h>
 #endif
 
+#include "Common/CommonPaths.h"
+#include "Common/SettingsHandler.h"
+#include "Common/Timer.h"
+
 SettingsHandler::SettingsHandler()
 {
 	Reset();
diff --git a/Source/Core/Common/StringUtil.cpp b/Source/Core/Common/StringUtil.cpp
index 233bc8717b..3031669323 100644
--- a/Source/Core/Common/StringUtil.cpp
+++ b/Source/Core/Common/StringUtil.cpp
@@ -3,8 +3,8 @@
 // Refer to the license.txt file included.
 
 #include <algorithm>
-#include <cstdlib>
 #include <cstdio>
+#include <cstdlib>
 
 #include "Common/CommonPaths.h"
 #include "Common/StringUtil.h"
diff --git a/Source/Core/Common/Thread.h b/Source/Core/Common/Thread.h
index dda363094f..999689cf72 100644
--- a/Source/Core/Common/Thread.h
+++ b/Source/Core/Common/Thread.h
@@ -5,13 +5,13 @@
 #pragma once
 
 #include <cstdio>
-#include <string.h>
+#include <cstring>
 
+// Don't include common.h here as it will break LogManager
+#include "Common/CommonTypes.h"
 #include "Common/StdConditionVariable.h"
 #include "Common/StdMutex.h"
 #include "Common/StdThread.h"
-// Don't include common.h here as it will break LogManager
-#include "Common/CommonTypes.h"
 
 // This may not be defined outside _WIN32
 #ifndef _WIN32
diff --git a/Source/Core/Common/Timer.cpp b/Source/Core/Common/Timer.cpp
index d9299e7b49..1670e861db 100644
--- a/Source/Core/Common/Timer.cpp
+++ b/Source/Core/Common/Timer.cpp
@@ -2,13 +2,13 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include <ctime>
 #include <cinttypes>
+#include <ctime>
 
 #ifdef _WIN32
-#include <Windows.h>
 #include <mmsystem.h>
 #include <sys/timeb.h>
+#include <windows.h>
 #else
 #include <sys/time.h>
 #endif
diff --git a/Source/Core/Common/Version.cpp b/Source/Core/Common/Version.cpp
index 76546f040f..1223bf373d 100644
--- a/Source/Core/Common/Version.cpp
+++ b/Source/Core/Common/Version.cpp
@@ -2,8 +2,8 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "Common/Common.h"
 #include "scmrev.h"
+#include "Common/Common.h"
 
 #ifdef _DEBUG
 	#define BUILD_TYPE_STR "Debug "
diff --git a/Source/Core/Common/stdafx.h b/Source/Core/Common/stdafx.h
index 8b1c934c4f..832a942e21 100644
--- a/Source/Core/Common/stdafx.h
+++ b/Source/Core/Common/stdafx.h
@@ -18,7 +18,7 @@
 #define _CRT_SECURE_NO_DEPRECATE 1
 #define _CRT_NONSTDC_NO_DEPRECATE 1
 */
-#include <windows.h>
 #include <tchar.h>
 #include <vector>
+#include <windows.h>