diff --git a/stratosphere/libstratosphere/include/stratosphere/results/fs_results.hpp b/stratosphere/libstratosphere/include/stratosphere/results/fs_results.hpp
index 4bb0b89a0..8dd66d3d9 100644
--- a/stratosphere/libstratosphere/include/stratosphere/results/fs_results.hpp
+++ b/stratosphere/libstratosphere/include/stratosphere/results/fs_results.hpp
@@ -19,49 +19,54 @@
 
 static constexpr u32 Module_Fs = 2;
 
-static constexpr Result ResultFsPathNotFound       = MAKERESULT(Module_Fs, 1);
-static constexpr Result ResultFsPathAlreadyExists  = MAKERESULT(Module_Fs, 2);
+static constexpr Result ResultFsPathNotFound                                   = MAKERESULT(Module_Fs, 1);
+static constexpr Result ResultFsPathAlreadyExists                              = MAKERESULT(Module_Fs, 2);
 
-static constexpr Result ResultFsTargetLocked       = MAKERESULT(Module_Fs, 7);
-static constexpr Result ResultFsDirectoryNotEmpty  = MAKERESULT(Module_Fs, 8);
+static constexpr Result ResultFsTargetLocked                                   = MAKERESULT(Module_Fs, 7);
+static constexpr Result ResultFsDirectoryNotEmpty                              = MAKERESULT(Module_Fs, 8);
 
-static constexpr Result ResultFsNotEnoughFreeSpaceRangeStart             = MAKERESULT(Module_Fs, 30);
-    static constexpr Result ResultFsNotEnoughFreeSpaceBisRangeStart      = MAKERESULT(Module_Fs, 34);
-        static constexpr Result ResultFsNotEnoughFreeSpaceBisCalibration = MAKERESULT(Module_Fs, 35);
-        static constexpr Result ResultFsNotEnoughFreeSpaceBisSafe        = MAKERESULT(Module_Fs, 36);
-        static constexpr Result ResultFsNotEnoughFreeSpaceBisUser        = MAKERESULT(Module_Fs, 37);
-        static constexpr Result ResultFsNotEnoughFreeSpaceBisSystem      = MAKERESULT(Module_Fs, 38);
-    static constexpr Result ResultFsNotEnoughFreeSpaceBisRangeEnd        = MAKERESULT(Module_Fs, 39);
-    static constexpr Result ResultFsNotEnoughFreeSpaceSdCard             = MAKERESULT(Module_Fs, 39);
-static constexpr Result ResultFsNotEnoughFreeSpaceRangeEnd               = MAKERESULT(Module_Fs, 45);
+static constexpr Result ResultFsNotEnoughFreeSpaceRangeStart                   = MAKERESULT(Module_Fs, 30);
+    static constexpr Result ResultFsNotEnoughFreeSpaceBisRangeStart            = MAKERESULT(Module_Fs, 34);
+        static constexpr Result ResultFsNotEnoughFreeSpaceBisCalibration       = MAKERESULT(Module_Fs, 35);
+        static constexpr Result ResultFsNotEnoughFreeSpaceBisSafe              = MAKERESULT(Module_Fs, 36);
+        static constexpr Result ResultFsNotEnoughFreeSpaceBisUser              = MAKERESULT(Module_Fs, 37);
+        static constexpr Result ResultFsNotEnoughFreeSpaceBisSystem            = MAKERESULT(Module_Fs, 38);
+    static constexpr Result ResultFsNotEnoughFreeSpaceBisRangeEnd              = MAKERESULT(Module_Fs, 39);
+    static constexpr Result ResultFsNotEnoughFreeSpaceSdCard                   = MAKERESULT(Module_Fs, 39);
+static constexpr Result ResultFsNotEnoughFreeSpaceRangeEnd                     = MAKERESULT(Module_Fs, 45);
 
-static constexpr Result ResultFsMountNameAlreadyExists = MAKERESULT(Module_Fs, 60);
+static constexpr Result ResultFsMountNameAlreadyExists                         = MAKERESULT(Module_Fs, 60);
 
-static constexpr Result ResultFsTargetNotFound   = MAKERESULT(Module_Fs, 1002);
+static constexpr Result ResultFsTargetNotFound                                 = MAKERESULT(Module_Fs, 1002);
 
-static constexpr Result ResultFsSdCardNotPresent = MAKERESULT(Module_Fs, 2001);
+static constexpr Result ResultFsSdCardNotPresent                               = MAKERESULT(Module_Fs, 2001);
 
