diff --git a/src/core/file_sys/nca_patch.cpp b/src/core/file_sys/nca_patch.cpp
index e0111bffc4cc5ba6ee842b7967adc64a4f3fb5df..4836706bb7c243bc9517e5c62f1f46d1c2db9a5d 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"
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 {