1 files changed, 11 insertions, 8 deletions
diff --git a/src/core/loader/nca.h b/src/core/loader/nca.h
index 52c95953a..326f84857 100644
--- a/src/core/loader/nca.h
+++ b/src/core/loader/nca.h
@@ -4,19 +4,24 @@
 
 #pragma once
 
-#include <string>
 #include "common/common_types.h"
-#include "core/file_sys/content_archive.h"
-#include "core/file_sys/program_metadata.h"
-#include "core/hle/kernel/kernel.h"
+#include "core/file_sys/vfs.h"
+#include "core/hle/kernel/object.h"
 #include "core/loader/loader.h"
 
+namespace FileSys {
+class NCA;
+}
+
 namespace Loader {
 
+class AppLoader_DeconstructedRomDirectory;
+
 /// Loads an NCA file
 class AppLoader_NCA final : public AppLoader {
 public:
     explicit AppLoader_NCA(FileSys::VirtualFile file);
+    ~AppLoader_NCA() override;
 
     /**
      * Returns the type of the file
@@ -32,13 +37,11 @@ public:
     ResultStatus Load(Kernel::SharedPtr<Kernel::Process>& process) override;
 
     ResultStatus ReadRomFS(FileSys::VirtualFile& dir) override;
-
-    ~AppLoader_NCA();
+    ResultStatus ReadProgramId(u64& out_program_id) override;
 
 private:
-    FileSys::ProgramMetadata metadata;
-
     std::unique_ptr<FileSys::NCA> nca;
+    std::unique_ptr<AppLoader_DeconstructedRomDirectory> directory_loader;
 };
 
 } // namespace Loader