Remove empty newlines in #include blocks.

This makes clang-format useful on those.

Also add a bunch of forgotten transitive includes, which otherwise
prevented compilation.

32 files changed, 13 insertions, 54 deletions

diff --git a/src/common/assert.h b/src/common/assert.h
index 70214efae..04e80c87a 100644
--- a/src/common/assert.h
+++ b/src/common/assert.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include <cstdlib>
-
 #include "common/common_funcs.h"
 #include "common/logging/log.h"
 
@@ -54,4 +53,4 @@ __declspec(noinline, noreturn)
 #endif
 
 #define UNIMPLEMENTED() DEBUG_ASSERT_MSG(false, "Unimplemented code!")
-#define UNIMPLEMENTED_MSG(_a_, ...) ASSERT_MSG(false, _a_, __VA_ARGS__)
\ No newline at end of file
+#define UNIMPLEMENTED_MSG(_a_, ...) ASSERT_MSG(false, _a_, __VA_ARGS__)
diff --git a/src/common/bit_field.h b/src/common/bit_field.h
index 8d45743e2..030f7caeb 100644
--- a/src/common/bit_field.h
+++ b/src/common/bit_field.h
@@ -33,7 +33,6 @@
 #include <cstddef>
 #include <limits>
 #include <type_traits>
