diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp
index 578ce4af5c..20f366635c 100644
--- a/src/core/hle/service/am/am.cpp
+++ b/src/core/hle/service/am/am.cpp
@@ -1624,245 +1624,4 @@ IProcessWindingController::IProcessWindingController()
 }
 
 IProcessWindingController::~IProcessWindingController() = default;
-
-ILockAccessor::ILockAccessor() : ServiceFramework("ILockAccessor") {
-    // clang-format off
-    static const FunctionInfo functions[] = {
-        {1, nullptr, "TryLock"},
-        {2, nullptr, "Unlock"},
-        {3, nullptr, "GetEvent"},
-        {4, nullptr, "IsLocked"},
-    };
-    // clang-format on
-
-    RegisterHandlers(functions);
-}
-
-ILockAccessor::~ILockAccessor() = default;
-
-IApplicationAccessor::IApplicationAccessor() : ServiceFramework("IApplicationAccessor") {
-    // clang-format off
-    static const FunctionInfo functions[] = {
-        {0, nullptr, "GetAppletStateChangedEvent"},
-        {1, nullptr, "IsCompleted"},
-        {10, nullptr, "Start"},
-        {20, nullptr, "RequestExit"},
-        {25, nullptr, "Terminate"},
-        {30, nullptr, "GetResult"},
-        {101, nullptr, "RequestForApplicationToGetForeground"},
-        {110, nullptr, "TerminateAllLibraryApplets"},
-        {111, nullptr, "AreAnyLibraryAppletsLeft"},
-        {112, nullptr, "GetCurrentLibraryApplet"},
-        {120, nullptr, "GetApplicationId"},
-        {121, nullptr, "PushLaunchParameter"},
-        {122, nullptr, "GetApplicationControlProperty"},
-        {123, nullptr, "GetApplicationLaunchProperty"},
-        {124, nullptr, "GetApplicationLaunchRequestInfo"},
-        {130, nullptr, "SetUsers"},
-        {131, nullptr, "CheckRightsEnvironmentAvailable"},
-        {132, nullptr, "CheckNsRightsEnvironmentHandle"},
-        {140, nullptr, "GetDesirableUids"},
-        {150, nullptr, "ReportApplicationExitTimeout"},
-        {160, nullptr, "SetApplicationAttribute"},
-        {170, nullptr, "HasSaveDataAccessPermission"},
-        {180, nullptr, "PushToFriendInvitationStorageChannel"},
-        {190, nullptr, "PushToNotificationStorageChannel"},
-        {200, nullptr, "RequestApplicationSoftReset"},
-        {201, nullptr, "RestartApplicationTimer"},
-    };
-    // clang-format on
-
-    RegisterHandlers(functions);
-}
-
-IApplicationAccessor::~IApplicationAccessor() = default;
-
-IAppletAccessor::IAppletAccessor() : ServiceFramework("IAppletAccessor") {
-    // clang-format off
-    static const FunctionInfo functions[] = {
-        {0, nullptr, "GetAppletStateChangedEvent"},
-        {1, nullptr, "IsCompleted"},
-        {10, nullptr, "Start"},
-        {20, nullptr, "RequestExit"},
-        {25, nullptr, "Terminate"},
-        {30, nullptr, "GetResult"},
-    };
-    // clang-format on
-
-    RegisterHandlers(functions);
-}
-
-IAppletAccessor::~IAppletAccessor() = default;
-
-// 7.0.0+
-IAppletCommonFunctions::IAppletCommonFunctions() : ServiceFramework("IAppletCommonFunctions") {
-    // clang-format off
-    static const FunctionInfo functions[] = {
-        {0, nullptr, "SetTerminateResult"},
-        {10, nullptr, "ReadThemeStorage"},
-        {11, nullptr, "WriteThemeStorage"},
-        {20, nullptr, "PushToAppletBoundChannel"},
-        {21, nullptr, "TryPopFromAppletBoundChannel"},
-        {40, nullptr, "GetDisplayLogicalResolution"},
-        {42, nullptr, "SetDisplayMagnification"},
-        {50, nullptr, "SetHomeButtonDoubleClickEnabled"},
-        {51, nullptr, "GetHomeButtonDoubleClickEnabled"},
-        {52, nullptr, "IsHomeButtonShortPressedBlocked"},
-    };
-    // clang-format on
-
-    RegisterHandlers(functions);
-}
-
-IAppletCommonFunctions::~IAppletCommonFunctions() = default;
-
-ILibraryAppletSelfAccessor::ILibraryAppletSelfAccessor()
-    : ServiceFramework("ILibraryAppletSelfAccessor") {
-    // clang-format off
-    static const FunctionInfo functions[] = {
-        {0, nullptr, "PopInData"},
-        {1, nullptr, "PushOutData"},
-        {2, nullptr, "PopInteractiveInData"},
-        {3, nullptr, "PushInteractiveOutData"},
-        {5, nullptr, "GetPopInDataEvent"},
-        {6, nullptr, "GetPopInteractiveInDataEvent"},
-        {10, nullptr, "ExitProcessAndReturn"},
-        {11, nullptr, "GetLibraryAppletInfo"},
-        {12, nullptr, "GetMainAppletIdentityInfo"},
-        {13, nullptr, "CanUseApplicationCore"},
-        {14, nullptr, "GetCallerAppletIdentityInfo"},
-        {15, nullptr, "GetMainAppletApplicationControlProperty"},
-        {16, nullptr, "GetMainAppletStorageId"},
-        {17, nullptr, "GetCallerAppletIdentityInfoStack"},
-        {18, nullptr, "GetNextReturnDestinationAppletIdentityInfo"},
-        {19, nullptr, "GetDesirableKeyboardLayout"},
-        {20, nullptr, "PopExtraStorage"},
-        {25, nullptr, "GetPopExtraStorageEvent"},
-        {30, nullptr, "UnpopInData"},
-        {31, nullptr, "UnpopExtraStorage"},
-        {40, nullptr, "GetIndirectLayerProducerHandle"},
-        {50, nullptr, "ReportVisibleError"},
-        {51, nullptr, "ReportVisibleErrorWithErrorContext"},
-        {60, nullptr, "GetMainAppletApplicationDesiredLanguage"},
-        {70, nullptr, "GetCurrentApplicationId"},
-        {80, nullptr, "RequestExitToSelf"},
-        {90, nullptr, "CreateApplicationAndPushAndRequestToLaunch"},
-        {100, nullptr, "CreateGameMovieTrimmer"},
-        {101, nullptr, "ReserveResourceForMovieOperation"},
-        {102, nullptr, "UnreserveResourceForMovieOperation"},
-        {110, nullptr, "GetMainAppletAvailableUsers"},
-        {120, nullptr, "GetLaunchStorageInfoForDebug"},
-        {130, nullptr, "GetGpuErrorDetectedSystemEvent"},
-        {140, nullptr, "SetApplicationMemoryReservation"},
-        {150, nullptr, "ShouldSetGpuTimeSliceManually"},
-    };
-    // clang-format on
-
-    RegisterHandlers(functions);
-}
-
-ILibraryAppletSelfAccessor::~ILibraryAppletSelfAccessor() = default;
-
-IOverlayAppletProxy::IOverlayAppletProxy() : ServiceFramework("IOverlayAppletProxy") {
-    // clang-format off
-    static const FunctionInfo functions[] = {
-        {0, nullptr, "GetCommonStateGetter"},
-        {1, nullptr, "GetSelfController"},
-        {2, nullptr, "GetWindowController"},
-        {3, nullptr, "GetAudioController"},
-        {4, nullptr, "GetDisplayController"},
-        {10, nullptr, "GetProcessWindingController"},
-        {11, nullptr, "GetLibraryAppletCreator"},
-        {20, nullptr, "GetOverlayFunctions"},
-        {21, nullptr, "GetAppletCommonFunctions"},
-        {1000, nullptr, "GetDebugFunctions"},
-    };
-    // clang-format on
-
-    RegisterHandlers(functions);
-}
-
-IOverlayAppletProxy::~IOverlayAppletProxy() = default;
-
-IOverlayFunctions::IOverlayFunctions() : ServiceFramework("IOverlayFunctions") {
-    // clang-format off
-    static const FunctionInfo functions[] = {
-        {0, nullptr, "BeginToWatchShortHomeButtonMessage"},
-        {1, nullptr, "EndToWatchShortHomeButtonMessage"},
-        {2, nullptr, "GetApplicationIdForLogo"},
-        {3, nullptr, "SetGpuTimeSliceBoost"},
-        {4, nullptr, "SetAutoSleepTimeAndDimmingTimeEnabled"},
-        {5, nullptr, "TerminateApplicationAndSetReason"},
-        {6, nullptr, "SetScreenShotPermissionGlobally"},
-        {10, nullptr, "StartShutdownSequenceForOverlay"},
-        {11, nullptr, "StartRebootSequenceForOverlay"},
-        {20, nullptr, "SetHandlingHomeButtonShortPressedEnabled"},
-        {30, nullptr, "SetHealthWarningShowingState"},
-        {31, nullptr, "IsHealthWarningRequired"},
-        {90, nullptr, "SetRequiresGpuResourceUse"},
-        {101, nullptr, "BeginToObserveHidInputForDevelop"},
-    };
-    // clang-format on
-
-    RegisterHandlers(functions);
-}
-
-IOverlayFunctions::~IOverlayFunctions() = default;
-
-IMovieMaker::IMovieMaker() : ServiceFramework("IMovieMaker") {
-    // clang-format off
-    static const FunctionInfo functions[] = {
-        {0, nullptr, "GetGrcMovieMaker"},
-        {1, nullptr, "GetLayerHandle"},
-    };
-    // clang-format on
-
-    RegisterHandlers(functions);
-}
-
-IMovieMaker::~IMovieMaker() = default;
-
-// 7.0.0+
-IStorageChannel::IStorageChannel() : ServiceFramework("IStorageChannel") {
-    // clang-format off
-    static const FunctionInfo functions[] = {
-        {0, nullptr, "Push"},
-        {1, nullptr, "Unpop"},
-        {2, nullptr, "Pop"},
-        {3, nullptr, "GetPopEventHandle"},
-        {4, nullptr, "Clear"},
-    };
-    // clang-format on
-
-    RegisterHandlers(functions);
-}
-
-IStorageChannel::~IStorageChannel() = default;
-
-ISystemAppletControllerForDebug::ISystemAppletControllerForDebug()
-    : ServiceFramework("ISystemAppletControllerForDebug") {
-    // clang-format off
-    static const FunctionInfo functions[] = {
-        {1, nullptr, "RequestLaunchApplicationForDebug"},
-        {2, nullptr, "GetDebugStorageChannel"},
-        {3, nullptr, "CreateStorageForDebug"},
-    };
-    // clang-format on
-
-    RegisterHandlers(functions);
-}
-
-ISystemAppletControllerForDebug::~ISystemAppletControllerForDebug() = default;
-
-ITransferStorageAccessor::ITransferStorageAccessor()
-    : ServiceFramework("ITransferStorageAccessor") {
-    // clang-format off
-    static const FunctionInfo functions[] = {
-        {0, nullptr, "GetSize"},
-        {1, nullptr, "GetHandle"},
-    };
-    // clang-format on
-}
-
-ITransferStorageAccessor::~ITransferStorageAccessor() = default;
 } // namespace Service::AM