10 files changed, 11 insertions, 11 deletions

diff --git a/src/common/break_points.cpp b/src/common/break_points.cpp
index 4b64a6c7b..03a19acba 100644
--- a/src/common/break_points.cpp
+++ b/src/common/break_points.cpp
@@ -2,9 +2,9 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/break_points.h"
 #include <algorithm>
 #include <sstream>
+#include "common/break_points.h"
 #include "common/logging/log.h"
 
 bool BreakPoints::IsAddressBreakPoint(u32 iAddress) const {
diff --git a/src/common/emu_window.cpp b/src/common/emu_window.cpp
index 6fd6f1987..122f1c212 100644
--- a/src/common/emu_window.cpp
+++ b/src/common/emu_window.cpp
@@ -2,11 +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/file_util.cpp b/src/common/file_util.cpp
index a0cae11e3..7a21962cc 100644
--- a/src/common/file_util.cpp
+++ b/src/common/file_util.cpp
@@ -2,10 +2,10 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/file_util.h"
 #include "common/assert.h"
 #include "common/common_funcs.h"
 #include "common/common_paths.h"
+#include "common/file_util.h"
 #include "common/logging/log.h"
 
 #ifdef _WIN32
diff --git a/src/common/key_map.cpp b/src/common/key_map.cpp
index 8380ce489..79b3fcb18 100644
--- a/src/common/key_map.cpp
+++ b/src/common/key_map.cpp
@@ -2,9 +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 b4a312948..9a13a9e90 100644
--- a/src/common/logging/backend.cpp
+++ b/src/common/logging/backend.cpp
@@ -2,12 +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/filter.cpp b/src/common/logging/filter.cpp
index 9aa72cecc..12e5bb45d 100644
--- a/src/common/logging/filter.cpp
+++ b/src/common/logging/filter.cpp
@@ -2,9 +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/memory_util.cpp b/src/common/memory_util.cpp
index 7d352f00f..e19d7202a 100644
--- a/src/common/memory_util.cpp
+++ b/src/common/memory_util.cpp
@@ -2,8 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/memory_util.h"
 #include "common/logging/log.h"
+#include "common/memory_util.h"
 
 #ifdef _WIN32
 #include <windows.h>
diff --git a/src/common/string_util.cpp b/src/common/string_util.cpp
index 968854bae..ca97e8ab4 100644
--- a/src/common/string_util.cpp
+++ b/src/common/string_util.cpp
@@ -2,7 +2,6 @@
 // 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>
@@ -11,6 +10,7 @@
 #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/x64/cpu_detect.cpp b/src/common/x64/cpu_detect.cpp
index ac37c42bc..6ddf9b70c 100644
--- a/src/common/x64/cpu_detect.cpp
+++ b/src/common/x64/cpu_detect.cpp
@@ -2,11 +2,11 @@
 // 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 {
 
diff --git a/src/common/x64/emitter.cpp b/src/common/x64/emitter.cpp
index b69e4bd5e..f5930abec 100644
--- a/src/common/x64/emitter.cpp
+++ b/src/common/x64/emitter.cpp
@@ -15,7 +15,6 @@
 // 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"
@@ -23,6 +22,7 @@
 #include "common/logging/log.h"
 #include "common/memory_util.h"
 #include "cpu_detect.h"
+#include "emitter.h"
 
 namespace Gen {
 
@@ -220,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;