-static constexpr Result ResultFsNotImplemented       = MAKERESULT(Module_Fs, 3001);
-static constexpr Result ResultFsOutOfRange           = MAKERESULT(Module_Fs, 3005);
+static constexpr Result ResultFsNotImplemented                                 = MAKERESULT(Module_Fs, 3001);
+static constexpr Result ResultFsOutOfRange                                     = MAKERESULT(Module_Fs, 3005);
 
 static constexpr Result ResultFsAllocationFailureInDirectorySaveDataFileSystem = MAKERESULT(Module_Fs, 3321);
 static constexpr Result ResultFsAllocationFailureInSubDirectoryFileSystem      = MAKERESULT(Module_Fs, 3355);
 
-static constexpr Result ResultFsPreconditionViolation = MAKERESULT(Module_Fs, 6000);
-static constexpr Result ResultFsInvalidArgument       = MAKERESULT(Module_Fs, 6001);
-static constexpr Result ResultFsInvalidPath           = MAKERESULT(Module_Fs, 6002);
-static constexpr Result ResultFsTooLongPath           = MAKERESULT(Module_Fs, 6003);
-static constexpr Result ResultFsInvalidCharacter      = MAKERESULT(Module_Fs, 6004);
-static constexpr Result ResultFsInvalidPathFormat     = MAKERESULT(Module_Fs, 6005);
-static constexpr Result ResultFsDirectoryUnobtainable = MAKERESULT(Module_Fs, 6006);
-static constexpr Result ResultFsNotNormalized         = MAKERESULT(Module_Fs, 6007);
+static constexpr Result ResultFsPreconditionViolation                          = MAKERESULT(Module_Fs, 6000);
+static constexpr Result ResultFsInvalidArgument                                = MAKERESULT(Module_Fs, 6001);
+static constexpr Result ResultFsInvalidPath                                    = MAKERESULT(Module_Fs, 6002);
+static constexpr Result ResultFsTooLongPath                                    = MAKERESULT(Module_Fs, 6003);
+static constexpr Result ResultFsInvalidCharacter                               = MAKERESULT(Module_Fs, 6004);
+static constexpr Result ResultFsInvalidPathFormat                              = MAKERESULT(Module_Fs, 6005);
+static constexpr Result ResultFsDirectoryUnobtainable                          = MAKERESULT(Module_Fs, 6006);
+static constexpr Result ResultFsNotNormalized                                  = MAKERESULT(Module_Fs, 6007);
 
-static constexpr Result ResultFsInvalidOffset          = MAKERESULT(Module_Fs, 6061);
-static constexpr Result ResultFsInvalidSize            = MAKERESULT(Module_Fs, 6062);
-static constexpr Result ResultFsNullptrArgument        = MAKERESULT(Module_Fs, 6063);
+static constexpr Result ResultFsInvalidOffset                                  = MAKERESULT(Module_Fs, 6061);
+static constexpr Result ResultFsInvalidSize                                    = MAKERESULT(Module_Fs, 6062);
+static constexpr Result ResultFsNullptrArgument                                = MAKERESULT(Module_Fs, 6063);
+static constexpr Result ResultFsInvalidMountName                               = MAKERESULT(Module_Fs, 6065);
 
-static constexpr Result ResultFsInvalidSaveDataSpaceId = MAKERESULT(Module_Fs, 6082);
+static constexpr Result ResultFsInvalidSaveDataSpaceId                         = MAKERESULT(Module_Fs, 6082);
 
-static constexpr Result ResultFsUnsupportedOperation = MAKERESULT(Module_Fs, 6300);
+static constexpr Result ResultFsFileExtensionWithoutOpenModeAllowAppend        = MAKERESULT(Module_Fs, 6201);
 
-static constexpr Result ResultFsPermissionDenied = MAKERESULT(Module_Fs, 6400);
+static constexpr Result ResultFsUnsupportedOperation                           = MAKERESULT(Module_Fs, 6300);
+
+static constexpr Result ResultFsPermissionDenied                               = MAKERESULT(Module_Fs, 6400);
+
+static constexpr Result ResultFsMountNameNotFound                              = MAKERESULT(Module_Fs, 6905);
diff --git a/stratosphere/libstratosphere/include/stratosphere/results/lr_results.hpp b/stratosphere/libstratosphere/include/stratosphere/results/lr_results.hpp
index 5b2a01b97..a463ceedf 100644
--- a/stratosphere/libstratosphere/include/stratosphere/results/lr_results.hpp
+++ b/stratosphere/libstratosphere/include/stratosphere/results/lr_results.hpp
@@ -26,5 +26,6 @@ static constexpr Result ResultLrHtmlDocumentNotFound                     = MAKER
 static constexpr Result ResultLrAddOnContentNotFound                     = MAKERESULT(Module_Lr, 7);
 static constexpr Result ResultLrControlNotFound                          = MAKERESULT(Module_Lr, 8);
 static constexpr Result ResultLrLegalInformationNotFound                 = MAKERESULT(Module_Lr, 9);
+static constexpr Result ResultLrDebugProgramNotFound                     = MAKERESULT(Module_Lr, 10);
 
 static constexpr Result ResultLrTooManyRegisteredPaths = MAKERESULT(Module_Lr, 90);
