10 files changed, 4 insertions, 21 deletions

diff --git a/src/core/loader/3dsx.cpp b/src/core/loader/3dsx.cpp
index c2e87f592..212772c5d 100644
--- a/src/core/loader/3dsx.cpp
+++ b/src/core/loader/3dsx.cpp
@@ -2,16 +2,14 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include "core/loader/3dsx.h"
 #include <algorithm>
 #include <vector>
-
 #include "common/logging/log.h"
-
 #include "core/file_sys/archive_romfs.h"
 #include "core/hle/kernel/process.h"
 #include "core/hle/kernel/resource_limit.h"
 #include "core/hle/service/fs/archive.h"
-#include "core/loader/3dsx.h"
 #include "core/memory.h"
 
 namespace Loader {
diff --git a/src/core/loader/3dsx.h b/src/core/loader/3dsx.h
index 8d15ba555..cfcc21cc4 100644
--- a/src/core/loader/3dsx.h
+++ b/src/core/loader/3dsx.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include <string>
-
 #include "common/common_types.h"
 #include "core/loader/loader.h"
 
diff --git a/src/core/loader/elf.cpp b/src/core/loader/elf.cpp
index 53c10a456..0f4148a59 100644
--- a/src/core/loader/elf.cpp
+++ b/src/core/loader/elf.cpp
@@ -2,18 +2,16 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include "core/loader/elf.h"
 #include <cstring>
 #include <memory>
 #include <string>
-
 #include "common/common_types.h"
 #include "common/file_util.h"
 #include "common/logging/log.h"
 #include "common/symbols.h"
-
 #include "core/hle/kernel/process.h"
 #include "core/hle/kernel/resource_limit.h"
-#include "core/loader/elf.h"
 #include "core/memory.h"
 
 using Kernel::SharedPtr;
diff --git a/src/core/loader/elf.h b/src/core/loader/elf.h
index 04a9b482d..584bf6e27 100644
--- a/src/core/loader/elf.h
+++ b/src/core/loader/elf.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include <string>
-
 #include "common/common_types.h"
 #include "core/loader/loader.h"
 
diff --git a/src/core/loader/loader.cpp b/src/core/loader/loader.cpp
index b392bf544..147bf8591 100644
--- a/src/core/loader/loader.cpp
+++ b/src/core/loader/loader.cpp
@@ -4,10 +4,8 @@
 
 #include <memory>
 #include <string>
-
 #include "common/logging/log.h"
 #include "common/string_util.h"
-
 #include "core/hle/kernel/process.h"
 #include "core/loader/3dsx.h"
 #include "core/loader/elf.h"
diff --git a/src/core/loader/loader.h b/src/core/loader/loader.h
index fdfee835c..9652d7ac5 100644
--- a/src/core/loader/loader.h
+++ b/src/core/loader/loader.h
@@ -9,7 +9,6 @@
 #include <memory>
 #include <string>
 #include <vector>
-
 #include "common/common_types.h"
 #include "common/file_util.h"
 
diff --git a/src/core/loader/ncch.cpp b/src/core/loader/ncch.cpp
index 5b996d671..64c8fef07 100644
--- a/src/core/loader/ncch.cpp
+++ b/src/core/loader/ncch.cpp
@@ -2,19 +2,17 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include "core/loader/ncch.h"
 #include <algorithm>
 #include <cstring>
 #include <memory>
-
 #include "common/logging/log.h"
 #include "common/string_util.h"
 #include "common/swap.h"
-
 #include "core/file_sys/archive_romfs.h"
 #include "core/hle/kernel/process.h"
 #include "core/hle/kernel/resource_limit.h"
 #include "core/hle/service/fs/archive.h"
-#include "core/loader/ncch.h"
 #include "core/memory.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/core/loader/ncch.h b/src/core/loader/ncch.h
index f53f8100e..04350d006 100644
--- a/src/core/loader/ncch.h
+++ b/src/core/loader/ncch.h
@@ -5,11 +5,9 @@
 #pragma once
 
 #include <memory>
-
 #include "common/bit_field.h"
 #include "common/common_types.h"
 #include "common/swap.h"
-
 #include "core/loader/loader.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/core/loader/smdh.cpp b/src/core/loader/smdh.cpp
index 2d014054a..7c875131f 100644
--- a/src/core/loader/smdh.cpp
+++ b/src/core/loader/smdh.cpp
@@ -2,14 +2,11 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include "core/loader/smdh.h"
 #include <cstring>
 #include <vector>
-
 #include "common/common_types.h"
-
 #include "core/loader/loader.h"
-#include "core/loader/smdh.h"
-
 #include "video_core/utils.h"
 
 namespace Loader {
diff --git a/src/core/loader/smdh.h b/src/core/loader/smdh.h
index ab665ea82..ac7726c8f 100644
--- a/src/core/loader/smdh.h
+++ b/src/core/loader/smdh.h
@@ -6,7 +6,6 @@
 
 #include <array>
 #include <vector>
-
 #include "common/common_funcs.h"
 #include "common/common_types.h"
 #include "common/swap.h"