diff --git a/src/core/file_sys/nca_patch.cpp b/src/core/file_sys/nca_patch.cpp
index e0111bffc4cc5ba6ee842b7967adc64a4f3fb5df..6fc5bd7d860449ca1b33fcb3624324fece5145fb 100644
--- a/src/core/file_sys/nca_patch.cpp
+++ b/src/core/file_sys/nca_patch.cpp
@@ -2,6 +2,10 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include <algorithm>
+#include <cstddef>
+#include <cstring>
+
 #include "common/assert.h"
 #include "core/crypto/aes_util.h"
 #include "core/file_sys/nca_patch.h"
@@ -13,9 +17,9 @@ BKTR::BKTR(VirtualFile base_romfs_, VirtualFile bktr_romfs_, RelocationBlock rel
            std::vector<SubsectionBucket> subsection_buckets_, bool is_encrypted_,
            Core::Crypto::Key128 key_, u64 base_offset_, u64 ivfc_offset_,
            std::array<u8, 8> section_ctr_)
-    : base_romfs(std::move(base_romfs_)), bktr_romfs(std::move(bktr_romfs_)),
-      relocation(relocation_), relocation_buckets(std::move(relocation_buckets_)),
+    : relocation(relocation_), relocation_buckets(std::move(relocation_buckets_)),
       subsection(subsection_), subsection_buckets(std::move(subsection_buckets_)),
+      base_romfs(std::move(base_romfs_)), bktr_romfs(std::move(bktr_romfs_)),
       encrypted(is_encrypted_), key(key_), base_offset(base_offset_), ivfc_offset(ivfc_offset_),
       section_ctr(section_ctr_) {
     for (size_t i = 0; i < relocation.number_buckets - 1; ++i) {
diff --git a/src/core/file_sys/nca_patch.h b/src/core/file_sys/nca_patch.h
index 0d9ad95f53e66b619c494d20daeaeac12d761327..381f3504fb8ec395d291acda44856878ea6aa268 100644
--- a/src/core/file_sys/nca_patch.h
+++ b/src/core/file_sys/nca_patch.h
@@ -5,10 +5,13 @@
 #pragma once
 
 #include <array>
+#include <memory>
 #include <vector>
-#include <common/common_funcs.h>
+
+#include "common/common_funcs.h"
+#include "common/common_types.h"
+#include "common/swap.h"
 #include "core/crypto/key_manager.h"
-#include "core/file_sys/romfs.h"
 
 namespace FileSys {
 
diff --git a/src/core/file_sys/patch_manager.cpp b/src/core/file_sys/patch_manager.cpp
index 40675de35bd0a15b7eafe6faa029f5aaeb1c3c43..6cecab336a1c59e0692d72f627025718ddc5281b 100644
--- a/src/core/file_sys/patch_manager.cpp
+++ b/src/core/file_sys/patch_manager.cpp
@@ -2,6 +2,10 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include <array>
+#include <cstddef>
+
+#include "common/logging/log.h"
 #include "core/file_sys/content_archive.h"
 #include "core/file_sys/control_metadata.h"
 #include "core/file_sys/patch_manager.h"
diff --git a/src/core/file_sys/patch_manager.h b/src/core/file_sys/patch_manager.h
index 28c7ae1363460abdaee8c718cefc2de1f7478a52..b521977b21dc61046d7bd07e6be8756ddbd925dd 100644
--- a/src/core/file_sys/patch_manager.h
+++ b/src/core/file_sys/patch_manager.h
@@ -5,6 +5,7 @@
 #pragma once
 
 #include <map>
+#include <memory>
 #include <string>
 #include "common/common_types.h"
 #include "core/file_sys/nca_metadata.h"