Use negative priorities to avoid special-casing the self-include

src/.clang-format

@@ -47,13 +47,15 @@ DisableFormat:   false
 ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
 IncludeCategories:
   - Regex:           '^\<[wW]indows.h\>'
-    Priority:        1
+    Priority:        -3
   - Regex:           '^\<(boost|catch|dynarmic|glad|inih|nihstro)/'
-    Priority:        3
+    Priority:        -1
   - Regex:           '^\<(SDL|SoundTouch|Q)'
-    Priority:        3
+    Priority:        -1
   - Regex:           '^\<'
-    Priority:        2
+    Priority:        -2
+  - Regex:           '^\"'
+    Priority:        0
 IndentCaseLabels: false
 IndentWidth:     4
 IndentWrappedFunctionNames: false

src/audio_core/audio_core.cpp

@@ -2,9 +2,9 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "audio_core/audio_core.h"
 #include <memory>
 #include <string>
+#include "audio_core/audio_core.h"
 #include "audio_core/hle/dsp.h"
 #include "audio_core/hle/pipe.h"
 #include "audio_core/null_sink.h"

src/audio_core/codec.cpp

@@ -2,11 +2,11 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "audio_core/codec.h"
 #include <array>
 #include <cstddef>
 #include <cstring>
 #include <vector>
+#include "audio_core/codec.h"
 #include "common/assert.h"
 #include "common/common_types.h"
 #include "common/math_util.h"

src/audio_core/hle/dsp.cpp

@@ -2,9 +2,9 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "audio_core/hle/dsp.h"
 #include <array>
 #include <memory>
+#include "audio_core/hle/dsp.h"
 #include "audio_core/hle/mixers.h"
 #include "audio_core/hle/pipe.h"
 #include "audio_core/hle/source.h"

src/audio_core/hle/filter.cpp

@@ -2,11 +2,11 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "audio_core/hle/filter.h"
 #include <array>
 #include <cstddef>
 #include "audio_core/hle/common.h"
 #include "audio_core/hle/dsp.h"
+#include "audio_core/hle/filter.h"
 #include "common/common_types.h"
 #include "common/math_util.h"
 

src/audio_core/hle/pipe.cpp

@@ -2,10 +2,10 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "audio_core/hle/pipe.h"
 #include <array>
 #include <vector>
 #include "audio_core/hle/dsp.h"
+#include "audio_core/hle/pipe.h"
 #include "common/assert.h"
 #include "common/common_types.h"
 #include "common/logging/log.h"

src/audio_core/hle/source.cpp

@@ -2,11 +2,11 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "audio_core/hle/source.h"
 #include <algorithm>
 #include <array>
 #include "audio_core/codec.h"
 #include "audio_core/hle/common.h"
+#include "audio_core/hle/source.h"
 #include "audio_core/interpolate.h"
 #include "common/assert.h"
 #include "common/logging/log.h"

src/audio_core/sdl2_sink.cpp

@@ -2,12 +2,12 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "audio_core/sdl2_sink.h"
 #include <list>
 #include <numeric>
 #include <vector>
 #include <SDL.h>
 #include "audio_core/audio_core.h"
+#include "audio_core/sdl2_sink.h"
 #include "common/assert.h"
 #include "common/logging/log.h"
 

src/audio_core/sink_details.cpp

@@ -2,10 +2,10 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "audio_core/sink_details.h"
 #include <memory>
 #include <vector>
 #include "audio_core/null_sink.h"
+#include "audio_core/sink_details.h"
 #ifdef HAVE_SDL2
 #include "audio_core/sdl2_sink.h"
 #endif

src/audio_core/time_stretch.cpp

@@ -2,12 +2,12 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "audio_core/time_stretch.h"
 #include <chrono>
 #include <cmath>
 #include <vector>
 #include <SoundTouch.h>
 #include "audio_core/audio_core.h"
+#include "audio_core/time_stretch.h"
 #include "common/common_types.h"
 #include "common/logging/log.h"
 #include "common/math_util.h"

src/citra/config.cpp

@@ -2,13 +2,13 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "config.h"
 #include <memory>
 #include <SDL.h>
 #include <inih/cpp/INIReader.h>
 #include "citra/default_ini.h"
 #include "common/file_util.h"
 #include "common/logging/log.h"
