diff --git a/libstratosphere/include/stratosphere/fssystem/fssystem_crypto_configuration.hpp b/libstratosphere/include/stratosphere/fssystem/fssystem_crypto_configuration.hpp
index 90f2ccdb..17dfb656 100644
--- a/libstratosphere/include/stratosphere/fssystem/fssystem_crypto_configuration.hpp
+++ b/libstratosphere/include/stratosphere/fssystem/fssystem_crypto_configuration.hpp
@@ -16,7 +16,7 @@
 #pragma once
 #include <vapours.hpp>
 #include <stratosphere/fssystem/fssystem_nca_file_system_driver.hpp>
-#include <stratosphere/ldr/ldr_platform_id.hpp>
+#include <stratosphere/ncm/ncm_content_meta_platform.hpp>
 
 namespace ams::fssystem {
 
@@ -26,10 +26,10 @@ namespace ams::fssystem {
 
     void InvalidateHardwareAesKey();
 
-    bool IsValidSignatureKeyGeneration(ldr::PlatformId platform, size_t key_generation);
+    bool IsValidSignatureKeyGeneration(ncm::ContentMetaPlatform platform, size_t key_generation);
 
-    const u8 *GetAcidSignatureKeyModulus(ldr::PlatformId platform, bool prod, size_t key_generation, bool unk_unused);
-    size_t GetAcidSignatureKeyModulusSize(ldr::PlatformId platform, bool unk_unused);
+    const u8 *GetAcidSignatureKeyModulus(ncm::ContentMetaPlatform platform, bool prod, size_t key_generation, bool unk_unused);
+    size_t GetAcidSignatureKeyModulusSize(ncm::ContentMetaPlatform platform, bool unk_unused);
 
     const u8 *GetAcidSignatureKeyPublicExponent();
 
diff --git a/libstratosphere/include/stratosphere/ldr/ldr_platform_id.hpp b/libstratosphere/include/stratosphere/ldr/ldr_platform_id.hpp
deleted file mode 100644
index 884cd094..00000000
--- a/libstratosphere/include/stratosphere/ldr/ldr_platform_id.hpp
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) Atmosphère-NX
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-#include <vapours.hpp>
-
-namespace ams::ldr {
-
-    /* TODO: Is this really a FS type? What namespace does this actually live inside? */
-    enum PlatformId {
-        PlatformId_Nx = 0,
-    };
-
-}
diff --git a/libstratosphere/include/stratosphere/ldr/ldr_types.hpp b/libstratosphere/include/stratosphere/ldr/ldr_types.hpp
index 7d1a94aa..52465704 100644
--- a/libstratosphere/include/stratosphere/ldr/ldr_types.hpp
+++ b/libstratosphere/include/stratosphere/ldr/ldr_types.hpp
@@ -19,7 +19,7 @@
 #include <stratosphere/ncm/ncm_ids.hpp>
 #include <stratosphere/ncm/ncm_program_location.hpp>
 #include <stratosphere/sf/sf_buffer_tags.hpp>
-#include <stratosphere/ldr/ldr_platform_id.hpp>
+#include <stratosphere/ncm/ncm_content_meta_platform.hpp>
 
 namespace ams::ldr {
 
diff --git a/libstratosphere/source/erpt/srv/erpt_srv_reporter.cpp b/libstratosphere/source/erpt/srv/erpt_srv_reporter.cpp
index 274f9d5a..eb291db6 100644
--- a/libstratosphere/source/erpt/srv/erpt_srv_reporter.cpp
+++ b/libstratosphere/source/erpt/srv/erpt_srv_reporter.cpp
@@ -537,6 +537,8 @@ namespace ams::erpt::srv {
             /* NOTE: Nintendo ignores the result of this call. */
             SubmitFsInfo();
         }
+        #else
+        AMS_UNUSED(flags);
         #endif
 
 
diff --git a/libstratosphere/source/fssystem/fssystem_crypto_configuration.cpp b/libstratosphere/source/fssystem/fssystem_crypto_configuration.cpp
index dbd2f86c..23e4d0b3 100644
--- a/libstratosphere/source/fssystem/fssystem_crypto_configuration.cpp
+++ b/libstratosphere/source/fssystem/fssystem_crypto_configuration.cpp
@@ -297,20 +297,20 @@ namespace ams::fssystem {
         }
     }
 
-    bool IsValidSignatureKeyGeneration(ldr::PlatformId platform, size_t key_generation) {
+    bool IsValidSignatureKeyGeneration(ncm::ContentMetaPlatform platform, size_t key_generation) {
         switch (platform) {
-            case ldr::PlatformId_Nx:
+            case ncm::ContentMetaPlatform::Nx:
                 return key_generation <= NxAcidSignatureKeyGenerationMax;
             AMS_UNREACHABLE_DEFAULT_CASE();
         }
     }
 
-    const u8 *GetAcidSignatureKeyModulus(ldr::PlatformId platform, bool prod, size_t key_generation, bool unk_unused) {
+    const u8 *GetAcidSignatureKeyModulus(ncm::ContentMetaPlatform platform, bool prod, size_t key_generation, bool unk_unused) {
         AMS_ASSERT(IsValidSignatureKeyGeneration(platform, key_generation));
         AMS_UNUSED(unk_unused);
 
         switch (platform) {
-            case ldr::PlatformId_Nx:
+            case ncm::ContentMetaPlatform::Nx:
                 {
                     const size_t used_keygen = (key_generation % (NxAcidSignatureKeyGenerationMax + 1));
                     return prod ? NxAcidSignatureKeyModulusProd[used_keygen] : NxAcidSignatureKeyModulusDev[used_keygen];
@@ -319,11 +319,11 @@ namespace ams::fssystem {
         }
     }
 
-    size_t GetAcidSignatureKeyModulusSize(ldr::PlatformId platform, bool unk_unused) {
+    size_t GetAcidSignatureKeyModulusSize(ncm::ContentMetaPlatform platform, bool unk_unused) {
         AMS_UNUSED(unk_unused);
 
         switch (platform) {
-            case ldr::PlatformId_Nx:
+            case ncm::ContentMetaPlatform::Nx:
                 return NxAcidSignatureKeyModulusSize;
             AMS_UNREACHABLE_DEFAULT_CASE();
         }