-
 #include "common/common_funcs.h"
 
 /*
diff --git a/src/common/break_points.cpp b/src/common/break_points.cpp
index 3218db314..4b64a6c7b 100644
--- a/src/common/break_points.cpp
+++ b/src/common/break_points.cpp
@@ -3,10 +3,9 @@
 // Refer to the license.txt file included.
 
 #include "common/break_points.h"
-#include "common/logging/log.h"
-
 #include <algorithm>
 #include <sstream>
+#include "common/logging/log.h"
 
 bool BreakPoints::IsAddressBreakPoint(u32 iAddress) const {
     auto cond = [&iAddress](const TBreakPoint& bp) { return bp.iAddress == iAddress; };
diff --git a/src/common/break_points.h b/src/common/break_points.h
index 1a5b7d296..e15b9f842 100644
--- a/src/common/break_points.h
+++ b/src/common/break_points.h
@@ -6,7 +6,6 @@
 
 #include <string>
 #include <vector>
-
 #include "common/common_types.h"
 
 class DebugInterface;
diff --git a/src/common/chunk_file.h b/src/common/chunk_file.h
index 2bf3c774b..5145a3657 100644
--- a/src/common/chunk_file.h
+++ b/src/common/chunk_file.h
@@ -35,7 +35,6 @@
 #include <type_traits>
 #include <utility>
 #include <vector>
-
 #include "common/assert.h"
 #include "common/common_types.h"
 #include "common/logging/log.h"
diff --git a/src/common/code_block.h b/src/common/code_block.h
index 099088925..6a55a8e30 100644
--- a/src/common/code_block.h
+++ b/src/common/code_block.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include <cstddef>
-
 #include "common/common_types.h"
 #include "common/memory_util.h"
 
diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h
index 7032c2117..b141e79ed 100644
--- a/src/common/common_funcs.h
+++ b/src/common/common_funcs.h
@@ -7,7 +7,6 @@
 #if !defined(ARCHITECTURE_x86_64) && !defined(_M_ARM)
 #include <cstdlib> // for exit
 #endif
-
 #include "common_types.h"
 
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
diff --git a/src/common/emu_window.cpp b/src/common/emu_window.cpp
index c86f663a8..6fd6f1987 100644
--- a/src/common/emu_window.cpp
+++ b/src/common/emu_window.cpp
@@ -2,13 +2,11 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include "emu_window.h"
 #include <algorithm>
 #include <cmath>
-
 #include "common/assert.h"
 #include "common/key_map.h"
-
-#include "emu_window.h"
 #include "video_core/video_core.h"
 
 void EmuWindow::ButtonPressed(Service::HID::PadState pad) {
diff --git a/src/common/emu_window.h b/src/common/emu_window.h
index 20131300d..67df63e06 100644
--- a/src/common/emu_window.h
+++ b/src/common/emu_window.h
@@ -6,10 +6,8 @@
 
 #include <tuple>
 #include <utility>
-
 #include "common/common_types.h"
 #include "common/math_util.h"
-
 #include "core/hle/service/hid/hid.h"
 
 /**
diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp
index 96afe2ca0..a0cae11e3 100644
--- a/src/common/file_util.cpp
+++ b/src/common/file_util.cpp
@@ -16,7 +16,6 @@
 #include <shellapi.h>
 #include <shlobj.h> // for SHGetFolderPath
 #include <tchar.h>
-
 #include "common/string_util.h"
 
 // 64 bit offsets for windows
diff --git a/src/common/file_util.h b/src/common/file_util.h
index b15021a63..204b06f14 100644
--- a/src/common/file_util.h
+++ b/src/common/file_util.h
@@ -11,9 +11,7 @@
 #include <string>
 #include <type_traits>
 #include <vector>
-
 #include "common/common_types.h"
-
 #ifdef _MSC_VER
 #include "common/string_util.h"
 #endif
diff --git a/src/common/hash.cpp b/src/common/hash.cpp
index a46c92553..5aa5118eb 100644
--- a/src/common/hash.cpp
+++ b/src/common/hash.cpp
@@ -5,7 +5,6 @@
 #if defined(_MSC_VER)
 #include <stdlib.h>
 #endif
-
 #include "common_funcs.h"
 #include "common_types.h"
 #include "hash.h"
diff --git a/src/common/key_map.cpp b/src/common/key_map.cpp
index e882f5f52..8380ce489 100644
--- a/src/common/key_map.cpp
+++ b/src/common/key_map.cpp
@@ -2,10 +2,9 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include "common/key_map.h"
 #include <map>
-
 #include "common/emu_window.h"
-#include "common/key_map.h"
 
 namespace KeyMap {
 
diff --git a/src/common/logging/backend.cpp b/src/common/logging/backend.cpp
index b3d6598e4..b4a312948 100644
--- a/src/common/logging/backend.cpp
+++ b/src/common/logging/backend.cpp
@@ -2,13 +2,12 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include "common/logging/backend.h"
 #include <algorithm>
 #include <array>
 #include <cstdio>
-
 #include "common/assert.h"
 #include "common/common_funcs.h" // snprintf compatibility define
-#include "common/logging/backend.h"
 #include "common/logging/filter.h"
 #include "common/logging/log.h"
 #include "common/logging/text_formatter.h"
diff --git a/src/common/logging/backend.h b/src/common/logging/backend.h
index 3fe88e4f6..c4fe2acbf 100644
--- a/src/common/logging/backend.h
+++ b/src/common/logging/backend.h
@@ -8,7 +8,6 @@
 #include <cstdarg>
 #include <string>
 #include <utility>
-
 #include "common/logging/log.h"
 
 namespace Log {
diff --git a/src/common/logging/filter.cpp b/src/common/logging/filter.cpp
index 186e0b621..9aa72cecc 100644
--- a/src/common/logging/filter.cpp
+++ b/src/common/logging/filter.cpp
@@ -2,10 +2,9 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include "common/logging/filter.h"
 #include <algorithm>
-
 #include "common/logging/backend.h"
-#include "common/logging/filter.h"
 #include "common/string_util.h"
 
 namespace Log {
diff --git a/src/common/logging/filter.h b/src/common/logging/filter.h
index db526fead..b51df61de 100644
--- a/src/common/logging/filter.h
+++ b/src/common/logging/filter.h
@@ -7,7 +7,6 @@
 #include <array>
 #include <cstddef>
 #include <string>
-
 #include "common/logging/log.h"
 
 namespace Log {
diff --git a/src/common/logging/text_formatter.cpp b/src/common/logging/text_formatter.cpp
index 955358553..d61c1696b 100644
--- a/src/common/logging/text_formatter.cpp
+++ b/src/common/logging/text_formatter.cpp
@@ -10,12 +10,11 @@
 #include <Windows.h>
 #endif
 
+#include "common/assert.h"
+#include "common/common_funcs.h"
 #include "common/logging/backend.h"
 #include "common/logging/log.h"
 #include "common/logging/text_formatter.h"
-
-#include "common/assert.h"
-#include "common/common_funcs.h"
 #include "common/string_util.h"
 
 namespace Log {
diff --git a/src/common/misc.cpp b/src/common/misc.cpp
index 5938e6289..7be2235b0 100644
--- a/src/common/misc.cpp
+++ b/src/common/misc.cpp
@@ -3,7 +3,6 @@
 // Refer to the license.txt file included.
 
 #include <cstddef>
-
 #ifdef _WIN32
 #include <windows.h>
 #else
diff --git a/src/common/profiler.cpp b/src/common/profiler.cpp
index 231a0afc1..b40e7205d 100644
--- a/src/common/profiler.cpp
+++ b/src/common/profiler.cpp
@@ -5,7 +5,6 @@
 #include <algorithm>
 #include <cstddef>
 #include <vector>
-
 #include "common/assert.h"
 #include "common/profiler_reporting.h"
 #include "common/synchronized_wrapper.h"
diff --git a/src/common/profiler_reporting.h b/src/common/profiler_reporting.h
index fa1ac883f..e9ce6d41c 100644
--- a/src/common/profiler_reporting.h
+++ b/src/common/profiler_reporting.h
@@ -7,7 +7,6 @@
 #include <chrono>
 #include <cstddef>
 #include <vector>
-
 #include "common/synchronized_wrapper.h"
 
 namespace Common {
diff --git a/src/common/string_util.cpp b/src/common/string_util.cpp
index 9ccd6f135..968854bae 100644
--- a/src/common/string_util.cpp
+++ b/src/common/string_util.cpp
@@ -2,17 +2,15 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include "common/string_util.h"
 #include <cctype>
 #include <cerrno>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
 #include <boost/range/algorithm/transform.hpp>
-
 #include "common/common_paths.h"
 #include "common/logging/log.h"
-#include "common/string_util.h"
-
 #ifdef _MSC_VER
 #include <Windows.h>
 #include <codecvt>
diff --git a/src/common/string_util.h b/src/common/string_util.h
index 6ffd735f4..075bf4ecb 100644
--- a/src/common/string_util.h
+++ b/src/common/string_util.h
@@ -10,7 +10,6 @@
 #include <sstream>
 #include <string>
 #include <vector>
-
 #include "common/common_types.h"
 
 namespace Common {
diff --git a/src/common/swap.h b/src/common/swap.h
index 72c50d789..e241c9f73 100644
--- a/src/common/swap.h
+++ b/src/common/swap.h
@@ -24,9 +24,7 @@
 #elif defined(__FreeBSD__)
 #include <sys/endian.h>
 #endif
-
 #include <cstring>
-
 #include "common/common_types.h"
 
 // GCC 4.6+
diff --git a/src/common/symbols.h b/src/common/symbols.h
index 6044c9db6..f5a48e05a 100644
--- a/src/common/symbols.h
+++ b/src/common/symbols.h
@@ -7,7 +7,6 @@
 #include <map>
 #include <string>
 #include <utility>
-
 #include "common/common_types.h"
 
 struct TSymbol {
diff --git a/src/common/thread.cpp b/src/common/thread.cpp
index bee607ce9..6e7b39b9a 100644
--- a/src/common/thread.cpp
+++ b/src/common/thread.cpp
@@ -3,7 +3,6 @@
 // Refer to the license.txt file included.
 
 #include "common/thread.h"
-
 #ifdef __APPLE__
 #include <mach/mach.h>
 #elif defined(_WIN32)
@@ -16,7 +15,6 @@
 #endif
 #include <sched.h>
 #endif
-
 #ifndef _WIN32
 #include <unistd.h>
 #endif
diff --git a/src/common/thread.h b/src/common/thread.h
index 499c151c2..9c08be7e3 100644
--- a/src/common/thread.h
+++ b/src/common/thread.h
@@ -8,7 +8,6 @@
 #include <cstddef>
 #include <mutex>
 #include <thread>
-
 #include "common/common_types.h"
 
 // Support for C++11's thread_local keyword was surprisingly spotty in compilers until very
diff --git a/src/common/thread_queue_list.h b/src/common/thread_queue_list.h
index 0dcf785b6..edd0e4a3f 100644
--- a/src/common/thread_queue_list.h
+++ b/src/common/thread_queue_list.h
@@ -6,7 +6,6 @@
 
 #include <array>
 #include <deque>
-
 #include <boost/range/algorithm_ext/erase.hpp>
 
 namespace Common {
diff --git a/src/common/timer.cpp b/src/common/timer.cpp
index 27560eb0b..e843cbd9c 100644
--- a/src/common/timer.cpp
+++ b/src/common/timer.cpp
@@ -3,7 +3,6 @@
 // Refer to the license.txt file included.
 
 #include <time.h>
-
 #ifdef _WIN32
 #include <Windows.h>
 #include <mmsystem.h>
@@ -11,7 +10,6 @@
 #else
 #include <sys/time.h>
 #endif
-
 #include "common/common_types.h"
 #include "common/string_util.h"
 #include "common/timer.h"
diff --git a/src/common/x64/cpu_detect.cpp b/src/common/x64/cpu_detect.cpp
index 19f1a4030..ac37c42bc 100644
--- a/src/common/x64/cpu_detect.cpp
+++ b/src/common/x64/cpu_detect.cpp
@@ -2,14 +2,12 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include "cpu_detect.h"
 #include <cstring>
 #include <string>
 #include <thread>
-
 #include "common/common_types.h"
 
-#include "cpu_detect.h"
-
 namespace Common {
 
 #ifndef _MSC_VER
diff --git a/src/common/x64/emitter.cpp b/src/common/x64/emitter.cpp
index 7cf350b4a..b69e4bd5e 100644
--- a/src/common/x64/emitter.cpp
+++ b/src/common/x64/emitter.cpp
@@ -15,16 +15,14 @@
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
+#include "emitter.h"
 #include <cinttypes>
 #include <cstring>
-
+#include "abi.h"
 #include "common/assert.h"
 #include "common/logging/log.h"
 #include "common/memory_util.h"
-
-#include "abi.h"
 #include "cpu_detect.h"
-#include "emitter.h"
 
 namespace Gen {
 
@@ -222,7 +220,7 @@ void OpArg::WriteVex(XEmitter* emit, X64Reg regOp1, X64Reg regOp2, int L, int pp
 void OpArg::WriteRest(XEmitter* emit, int extraBytes, X64Reg _operandReg,
                       bool warn_64bit_offset) const {
     if (_operandReg == INVALID_REG)
-        _operandReg = (X64Reg)this->operandReg;
+        _operandReg = (X64Reg) this->operandReg;
     int mod = 0;
     int ireg = indexReg;
     bool SIB = false;
diff --git a/src/common/x64/emitter.h b/src/common/x64/emitter.h
index 6c9dc3d6b..7d7cdde16 100644
--- a/src/common/x64/emitter.h
+++ b/src/common/x64/emitter.h
@@ -18,7 +18,6 @@
 #pragma once
 
 #include <cstddef>
-
 #include "common/assert.h"
 #include "common/bit_set.h"
 #include "common/code_block.h"