diff --git a/stratosphere/libstratosphere/include/stratosphere/results/ncm_results.hpp b/stratosphere/libstratosphere/include/stratosphere/results/ncm_results.hpp
index 87cc115e9..6455921df 100644
--- a/stratosphere/libstratosphere/include/stratosphere/results/ncm_results.hpp
+++ b/stratosphere/libstratosphere/include/stratosphere/results/ncm_results.hpp
@@ -19,6 +19,7 @@
 
 static constexpr u32 Module_Ncm = 5;
 
+static constexpr Result ResultNcmStoragePathNotFound                     = MAKERESULT(Module_Ncm, 1);
 static constexpr Result ResultNcmPlaceHolderAlreadyExists                = MAKERESULT(Module_Ncm, 2);
 static constexpr Result ResultNcmPlaceHolderNotFound                     = MAKERESULT(Module_Ncm, 3);
 static constexpr Result ResultNcmContentAlreadyExists                    = MAKERESULT(Module_Ncm, 4);
@@ -30,7 +31,9 @@ static constexpr Result ResultNcmUnknownStorage                          = MAKER
 static constexpr Result ResultNcmInvalidContentStorage                   = MAKERESULT(Module_Ncm, 100);
 static constexpr Result ResultNcmInvalidContentMetaDatabase              = MAKERESULT(Module_Ncm, 110);
 
+static constexpr Result ResultNcmInvalidPlaceHolderDirectoryEntry        = MAKERESULT(Module_Ncm, 170);
 static constexpr Result ResultNcmBufferInsufficient                      = MAKERESULT(Module_Ncm, 180);
+static constexpr Result ResultNcmInvalidContentStorageOperation          = MAKERESULT(Module_Ncm, 190);
 static constexpr Result ResultNcmInvalidContentMetaKey                   = MAKERESULT(Module_Ncm, 240);
 
 static constexpr Result ResultNcmContentStorageNotActive                 = MAKERESULT(Module_Ncm, 250);
@@ -47,5 +50,7 @@ static constexpr Result ResultNcmNandUserContentMetaDatabaseNotActive    = MAKER
 static constexpr Result ResultNcmSdCardContentMetaDatabaseNotActive      = MAKERESULT(Module_Ncm, 264);
 static constexpr Result ResultNcmUnknownContentMetaDatabaseNotActive     = MAKERESULT(Module_Ncm, 268);
 
+static constexpr Result ResultNcmStorageRootNotFound                     = MAKERESULT(Module_Ncm, 310);
+
 static constexpr Result ResultNcmInvalidArgument        = MAKERESULT(Module_Ncm, 8181);
 static constexpr Result ResultNcmInvalidOffset          = MAKERESULT(Module_Ncm, 8182);
diff --git a/stratosphere/ncm/source/lr_types.hpp b/stratosphere/ncm/source/lr_types.hpp
index 9d921aa45..e0d7df167 100644
--- a/stratosphere/ncm/source/lr_types.hpp
+++ b/stratosphere/ncm/source/lr_types.hpp
@@ -110,6 +110,4 @@ namespace sts::lr {
             }
     };
 
-    static constexpr Result ResultLrDebugProgramNotFound              = MAKERESULT(Module_Lr, 10);
-
 }
\ No newline at end of file
diff --git a/stratosphere/ncm/source/ncm_types.hpp b/stratosphere/ncm/source/ncm_types.hpp
index 8264c4f06..72b48ad3b 100644
--- a/stratosphere/ncm/source/ncm_types.hpp
+++ b/stratosphere/ncm/source/ncm_types.hpp
@@ -198,14 +198,4 @@ namespace sts::ncm {
     typedef void (*MakeContentPathFunc)(char* out, ContentId content_id, const char* root);
     typedef void (*MakePlaceHolderPathFunc)(char* out, PlaceHolderId placeholder_id, const char* root);
 
-    // TODO: Move to libstrat
-    static constexpr Result ResultNcmStoragePathNotFound                    = MAKERESULT(Module_Ncm, 1);
-    static constexpr Result ResultNcmInvalidPlaceHolderDirectoryEntry       = MAKERESULT(Module_Ncm, 170);
-    static constexpr Result ResultNcmInvalidContentStorageOperation         = MAKERESULT(Module_Ncm, 190);
-    static constexpr Result ResultNcmStorageRootNotFound                    = MAKERESULT(Module_Ncm, 310);
-    
-    static constexpr Result ResultFsFileExtensionWithoutOpenModeAllowAppend = MAKERESULT(Module_Fs, 6201);
-    static constexpr Result ResultFsInvalidMountName                        = MAKERESULT(Module_Fs, 6065);
-    static constexpr Result ResultFsMountNameNotFound                       = MAKERESULT(Module_Fs, 6905);
-
 }
\ No newline at end of file