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.

3 files changed, 2 insertions, 8 deletions

diff --git a/src/core/hle/service/fs/archive.cpp b/src/core/hle/service/fs/archive.cpp
index 77fe5ab6c..b945b255e 100644
--- a/src/core/hle/service/fs/archive.cpp
+++ b/src/core/hle/service/fs/archive.cpp
@@ -2,20 +2,18 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include "core/hle/service/fs/archive.h"
 #include <cstddef>
 #include <memory>
 #include <system_error>
 #include <type_traits>
 #include <unordered_map>
 #include <utility>
-
 #include <boost/container/flat_map.hpp>
-
 #include "common/assert.h"
 #include "common/common_types.h"
 #include "common/file_util.h"
 #include "common/logging/log.h"
-
 #include "core/file_sys/archive_backend.h"
 #include "core/file_sys/archive_extsavedata.h"
 #include "core/file_sys/archive_savedata.h"
@@ -26,7 +24,6 @@
 #include "core/file_sys/file_backend.h"
 #include "core/hle/hle.h"
 #include "core/hle/result.h"
-#include "core/hle/service/fs/archive.h"
 #include "core/hle/service/fs/fs_user.h"
 #include "core/hle/service/service.h"
 #include "core/memory.h"
diff --git a/src/core/hle/service/fs/archive.h b/src/core/hle/service/fs/archive.h
index aad540ff9..533be34a4 100644
--- a/src/core/hle/service/fs/archive.h
+++ b/src/core/hle/service/fs/archive.h
@@ -6,9 +6,7 @@
 
 #include <memory>
 #include <string>
-
 #include "common/common_types.h"
-
 #include "core/file_sys/archive_backend.h"
 #include "core/hle/kernel/session.h"
 #include "core/hle/result.h"
diff --git a/src/core/hle/service/fs/fs_user.cpp b/src/core/hle/service/fs/fs_user.cpp
index 605832214..92578270b 100644
--- a/src/core/hle/service/fs/fs_user.cpp
+++ b/src/core/hle/service/fs/fs_user.cpp
@@ -2,16 +2,15 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include "core/hle/service/fs/fs_user.h"
 #include "common/assert.h"
 #include "common/common_types.h"
 #include "common/file_util.h"
 #include "common/logging/log.h"
 #include "common/scope_exit.h"
 #include "common/string_util.h"
-
 #include "core/hle/result.h"
 #include "core/hle/service/fs/archive.h"
-#include "core/hle/service/fs/fs_user.h"
 #include "core/settings.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////