file_sys: Cut down on includes and copies

2 files changed, 11 insertions, 4 deletions

diff --git a/src/core/loader/nax.cpp b/src/core/loader/nax.cpp
index 76390bf46..b35fdc3f8 100644
--- a/src/core/loader/nax.cpp
+++ b/src/core/loader/nax.cpp
@@ -6,8 +6,10 @@
 #include "core/core.h"
 #include "core/file_sys/content_archive.h"
 #include "core/file_sys/romfs.h"
+#include "core/file_sys/xts_archive.h"
 #include "core/hle/kernel/process.h"
 #include "core/loader/nax.h"
+#include "core/loader/nca.h"
 
 namespace Loader {
 
diff --git a/src/core/loader/nax.h b/src/core/loader/nax.h
index 08d6ef346..4dbae2918 100644
--- a/src/core/loader/nax.h
+++ b/src/core/loader/nax.h
@@ -6,18 +6,23 @@
 
 #include <memory>
 #include "common/common_types.h"
-#include "core/file_sys/card_image.h"
-#include "core/file_sys/xts_archive.h"
 #include "core/loader/loader.h"
-#include "core/loader/nca.h"
+
+namespace FileSys {
+
+class NAX;
+
+} // namespace FileSys
 
 namespace Loader {
 
+class AppLoader_NCA;
+
 /// Loads a NAX file
 class AppLoader_NAX final : public AppLoader {
 public:
     explicit AppLoader_NAX(FileSys::VirtualFile file);
-    ~AppLoader_NAX();
+    ~AppLoader_NAX() override;
 
     /**
      * Returns the type of the file