1 files changed, 3 insertions, 10 deletions
diff --git a/src/core/loader/loader.h b/src/core/loader/loader.h
index cfdadbee3..b74cfbf8a 100644
--- a/src/core/loader/loader.h
+++ b/src/core/loader/loader.h
@@ -5,7 +5,7 @@
 #pragma once
 
 #include <algorithm>
-#include <initializer_list>
+#include <iosfwd>
 #include <memory>
 #include <string>
 #include <utility>
@@ -56,7 +56,7 @@ FileType GuessFromFilename(const std::string& name);
 std::string GetFileTypeString(FileType type);
 
 /// Return type for functions in Loader namespace
-enum class ResultStatus {
+enum class ResultStatus : u16 {
     Success,
     ErrorAlreadyLoaded,
     ErrorNotImplemented,
@@ -95,8 +95,7 @@ enum class ResultStatus {
     ErrorNoControl,
 };
 
-std::string GetMessageForResultStatus(ResultStatus status);
-std::string GetMessageForResultStatus(u16 status);
+std::ostream& operator<<(std::ostream& os, ResultStatus status);
 
 /// Interface for loading an application
 class AppLoader : NonCopyable {
@@ -208,12 +207,6 @@ protected:
 };
 
 /**
- * Common address mappings found in most games, used for binary formats that don't have this
- * information.
- */
-extern const std::initializer_list<Kernel::AddressMapping> default_address_mappings;
-
-/**
  * Identifies a bootable file and return a suitable loader
  * @param file The bootable file
  * @return the best loader for this file