+#include "config.h"
 #include "core/settings.h"
 
 Config::Config() {

src/citra_qt/config.cpp

@@ -2,8 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "citra_qt/config.h"
 #include <QSettings>
+#include "citra_qt/config.h"
 #include "citra_qt/ui_settings.h"
 #include "common/file_util.h"
 

src/citra_qt/configure_audio.cpp

@@ -2,8 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "citra_qt/configure_audio.h"
 #include "audio_core/sink_details.h"
+#include "citra_qt/configure_audio.h"
 #include "core/settings.h"
 #include "ui_configure_audio.h"
 

src/citra_qt/configure_dialog.cpp

@@ -2,8 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "citra_qt/configure_dialog.h"
 #include "citra_qt/config.h"
+#include "citra_qt/configure_dialog.h"
 #include "core/settings.h"
 #include "ui_configure.h"
 

src/citra_qt/configure_input.cpp

@@ -2,10 +2,10 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "citra_qt/configure_input.h"
 #include <memory>
 #include <utility>
 #include <QTimer>
+#include "citra_qt/configure_input.h"
 
 ConfigureInput::ConfigureInput(QWidget* parent)
     : QWidget(parent), ui(std::make_unique<Ui::ConfigureInput>()) {

src/citra_qt/debugger/callstack.cpp

@@ -2,8 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "citra_qt/debugger/callstack.h"
 #include <QStandardItemModel>
+#include "citra_qt/debugger/callstack.h"
 #include "common/common_types.h"
 #include "common/symbols.h"
 #include "core/arm/arm_interface.h"

src/citra_qt/debugger/disassembler.cpp

@@ -2,9 +2,9 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "citra_qt/debugger/disassembler.h"
 #include <QShortcut>
 #include "citra_qt/bootmanager.h"
+#include "citra_qt/debugger/disassembler.h"
 #include "citra_qt/hotkeys.h"
 #include "citra_qt/util/util.h"
 #include "common/break_points.h"

src/citra_qt/debugger/graphics.cpp

@@ -2,8 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "citra_qt/debugger/graphics.h"
 #include <QListView>
+#include "citra_qt/debugger/graphics.h"
 #include "citra_qt/util/util.h"
 
 extern GraphicsDebugger g_debugger;

src/citra_qt/debugger/graphics_breakpoint_observer.cpp

@@ -2,8 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "citra_qt/debugger/graphics_breakpoint_observer.h"
 #include <QMetaType>
+#include "citra_qt/debugger/graphics_breakpoint_observer.h"
 
 BreakPointObserverDock::BreakPointObserverDock(std::shared_ptr<Pica::DebugContext> debug_context,
                                                const QString& title, QWidget* parent)

src/citra_qt/debugger/graphics_breakpoints.cpp

@@ -2,12 +2,12 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "citra_qt/debugger/graphics_breakpoints.h"
 #include <QLabel>
 #include <QMetaType>
 #include <QPushButton>
 #include <QTreeView>
 #include <QVBoxLayout>
+#include "citra_qt/debugger/graphics_breakpoints.h"
 #include "citra_qt/debugger/graphics_breakpoints_p.h"
 #include "common/assert.h"
 

src/citra_qt/debugger/graphics_cmdlists.cpp

@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "citra_qt/debugger/graphics_cmdlists.h"
 #include <QApplication>
 #include <QClipboard>
 #include <QComboBox>
@@ -14,6 +13,7 @@
 #include <QSpinBox>
 #include <QTreeView>
 #include <QVBoxLayout>
+#include "citra_qt/debugger/graphics_cmdlists.h"
 #include "citra_qt/util/spinbox.h"
 #include "citra_qt/util/util.h"
 #include "common/vector_math.h"

src/citra_qt/debugger/graphics_surface.cpp

@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "citra_qt/debugger/graphics_surface.h"
 #include <QBoxLayout>
 #include <QComboBox>
 #include <QDebug>
@@ -12,6 +11,7 @@
 #include <QPushButton>
 #include <QScrollArea>
 #include <QSpinBox>
+#include "citra_qt/debugger/graphics_surface.h"
 #include "citra_qt/util/spinbox.h"
 #include "common/color.h"
 #include "core/hw/gpu.h"

src/citra_qt/debugger/graphics_tracing.cpp

@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "citra_qt/debugger/graphics_tracing.h"
 #include <algorithm>
 #include <array>
 #include <iterator>
@@ -13,6 +12,7 @@
 #include <QMessageBox>
 #include <QPushButton>
 #include <boost/range/algorithm/copy.hpp>
+#include "citra_qt/debugger/graphics_tracing.h"
 #include "common/common_types.h"
 #include "core/hw/gpu.h"
 #include "core/hw/lcd.h"

src/citra_qt/debugger/graphics_vertex_shader.cpp

@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "citra_qt/debugger/graphics_vertex_shader.h"
 #include <iomanip>
 #include <sstream>
 #include <QBoxLayout>
@@ -15,6 +14,7 @@
 #include <QSignalMapper>
 #include <QSpinBox>
 #include <QTreeView>
+#include "citra_qt/debugger/graphics_vertex_shader.h"
 #include "citra_qt/util/util.h"
 #include "video_core/pica.h"
 #include "video_core/pica_state.h"

src/citra_qt/debugger/profiler.cpp

@@ -2,10 +2,10 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "citra_qt/debugger/profiler.h"
 #include <QMouseEvent>
 #include <QPainter>
 #include <QString>
+#include "citra_qt/debugger/profiler.h"
 #include "citra_qt/util/util.h"
 #include "common/common_types.h"
 #include "common/microprofile.h"

src/citra_qt/debugger/registers.cpp

@@ -2,8 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "citra_qt/debugger/registers.h"
 #include <QTreeWidgetItem>
+#include "citra_qt/debugger/registers.h"
 #include "citra_qt/util/util.h"
 #include "core/arm/arm_interface.h"
 #include "core/core.h"

src/citra_qt/game_list.cpp

@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "game_list.h"
 #include <QHeaderView>
 #include <QThreadPool>
 #include <QVBoxLayout>
@@ -10,6 +9,7 @@
 #include "common/logging/log.h"
 #include "common/string_util.h"
 #include "core/loader/loader.h"
+#include "game_list.h"
 #include "game_list_p.h"
 #include "ui_settings.h"
 

src/citra_qt/hotkeys.cpp

@@ -2,11 +2,11 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "citra_qt/hotkeys.h"
 #include <map>
 #include <QKeySequence>
 #include <QShortcut>
 #include <QtGlobal>
+#include "citra_qt/hotkeys.h"
 #include "citra_qt/ui_settings.h"
 
 struct Hotkey {

src/citra_qt/util/spinbox.cpp

@@ -28,10 +28,10 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "citra_qt/util/spinbox.h"
 #include <cstdlib>
 #include <QLineEdit>
 #include <QRegExpValidator>
+#include "citra_qt/util/spinbox.h"
 #include "common/assert.h"
 
 CSpinBox::CSpinBox(QWidget* parent)

src/citra_qt/util/util.cpp

@@ -2,9 +2,9 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "citra_qt/util/util.h"
 #include <array>
 #include <cmath>
+#include "citra_qt/util/util.h"
 
 QFont GetMonospaceFont() {
     QFont font("monospace");

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 {

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) {

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

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 {
 

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"

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 {

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>

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>

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 {
 

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 {
 

src/core/arm/disassembler/arm_disasm.cpp

@@ -1,10 +1,10 @@
 // Copyright 2006 The Android Open Source Project
 
-#include "core/arm/disassembler/arm_disasm.h"
 #include <string>
 #include <unordered_set>
 #include "common/common_types.h"
 #include "common/string_util.h"
+#include "core/arm/disassembler/arm_disasm.h"
 #include "core/arm/skyeye_common/armsupp.h"
 
 static const char* cond_names[] = {"eq", "ne", "cs", "cc", "mi", "pl", "vs", "vc",

src/core/arm/disassembler/load_symbol_map.cpp

@@ -2,12 +2,12 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/arm/disassembler/load_symbol_map.h"
 #include <sstream>
 #include <string>
 #include <vector>
 #include "common/file_util.h"
 #include "common/symbols.h"
+#include "core/arm/disassembler/load_symbol_map.h"
 
 /*
  * Loads a symbol map file for use with the disassembler

src/core/arm/dynarmic/arm_dynarmic.cpp

@@ -2,10 +2,10 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/arm/dynarmic/arm_dynarmic.h"
 #include <dynarmic/dynarmic.h>
 #include "common/assert.h"
 #include "common/microprofile.h"
+#include "core/arm/dynarmic/arm_dynarmic.h"
 #include "core/arm/dyncom/arm_dyncom_interpreter.h"
 #include "core/core.h"
 #include "core/core_timing.h"

src/core/arm/dyncom/arm_dyncom.cpp

@@ -2,9 +2,9 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/arm/dyncom/arm_dyncom.h"
 #include <cstring>
 #include <memory>
+#include "core/arm/dyncom/arm_dyncom.h"
 #include "core/arm/dyncom/arm_dyncom_interpreter.h"
 #include "core/arm/dyncom/arm_dyncom_run.h"
 #include "core/arm/dyncom/arm_dyncom_trans.h"

src/core/arm/dyncom/arm_dyncom_interpreter.cpp

@@ -4,7 +4,6 @@
 
 #define CITRA_IGNORE_EXIT(x)
 
-#include "core/arm/dyncom/arm_dyncom_interpreter.h"
 #include <algorithm>
 #include <cstdio>
 #include "common/common_types.h"
@@ -12,6 +11,7 @@
 #include "common/microprofile.h"
 #include "core/arm/disassembler/arm_disasm.h"
 #include "core/arm/dyncom/arm_dyncom_dec.h"
+#include "core/arm/dyncom/arm_dyncom_interpreter.h"
 #include "core/arm/dyncom/arm_dyncom_run.h"
 #include "core/arm/dyncom/arm_dyncom_thumb.h"
 #include "core/arm/dyncom/arm_dyncom_trans.h"

src/core/arm/dyncom/arm_dyncom_trans.cpp

@@ -1,8 +1,8 @@
-#include "core/arm/dyncom/arm_dyncom_trans.h"
 #include <cstdlib>
 #include "common/assert.h"
 #include "common/common_types.h"
 #include "core/arm/dyncom/arm_dyncom_interpreter.h"
+#include "core/arm/dyncom/arm_dyncom_trans.h"
 #include "core/arm/skyeye_common/armstate.h"
 #include "core/arm/skyeye_common/armsupp.h"
 #include "core/arm/skyeye_common/vfp/vfp.h"

src/core/arm/skyeye_common/armstate.cpp

@@ -2,10 +2,10 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/arm/skyeye_common/armstate.h"
 #include <algorithm>
 #include "common/logging/log.h"
 #include "common/swap.h"
+#include "core/arm/skyeye_common/armstate.h"
 #include "core/arm/skyeye_common/vfp/vfp.h"
 #include "core/gdbstub/gdbstub.h"
 #include "core/memory.h"

src/core/arm/skyeye_common/armsupp.cpp

@@ -15,10 +15,10 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 
-#include "core/arm/skyeye_common/armsupp.h"
 #include "common/logging/log.h"
 #include "core/arm/skyeye_common/arm_regformat.h"
 #include "core/arm/skyeye_common/armstate.h"
+#include "core/arm/skyeye_common/armsupp.h"
 
 // Unsigned sum of absolute difference
 u8 ARMul_UnsignedAbsoluteDifference(u8 left, u8 right) {

src/core/arm/skyeye_common/vfp/vfp.cpp

@@ -20,12 +20,12 @@
 
 /* Note: this file handles interface with arm core and vfp registers */
 
-#include "core/arm/skyeye_common/vfp/vfp.h"
 #include "common/common_funcs.h"
 #include "common/common_types.h"
 #include "common/logging/log.h"
 #include "core/arm/skyeye_common/armstate.h"
 #include "core/arm/skyeye_common/vfp/asm_vfp.h"
+#include "core/arm/skyeye_common/vfp/vfp.h"
 
 void VFPInit(ARMul_State* state) {
     state->VFP[VFP_FPSID] = VFP_FPSID_IMPLMEN << 24 | VFP_FPSID_SW << 23 | VFP_FPSID_SUBARCH << 16 |

src/core/arm/skyeye_common/vfp/vfpdouble.cpp

@@ -51,10 +51,10 @@
  * ===========================================================================
  */
 
-#include "core/arm/skyeye_common/vfp/vfp.h"
 #include <algorithm>
 #include "common/logging/log.h"
 #include "core/arm/skyeye_common/vfp/asm_vfp.h"
+#include "core/arm/skyeye_common/vfp/vfp.h"
 #include "core/arm/skyeye_common/vfp/vfp_helper.h"
 
 static struct vfp_double vfp_double_default_qnan = {

src/core/arm/skyeye_common/vfp/vfpsingle.cpp

@@ -51,13 +51,13 @@
  * ===========================================================================
  */
 
-#include "core/arm/skyeye_common/vfp/vfp.h"
 #include <algorithm>
 #include <cinttypes>
 #include "common/common_funcs.h"
 #include "common/common_types.h"
 #include "common/logging/log.h"
 #include "core/arm/skyeye_common/vfp/asm_vfp.h"
+#include "core/arm/skyeye_common/vfp/vfp.h"
 #include "core/arm/skyeye_common/vfp/vfp_helper.h"
 
 static struct vfp_single vfp_single_default_qnan = {

src/core/core.cpp

@@ -2,12 +2,12 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/core.h"
 #include <memory>
 #include "common/logging/log.h"
 #include "core/arm/arm_interface.h"
 #include "core/arm/dynarmic/arm_dynarmic.h"
 #include "core/arm/dyncom/arm_dyncom.h"
+#include "core/core.h"
 #include "core/core_timing.h"
 #include "core/gdbstub/gdbstub.h"
 #include "core/hle/hle.h"

src/core/core_timing.cpp

@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/core.h"
 #include <atomic>
 #include <cinttypes>
 #include <mutex>
@@ -11,6 +10,7 @@
 #include "common/logging/log.h"
 #include "common/string_util.h"
 #include "core/arm/arm_interface.h"
+#include "core/core.h"
 #include "core/core_timing.h"
 
 int g_clock_rate_arm11 = 268123480;

src/core/file_sys/archive_backend.cpp

@@ -2,12 +2,12 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/file_sys/archive_backend.h"
 #include <cstddef>
 #include <iomanip>
 #include <sstream>
 #include "common/logging/log.h"
 #include "common/string_util.h"
+#include "core/file_sys/archive_backend.h"
 #include "core/memory.h"
 
 namespace FileSys {

src/core/file_sys/archive_extsavedata.cpp

@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/file_sys/archive_extsavedata.h"
 #include <algorithm>
 #include <memory>
 #include <vector>
@@ -10,6 +9,7 @@
 #include "common/file_util.h"
 #include "common/logging/log.h"
 #include "common/string_util.h"
+#include "core/file_sys/archive_extsavedata.h"
 #include "core/file_sys/disk_archive.h"
 #include "core/hle/service/fs/archive.h"
 

src/core/file_sys/archive_romfs.cpp

@@ -2,11 +2,11 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/file_sys/archive_romfs.h"
 #include <algorithm>
 #include <memory>
 #include "common/common_types.h"
 #include "common/logging/log.h"
+#include "core/file_sys/archive_romfs.h"
 #include "core/file_sys/ivfc_archive.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////

src/core/file_sys/archive_savedata.cpp

@@ -2,13 +2,13 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/file_sys/archive_savedata.h"
 #include <algorithm>
 #include <memory>
 #include "common/common_types.h"
 #include "common/file_util.h"
 #include "common/logging/log.h"
 #include "common/string_util.h"
+#include "core/file_sys/archive_savedata.h"
 #include "core/file_sys/disk_archive.h"
 #include "core/hle/kernel/process.h"
 #include "core/hle/service/fs/archive.h"

src/core/file_sys/archive_savedatacheck.cpp

@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/file_sys/archive_savedatacheck.h"
 #include <algorithm>
 #include <memory>
 #include <vector>
@@ -10,6 +9,7 @@
 #include "common/file_util.h"
 #include "common/logging/log.h"
 #include "common/string_util.h"
+#include "core/file_sys/archive_savedatacheck.h"
 #include "core/file_sys/ivfc_archive.h"
 #include "core/hle/service/fs/archive.h"
 

src/core/file_sys/archive_sdmc.cpp

@@ -2,11 +2,11 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/file_sys/archive_sdmc.h"
 #include <algorithm>
 #include <memory>
 #include "common/file_util.h"
 #include "common/logging/log.h"
+#include "core/file_sys/archive_sdmc.h"
 #include "core/file_sys/disk_archive.h"
 #include "core/settings.h"
 

src/core/file_sys/archive_systemsavedata.cpp

@@ -2,13 +2,13 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/file_sys/archive_systemsavedata.h"
 #include <algorithm>
 #include <memory>
 #include <vector>
 #include "common/common_types.h"
 #include "common/file_util.h"
 #include "common/string_util.h"
+#include "core/file_sys/archive_systemsavedata.h"
 #include "core/file_sys/disk_archive.h"
 #include "core/hle/service/fs/archive.h"
 

src/core/file_sys/disk_archive.cpp

@@ -2,13 +2,13 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/file_sys/disk_archive.h"
 #include <algorithm>
 #include <cstdio>
 #include <memory>
 #include "common/common_types.h"
 #include "common/file_util.h"
 #include "common/logging/log.h"
+#include "core/file_sys/disk_archive.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // FileSys namespace

src/core/file_sys/ivfc_archive.cpp

@@ -2,11 +2,11 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/file_sys/ivfc_archive.h"
 #include <cstring>
 #include <memory>
 #include "common/common_types.h"
 #include "common/logging/log.h"
+#include "core/file_sys/ivfc_archive.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // FileSys namespace

src/core/hle/applets/applet.cpp

@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/applets/applet.h"
 #include <cstddef>
 #include <memory>
 #include <type_traits>
@@ -10,6 +9,7 @@
 #include "common/assert.h"
 #include "common/common_types.h"
 #include "core/core_timing.h"
+#include "core/hle/applets/applet.h"
 #include "core/hle/applets/erreula.h"
 #include "core/hle/applets/mii_selector.h"
 #include "core/hle/applets/swkbd.h"

src/core/hle/applets/erreula.cpp

@@ -2,8 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/applets/erreula.h"
 #include "common/string_util.h"
+#include "core/hle/applets/erreula.h"
 #include "core/hle/service/apt/apt.h"
 
 namespace HLE {

src/core/hle/applets/mii_selector.cpp

@@ -2,12 +2,12 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/applets/mii_selector.h"
 #include <cstring>
 #include <string>
 #include "common/assert.h"
 #include "common/logging/log.h"
 #include "common/string_util.h"
+#include "core/hle/applets/mii_selector.h"
 #include "core/hle/kernel/kernel.h"
 #include "core/hle/kernel/shared_memory.h"
 #include "core/hle/result.h"

src/core/hle/applets/swkbd.cpp

@@ -2,12 +2,12 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/applets/swkbd.h"
 #include <cstring>
 #include <string>
 #include "common/assert.h"
 #include "common/logging/log.h"
 #include "common/string_util.h"
+#include "core/hle/applets/swkbd.h"
 #include "core/hle/kernel/kernel.h"
 #include "core/hle/kernel/shared_memory.h"
 #include "core/hle/result.h"

src/core/hle/config_mem.cpp

@@ -2,8 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/config_mem.h"
 #include <cstring>
+#include "core/hle/config_mem.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 

src/core/hle/hle.cpp

@@ -2,11 +2,11 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/hle.h"
 #include "common/assert.h"
 #include "common/logging/log.h"
 #include "core/arm/arm_interface.h"
 #include "core/core.h"
+#include "core/hle/hle.h"
 #include "core/hle/service/service.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////

src/core/hle/kernel/address_arbiter.cpp

@@ -2,10 +2,10 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/kernel/address_arbiter.h"
 #include "common/common_types.h"
 #include "common/logging/log.h"
 #include "core/hle/hle.h"
+#include "core/hle/kernel/address_arbiter.h"
 #include "core/hle/kernel/thread.h"
 #include "core/memory.h"
 

src/core/hle/kernel/client_port.cpp

@@ -2,8 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/kernel/client_port.h"
 #include "common/assert.h"
+#include "core/hle/kernel/client_port.h"
 #include "core/hle/kernel/kernel.h"
 #include "core/hle/kernel/server_port.h"
 

src/core/hle/kernel/event.cpp

@@ -2,11 +2,11 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/kernel/event.h"
 #include <algorithm>
 #include <map>
 #include <vector>
 #include "common/assert.h"
+#include "core/hle/kernel/event.h"
 #include "core/hle/kernel/kernel.h"
 #include "core/hle/kernel/thread.h"
 

src/core/hle/kernel/kernel.cpp

@@ -2,11 +2,11 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/kernel/kernel.h"
 #include <algorithm>
 #include "common/assert.h"
 #include "common/logging/log.h"
 #include "core/hle/config_mem.h"
+#include "core/hle/kernel/kernel.h"
 #include "core/hle/kernel/memory.h"
 #include "core/hle/kernel/process.h"
 #include "core/hle/kernel/resource_limit.h"

src/core/hle/kernel/memory.cpp

@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/kernel/memory.h"
 #include <map>
 #include <memory>
 #include <utility>
@@ -11,6 +10,7 @@
 #include "common/common_types.h"
 #include "common/logging/log.h"
 #include "core/hle/config_mem.h"
+#include "core/hle/kernel/memory.h"
 #include "core/hle/kernel/vm_manager.h"
 #include "core/hle/result.h"
 #include "core/hle/shared_page.h"

src/core/hle/kernel/mutex.cpp

@@ -2,12 +2,12 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/kernel/mutex.h"
 #include <map>
 #include <vector>
 #include <boost/range/algorithm_ext/erase.hpp>
 #include "common/assert.h"
 #include "core/hle/kernel/kernel.h"
+#include "core/hle/kernel/mutex.h"
 #include "core/hle/kernel/thread.h"
 
 namespace Kernel {

src/core/hle/kernel/process.cpp

@@ -2,12 +2,12 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/kernel/process.h"
 #include <memory>
 #include "common/assert.h"
 #include "common/common_funcs.h"
 #include "common/logging/log.h"
 #include "core/hle/kernel/memory.h"
+#include "core/hle/kernel/process.h"
 #include "core/hle/kernel/resource_limit.h"
 #include "core/hle/kernel/thread.h"
 #include "core/hle/kernel/vm_manager.h"

src/core/hle/kernel/resource_limit.cpp

@@ -2,9 +2,9 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/kernel/resource_limit.h"
 #include <cstring>
 #include "common/logging/log.h"
+#include "core/hle/kernel/resource_limit.h"
 
 namespace Kernel {
 

src/core/hle/kernel/semaphore.cpp

@@ -2,9 +2,9 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/kernel/semaphore.h"
 #include "common/assert.h"
 #include "core/hle/kernel/kernel.h"
+#include "core/hle/kernel/semaphore.h"
 #include "core/hle/kernel/thread.h"
 
 namespace Kernel {

src/core/hle/kernel/server_port.cpp

@@ -2,11 +2,11 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/kernel/server_port.h"
 #include <tuple>
 #include "common/assert.h"
 #include "core/hle/kernel/client_port.h"
 #include "core/hle/kernel/kernel.h"
+#include "core/hle/kernel/server_port.h"
 #include "core/hle/kernel/thread.h"
 
 namespace Kernel {

src/core/hle/kernel/shared_memory.cpp

@@ -2,10 +2,10 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/kernel/shared_memory.h"
 #include <cstring>
 #include "common/logging/log.h"
 #include "core/hle/kernel/memory.h"
+#include "core/hle/kernel/shared_memory.h"
 #include "core/memory.h"
 
 namespace Kernel {

src/core/hle/kernel/thread.cpp

@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/kernel/thread.h"
 #include <algorithm>
 #include <list>
 #include <vector>
@@ -20,6 +19,7 @@
 #include "core/hle/kernel/memory.h"
 #include "core/hle/kernel/mutex.h"
 #include "core/hle/kernel/process.h"
+#include "core/hle/kernel/thread.h"
 #include "core/hle/result.h"
 #include "core/memory.h"
 

src/core/hle/kernel/timer.cpp

@@ -2,13 +2,13 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/kernel/timer.h"
 #include <cinttypes>
 #include "common/assert.h"
 #include "common/logging/log.h"
 #include "core/core_timing.h"
 #include "core/hle/kernel/kernel.h"
 #include "core/hle/kernel/thread.h"
+#include "core/hle/kernel/timer.h"
 
 namespace Kernel {
 

src/core/hle/kernel/vm_manager.cpp

@@ -2,9 +2,9 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/kernel/vm_manager.h"
 #include <iterator>
 #include "common/assert.h"
+#include "core/hle/kernel/vm_manager.h"
 #include "core/memory.h"
 #include "core/memory_setup.h"
 #include "core/mmio.h"

src/core/hle/service/ac_u.cpp

@@ -2,9 +2,9 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/service/ac_u.h"
 #include "common/logging/log.h"
 #include "core/hle/kernel/event.h"
+#include "core/hle/service/ac_u.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // Namespace AC_U

src/core/hle/service/am/am.cpp

@@ -2,9 +2,9 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/service/am/am.h"
 #include <cinttypes>
 #include "common/logging/log.h"
+#include "core/hle/service/am/am.h"
 #include "core/hle/service/am/am_app.h"
 #include "core/hle/service/am/am_net.h"
 #include "core/hle/service/am/am_sys.h"

src/core/hle/service/am/am_app.cpp

@@ -2,8 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/service/am/am_app.h"
 #include "core/hle/service/am/am.h"
+#include "core/hle/service/am/am_app.h"
 
 namespace Service {
 namespace AM {

src/core/hle/service/am/am_net.cpp

@@ -2,8 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/service/am/am_net.h"
 #include "core/hle/service/am/am.h"
+#include "core/hle/service/am/am_net.h"
 
 namespace Service {
 namespace AM {

src/core/hle/service/am/am_sys.cpp

@@ -2,8 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/service/am/am_sys.h"
 #include "core/hle/service/am/am.h"
+#include "core/hle/service/am/am_sys.h"
 
 namespace Service {
 namespace AM {

src/core/hle/service/am/am_u.cpp

@@ -2,8 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/service/am/am_u.h"
 #include "core/hle/service/am/am.h"
+#include "core/hle/service/am/am_u.h"
 
 namespace Service {
 namespace AM {

src/core/hle/service/apt/apt.cpp

@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/service/apt/apt.h"
 #include "common/common_paths.h"
 #include "common/file_util.h"
 #include "common/logging/log.h"
@@ -11,6 +10,7 @@
 #include "core/hle/kernel/mutex.h"
 #include "core/hle/kernel/process.h"
 #include "core/hle/kernel/shared_memory.h"
+#include "core/hle/service/apt/apt.h"
 #include "core/hle/service/apt/apt_a.h"
 #include "core/hle/service/apt/apt_s.h"
 #include "core/hle/service/apt/apt_u.h"

src/core/hle/service/apt/apt_a.cpp

@@ -2,8 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/service/apt/apt_a.h"
 #include "core/hle/service/apt/apt.h"
+#include "core/hle/service/apt/apt_a.h"
 
 namespace Service {
 namespace APT {

src/core/hle/service/apt/apt_s.cpp

@@ -2,8 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/service/apt/apt_s.h"
 #include "core/hle/service/apt/apt.h"
+#include "core/hle/service/apt/apt_s.h"
 
 namespace Service {
 namespace APT {

src/core/hle/service/apt/apt_u.cpp

@@ -2,8 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/service/apt/apt_u.h"
 #include "core/hle/service/apt/apt.h"
+#include "core/hle/service/apt/apt_u.h"
 
 namespace Service {
 namespace APT {

src/core/hle/service/cam/cam.cpp

@@ -2,9 +2,9 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/service/cam/cam.h"
 #include "common/logging/log.h"
 #include "core/hle/kernel/event.h"
+#include "core/hle/service/cam/cam.h"
 #include "core/hle/service/cam/cam_c.h"
 #include "core/hle/service/cam/cam_q.h"
 #include "core/hle/service/cam/cam_s.h"

src/core/hle/service/cam/cam_u.cpp

@@ -2,8 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/service/cam/cam_u.h"
 #include "core/hle/service/cam/cam.h"
+#include "core/hle/service/cam/cam_u.h"
 
 namespace Service {
 namespace CAM {

src/core/hle/service/cecd/cecd.cpp

@@ -2,9 +2,9 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/service/cecd/cecd.h"
 #include "common/logging/log.h"
 #include "core/hle/kernel/event.h"
+#include "core/hle/service/cecd/cecd.h"
 #include "core/hle/service/cecd/cecd_s.h"
 #include "core/hle/service/cecd/cecd_u.h"
 #include "core/hle/service/service.h"

src/core/hle/service/cecd/cecd_u.cpp

@@ -2,8 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/service/cecd/cecd_u.h"
 #include "core/hle/service/cecd/cecd.h"
+#include "core/hle/service/cecd/cecd_u.h"
 
 namespace Service {
 namespace CECD {

src/core/hle/service/cfg/cfg.cpp

@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/service/cfg/cfg.h"
 #include <algorithm>
 #include "common/file_util.h"
 #include "common/logging/log.h"
@@ -11,6 +10,7 @@
 #include "core/file_sys/archive_systemsavedata.h"
 #include "core/file_sys/file_backend.h"
 #include "core/hle/result.h"
+#include "core/hle/service/cfg/cfg.h"
 #include "core/hle/service/cfg/cfg_i.h"
 #include "core/hle/service/cfg/cfg_s.h"
 #include "core/hle/service/cfg/cfg_u.h"

src/core/hle/service/cfg/cfg_i.cpp

@@ -2,8 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/service/cfg/cfg_i.h"
 #include "core/hle/service/cfg/cfg.h"
+#include "core/hle/service/cfg/cfg_i.h"
 
 namespace Service {
 namespace CFG {

src/core/hle/service/cfg/cfg_s.cpp

@@ -2,8 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/service/cfg/cfg_s.h"
 #include "core/hle/service/cfg/cfg.h"
+#include "core/hle/service/cfg/cfg_s.h"
 
 namespace Service {
 namespace CFG {

src/core/hle/service/cfg/cfg_u.cpp

@@ -2,8 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/hle/service/cfg/cfg_u.h"
 #include "core/hle/service/cfg/cfg.h"
+#include "core/hle/service/cfg/cfg_u.h"
 
 namespace Service {
 namespace CFG {