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.

src/core/file_sys/archive_backend.cpp

@@ -2,14 +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_backend.h

@@ -8,11 +8,9 @@
 #include <string>
 #include <utility>
 #include <vector>
-
 #include "common/bit_field.h"
 #include "common/common_types.h"
 #include "common/swap.h"
-
 #include "core/hle/result.h"
 
 namespace FileSys {

src/core/file_sys/archive_extsavedata.cpp

@@ -2,16 +2,14 @@
 // 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>
-
 #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_extsavedata.h"
 #include "core/file_sys/disk_archive.h"
 #include "core/hle/service/fs/archive.h"
 

src/core/file_sys/archive_extsavedata.h

@@ -6,9 +6,7 @@
 
 #include <memory>
 #include <string>
-
 #include "common/common_types.h"
-
 #include "core/file_sys/archive_backend.h"
 #include "core/hle/result.h"
 

src/core/file_sys/archive_romfs.cpp

@@ -2,13 +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_romfs.h

@@ -7,9 +7,7 @@
 #include <memory>
 #include <string>
 #include <vector>
-
 #include "common/common_types.h"
-
 #include "core/file_sys/archive_backend.h"
 #include "core/hle/result.h"
 #include "core/loader/loader.h"

src/core/file_sys/archive_savedata.cpp

@@ -2,15 +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_savedata.h

@@ -6,7 +6,6 @@
 
 #include <memory>
 #include <string>
-
 #include "core/file_sys/archive_backend.h"
 #include "core/hle/result.h"
 

src/core/file_sys/archive_savedatacheck.cpp

@@ -2,16 +2,14 @@
 // 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>
-
 #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_savedatacheck.h"
 #include "core/file_sys/ivfc_archive.h"
 #include "core/hle/service/fs/archive.h"
 

src/core/file_sys/archive_savedatacheck.h

@@ -6,7 +6,6 @@
 
 #include <memory>
 #include <string>
-
 #include "core/file_sys/archive_backend.h"
 #include "core/hle/result.h"
 

src/core/file_sys/archive_sdmc.cpp

@@ -2,13 +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_sdmc.h

@@ -6,7 +6,6 @@
 
 #include <memory>
 #include <string>
-
 #include "core/file_sys/archive_backend.h"
 #include "core/hle/result.h"
 

src/core/file_sys/archive_systemsavedata.cpp

@@ -2,15 +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/archive_systemsavedata.h

@@ -6,9 +6,7 @@
 
 #include <memory>
 #include <string>
-
 #include "common/common_types.h"
-
 #include "core/file_sys/archive_backend.h"
 #include "core/hle/result.h"
 

src/core/file_sys/directory_backend.h

@@ -6,7 +6,6 @@
 
 #include <array>
 #include <cstddef>
-
 #include "common/common_types.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////

src/core/file_sys/disk_archive.cpp

@@ -2,16 +2,14 @@
 // 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/disk_archive.h

@@ -8,10 +8,8 @@
 #include <memory>
 #include <string>
 #include <vector>
-
 #include "common/common_types.h"
 #include "common/file_util.h"
-
 #include "core/file_sys/archive_backend.h"
 #include "core/file_sys/directory_backend.h"
 #include "core/file_sys/file_backend.h"

src/core/file_sys/file_backend.h

@@ -5,7 +5,6 @@
 #pragma once
 
 #include <cstddef>
-
 #include "common/common_types.h"
 #include "core/hle/result.h"
 

src/core/file_sys/ivfc_archive.cpp

@@ -2,14 +2,12 @@
 // 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/file_sys/ivfc_archive.h

@@ -8,10 +8,8 @@
 #include <memory>
 #include <string>
 #include <vector>
-
 #include "common/common_types.h"
 #include "common/file_util.h"
-
 #include "core/file_sys/archive_backend.h"
 #include "core/file_sys/directory_backend.h"
 #include "core/file_sys/file_backend.h"