From ad5eb5787cc5b27a4631cd46ef5f551c4ae95e51 Mon Sep 17 00:00:00 2001
From: Alex Barney <thealexbarney@gmail.com>
Date: Sat, 1 Dec 2018 14:38:15 -0600
Subject: [PATCH] Explicitly label class visibility

---
 Ryujinx.HLE/DeviceMemory.cs                               | 2 +-
 Ryujinx.HLE/FileSystem/Content/ContentPath.cs             | 2 +-
 Ryujinx.HLE/FileSystem/Content/TitleType.cs               | 2 +-
 Ryujinx.HLE/FileSystem/FileSystemProvider.cs              | 2 +-
 Ryujinx.HLE/FileSystem/IFileSystemProvider.cs             | 2 +-
 Ryujinx.HLE/FileSystem/PFsProvider.cs                     | 2 +-
 Ryujinx.HLE/FileSystem/RomFsProvider.cs                   | 2 +-
 Ryujinx.HLE/FileSystem/SaveDataType.cs                    | 2 +-
 Ryujinx.HLE/FileSystem/SaveHelper.cs                      | 2 +-
 Ryujinx.HLE/FileSystem/SaveInfo.cs                        | 2 +-
 Ryujinx.HLE/FileSystem/SaveSpaceId.cs                     | 2 +-
 Ryujinx.HLE/FileSystem/VirtualFileSystem.cs               | 2 +-
 Ryujinx.HLE/HOS/Diagnostics/Demangler/Demangler.cs        | 4 ++--
 Ryujinx.HLE/HOS/ErrorCode.cs                              | 2 +-
 Ryujinx.HLE/HOS/ErrorModule.cs                            | 2 +-
 Ryujinx.HLE/HOS/Font/SharedFontManager.cs                 | 2 +-
 Ryujinx.HLE/HOS/GlobalStateTable.cs                       | 2 +-
 Ryujinx.HLE/HOS/Homebrew.cs                               | 2 +-
 Ryujinx.HLE/HOS/IdDictionary.cs                           | 2 +-
 Ryujinx.HLE/HOS/Ipc/IpcBuffDesc.cs                        | 2 +-
 Ryujinx.HLE/HOS/Ipc/IpcHandleDesc.cs                      | 2 +-
 Ryujinx.HLE/HOS/Ipc/IpcHandler.cs                         | 2 +-
 Ryujinx.HLE/HOS/Ipc/IpcMagic.cs                           | 2 +-
 Ryujinx.HLE/HOS/Ipc/IpcMessage.cs                         | 2 +-
 Ryujinx.HLE/HOS/Ipc/IpcMessageType.cs                     | 2 +-
 Ryujinx.HLE/HOS/Ipc/IpcPtrBuffDesc.cs                     | 2 +-
 Ryujinx.HLE/HOS/Ipc/IpcRecvListBuffDesc.cs                | 2 +-
 Ryujinx.HLE/HOS/Ipc/ServiceProcessRequest.cs              | 2 +-
 Ryujinx.HLE/HOS/Kernel/AddressSpaceType.cs                | 2 +-
 Ryujinx.HLE/HOS/Kernel/ArbitrationType.cs                 | 2 +-
 Ryujinx.HLE/HOS/Kernel/DramMemoryMap.cs                   | 2 +-
 Ryujinx.HLE/HOS/Kernel/HleCoreManager.cs                  | 2 +-
 Ryujinx.HLE/HOS/Kernel/HleProcessDebugger.cs              | 2 +-
 Ryujinx.HLE/HOS/Kernel/HleScheduler.cs                    | 2 +-
 Ryujinx.HLE/HOS/Kernel/IKFutureSchedulerObject.cs         | 2 +-
 Ryujinx.HLE/HOS/Kernel/KAddressArbiter.cs                 | 2 +-
 Ryujinx.HLE/HOS/Kernel/KAutoObject.cs                     | 2 +-
 Ryujinx.HLE/HOS/Kernel/KClientPort.cs                     | 2 +-
 Ryujinx.HLE/HOS/Kernel/KConditionVariable.cs              | 2 +-
 Ryujinx.HLE/HOS/Kernel/KContextIdManager.cs               | 2 +-
 Ryujinx.HLE/HOS/Kernel/KCoreContext.cs                    | 2 +-
 Ryujinx.HLE/HOS/Kernel/KCriticalSection.cs                | 2 +-
 Ryujinx.HLE/HOS/Kernel/KEvent.cs                          | 2 +-
 Ryujinx.HLE/HOS/Kernel/KHandleEntry.cs                    | 2 +-
 Ryujinx.HLE/HOS/Kernel/KHandleTable.cs                    | 2 +-
 Ryujinx.HLE/HOS/Kernel/KMemoryArrange.cs                  | 2 +-
 Ryujinx.HLE/HOS/Kernel/KMemoryArrangeRegion.cs            | 2 +-
 Ryujinx.HLE/HOS/Kernel/KMemoryBlock.cs                    | 2 +-
 Ryujinx.HLE/HOS/Kernel/KMemoryBlockAllocator.cs           | 2 +-
 Ryujinx.HLE/HOS/Kernel/KMemoryInfo.cs                     | 2 +-
 Ryujinx.HLE/HOS/Kernel/KMemoryManager.cs                  | 2 +-
 Ryujinx.HLE/HOS/Kernel/KMemoryRegionBlock.cs              | 2 +-
 Ryujinx.HLE/HOS/Kernel/KMemoryRegionManager.cs            | 2 +-
 Ryujinx.HLE/HOS/Kernel/KPageList.cs                       | 2 +-
 Ryujinx.HLE/HOS/Kernel/KPageNode.cs                       | 2 +-
 Ryujinx.HLE/HOS/Kernel/KPort.cs                           | 2 +-
 Ryujinx.HLE/HOS/Kernel/KProcess.cs                        | 2 +-
 Ryujinx.HLE/HOS/Kernel/KProcessCapabilities.cs            | 2 +-
 Ryujinx.HLE/HOS/Kernel/KReadableEvent.cs                  | 2 +-
 Ryujinx.HLE/HOS/Kernel/KResourceLimit.cs                  | 2 +-
 Ryujinx.HLE/HOS/Kernel/KScheduler.cs                      | 2 +-
 Ryujinx.HLE/HOS/Kernel/KSchedulingData.cs                 | 2 +-
 Ryujinx.HLE/HOS/Kernel/KServerPort.cs                     | 2 +-
 Ryujinx.HLE/HOS/Kernel/KSession.cs                        | 2 +-
 Ryujinx.HLE/HOS/Kernel/KSharedMemory.cs                   | 2 +-
 Ryujinx.HLE/HOS/Kernel/KSlabHeap.cs                       | 2 +-
 Ryujinx.HLE/HOS/Kernel/KSynchronization.cs                | 2 +-
 Ryujinx.HLE/HOS/Kernel/KSynchronizationObject.cs          | 2 +-
 Ryujinx.HLE/HOS/Kernel/KThread.cs                         | 2 +-
 Ryujinx.HLE/HOS/Kernel/KTimeManager.cs                    | 2 +-
 Ryujinx.HLE/HOS/Kernel/KTlsPageInfo.cs                    | 2 +-
 Ryujinx.HLE/HOS/Kernel/KTlsPageManager.cs                 | 2 +-
 Ryujinx.HLE/HOS/Kernel/KTransferMemory.cs                 | 2 +-
 Ryujinx.HLE/HOS/Kernel/KWritableEvent.cs                  | 2 +-
 Ryujinx.HLE/HOS/Kernel/KernelErr.cs                       | 2 +-
 Ryujinx.HLE/HOS/Kernel/KernelInit.cs                      | 2 +-
 Ryujinx.HLE/HOS/Kernel/KernelResult.cs                    | 2 +-
 Ryujinx.HLE/HOS/Kernel/KernelTransfer.cs                  | 2 +-
 Ryujinx.HLE/HOS/Kernel/LimitableResource.cs               | 2 +-
 Ryujinx.HLE/HOS/Kernel/MemoryAttribute.cs                 | 2 +-
 Ryujinx.HLE/HOS/Kernel/MemoryOperation.cs                 | 2 +-
 Ryujinx.HLE/HOS/Kernel/MemoryPermission.cs                | 2 +-
 Ryujinx.HLE/HOS/Kernel/MemoryRegion.cs                    | 2 +-
 Ryujinx.HLE/HOS/Kernel/MemoryState.cs                     | 2 +-
 Ryujinx.HLE/HOS/Kernel/MersenneTwister.cs                 | 2 +-
 Ryujinx.HLE/HOS/Kernel/ProcessCreationInfo.cs             | 2 +-
 Ryujinx.HLE/HOS/Kernel/ProcessState.cs                    | 2 +-
 Ryujinx.HLE/HOS/Kernel/SignalType.cs                      | 2 +-
 Ryujinx.HLE/HOS/Kernel/SvcHandler.cs                      | 2 +-
 Ryujinx.HLE/HOS/Kernel/SvcMemory.cs                       | 2 +-
 Ryujinx.HLE/HOS/Kernel/SvcSystem.cs                       | 2 +-
 Ryujinx.HLE/HOS/Kernel/SvcThread.cs                       | 2 +-
 Ryujinx.HLE/HOS/Kernel/SvcThreadSync.cs                   | 2 +-
 Ryujinx.HLE/HOS/Kernel/ThreadSchedState.cs                | 2 +-
 Ryujinx.HLE/HOS/Kernel/ThreadType.cs                      | 2 +-
 Ryujinx.HLE/HOS/ProgramLoader.cs                          | 2 +-
 Ryujinx.HLE/HOS/ServiceCtx.cs                             | 2 +-
 Ryujinx.HLE/HOS/Services/Acc/AccErr.cs                    | 2 +-
 Ryujinx.HLE/HOS/Services/Acc/IAccountService.cs           | 2 +-
 Ryujinx.HLE/HOS/Services/Acc/IManagerForApplication.cs    | 2 +-
 Ryujinx.HLE/HOS/Services/Acc/IProfile.cs                  | 2 +-
 Ryujinx.HLE/HOS/Services/Am/AmErr.cs                      | 2 +-
 Ryujinx.HLE/HOS/Services/Am/FocusState.cs                 | 2 +-
 .../HOS/Services/Am/IAllSystemAppletProxiesService.cs     | 2 +-
 Ryujinx.HLE/HOS/Services/Am/IApplicationCreator.cs        | 2 +-
 Ryujinx.HLE/HOS/Services/Am/IApplicationFunctions.cs      | 2 +-
 Ryujinx.HLE/HOS/Services/Am/IApplicationProxy.cs          | 2 +-
 Ryujinx.HLE/HOS/Services/Am/IApplicationProxyService.cs   | 2 +-
 Ryujinx.HLE/HOS/Services/Am/IAudioController.cs           | 2 +-
 Ryujinx.HLE/HOS/Services/Am/ICommonStateGetter.cs         | 2 +-
 Ryujinx.HLE/HOS/Services/Am/IDebugFunctions.cs            | 2 +-
 Ryujinx.HLE/HOS/Services/Am/IDisplayController.cs         | 2 +-
 Ryujinx.HLE/HOS/Services/Am/IGlobalStateController.cs     | 2 +-
 Ryujinx.HLE/HOS/Services/Am/IHomeMenuFunctions.cs         | 2 +-
 Ryujinx.HLE/HOS/Services/Am/ILibraryAppletAccessor.cs     | 2 +-
 Ryujinx.HLE/HOS/Services/Am/ILibraryAppletCreator.cs      | 2 +-
 Ryujinx.HLE/HOS/Services/Am/ISelfController.cs            | 2 +-
 Ryujinx.HLE/HOS/Services/Am/IStorage.cs                   | 2 +-
 Ryujinx.HLE/HOS/Services/Am/IStorageAccessor.cs           | 2 +-
 Ryujinx.HLE/HOS/Services/Am/ISystemAppletProxy.cs         | 2 +-
 Ryujinx.HLE/HOS/Services/Am/IWindowController.cs          | 2 +-
 Ryujinx.HLE/HOS/Services/Am/MessageInfo.cs                | 2 +-
 Ryujinx.HLE/HOS/Services/Am/OperationMode.cs              | 2 +-
 Ryujinx.HLE/HOS/Services/Am/StorageHelper.cs              | 2 +-
 Ryujinx.HLE/HOS/Services/Apm/IManager.cs                  | 2 +-
 Ryujinx.HLE/HOS/Services/Apm/ISession.cs                  | 2 +-
 Ryujinx.HLE/HOS/Services/Apm/PerformanceConfiguration.cs  | 2 +-
 Ryujinx.HLE/HOS/Services/Apm/PerformanceMode.cs           | 2 +-
 Ryujinx.HLE/HOS/Services/Aud/AudErr.cs                    | 2 +-
 Ryujinx.HLE/HOS/Services/Aud/AudioOut/AudioOutData.cs     | 2 +-
 Ryujinx.HLE/HOS/Services/Aud/AudioOut/IAudioOut.cs        | 2 +-
 Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/AudioConsts.cs | 2 +-
 Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/BehaviorIn.cs  | 2 +-
 .../HOS/Services/Aud/AudioRenderer/BiquadFilter.cs        | 2 +-
 .../HOS/Services/Aud/AudioRenderer/IAudioRenderer.cs      | 2 +-
 .../HOS/Services/Aud/AudioRenderer/MemoryPoolContext.cs   | 2 +-
 .../HOS/Services/Aud/AudioRenderer/MemoryPoolIn.cs        | 2 +-
 .../HOS/Services/Aud/AudioRenderer/MemoryPoolOut.cs       | 2 +-
 .../HOS/Services/Aud/AudioRenderer/MemoryPoolState.cs     | 2 +-
 Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/PlayState.cs   | 2 +-
 Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/Resampler.cs   | 2 +-
 .../HOS/Services/Aud/AudioRenderer/UpdateDataHeader.cs    | 2 +-
 .../Services/Aud/AudioRenderer/VoiceChannelResourceIn.cs  | 2 +-
 .../HOS/Services/Aud/AudioRenderer/VoiceContext.cs        | 2 +-
 Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/VoiceIn.cs     | 2 +-
 Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/VoiceOut.cs    | 2 +-
 Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/WaveBuffer.cs  | 2 +-
 Ryujinx.HLE/HOS/Services/Aud/AudioRendererParameter.cs    | 2 +-
 Ryujinx.HLE/HOS/Services/Aud/IAudioDevice.cs              | 2 +-
 Ryujinx.HLE/HOS/Services/Aud/IAudioOutManager.cs          | 2 +-
 Ryujinx.HLE/HOS/Services/Aud/IAudioRendererManager.cs     | 2 +-
 Ryujinx.HLE/HOS/Services/Aud/IHardwareOpusDecoder.cs      | 2 +-
 .../HOS/Services/Aud/IHardwareOpusDecoderManager.cs       | 2 +-
 Ryujinx.HLE/HOS/Services/Aud/SampleFormat.cs              | 2 +-
 Ryujinx.HLE/HOS/Services/Bcat/IBcatService.cs             | 2 +-
 .../HOS/Services/Bcat/IDeliveryCacheStorageService.cs     | 2 +-
 Ryujinx.HLE/HOS/Services/Bcat/IServiceCreator.cs          | 2 +-
 Ryujinx.HLE/HOS/Services/Bsd/BsdIoctl.cs                  | 2 +-
 Ryujinx.HLE/HOS/Services/Bsd/BsdSocket.cs                 | 2 +-
 Ryujinx.HLE/HOS/Services/Bsd/IClient.cs                   | 2 +-
 Ryujinx.HLE/HOS/Services/Bsd/PollEvent.cs                 | 2 +-
 Ryujinx.HLE/HOS/Services/Caps/IAlbumAccessorService.cs    | 2 +-
 Ryujinx.HLE/HOS/Services/Caps/IScreenshotService.cs       | 2 +-
 Ryujinx.HLE/HOS/Services/Es/IETicketService.cs            | 2 +-
 Ryujinx.HLE/HOS/Services/Friend/IFriendService.cs         | 2 +-
 Ryujinx.HLE/HOS/Services/Friend/IFriendServiceTypes.cs    | 4 ++--
 Ryujinx.HLE/HOS/Services/Friend/IServiceCreator.cs        | 2 +-
 Ryujinx.HLE/HOS/Services/FspSrv/FileSystemType.cs         | 2 +-
 Ryujinx.HLE/HOS/Services/FspSrv/FsErr.cs                  | 2 +-
 Ryujinx.HLE/HOS/Services/FspSrv/IDirectory.cs             | 2 +-
 Ryujinx.HLE/HOS/Services/FspSrv/IFile.cs                  | 2 +-
 Ryujinx.HLE/HOS/Services/FspSrv/IFileSystem.cs            | 2 +-
 Ryujinx.HLE/HOS/Services/FspSrv/IFileSystemProxy.cs       | 2 +-
 Ryujinx.HLE/HOS/Services/FspSrv/IStorage.cs               | 2 +-
 .../HOS/Services/Hid/IActiveVibrationDeviceList.cs        | 2 +-
 Ryujinx.HLE/HOS/Services/Hid/IAppletResource.cs           | 2 +-
 Ryujinx.HLE/HOS/Services/Hid/IHidServer.cs                | 2 +-
 Ryujinx.HLE/HOS/Services/IIpcService.cs                   | 2 +-
 Ryujinx.HLE/HOS/Services/IpcService.cs                    | 2 +-
 Ryujinx.HLE/HOS/Services/Irs/IIrSensorServer.cs           | 2 +-
 Ryujinx.HLE/HOS/Services/Ldr/IRoInterface.cs              | 8 ++++----
 Ryujinx.HLE/HOS/Services/Ldr/LoaderErr.cs                 | 2 +-
 Ryujinx.HLE/HOS/Services/Lm/ILogService.cs                | 2 +-
 Ryujinx.HLE/HOS/Services/Lm/ILogger.cs                    | 2 +-
 Ryujinx.HLE/HOS/Services/Lm/LmLogField.cs                 | 2 +-
 Ryujinx.HLE/HOS/Services/Lm/LmLogLevel.cs                 | 2 +-
 Ryujinx.HLE/HOS/Services/Lr/ILocationResolver.cs          | 2 +-
 Ryujinx.HLE/HOS/Services/Lr/ILocationResolverManager.cs   | 2 +-
 Ryujinx.HLE/HOS/Services/Lr/LrErr.cs                      | 2 +-
 Ryujinx.HLE/HOS/Services/Mm/IRequest.cs                   | 2 +-
 Ryujinx.HLE/HOS/Services/Ncm/IContentManager.cs           | 2 +-
 Ryujinx.HLE/HOS/Services/Ncm/IContentStorage.cs           | 2 +-
 Ryujinx.HLE/HOS/Services/Nfp/DeviceState.cs               | 2 +-
 Ryujinx.HLE/HOS/Services/Nfp/IUser.cs                     | 2 +-
 Ryujinx.HLE/HOS/Services/Nfp/IUserManager.cs              | 2 +-
 Ryujinx.HLE/HOS/Services/Nfp/State.cs                     | 2 +-
 Ryujinx.HLE/HOS/Services/Nifm/IGeneralService.cs          | 2 +-
 Ryujinx.HLE/HOS/Services/Nifm/IRequest.cs                 | 2 +-
 Ryujinx.HLE/HOS/Services/Nifm/IStaticService.cs           | 2 +-
 Ryujinx.HLE/HOS/Services/Nifm/NifmErr.cs                  | 2 +-
 Ryujinx.HLE/HOS/Services/Ns/IAddOnContentManager.cs       | 2 +-
 .../HOS/Services/Ns/IApplicationManagerInterface.cs       | 2 +-
 Ryujinx.HLE/HOS/Services/Ns/IServiceGetterInterface.cs    | 2 +-
 Ryujinx.HLE/HOS/Services/Ns/ISystemUpdateInterface.cs     | 2 +-
 .../HOS/Services/Ns/IVulnerabilityManagerInterface.cs     | 2 +-
 Ryujinx.HLE/HOS/Services/Nv/INvDrvServices.cs             | 2 +-
 Ryujinx.HLE/HOS/Services/Nv/NvFd.cs                       | 2 +-
 Ryujinx.HLE/HOS/Services/Nv/NvGpuAS/NvGpuASAllocSpace.cs  | 2 +-
 Ryujinx.HLE/HOS/Services/Nv/NvGpuAS/NvGpuASCtx.cs         | 2 +-
 Ryujinx.HLE/HOS/Services/Nv/NvGpuAS/NvGpuASIoctl.cs       | 2 +-
 Ryujinx.HLE/HOS/Services/Nv/NvGpuAS/NvGpuASMapBufferEx.cs | 2 +-
 Ryujinx.HLE/HOS/Services/Nv/NvGpuAS/NvGpuASRemap.cs       | 2 +-
 Ryujinx.HLE/HOS/Services/Nv/NvGpuAS/NvGpuASUnmapBuffer.cs | 2 +-
 .../HOS/Services/Nv/NvGpuGpu/NvGpuGpuGetActiveSlotMask.cs | 2 +-
 .../Services/Nv/NvGpuGpu/NvGpuGpuGetCharacteristics.cs    | 2 +-
 .../HOS/Services/Nv/NvGpuGpu/NvGpuGpuGetTpcMasks.cs       | 2 +-
 Ryujinx.HLE/HOS/Services/Nv/NvGpuGpu/NvGpuGpuIoctl.cs     | 2 +-
 .../HOS/Services/Nv/NvGpuGpu/NvGpuGpuZcullGetCtxSize.cs   | 2 +-
 .../HOS/Services/Nv/NvGpuGpu/NvGpuGpuZcullGetInfo.cs      | 2 +-
 Ryujinx.HLE/HOS/Services/Nv/NvHelper.cs                   | 2 +-
 Ryujinx.HLE/HOS/Services/Nv/NvHostChannel/NvChannel.cs    | 2 +-
 .../HOS/Services/Nv/NvHostChannel/NvChannelName.cs        | 2 +-
 .../HOS/Services/Nv/NvHostChannel/NvHostChannelIoctl.cs   | 2 +-
 .../Nv/NvHostChannel/NvHostChannelSubmitGpfifo.cs         | 2 +-
 Ryujinx.HLE/HOS/Services/Nv/NvHostCtrl/NvHostCtrlIoctl.cs | 2 +-
 .../HOS/Services/Nv/NvHostCtrl/NvHostCtrlSyncPtRead.cs    | 2 +-
 .../HOS/Services/Nv/NvHostCtrl/NvHostCtrlSyncPtWait.cs    | 2 +-
 .../HOS/Services/Nv/NvHostCtrl/NvHostCtrlSyncPtWaitEx.cs  | 2 +-
 .../HOS/Services/Nv/NvHostCtrl/NvHostCtrlUserCtx.cs       | 2 +-
 Ryujinx.HLE/HOS/Services/Nv/NvHostCtrl/NvHostEvent.cs     | 2 +-
 .../HOS/Services/Nv/NvHostCtrl/NvHostEventState.cs        | 2 +-
 Ryujinx.HLE/HOS/Services/Nv/NvHostCtrl/NvHostSyncPt.cs    | 2 +-
 Ryujinx.HLE/HOS/Services/Nv/NvMap/NvMapAlloc.cs           | 2 +-
 Ryujinx.HLE/HOS/Services/Nv/NvMap/NvMapCreate.cs          | 2 +-
 Ryujinx.HLE/HOS/Services/Nv/NvMap/NvMapFree.cs            | 2 +-
 Ryujinx.HLE/HOS/Services/Nv/NvMap/NvMapFromId.cs          | 2 +-
 Ryujinx.HLE/HOS/Services/Nv/NvMap/NvMapGetId.cs           | 2 +-
 Ryujinx.HLE/HOS/Services/Nv/NvMap/NvMapHandle.cs          | 2 +-
 Ryujinx.HLE/HOS/Services/Nv/NvMap/NvMapHandleParam.cs     | 2 +-
 Ryujinx.HLE/HOS/Services/Nv/NvMap/NvMapIoctl.cs           | 2 +-
 Ryujinx.HLE/HOS/Services/Nv/NvMap/NvMapParam.cs           | 2 +-
 Ryujinx.HLE/HOS/Services/Nv/NvResult.cs                   | 2 +-
 Ryujinx.HLE/HOS/Services/Pctl/IParentalControlService.cs  | 2 +-
 .../HOS/Services/Pctl/IParentalControlServiceFactory.cs   | 2 +-
 Ryujinx.HLE/HOS/Services/Pl/ISharedFontManager.cs         | 2 +-
 Ryujinx.HLE/HOS/Services/Prepo/IPrepoService.cs           | 2 +-
 Ryujinx.HLE/HOS/Services/Psm/IPsmServer.cs                | 4 ++--
 Ryujinx.HLE/HOS/Services/Psm/IPsmSession.cs               | 2 +-
 Ryujinx.HLE/HOS/Services/ServiceFactory.cs                | 2 +-
 Ryujinx.HLE/HOS/Services/Set/ISettingsServer.cs           | 2 +-
 Ryujinx.HLE/HOS/Services/Set/ISystemSettingsServer.cs     | 2 +-
 Ryujinx.HLE/HOS/Services/Set/NxSettings.cs                | 2 +-
 Ryujinx.HLE/HOS/Services/Sfdnsres/GaiError.cs             | 2 +-
 Ryujinx.HLE/HOS/Services/Sfdnsres/IResolver.cs            | 2 +-
 Ryujinx.HLE/HOS/Services/Sfdnsres/NetDBError.cs           | 2 +-
 Ryujinx.HLE/HOS/Services/Sm/IUserInterface.cs             | 2 +-
 Ryujinx.HLE/HOS/Services/Spl/IRandomInterface.cs          | 2 +-
 Ryujinx.HLE/HOS/Services/Ssl/ISslContext.cs               | 2 +-
 Ryujinx.HLE/HOS/Services/Ssl/ISslService.cs               | 2 +-
 Ryujinx.HLE/HOS/Services/Time/IStaticService.cs           | 2 +-
 Ryujinx.HLE/HOS/Services/Time/ISteadyClock.cs             | 2 +-
 Ryujinx.HLE/HOS/Services/Time/ISystemClock.cs             | 2 +-
 Ryujinx.HLE/HOS/Services/Time/ITimeZoneService.cs         | 2 +-
 Ryujinx.HLE/HOS/Services/Time/SystemClockType.cs          | 2 +-
 Ryujinx.HLE/HOS/Services/Vi/Display.cs                    | 2 +-
 Ryujinx.HLE/HOS/Services/Vi/GbpBuffer.cs                  | 2 +-
 Ryujinx.HLE/HOS/Services/Vi/IApplicationDisplayService.cs | 2 +-
 Ryujinx.HLE/HOS/Services/Vi/IApplicationRootService.cs    | 2 +-
 Ryujinx.HLE/HOS/Services/Vi/IHOSBinderDriver.cs           | 2 +-
 Ryujinx.HLE/HOS/Services/Vi/IManagerDisplayService.cs     | 2 +-
 Ryujinx.HLE/HOS/Services/Vi/IManagerRootService.cs        | 2 +-
 Ryujinx.HLE/HOS/Services/Vi/ISystemDisplayService.cs      | 2 +-
 Ryujinx.HLE/HOS/Services/Vi/ISystemRootService.cs         | 2 +-
 Ryujinx.HLE/HOS/Services/Vi/NvFlinger.cs                  | 2 +-
 Ryujinx.HLE/HOS/Services/Vi/Parcel.cs                     | 2 +-
 Ryujinx.HLE/HOS/SystemState/AppletStateMgr.cs             | 2 +-
 Ryujinx.HLE/HOS/SystemState/UserProfile.cs                | 2 +-
 Ryujinx.HLE/Input/HidProController.cs                     | 2 +-
 Ryujinx.HLE/Input/IHidDevice.cs                           | 2 +-
 Ryujinx.HLE/Loaders/Compression/BackwardsLz.cs            | 2 +-
 Ryujinx.HLE/Loaders/Compression/Lz4.cs                    | 2 +-
 Ryujinx.HLE/Loaders/Elf/ElfDynamic.cs                     | 2 +-
 Ryujinx.HLE/Loaders/Elf/ElfSymbol.cs                      | 2 +-
 Ryujinx.HLE/Loaders/Elf/ElfSymbolBinding.cs               | 2 +-
 Ryujinx.HLE/Loaders/Elf/ElfSymbolType.cs                  | 2 +-
 Ryujinx.HLE/Loaders/Elf/ElfSymbolVisibility.cs            | 2 +-
 Ryujinx.HLE/Loaders/Executables/IExecutable.cs            | 2 +-
 Ryujinx.HLE/Loaders/Executables/KernelInitialProcess.cs   | 2 +-
 Ryujinx.HLE/Loaders/Executables/NxRelocatableObject.cs    | 2 +-
 Ryujinx.HLE/Loaders/Executables/NxStaticObject.cs         | 2 +-
 Ryujinx.HLE/Loaders/Npdm/ACI0.cs                          | 2 +-
 Ryujinx.HLE/Loaders/Npdm/ACID.cs                          | 2 +-
 Ryujinx.HLE/Loaders/Npdm/FsAccessControl.cs               | 2 +-
 Ryujinx.HLE/Loaders/Npdm/FsAccessHeader.cs                | 2 +-
 Ryujinx.HLE/Loaders/Npdm/KernelAccessControl.cs           | 2 +-
 Ryujinx.HLE/Loaders/Npdm/Npdm.cs                          | 2 +-
 Ryujinx.HLE/Loaders/Npdm/ServiceAccessControl.cs          | 2 +-
 Ryujinx.HLE/Utilities/EndianSwap.cs                       | 2 +-
 Ryujinx.HLE/Utilities/IntUtils.cs                         | 2 +-
 Ryujinx.HLE/Utilities/StringUtils.cs                      | 2 +-
 Ryujinx.HLE/Utilities/StructReader.cs                     | 2 +-
 Ryujinx.HLE/Utilities/StructWriter.cs                     | 2 +-
 302 files changed, 308 insertions(+), 308 deletions(-)

diff --git a/Ryujinx.HLE/DeviceMemory.cs b/Ryujinx.HLE/DeviceMemory.cs
index e5c5b62ffb..abf79f05e0 100644
--- a/Ryujinx.HLE/DeviceMemory.cs
+++ b/Ryujinx.HLE/DeviceMemory.cs
@@ -3,7 +3,7 @@ using System.Runtime.InteropServices;
 
 namespace Ryujinx.HLE
 {
-    class DeviceMemory : IDisposable
+    internal class DeviceMemory : IDisposable
     {
         public const long RamSize = 4L * 1024 * 1024 * 1024;
 
diff --git a/Ryujinx.HLE/FileSystem/Content/ContentPath.cs b/Ryujinx.HLE/FileSystem/Content/ContentPath.cs
index 1e2c8ab32a..b4db7757bc 100644
--- a/Ryujinx.HLE/FileSystem/Content/ContentPath.cs
+++ b/Ryujinx.HLE/FileSystem/Content/ContentPath.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.FileSystem.Content
 {
-    static class ContentPath
+    internal static class ContentPath
     {
         public const string SystemContent    = "@SystemContent";
         public const string UserContent      = "@UserContent";
diff --git a/Ryujinx.HLE/FileSystem/Content/TitleType.cs b/Ryujinx.HLE/FileSystem/Content/TitleType.cs
index 6ad26c9cdd..fd6a980440 100644
--- a/Ryujinx.HLE/FileSystem/Content/TitleType.cs
+++ b/Ryujinx.HLE/FileSystem/Content/TitleType.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.FileSystem.Content
 {
-    enum TitleType
+    internal enum TitleType
     {
         SystemPrograms     = 0x01,
         SystemDataArchive  = 0x02,
diff --git a/Ryujinx.HLE/FileSystem/FileSystemProvider.cs b/Ryujinx.HLE/FileSystem/FileSystemProvider.cs
index 8461467d19..9eb30cc96a 100644
--- a/Ryujinx.HLE/FileSystem/FileSystemProvider.cs
+++ b/Ryujinx.HLE/FileSystem/FileSystemProvider.cs
@@ -8,7 +8,7 @@ using static Ryujinx.HLE.HOS.ErrorCode;
 
 namespace Ryujinx.HLE.FileSystem
 {
-    class FileSystemProvider : IFileSystemProvider
+    internal class FileSystemProvider : IFileSystemProvider
     {
         private readonly string _basePath;
         private readonly string _rootPath;
diff --git a/Ryujinx.HLE/FileSystem/IFileSystemProvider.cs b/Ryujinx.HLE/FileSystem/IFileSystemProvider.cs
index 8e2cae6430..31628292e3 100644
--- a/Ryujinx.HLE/FileSystem/IFileSystemProvider.cs
+++ b/Ryujinx.HLE/FileSystem/IFileSystemProvider.cs
@@ -3,7 +3,7 @@ using Ryujinx.HLE.HOS.Services.FspSrv;
 
 namespace Ryujinx.HLE.FileSystem
 {
-    interface IFileSystemProvider
+    internal interface IFileSystemProvider
     {
         long CreateFile(string name, long size);
 
diff --git a/Ryujinx.HLE/FileSystem/PFsProvider.cs b/Ryujinx.HLE/FileSystem/PFsProvider.cs
index 63edadf11c..4e8e2ff3ef 100644
--- a/Ryujinx.HLE/FileSystem/PFsProvider.cs
+++ b/Ryujinx.HLE/FileSystem/PFsProvider.cs
@@ -10,7 +10,7 @@ using static Ryujinx.HLE.HOS.ErrorCode;
 
 namespace Ryujinx.HLE.FileSystem
 {
-    class PFsProvider : IFileSystemProvider
+    internal class PFsProvider : IFileSystemProvider
     {
         private Pfs _pfs;
 
diff --git a/Ryujinx.HLE/FileSystem/RomFsProvider.cs b/Ryujinx.HLE/FileSystem/RomFsProvider.cs
index f6a2f82f40..10ce2bed7a 100644
--- a/Ryujinx.HLE/FileSystem/RomFsProvider.cs
+++ b/Ryujinx.HLE/FileSystem/RomFsProvider.cs
@@ -10,7 +10,7 @@ using static Ryujinx.HLE.HOS.ErrorCode;
 
 namespace Ryujinx.HLE.FileSystem
 {
-    class RomFsProvider : IFileSystemProvider
+    internal class RomFsProvider : IFileSystemProvider
     {
         private Romfs _romFs;
 
diff --git a/Ryujinx.HLE/FileSystem/SaveDataType.cs b/Ryujinx.HLE/FileSystem/SaveDataType.cs
index edfe8ab1d9..f3817f3c28 100644
--- a/Ryujinx.HLE/FileSystem/SaveDataType.cs
+++ b/Ryujinx.HLE/FileSystem/SaveDataType.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.FileSystem
 {
-    enum SaveDataType : byte
+    internal enum SaveDataType : byte
     {
         SystemSaveData,
         SaveData,
diff --git a/Ryujinx.HLE/FileSystem/SaveHelper.cs b/Ryujinx.HLE/FileSystem/SaveHelper.cs
index 0dfcfd2bb9..0c20d11ead 100644
--- a/Ryujinx.HLE/FileSystem/SaveHelper.cs
+++ b/Ryujinx.HLE/FileSystem/SaveHelper.cs
@@ -5,7 +5,7 @@ using static Ryujinx.HLE.FileSystem.VirtualFileSystem;
 
 namespace Ryujinx.HLE.FileSystem
 {
-    static class SaveHelper
+    internal static class SaveHelper
     {
         public static string GetSavePath(SaveInfo saveMetaData, ServiceCtx context)
         {
diff --git a/Ryujinx.HLE/FileSystem/SaveInfo.cs b/Ryujinx.HLE/FileSystem/SaveInfo.cs
index db7f6765d7..f894165243 100644
--- a/Ryujinx.HLE/FileSystem/SaveInfo.cs
+++ b/Ryujinx.HLE/FileSystem/SaveInfo.cs
@@ -2,7 +2,7 @@
 
 namespace Ryujinx.HLE.FileSystem
 {
-    struct SaveInfo
+    internal struct SaveInfo
     {
         public long    TitleId { get; private set; }
         public long    SaveId  { get; private set; }
diff --git a/Ryujinx.HLE/FileSystem/SaveSpaceId.cs b/Ryujinx.HLE/FileSystem/SaveSpaceId.cs
index d51922df1a..ab49f458ed 100644
--- a/Ryujinx.HLE/FileSystem/SaveSpaceId.cs
+++ b/Ryujinx.HLE/FileSystem/SaveSpaceId.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.FileSystem
 {
-    enum SaveSpaceId
+    internal enum SaveSpaceId
     {
         NandSystem,
         NandUser,
diff --git a/Ryujinx.HLE/FileSystem/VirtualFileSystem.cs b/Ryujinx.HLE/FileSystem/VirtualFileSystem.cs
index eed5953f19..50ed186a9c 100644
--- a/Ryujinx.HLE/FileSystem/VirtualFileSystem.cs
+++ b/Ryujinx.HLE/FileSystem/VirtualFileSystem.cs
@@ -5,7 +5,7 @@ using System.IO;
 
 namespace Ryujinx.HLE.FileSystem
 {
-    class VirtualFileSystem : IDisposable
+    internal class VirtualFileSystem : IDisposable
     {
         public const string BasePath   = "RyuFs";
         public const string NandPath   = "nand";
diff --git a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Demangler.cs b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Demangler.cs
index b89c920f46..f407e3e734 100644
--- a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Demangler.cs
+++ b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Demangler.cs
@@ -6,7 +6,7 @@ using Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast;
 
 namespace Ryujinx.HLE.HOS.Diagnostics.Demangler
 {
-    class Demangler
+    internal class Demangler
     {
         private static readonly string Base36     = "0123456789abcdefghijklmnopqrstuvwxyz";
         private List<BaseNode> _substitutionList  = new List<BaseNode>();
@@ -2684,7 +2684,7 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler
             }
         }
 
-        class NameParserContext
+        private class NameParserContext
         {
             public CvType Cv;
             public SimpleReferenceType Ref;
diff --git a/Ryujinx.HLE/HOS/ErrorCode.cs b/Ryujinx.HLE/HOS/ErrorCode.cs
index 564fa91ddc..b7f42ad1ba 100644
--- a/Ryujinx.HLE/HOS/ErrorCode.cs
+++ b/Ryujinx.HLE/HOS/ErrorCode.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS
 {
-    static class ErrorCode
+    internal static class ErrorCode
     {
         public static uint MakeError(ErrorModule module, int code)
         {
diff --git a/Ryujinx.HLE/HOS/ErrorModule.cs b/Ryujinx.HLE/HOS/ErrorModule.cs
index e13d5e84fb..b634952db9 100644
--- a/Ryujinx.HLE/HOS/ErrorModule.cs
+++ b/Ryujinx.HLE/HOS/ErrorModule.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS
 {
-    enum ErrorModule
+    internal enum ErrorModule
     {
         Kernel                = 1,
         Fs                    = 2,
diff --git a/Ryujinx.HLE/HOS/Font/SharedFontManager.cs b/Ryujinx.HLE/HOS/Font/SharedFontManager.cs
index 28c65785b0..a79c810074 100644
--- a/Ryujinx.HLE/HOS/Font/SharedFontManager.cs
+++ b/Ryujinx.HLE/HOS/Font/SharedFontManager.cs
@@ -11,7 +11,7 @@ using static Ryujinx.HLE.Utilities.FontUtils;
 
 namespace Ryujinx.HLE.HOS.Font
 {
-    class SharedFontManager
+    internal class SharedFontManager
     {
         private Switch _device;
 
diff --git a/Ryujinx.HLE/HOS/GlobalStateTable.cs b/Ryujinx.HLE/HOS/GlobalStateTable.cs
index a350dee236..7748326c00 100644
--- a/Ryujinx.HLE/HOS/GlobalStateTable.cs
+++ b/Ryujinx.HLE/HOS/GlobalStateTable.cs
@@ -4,7 +4,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS
 {
-    class GlobalStateTable
+    internal class GlobalStateTable
     {
         private ConcurrentDictionary<KProcess, IdDictionary> _dictByProcess;
 
diff --git a/Ryujinx.HLE/HOS/Homebrew.cs b/Ryujinx.HLE/HOS/Homebrew.cs
index b0e05554b9..c99b3feca3 100644
--- a/Ryujinx.HLE/HOS/Homebrew.cs
+++ b/Ryujinx.HLE/HOS/Homebrew.cs
@@ -3,7 +3,7 @@ using System.Text;
 
 namespace Ryujinx.HLE.HOS
 {
-    static class Homebrew
+    internal static class Homebrew
     {
         public const string TemporaryNroSuffix = ".ryu_tmp.nro";
 
diff --git a/Ryujinx.HLE/HOS/IdDictionary.cs b/Ryujinx.HLE/HOS/IdDictionary.cs
index c6356725ab..173c291b46 100644
--- a/Ryujinx.HLE/HOS/IdDictionary.cs
+++ b/Ryujinx.HLE/HOS/IdDictionary.cs
@@ -4,7 +4,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS
 {
-    class IdDictionary
+    internal class IdDictionary
     {
         private ConcurrentDictionary<int, object> _objs;
 
diff --git a/Ryujinx.HLE/HOS/Ipc/IpcBuffDesc.cs b/Ryujinx.HLE/HOS/Ipc/IpcBuffDesc.cs
index dddd2671a1..4182bc14d0 100644
--- a/Ryujinx.HLE/HOS/Ipc/IpcBuffDesc.cs
+++ b/Ryujinx.HLE/HOS/Ipc/IpcBuffDesc.cs
@@ -2,7 +2,7 @@ using System.IO;
 
 namespace Ryujinx.HLE.HOS.Ipc
 {
-    struct IpcBuffDesc
+    internal struct IpcBuffDesc
     {
         public long Position { get; private set; }
         public long Size     { get; private set; }
diff --git a/Ryujinx.HLE/HOS/Ipc/IpcHandleDesc.cs b/Ryujinx.HLE/HOS/Ipc/IpcHandleDesc.cs
index 14b7e3ad5e..856329c09d 100644
--- a/Ryujinx.HLE/HOS/Ipc/IpcHandleDesc.cs
+++ b/Ryujinx.HLE/HOS/Ipc/IpcHandleDesc.cs
@@ -3,7 +3,7 @@ using System.IO;
 
 namespace Ryujinx.HLE.HOS.Ipc
 {
-    class IpcHandleDesc
+    internal class IpcHandleDesc
     {
         public bool HasPId { get; private set; }
 
diff --git a/Ryujinx.HLE/HOS/Ipc/IpcHandler.cs b/Ryujinx.HLE/HOS/Ipc/IpcHandler.cs
index e5d19236bb..be81da59fd 100644
--- a/Ryujinx.HLE/HOS/Ipc/IpcHandler.cs
+++ b/Ryujinx.HLE/HOS/Ipc/IpcHandler.cs
@@ -5,7 +5,7 @@ using System.IO;
 
 namespace Ryujinx.HLE.HOS.Ipc
 {
-    static class IpcHandler
+    internal static class IpcHandler
     {
         public static long IpcCall(
             Switch        device,
diff --git a/Ryujinx.HLE/HOS/Ipc/IpcMagic.cs b/Ryujinx.HLE/HOS/Ipc/IpcMagic.cs
index 72770b90ed..3a5fafae1a 100644
--- a/Ryujinx.HLE/HOS/Ipc/IpcMagic.cs
+++ b/Ryujinx.HLE/HOS/Ipc/IpcMagic.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Ipc
 {
-    abstract class IpcMagic
+    internal abstract class IpcMagic
     {
         public const long Sfci = 'S' << 0 | 'F' << 8 | 'C' << 16 | 'I' << 24;
         public const long Sfco = 'S' << 0 | 'F' << 8 | 'C' << 16 | 'O' << 24;
diff --git a/Ryujinx.HLE/HOS/Ipc/IpcMessage.cs b/Ryujinx.HLE/HOS/Ipc/IpcMessage.cs
index 85b6820a63..dc7d5a738c 100644
--- a/Ryujinx.HLE/HOS/Ipc/IpcMessage.cs
+++ b/Ryujinx.HLE/HOS/Ipc/IpcMessage.cs
@@ -3,7 +3,7 @@ using System.IO;
 
 namespace Ryujinx.HLE.HOS.Ipc
 {
-    class IpcMessage
+    internal class IpcMessage
     {
         public IpcMessageType Type { get; set; }
 
diff --git a/Ryujinx.HLE/HOS/Ipc/IpcMessageType.cs b/Ryujinx.HLE/HOS/Ipc/IpcMessageType.cs
index e258accc9b..cf24e027a0 100644
--- a/Ryujinx.HLE/HOS/Ipc/IpcMessageType.cs
+++ b/Ryujinx.HLE/HOS/Ipc/IpcMessageType.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Ipc
 {
-    enum IpcMessageType
+    internal enum IpcMessageType
     {
         Response           = 0,
         CloseSession       = 2,
diff --git a/Ryujinx.HLE/HOS/Ipc/IpcPtrBuffDesc.cs b/Ryujinx.HLE/HOS/Ipc/IpcPtrBuffDesc.cs
index cdc43f17f0..f38cd46f90 100644
--- a/Ryujinx.HLE/HOS/Ipc/IpcPtrBuffDesc.cs
+++ b/Ryujinx.HLE/HOS/Ipc/IpcPtrBuffDesc.cs
@@ -2,7 +2,7 @@ using System.IO;
 
 namespace Ryujinx.HLE.HOS.Ipc
 {
-    struct IpcPtrBuffDesc
+    internal struct IpcPtrBuffDesc
     {
         public long  Position { get; private set; }
         public int   Index    { get; private set; }
diff --git a/Ryujinx.HLE/HOS/Ipc/IpcRecvListBuffDesc.cs b/Ryujinx.HLE/HOS/Ipc/IpcRecvListBuffDesc.cs
index 3fd92f02a0..710ab6041d 100644
--- a/Ryujinx.HLE/HOS/Ipc/IpcRecvListBuffDesc.cs
+++ b/Ryujinx.HLE/HOS/Ipc/IpcRecvListBuffDesc.cs
@@ -2,7 +2,7 @@ using System.IO;
 
 namespace Ryujinx.HLE.HOS.Ipc
 {
-    struct IpcRecvListBuffDesc
+    internal struct IpcRecvListBuffDesc
     {
         public long Position { get; private set; }
         public long Size     { get; private set; }
diff --git a/Ryujinx.HLE/HOS/Ipc/ServiceProcessRequest.cs b/Ryujinx.HLE/HOS/Ipc/ServiceProcessRequest.cs
index b3aaa2191b..b47ff6b5b3 100644
--- a/Ryujinx.HLE/HOS/Ipc/ServiceProcessRequest.cs
+++ b/Ryujinx.HLE/HOS/Ipc/ServiceProcessRequest.cs
@@ -1,4 +1,4 @@
 namespace Ryujinx.HLE.HOS.Ipc
 {
-    delegate long ServiceProcessRequest(ServiceCtx context);
+    internal delegate long ServiceProcessRequest(ServiceCtx context);
 }
\ No newline at end of file
diff --git a/Ryujinx.HLE/HOS/Kernel/AddressSpaceType.cs b/Ryujinx.HLE/HOS/Kernel/AddressSpaceType.cs
index 6f7b230e70..c65ff21fce 100644
--- a/Ryujinx.HLE/HOS/Kernel/AddressSpaceType.cs
+++ b/Ryujinx.HLE/HOS/Kernel/AddressSpaceType.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    enum AddressSpaceType
+    internal enum AddressSpaceType
     {
         Addr32Bits      = 0,
         Addr36Bits      = 1,
diff --git a/Ryujinx.HLE/HOS/Kernel/ArbitrationType.cs b/Ryujinx.HLE/HOS/Kernel/ArbitrationType.cs
index b584d7192b..16eb6205d4 100644
--- a/Ryujinx.HLE/HOS/Kernel/ArbitrationType.cs
+++ b/Ryujinx.HLE/HOS/Kernel/ArbitrationType.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    enum ArbitrationType
+    internal enum ArbitrationType
     {
         WaitIfLessThan             = 0,
         DecrementAndWaitIfLessThan = 1,
diff --git a/Ryujinx.HLE/HOS/Kernel/DramMemoryMap.cs b/Ryujinx.HLE/HOS/Kernel/DramMemoryMap.cs
index b20a83e2a9..bc6251d173 100644
--- a/Ryujinx.HLE/HOS/Kernel/DramMemoryMap.cs
+++ b/Ryujinx.HLE/HOS/Kernel/DramMemoryMap.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    static class DramMemoryMap
+    internal static class DramMemoryMap
     {
         public const ulong DramBase = 0x80000000;
         public const ulong DramSize = 0x100000000;
diff --git a/Ryujinx.HLE/HOS/Kernel/HleCoreManager.cs b/Ryujinx.HLE/HOS/Kernel/HleCoreManager.cs
index 04017d6d8a..123ac3e5e5 100644
--- a/Ryujinx.HLE/HOS/Kernel/HleCoreManager.cs
+++ b/Ryujinx.HLE/HOS/Kernel/HleCoreManager.cs
@@ -3,7 +3,7 @@ using System.Threading;
 
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    class HleCoreManager
+    internal class HleCoreManager
     {
         private class PausableThread
         {
diff --git a/Ryujinx.HLE/HOS/Kernel/HleProcessDebugger.cs b/Ryujinx.HLE/HOS/Kernel/HleProcessDebugger.cs
index 35e1391432..80824c89df 100644
--- a/Ryujinx.HLE/HOS/Kernel/HleProcessDebugger.cs
+++ b/Ryujinx.HLE/HOS/Kernel/HleProcessDebugger.cs
@@ -10,7 +10,7 @@ using System.Threading;
 
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    class HleProcessDebugger
+    internal class HleProcessDebugger
     {
         private const int Mod0 = 'M' << 0 | 'O' << 8 | 'D' << 16 | '0' << 24;
 
diff --git a/Ryujinx.HLE/HOS/Kernel/HleScheduler.cs b/Ryujinx.HLE/HOS/Kernel/HleScheduler.cs
index 1a4c9dfef8..c713d0041e 100644
--- a/Ryujinx.HLE/HOS/Kernel/HleScheduler.cs
+++ b/Ryujinx.HLE/HOS/Kernel/HleScheduler.cs
@@ -3,7 +3,7 @@ using System.Threading;
 
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    partial class KScheduler
+    internal partial class KScheduler
     {
         private const int RoundRobinTimeQuantumMs = 10;
 
diff --git a/Ryujinx.HLE/HOS/Kernel/IKFutureSchedulerObject.cs b/Ryujinx.HLE/HOS/Kernel/IKFutureSchedulerObject.cs
index 6a255e6552..dce50f6091 100644
--- a/Ryujinx.HLE/HOS/Kernel/IKFutureSchedulerObject.cs
+++ b/Ryujinx.HLE/HOS/Kernel/IKFutureSchedulerObject.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    interface IKFutureSchedulerObject
+    internal interface IKFutureSchedulerObject
     {
         void TimeUp();
     }
diff --git a/Ryujinx.HLE/HOS/Kernel/KAddressArbiter.cs b/Ryujinx.HLE/HOS/Kernel/KAddressArbiter.cs
index b435248556..772dc4f24f 100644
--- a/Ryujinx.HLE/HOS/Kernel/KAddressArbiter.cs
+++ b/Ryujinx.HLE/HOS/Kernel/KAddressArbiter.cs
@@ -5,7 +5,7 @@ using static Ryujinx.HLE.HOS.ErrorCode;
 
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    class KAddressArbiter
+    internal class KAddressArbiter
     {
         private const int HasListenersMask = 0x40000000;
 
diff --git a/Ryujinx.HLE/HOS/Kernel/KAutoObject.cs b/Ryujinx.HLE/HOS/Kernel/KAutoObject.cs
index f49beaac94..25bdc05482 100644
--- a/Ryujinx.HLE/HOS/Kernel/KAutoObject.cs
+++ b/Ryujinx.HLE/HOS/Kernel/KAutoObject.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    class KAutoObject
+    internal class KAutoObject
     {
         protected Horizon System;
 
diff --git a/Ryujinx.HLE/HOS/Kernel/KClientPort.cs b/Ryujinx.HLE/HOS/Kernel/KClientPort.cs
index 5754762770..b79dd57ea1 100644
--- a/Ryujinx.HLE/HOS/Kernel/KClientPort.cs
+++ b/Ryujinx.HLE/HOS/Kernel/KClientPort.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    class KClientPort : KSynchronizationObject
+    internal class KClientPort : KSynchronizationObject
     {
         private int _sessionsCount;
         private int _currentCapacity;
diff --git a/Ryujinx.HLE/HOS/Kernel/KConditionVariable.cs b/Ryujinx.HLE/HOS/Kernel/KConditionVariable.cs
index 15c96c24d2..e39514bedb 100644
--- a/Ryujinx.HLE/HOS/Kernel/KConditionVariable.cs
+++ b/Ryujinx.HLE/HOS/Kernel/KConditionVariable.cs
@@ -3,7 +3,7 @@ using System.Threading;
 
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    static class KConditionVariable
+    internal static class KConditionVariable
     {
         public static void Wait(Horizon system, LinkedList<KThread> threadList, object mutex, long timeout)
         {
diff --git a/Ryujinx.HLE/HOS/Kernel/KContextIdManager.cs b/Ryujinx.HLE/HOS/Kernel/KContextIdManager.cs
index 80a1c1c711..6de9684308 100644
--- a/Ryujinx.HLE/HOS/Kernel/KContextIdManager.cs
+++ b/Ryujinx.HLE/HOS/Kernel/KContextIdManager.cs
@@ -3,7 +3,7 @@ using System;
 
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    class KContextIdManager
+    internal class KContextIdManager
     {
         private const int IdMasksCount = 8;
 
diff --git a/Ryujinx.HLE/HOS/Kernel/KCoreContext.cs b/Ryujinx.HLE/HOS/Kernel/KCoreContext.cs
index 4ca3c25a06..08a5c1fc6a 100644
--- a/Ryujinx.HLE/HOS/Kernel/KCoreContext.cs
+++ b/Ryujinx.HLE/HOS/Kernel/KCoreContext.cs
@@ -2,7 +2,7 @@ using Ryujinx.Common;
 
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    class KCoreContext
+    internal class KCoreContext
     {
         private KScheduler _scheduler;
 
diff --git a/Ryujinx.HLE/HOS/Kernel/KCriticalSection.cs b/Ryujinx.HLE/HOS/Kernel/KCriticalSection.cs
index a54dc6cbc1..3a18d61f0f 100644
--- a/Ryujinx.HLE/HOS/Kernel/KCriticalSection.cs
+++ b/Ryujinx.HLE/HOS/Kernel/KCriticalSection.cs
@@ -3,7 +3,7 @@ using System.Threading;
 
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    class KCriticalSection
+    internal class KCriticalSection
     {
         private Horizon _system;
 
diff --git a/Ryujinx.HLE/HOS/Kernel/KEvent.cs b/Ryujinx.HLE/HOS/Kernel/KEvent.cs
index aa2124ec4e..e69e784890 100644
--- a/Ryujinx.HLE/HOS/Kernel/KEvent.cs
+++ b/Ryujinx.HLE/HOS/Kernel/KEvent.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    class KEvent
+    internal class KEvent
     {
         public KReadableEvent ReadableEvent { get; private set; }
         public KWritableEvent WritableEvent { get; private set; }
diff --git a/Ryujinx.HLE/HOS/Kernel/KHandleEntry.cs b/Ryujinx.HLE/HOS/Kernel/KHandleEntry.cs
index 42e5932954..2ca5b78d4a 100644
--- a/Ryujinx.HLE/HOS/Kernel/KHandleEntry.cs
+++ b/Ryujinx.HLE/HOS/Kernel/KHandleEntry.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    class KHandleEntry
+    internal class KHandleEntry
     {
         public KHandleEntry Next { get; set; }
 
diff --git a/Ryujinx.HLE/HOS/Kernel/KHandleTable.cs b/Ryujinx.HLE/HOS/Kernel/KHandleTable.cs
index 805ad4ff6e..d808fba3da 100644
--- a/Ryujinx.HLE/HOS/Kernel/KHandleTable.cs
+++ b/Ryujinx.HLE/HOS/Kernel/KHandleTable.cs
@@ -2,7 +2,7 @@ using System;
 
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    class KHandleTable
+    internal class KHandleTable
     {
         private const int SelfThreadHandle  = (0x1ffff << 15) | 0;
         private const int SelfProcessHandle = (0x1ffff << 15) | 1;
diff --git a/Ryujinx.HLE/HOS/Kernel/KMemoryArrange.cs b/Ryujinx.HLE/HOS/Kernel/KMemoryArrange.cs
index de8bf3b1fa..0bb71c8269 100644
--- a/Ryujinx.HLE/HOS/Kernel/KMemoryArrange.cs
+++ b/Ryujinx.HLE/HOS/Kernel/KMemoryArrange.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    class KMemoryArrange
+    internal class KMemoryArrange
     {
         public KMemoryArrangeRegion Service     { get; private set; }
         public KMemoryArrangeRegion NvServices  { get; private set; }
diff --git a/Ryujinx.HLE/HOS/Kernel/KMemoryArrangeRegion.cs b/Ryujinx.HLE/HOS/Kernel/KMemoryArrangeRegion.cs
index 4fe58d730a..a38d2271f4 100644
--- a/Ryujinx.HLE/HOS/Kernel/KMemoryArrangeRegion.cs
+++ b/Ryujinx.HLE/HOS/Kernel/KMemoryArrangeRegion.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    struct KMemoryArrangeRegion
+    internal struct KMemoryArrangeRegion
     {
         public ulong Address { get; private set; }
         public ulong Size    { get; private set; }
diff --git a/Ryujinx.HLE/HOS/Kernel/KMemoryBlock.cs b/Ryujinx.HLE/HOS/Kernel/KMemoryBlock.cs
index 44b7a68341..38ef1cde3e 100644
--- a/Ryujinx.HLE/HOS/Kernel/KMemoryBlock.cs
+++ b/Ryujinx.HLE/HOS/Kernel/KMemoryBlock.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    class KMemoryBlock
+    internal class KMemoryBlock
     {
         public ulong BaseAddress { get; set; }
         public ulong PagesCount  { get; set; }
diff --git a/Ryujinx.HLE/HOS/Kernel/KMemoryBlockAllocator.cs b/Ryujinx.HLE/HOS/Kernel/KMemoryBlockAllocator.cs
index 375685e678..c082396d98 100644
--- a/Ryujinx.HLE/HOS/Kernel/KMemoryBlockAllocator.cs
+++ b/Ryujinx.HLE/HOS/Kernel/KMemoryBlockAllocator.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    class KMemoryBlockAllocator
+    internal class KMemoryBlockAllocator
     {
         private ulong _capacityElements;
 
diff --git a/Ryujinx.HLE/HOS/Kernel/KMemoryInfo.cs b/Ryujinx.HLE/HOS/Kernel/KMemoryInfo.cs
index 0372e0d382..43220686d9 100644
--- a/Ryujinx.HLE/HOS/Kernel/KMemoryInfo.cs
+++ b/Ryujinx.HLE/HOS/Kernel/KMemoryInfo.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    class KMemoryInfo
+    internal class KMemoryInfo
     {
         public ulong Address { get; private set; }
         public ulong Size    { get; private set; }
diff --git a/Ryujinx.HLE/HOS/Kernel/KMemoryManager.cs b/Ryujinx.HLE/HOS/Kernel/KMemoryManager.cs
index 831844c72e..1338ef2895 100644
--- a/Ryujinx.HLE/HOS/Kernel/KMemoryManager.cs
+++ b/Ryujinx.HLE/HOS/Kernel/KMemoryManager.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    class KMemoryManager
+    internal class KMemoryManager
     {
         public const int PageSize = 0x1000;
 
diff --git a/Ryujinx.HLE/HOS/Kernel/KMemoryRegionBlock.cs b/Ryujinx.HLE/HOS/Kernel/KMemoryRegionBlock.cs
index f7e85e9a53..516b368e4c 100644
--- a/Ryujinx.HLE/HOS/Kernel/KMemoryRegionBlock.cs
+++ b/Ryujinx.HLE/HOS/Kernel/KMemoryRegionBlock.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    class KMemoryRegionBlock
+    internal class KMemoryRegionBlock
     {
         public long[][] Masks;
 
diff --git a/Ryujinx.HLE/HOS/Kernel/KMemoryRegionManager.cs b/Ryujinx.HLE/HOS/Kernel/KMemoryRegionManager.cs
index b9265b13c6..15ddb6e6fb 100644
--- a/Ryujinx.HLE/HOS/Kernel/KMemoryRegionManager.cs
+++ b/Ryujinx.HLE/HOS/Kernel/KMemoryRegionManager.cs
@@ -2,7 +2,7 @@ using Ryujinx.Common;
 
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    class KMemoryRegionManager
+    internal class KMemoryRegionManager
     {
         private static readonly int[] BlockOrders = new int[] { 12, 16, 21, 22, 25, 29, 30 };
 
diff --git a/Ryujinx.HLE/HOS/Kernel/KPageList.cs b/Ryujinx.HLE/HOS/Kernel/KPageList.cs
index b24d126f50..315d259afd 100644
--- a/Ryujinx.HLE/HOS/Kernel/KPageList.cs
+++ b/Ryujinx.HLE/HOS/Kernel/KPageList.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    class KPageList : IEnumerable<KPageNode>
+    internal class KPageList : IEnumerable<KPageNode>
     {
         public LinkedList<KPageNode> Nodes { get; private set; }
 
diff --git a/Ryujinx.HLE/HOS/Kernel/KPageNode.cs b/Ryujinx.HLE/HOS/Kernel/KPageNode.cs
index 5cdb1c4934..427a0d4640 100644
--- a/Ryujinx.HLE/HOS/Kernel/KPageNode.cs
+++ b/Ryujinx.HLE/HOS/Kernel/KPageNode.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    struct KPageNode
+    internal struct KPageNode
     {
         public ulong Address;
         public ulong PagesCount;
diff --git a/Ryujinx.HLE/HOS/Kernel/KPort.cs b/Ryujinx.HLE/HOS/Kernel/KPort.cs
index a6c5b375f1..e53185c19c 100644
--- a/Ryujinx.HLE/HOS/Kernel/KPort.cs
+++ b/Ryujinx.HLE/HOS/Kernel/KPort.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    class KPort : KAutoObject
+    internal class KPort : KAutoObject
     {
         public KServerPort ServerPort { get; private set; }
         public KClientPort ClientPort { get; private set; }
diff --git a/Ryujinx.HLE/HOS/Kernel/KProcess.cs b/Ryujinx.HLE/HOS/Kernel/KProcess.cs
index c5cfd9646a..473d8766d3 100644
--- a/Ryujinx.HLE/HOS/Kernel/KProcess.cs
+++ b/Ryujinx.HLE/HOS/Kernel/KProcess.cs
@@ -10,7 +10,7 @@ using System.Threading;
 
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    class KProcess : KSynchronizationObject
+    internal class KProcess : KSynchronizationObject
     {
         public const int KernelVersionMajor    = 10;
         public const int KernelVersionMinor    = 4;
diff --git a/Ryujinx.HLE/HOS/Kernel/KProcessCapabilities.cs b/Ryujinx.HLE/HOS/Kernel/KProcessCapabilities.cs
index 4dc8500c6a..34e4c8cf5f 100644
--- a/Ryujinx.HLE/HOS/Kernel/KProcessCapabilities.cs
+++ b/Ryujinx.HLE/HOS/Kernel/KProcessCapabilities.cs
@@ -2,7 +2,7 @@ using Ryujinx.Common;
 
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    class KProcessCapabilities
+    internal class KProcessCapabilities
     {
         public byte[] SvcAccessMask { get; private set; }
         public byte[] IrqAccessMask { get; private set; }
diff --git a/Ryujinx.HLE/HOS/Kernel/KReadableEvent.cs b/Ryujinx.HLE/HOS/Kernel/KReadableEvent.cs
index e1a3e63fc8..f346069316 100644
--- a/Ryujinx.HLE/HOS/Kernel/KReadableEvent.cs
+++ b/Ryujinx.HLE/HOS/Kernel/KReadableEvent.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    class KReadableEvent : KSynchronizationObject
+    internal class KReadableEvent : KSynchronizationObject
     {
         private KEvent _parent;
 
diff --git a/Ryujinx.HLE/HOS/Kernel/KResourceLimit.cs b/Ryujinx.HLE/HOS/Kernel/KResourceLimit.cs
index 09c53e5b09..a96e699c53 100644
--- a/Ryujinx.HLE/HOS/Kernel/KResourceLimit.cs
+++ b/Ryujinx.HLE/HOS/Kernel/KResourceLimit.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    class KResourceLimit
+    internal class KResourceLimit
     {
         private const int Time10SecondsMs = 10000;
 
diff --git a/Ryujinx.HLE/HOS/Kernel/KScheduler.cs b/Ryujinx.HLE/HOS/Kernel/KScheduler.cs
index f85b9e8c41..72c4f69d2b 100644
--- a/Ryujinx.HLE/HOS/Kernel/KScheduler.cs
+++ b/Ryujinx.HLE/HOS/Kernel/KScheduler.cs
@@ -4,7 +4,7 @@ using System.Linq;
 
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    partial class KScheduler : IDisposable
+    internal partial class KScheduler : IDisposable
     {
         public const int PrioritiesCount = 64;
         public const int CpuCoresCount   = 4;
diff --git a/Ryujinx.HLE/HOS/Kernel/KSchedulingData.cs b/Ryujinx.HLE/HOS/Kernel/KSchedulingData.cs
index 651160361d..e6ce166cc6 100644
--- a/Ryujinx.HLE/HOS/Kernel/KSchedulingData.cs
+++ b/Ryujinx.HLE/HOS/Kernel/KSchedulingData.cs
@@ -2,7 +2,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    class KSchedulingData
+    internal class KSchedulingData
     {
         private LinkedList<KThread>[][] _scheduledThreadsPerPrioPerCore;
         private LinkedList<KThread>[][] _suggestedThreadsPerPrioPerCore;
diff --git a/Ryujinx.HLE/HOS/Kernel/KServerPort.cs b/Ryujinx.HLE/HOS/Kernel/KServerPort.cs
index 0aa74e487b..35a93c8b64 100644
--- a/Ryujinx.HLE/HOS/Kernel/KServerPort.cs
+++ b/Ryujinx.HLE/HOS/Kernel/KServerPort.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    class KServerPort : KSynchronizationObject
+    internal class KServerPort : KSynchronizationObject
     {
         private KPort _parent;
 
diff --git a/Ryujinx.HLE/HOS/Kernel/KSession.cs b/Ryujinx.HLE/HOS/Kernel/KSession.cs
index 361a7479f4..d4f36b0a0e 100644
--- a/Ryujinx.HLE/HOS/Kernel/KSession.cs
+++ b/Ryujinx.HLE/HOS/Kernel/KSession.cs
@@ -3,7 +3,7 @@ using System;
 
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    class KSession : IDisposable
+    internal class KSession : IDisposable
     {
         public IpcService Service { get; private set; }
 
diff --git a/Ryujinx.HLE/HOS/Kernel/KSharedMemory.cs b/Ryujinx.HLE/HOS/Kernel/KSharedMemory.cs
index 0e9f8840e5..bad34b9431 100644
--- a/Ryujinx.HLE/HOS/Kernel/KSharedMemory.cs
+++ b/Ryujinx.HLE/HOS/Kernel/KSharedMemory.cs
@@ -2,7 +2,7 @@ using Ryujinx.Common;
 
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    class KSharedMemory
+    internal class KSharedMemory
     {
         private KPageList _pageList;
 
diff --git a/Ryujinx.HLE/HOS/Kernel/KSlabHeap.cs b/Ryujinx.HLE/HOS/Kernel/KSlabHeap.cs
index 84c4dc0172..4ac0800a19 100644
--- a/Ryujinx.HLE/HOS/Kernel/KSlabHeap.cs
+++ b/Ryujinx.HLE/HOS/Kernel/KSlabHeap.cs
@@ -2,7 +2,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    class KSlabHeap
+    internal class KSlabHeap
     {
         private LinkedList<ulong> _items;
 
diff --git a/Ryujinx.HLE/HOS/Kernel/KSynchronization.cs b/Ryujinx.HLE/HOS/Kernel/KSynchronization.cs
index 51b74a03db..d95009ddb7 100644
--- a/Ryujinx.HLE/HOS/Kernel/KSynchronization.cs
+++ b/Ryujinx.HLE/HOS/Kernel/KSynchronization.cs
@@ -4,7 +4,7 @@ using static Ryujinx.HLE.HOS.ErrorCode;
 
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    class KSynchronization
+    internal class KSynchronization
     {
         private Horizon _system;
 
diff --git a/Ryujinx.HLE/HOS/Kernel/KSynchronizationObject.cs b/Ryujinx.HLE/HOS/Kernel/KSynchronizationObject.cs
index 79f0673ff3..b92d0dc82b 100644
--- a/Ryujinx.HLE/HOS/Kernel/KSynchronizationObject.cs
+++ b/Ryujinx.HLE/HOS/Kernel/KSynchronizationObject.cs
@@ -2,7 +2,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    class KSynchronizationObject : KAutoObject
+    internal class KSynchronizationObject : KAutoObject
     {
         public LinkedList<KThread> WaitingThreads;
 
diff --git a/Ryujinx.HLE/HOS/Kernel/KThread.cs b/Ryujinx.HLE/HOS/Kernel/KThread.cs
index 846b41aa33..89e4c16d7b 100644
--- a/Ryujinx.HLE/HOS/Kernel/KThread.cs
+++ b/Ryujinx.HLE/HOS/Kernel/KThread.cs
@@ -8,7 +8,7 @@ using static Ryujinx.HLE.HOS.ErrorCode;
 
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    class KThread : KSynchronizationObject, IKFutureSchedulerObject
+    internal class KThread : KSynchronizationObject, IKFutureSchedulerObject
     {
         public CpuThread Context { get; private set; }
 
diff --git a/Ryujinx.HLE/HOS/Kernel/KTimeManager.cs b/Ryujinx.HLE/HOS/Kernel/KTimeManager.cs
index 0c2551a393..e6e199bede 100644
--- a/Ryujinx.HLE/HOS/Kernel/KTimeManager.cs
+++ b/Ryujinx.HLE/HOS/Kernel/KTimeManager.cs
@@ -6,7 +6,7 @@ using System.Threading;
 
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    class KTimeManager : IDisposable
+    internal class KTimeManager : IDisposable
     {
         private class WaitingObject
         {
diff --git a/Ryujinx.HLE/HOS/Kernel/KTlsPageInfo.cs b/Ryujinx.HLE/HOS/Kernel/KTlsPageInfo.cs
index ff5ecf1391..45e9ebb424 100644
--- a/Ryujinx.HLE/HOS/Kernel/KTlsPageInfo.cs
+++ b/Ryujinx.HLE/HOS/Kernel/KTlsPageInfo.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    class KTlsPageInfo
+    internal class KTlsPageInfo
     {
         public const int TlsEntrySize = 0x200;
 
diff --git a/Ryujinx.HLE/HOS/Kernel/KTlsPageManager.cs b/Ryujinx.HLE/HOS/Kernel/KTlsPageManager.cs
index 75f595ebcb..b73107f347 100644
--- a/Ryujinx.HLE/HOS/Kernel/KTlsPageManager.cs
+++ b/Ryujinx.HLE/HOS/Kernel/KTlsPageManager.cs
@@ -2,7 +2,7 @@ using System;
 
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    class KTlsPageManager
+    internal class KTlsPageManager
     {
         private const int TlsEntrySize = 0x200;
 
diff --git a/Ryujinx.HLE/HOS/Kernel/KTransferMemory.cs b/Ryujinx.HLE/HOS/Kernel/KTransferMemory.cs
index d883785184..ffdbc1acb0 100644
--- a/Ryujinx.HLE/HOS/Kernel/KTransferMemory.cs
+++ b/Ryujinx.HLE/HOS/Kernel/KTransferMemory.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    class KTransferMemory
+    internal class KTransferMemory
     {
         public ulong Address { get; private set; }
         public ulong Size    { get; private set; }
diff --git a/Ryujinx.HLE/HOS/Kernel/KWritableEvent.cs b/Ryujinx.HLE/HOS/Kernel/KWritableEvent.cs
index 4d56a92d28..4a898a0e0f 100644
--- a/Ryujinx.HLE/HOS/Kernel/KWritableEvent.cs
+++ b/Ryujinx.HLE/HOS/Kernel/KWritableEvent.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    class KWritableEvent
+    internal class KWritableEvent
     {
         private KEvent _parent;
 
diff --git a/Ryujinx.HLE/HOS/Kernel/KernelErr.cs b/Ryujinx.HLE/HOS/Kernel/KernelErr.cs
index e0b196f412..d312d1702f 100644
--- a/Ryujinx.HLE/HOS/Kernel/KernelErr.cs
+++ b/Ryujinx.HLE/HOS/Kernel/KernelErr.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    static class KernelErr
+    internal static class KernelErr
     {
         public const int ThreadTerminating = 59;
         public const int InvalidSize       = 101;
diff --git a/Ryujinx.HLE/HOS/Kernel/KernelInit.cs b/Ryujinx.HLE/HOS/Kernel/KernelInit.cs
index a797951b0b..cf91cac857 100644
--- a/Ryujinx.HLE/HOS/Kernel/KernelInit.cs
+++ b/Ryujinx.HLE/HOS/Kernel/KernelInit.cs
@@ -2,7 +2,7 @@ using System;
 
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    static class KernelInit
+    internal static class KernelInit
     {
         public static void InitializeResourceLimit(KResourceLimit resourceLimit)
         {
diff --git a/Ryujinx.HLE/HOS/Kernel/KernelResult.cs b/Ryujinx.HLE/HOS/Kernel/KernelResult.cs
index 9870d17549..b7cb301fb4 100644
--- a/Ryujinx.HLE/HOS/Kernel/KernelResult.cs
+++ b/Ryujinx.HLE/HOS/Kernel/KernelResult.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    enum KernelResult
+    internal enum KernelResult
     {
         Success            = 0,
         InvalidCapability  = 0x1c01,
diff --git a/Ryujinx.HLE/HOS/Kernel/KernelTransfer.cs b/Ryujinx.HLE/HOS/Kernel/KernelTransfer.cs
index c0ce72c0cb..c6007d93d0 100644
--- a/Ryujinx.HLE/HOS/Kernel/KernelTransfer.cs
+++ b/Ryujinx.HLE/HOS/Kernel/KernelTransfer.cs
@@ -2,7 +2,7 @@ using ChocolArm64.Memory;
 
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    static class KernelTransfer
+    internal static class KernelTransfer
     {
         public static bool UserToKernelInt32(Horizon system, long address, out int value)
         {
diff --git a/Ryujinx.HLE/HOS/Kernel/LimitableResource.cs b/Ryujinx.HLE/HOS/Kernel/LimitableResource.cs
index baab422238..715ba3d98a 100644
--- a/Ryujinx.HLE/HOS/Kernel/LimitableResource.cs
+++ b/Ryujinx.HLE/HOS/Kernel/LimitableResource.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    enum LimitableResource : byte
+    internal enum LimitableResource : byte
     {
         Memory         = 0,
         Thread         = 1,
diff --git a/Ryujinx.HLE/HOS/Kernel/MemoryAttribute.cs b/Ryujinx.HLE/HOS/Kernel/MemoryAttribute.cs
index 8f3197cb0c..9e20643af7 100644
--- a/Ryujinx.HLE/HOS/Kernel/MemoryAttribute.cs
+++ b/Ryujinx.HLE/HOS/Kernel/MemoryAttribute.cs
@@ -3,7 +3,7 @@ using System;
 namespace Ryujinx.HLE.HOS.Kernel
 {
     [Flags]
-    enum MemoryAttribute  : byte
+    internal enum MemoryAttribute  : byte
     {
         None = 0,
         Mask = 0xff,
diff --git a/Ryujinx.HLE/HOS/Kernel/MemoryOperation.cs b/Ryujinx.HLE/HOS/Kernel/MemoryOperation.cs
index b93501210d..11e0d7cac1 100644
--- a/Ryujinx.HLE/HOS/Kernel/MemoryOperation.cs
+++ b/Ryujinx.HLE/HOS/Kernel/MemoryOperation.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    enum MemoryOperation
+    internal enum MemoryOperation
     {
         MapPa,
         MapVa,
diff --git a/Ryujinx.HLE/HOS/Kernel/MemoryPermission.cs b/Ryujinx.HLE/HOS/Kernel/MemoryPermission.cs
index 63539c2eba..2103df772f 100644
--- a/Ryujinx.HLE/HOS/Kernel/MemoryPermission.cs
+++ b/Ryujinx.HLE/HOS/Kernel/MemoryPermission.cs
@@ -3,7 +3,7 @@ using System;
 namespace Ryujinx.HLE.HOS.Kernel
 {
     [Flags]
-    enum MemoryPermission : byte
+    internal enum MemoryPermission : byte
     {
         None = 0,
         Mask = 0xff,
diff --git a/Ryujinx.HLE/HOS/Kernel/MemoryRegion.cs b/Ryujinx.HLE/HOS/Kernel/MemoryRegion.cs
index ea4f33c9ce..a0d4e3e6d5 100644
--- a/Ryujinx.HLE/HOS/Kernel/MemoryRegion.cs
+++ b/Ryujinx.HLE/HOS/Kernel/MemoryRegion.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    enum MemoryRegion
+    internal enum MemoryRegion
     {
         Application = 0,
         Applet      = 1,
diff --git a/Ryujinx.HLE/HOS/Kernel/MemoryState.cs b/Ryujinx.HLE/HOS/Kernel/MemoryState.cs
index e2ce27ef2f..58af69a0e1 100644
--- a/Ryujinx.HLE/HOS/Kernel/MemoryState.cs
+++ b/Ryujinx.HLE/HOS/Kernel/MemoryState.cs
@@ -3,7 +3,7 @@ using System;
 namespace Ryujinx.HLE.HOS.Kernel
 {
     [Flags]
-    enum MemoryState : uint
+    internal enum MemoryState : uint
     {
         Unmapped               = 0x00000000,
         Io                     = 0x00002001,
diff --git a/Ryujinx.HLE/HOS/Kernel/MersenneTwister.cs b/Ryujinx.HLE/HOS/Kernel/MersenneTwister.cs
index 5307bdc9fb..274ef895f2 100644
--- a/Ryujinx.HLE/HOS/Kernel/MersenneTwister.cs
+++ b/Ryujinx.HLE/HOS/Kernel/MersenneTwister.cs
@@ -2,7 +2,7 @@ using Ryujinx.Common;
 
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    class MersenneTwister
+    internal class MersenneTwister
     {
         private int _index;
         private uint[] _mt;
diff --git a/Ryujinx.HLE/HOS/Kernel/ProcessCreationInfo.cs b/Ryujinx.HLE/HOS/Kernel/ProcessCreationInfo.cs
index 7b2e8b72fa..f0949ff324 100644
--- a/Ryujinx.HLE/HOS/Kernel/ProcessCreationInfo.cs
+++ b/Ryujinx.HLE/HOS/Kernel/ProcessCreationInfo.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    struct ProcessCreationInfo
+    internal struct ProcessCreationInfo
     {
         public string Name { get; private set; }
 
diff --git a/Ryujinx.HLE/HOS/Kernel/ProcessState.cs b/Ryujinx.HLE/HOS/Kernel/ProcessState.cs
index 98ff4207e7..4cce888931 100644
--- a/Ryujinx.HLE/HOS/Kernel/ProcessState.cs
+++ b/Ryujinx.HLE/HOS/Kernel/ProcessState.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    enum ProcessState : byte
+    internal enum ProcessState : byte
     {
         Created         = 0,
         CreatedAttached = 1,
diff --git a/Ryujinx.HLE/HOS/Kernel/SignalType.cs b/Ryujinx.HLE/HOS/Kernel/SignalType.cs
index 0580315103..cde172bad1 100644
--- a/Ryujinx.HLE/HOS/Kernel/SignalType.cs
+++ b/Ryujinx.HLE/HOS/Kernel/SignalType.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    enum SignalType
+    internal enum SignalType
     {
         Signal                    = 0,
         SignalAndIncrementIfEqual = 1,
diff --git a/Ryujinx.HLE/HOS/Kernel/SvcHandler.cs b/Ryujinx.HLE/HOS/Kernel/SvcHandler.cs
index 38cd794b5b..dd3412688a 100644
--- a/Ryujinx.HLE/HOS/Kernel/SvcHandler.cs
+++ b/Ryujinx.HLE/HOS/Kernel/SvcHandler.cs
@@ -8,7 +8,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    partial class SvcHandler
+    internal partial class SvcHandler
     {
         private delegate void SvcFunc(CpuThreadState threadState);
 
diff --git a/Ryujinx.HLE/HOS/Kernel/SvcMemory.cs b/Ryujinx.HLE/HOS/Kernel/SvcMemory.cs
index c99c1e9859..f56142fcb8 100644
--- a/Ryujinx.HLE/HOS/Kernel/SvcMemory.cs
+++ b/Ryujinx.HLE/HOS/Kernel/SvcMemory.cs
@@ -5,7 +5,7 @@ using static Ryujinx.HLE.HOS.ErrorCode;
 
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    partial class SvcHandler
+    internal partial class SvcHandler
     {
         private void SvcSetHeapSize(CpuThreadState threadState)
         {
diff --git a/Ryujinx.HLE/HOS/Kernel/SvcSystem.cs b/Ryujinx.HLE/HOS/Kernel/SvcSystem.cs
index e42c2b4ec5..27533df7bf 100644
--- a/Ryujinx.HLE/HOS/Kernel/SvcSystem.cs
+++ b/Ryujinx.HLE/HOS/Kernel/SvcSystem.cs
@@ -12,7 +12,7 @@ using static Ryujinx.HLE.HOS.ErrorCode;
 
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    partial class SvcHandler
+    internal partial class SvcHandler
     {
         private void SvcExitProcess(CpuThreadState threadState)
         {
diff --git a/Ryujinx.HLE/HOS/Kernel/SvcThread.cs b/Ryujinx.HLE/HOS/Kernel/SvcThread.cs
index 0121303d90..d0f7ddf6fb 100644
--- a/Ryujinx.HLE/HOS/Kernel/SvcThread.cs
+++ b/Ryujinx.HLE/HOS/Kernel/SvcThread.cs
@@ -5,7 +5,7 @@ using static Ryujinx.HLE.HOS.ErrorCode;
 
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    partial class SvcHandler
+    internal partial class SvcHandler
     {
         private void CreateThread64(CpuThreadState threadState)
         {
diff --git a/Ryujinx.HLE/HOS/Kernel/SvcThreadSync.cs b/Ryujinx.HLE/HOS/Kernel/SvcThreadSync.cs
index 11cfffe9b2..b9bdb01f80 100644
--- a/Ryujinx.HLE/HOS/Kernel/SvcThreadSync.cs
+++ b/Ryujinx.HLE/HOS/Kernel/SvcThreadSync.cs
@@ -6,7 +6,7 @@ using static Ryujinx.HLE.HOS.ErrorCode;
 
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    partial class SvcHandler
+    internal partial class SvcHandler
     {
         private void SvcWaitSynchronization(CpuThreadState threadState)
         {
diff --git a/Ryujinx.HLE/HOS/Kernel/ThreadSchedState.cs b/Ryujinx.HLE/HOS/Kernel/ThreadSchedState.cs
index 37e5908a9c..26fe713b67 100644
--- a/Ryujinx.HLE/HOS/Kernel/ThreadSchedState.cs
+++ b/Ryujinx.HLE/HOS/Kernel/ThreadSchedState.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    enum ThreadSchedState : ushort
+    internal enum ThreadSchedState : ushort
     {
         LowMask        = 0xf,
         HighMask       = 0xfff0,
diff --git a/Ryujinx.HLE/HOS/Kernel/ThreadType.cs b/Ryujinx.HLE/HOS/Kernel/ThreadType.cs
index 0fe83423cf..faec485eca 100644
--- a/Ryujinx.HLE/HOS/Kernel/ThreadType.cs
+++ b/Ryujinx.HLE/HOS/Kernel/ThreadType.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Kernel
 {
-    enum ThreadType
+    internal enum ThreadType
     {
         Dummy,
         Kernel,
diff --git a/Ryujinx.HLE/HOS/ProgramLoader.cs b/Ryujinx.HLE/HOS/ProgramLoader.cs
index 00fc6b9354..bd0c1df5b2 100644
--- a/Ryujinx.HLE/HOS/ProgramLoader.cs
+++ b/Ryujinx.HLE/HOS/ProgramLoader.cs
@@ -7,7 +7,7 @@ using Ryujinx.HLE.Loaders.Npdm;
 
 namespace Ryujinx.HLE.HOS
 {
-    class ProgramLoader
+    internal class ProgramLoader
     {
         private const bool AslrEnabled = true;
 
diff --git a/Ryujinx.HLE/HOS/ServiceCtx.cs b/Ryujinx.HLE/HOS/ServiceCtx.cs
index f55e454615..8ece50455c 100644
--- a/Ryujinx.HLE/HOS/ServiceCtx.cs
+++ b/Ryujinx.HLE/HOS/ServiceCtx.cs
@@ -5,7 +5,7 @@ using System.IO;
 
 namespace Ryujinx.HLE.HOS
 {
-    class ServiceCtx
+    internal class ServiceCtx
     {
         public Switch        Device       { get; private set; }
         public KProcess      Process      { get; private set; }
diff --git a/Ryujinx.HLE/HOS/Services/Acc/AccErr.cs b/Ryujinx.HLE/HOS/Services/Acc/AccErr.cs
index 144d6680fa..5b867ced09 100644
--- a/Ryujinx.HLE/HOS/Services/Acc/AccErr.cs
+++ b/Ryujinx.HLE/HOS/Services/Acc/AccErr.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Services.Acc
 {
-    static class AccErr
+    internal static class AccErr
     {
         public const int UserNotFound = 100;
     }
diff --git a/Ryujinx.HLE/HOS/Services/Acc/IAccountService.cs b/Ryujinx.HLE/HOS/Services/Acc/IAccountService.cs
index 42f7304837..7f35ee839f 100644
--- a/Ryujinx.HLE/HOS/Services/Acc/IAccountService.cs
+++ b/Ryujinx.HLE/HOS/Services/Acc/IAccountService.cs
@@ -8,7 +8,7 @@ using static Ryujinx.HLE.HOS.ErrorCode;
 
 namespace Ryujinx.HLE.HOS.Services.Acc
 {
-    class IAccountService : IpcService
+    internal class IAccountService : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Acc/IManagerForApplication.cs b/Ryujinx.HLE/HOS/Services/Acc/IManagerForApplication.cs
index 93dc2290f9..44b2dc07e6 100644
--- a/Ryujinx.HLE/HOS/Services/Acc/IManagerForApplication.cs
+++ b/Ryujinx.HLE/HOS/Services/Acc/IManagerForApplication.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Acc
 {
-    class IManagerForApplication : IpcService
+    internal class IManagerForApplication : IpcService
     {
         private UInt128 _uuid;
 
diff --git a/Ryujinx.HLE/HOS/Services/Acc/IProfile.cs b/Ryujinx.HLE/HOS/Services/Acc/IProfile.cs
index 710374cf94..7758b5974b 100644
--- a/Ryujinx.HLE/HOS/Services/Acc/IProfile.cs
+++ b/Ryujinx.HLE/HOS/Services/Acc/IProfile.cs
@@ -10,7 +10,7 @@ using System.Text;
 
 namespace Ryujinx.HLE.HOS.Services.Acc
 {
-    class IProfile : IpcService
+    internal class IProfile : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Am/AmErr.cs b/Ryujinx.HLE/HOS/Services/Am/AmErr.cs
index 4e7771b809..b3711ab84f 100644
--- a/Ryujinx.HLE/HOS/Services/Am/AmErr.cs
+++ b/Ryujinx.HLE/HOS/Services/Am/AmErr.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Services.Am
 {
-    static class AmErr
+    internal static class AmErr
     {
         public const int NoMessages = 3;
     }
diff --git a/Ryujinx.HLE/HOS/Services/Am/FocusState.cs b/Ryujinx.HLE/HOS/Services/Am/FocusState.cs
index e8ae722369..3afb4da2c6 100644
--- a/Ryujinx.HLE/HOS/Services/Am/FocusState.cs
+++ b/Ryujinx.HLE/HOS/Services/Am/FocusState.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Services.Am
 {
-    enum FocusState
+    internal enum FocusState
     {
         InFocus    = 1,
         OutOfFocus = 2
diff --git a/Ryujinx.HLE/HOS/Services/Am/IAllSystemAppletProxiesService.cs b/Ryujinx.HLE/HOS/Services/Am/IAllSystemAppletProxiesService.cs
index 551b5790bb..d468833141 100644
--- a/Ryujinx.HLE/HOS/Services/Am/IAllSystemAppletProxiesService.cs
+++ b/Ryujinx.HLE/HOS/Services/Am/IAllSystemAppletProxiesService.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Am
 {
-    class IAllSystemAppletProxiesService : IpcService
+    internal class IAllSystemAppletProxiesService : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Am/IApplicationCreator.cs b/Ryujinx.HLE/HOS/Services/Am/IApplicationCreator.cs
index 532e56e948..dd704473f7 100644
--- a/Ryujinx.HLE/HOS/Services/Am/IApplicationCreator.cs
+++ b/Ryujinx.HLE/HOS/Services/Am/IApplicationCreator.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Am
 {
-    class IApplicationCreator : IpcService
+    internal class IApplicationCreator : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Am/IApplicationFunctions.cs b/Ryujinx.HLE/HOS/Services/Am/IApplicationFunctions.cs
index 9db0cf1d7a..0ebd261ac6 100644
--- a/Ryujinx.HLE/HOS/Services/Am/IApplicationFunctions.cs
+++ b/Ryujinx.HLE/HOS/Services/Am/IApplicationFunctions.cs
@@ -4,7 +4,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Am
 {
-    class IApplicationFunctions : IpcService
+    internal class IApplicationFunctions : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Am/IApplicationProxy.cs b/Ryujinx.HLE/HOS/Services/Am/IApplicationProxy.cs
index 09a6542187..450f3e1841 100644
--- a/Ryujinx.HLE/HOS/Services/Am/IApplicationProxy.cs
+++ b/Ryujinx.HLE/HOS/Services/Am/IApplicationProxy.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Am
 {
-    class IApplicationProxy : IpcService
+    internal class IApplicationProxy : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Am/IApplicationProxyService.cs b/Ryujinx.HLE/HOS/Services/Am/IApplicationProxyService.cs
index 8aff3a54fe..b079438f03 100644
--- a/Ryujinx.HLE/HOS/Services/Am/IApplicationProxyService.cs
+++ b/Ryujinx.HLE/HOS/Services/Am/IApplicationProxyService.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Am
 {
-    class IApplicationProxyService : IpcService
+    internal class IApplicationProxyService : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Am/IAudioController.cs b/Ryujinx.HLE/HOS/Services/Am/IAudioController.cs
index f8142030c6..89b64c99aa 100644
--- a/Ryujinx.HLE/HOS/Services/Am/IAudioController.cs
+++ b/Ryujinx.HLE/HOS/Services/Am/IAudioController.cs
@@ -4,7 +4,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Am
 {
-    class IAudioController : IpcService
+    internal class IAudioController : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Am/ICommonStateGetter.cs b/Ryujinx.HLE/HOS/Services/Am/ICommonStateGetter.cs
index f1b0e741c7..5ee92fcc7d 100644
--- a/Ryujinx.HLE/HOS/Services/Am/ICommonStateGetter.cs
+++ b/Ryujinx.HLE/HOS/Services/Am/ICommonStateGetter.cs
@@ -8,7 +8,7 @@ using static Ryujinx.HLE.HOS.ErrorCode;
 
 namespace Ryujinx.HLE.HOS.Services.Am
 {
-    class ICommonStateGetter : IpcService
+    internal class ICommonStateGetter : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Am/IDebugFunctions.cs b/Ryujinx.HLE/HOS/Services/Am/IDebugFunctions.cs
index 3854e53b75..bf08d81a3c 100644
--- a/Ryujinx.HLE/HOS/Services/Am/IDebugFunctions.cs
+++ b/Ryujinx.HLE/HOS/Services/Am/IDebugFunctions.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Am
 {
-    class IDebugFunctions : IpcService
+    internal class IDebugFunctions : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Am/IDisplayController.cs b/Ryujinx.HLE/HOS/Services/Am/IDisplayController.cs
index 12852ab1b7..005eccad6b 100644
--- a/Ryujinx.HLE/HOS/Services/Am/IDisplayController.cs
+++ b/Ryujinx.HLE/HOS/Services/Am/IDisplayController.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Am
 {
-    class IDisplayController : IpcService
+    internal class IDisplayController : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Am/IGlobalStateController.cs b/Ryujinx.HLE/HOS/Services/Am/IGlobalStateController.cs
index 7cf12df1bb..ed8f3f0eae 100644
--- a/Ryujinx.HLE/HOS/Services/Am/IGlobalStateController.cs
+++ b/Ryujinx.HLE/HOS/Services/Am/IGlobalStateController.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Am
 {
-    class IGlobalStateController : IpcService
+    internal class IGlobalStateController : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Am/IHomeMenuFunctions.cs b/Ryujinx.HLE/HOS/Services/Am/IHomeMenuFunctions.cs
index d954893acd..054c7caa14 100644
--- a/Ryujinx.HLE/HOS/Services/Am/IHomeMenuFunctions.cs
+++ b/Ryujinx.HLE/HOS/Services/Am/IHomeMenuFunctions.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Am
 {
-    class IHomeMenuFunctions : IpcService
+    internal class IHomeMenuFunctions : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Am/ILibraryAppletAccessor.cs b/Ryujinx.HLE/HOS/Services/Am/ILibraryAppletAccessor.cs
index 4d77e63815..75491bfa6b 100644
--- a/Ryujinx.HLE/HOS/Services/Am/ILibraryAppletAccessor.cs
+++ b/Ryujinx.HLE/HOS/Services/Am/ILibraryAppletAccessor.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Am
 {
-    class ILibraryAppletAccessor : IpcService
+    internal class ILibraryAppletAccessor : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Am/ILibraryAppletCreator.cs b/Ryujinx.HLE/HOS/Services/Am/ILibraryAppletCreator.cs
index adcc7de733..09b6a81cf9 100644
--- a/Ryujinx.HLE/HOS/Services/Am/ILibraryAppletCreator.cs
+++ b/Ryujinx.HLE/HOS/Services/Am/ILibraryAppletCreator.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Am
 {
-    class ILibraryAppletCreator : IpcService
+    internal class ILibraryAppletCreator : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Am/ISelfController.cs b/Ryujinx.HLE/HOS/Services/Am/ISelfController.cs
index 3ca15a1805..496e3da446 100644
--- a/Ryujinx.HLE/HOS/Services/Am/ISelfController.cs
+++ b/Ryujinx.HLE/HOS/Services/Am/ISelfController.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Am
 {
-    class ISelfController : IpcService
+    internal class ISelfController : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Am/IStorage.cs b/Ryujinx.HLE/HOS/Services/Am/IStorage.cs
index 759fa94f40..15a1010ab9 100644
--- a/Ryujinx.HLE/HOS/Services/Am/IStorage.cs
+++ b/Ryujinx.HLE/HOS/Services/Am/IStorage.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Am
 {
-    class IStorage : IpcService
+    internal class IStorage : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Am/IStorageAccessor.cs b/Ryujinx.HLE/HOS/Services/Am/IStorageAccessor.cs
index cc7105b5ab..07fa12021f 100644
--- a/Ryujinx.HLE/HOS/Services/Am/IStorageAccessor.cs
+++ b/Ryujinx.HLE/HOS/Services/Am/IStorageAccessor.cs
@@ -4,7 +4,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Am
 {
-    class IStorageAccessor : IpcService
+    internal class IStorageAccessor : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Am/ISystemAppletProxy.cs b/Ryujinx.HLE/HOS/Services/Am/ISystemAppletProxy.cs
index 64044e3030..f0c09806cd 100644
--- a/Ryujinx.HLE/HOS/Services/Am/ISystemAppletProxy.cs
+++ b/Ryujinx.HLE/HOS/Services/Am/ISystemAppletProxy.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Am
 {
-    class ISystemAppletProxy : IpcService
+    internal class ISystemAppletProxy : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Am/IWindowController.cs b/Ryujinx.HLE/HOS/Services/Am/IWindowController.cs
index 9113c3d86c..3aaa79bdaa 100644
--- a/Ryujinx.HLE/HOS/Services/Am/IWindowController.cs
+++ b/Ryujinx.HLE/HOS/Services/Am/IWindowController.cs
@@ -4,7 +4,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Am
 {
-    class IWindowController : IpcService
+    internal class IWindowController : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Am/MessageInfo.cs b/Ryujinx.HLE/HOS/Services/Am/MessageInfo.cs
index 65fddbedc2..bf83b83850 100644
--- a/Ryujinx.HLE/HOS/Services/Am/MessageInfo.cs
+++ b/Ryujinx.HLE/HOS/Services/Am/MessageInfo.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Services.Am
 {
-    enum MessageInfo
+    internal enum MessageInfo
     {
         FocusStateChanged      = 0xf,
         OperationModeChanged   = 0x1e,
diff --git a/Ryujinx.HLE/HOS/Services/Am/OperationMode.cs b/Ryujinx.HLE/HOS/Services/Am/OperationMode.cs
index cb11fff97d..2ced2e0afa 100644
--- a/Ryujinx.HLE/HOS/Services/Am/OperationMode.cs
+++ b/Ryujinx.HLE/HOS/Services/Am/OperationMode.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Services.Am
 {
-    enum OperationMode
+    internal enum OperationMode
     {
         Handheld = 0,
         Docked   = 1
diff --git a/Ryujinx.HLE/HOS/Services/Am/StorageHelper.cs b/Ryujinx.HLE/HOS/Services/Am/StorageHelper.cs
index 39a4c6dd9c..ea98c748df 100644
--- a/Ryujinx.HLE/HOS/Services/Am/StorageHelper.cs
+++ b/Ryujinx.HLE/HOS/Services/Am/StorageHelper.cs
@@ -2,7 +2,7 @@
 
 namespace Ryujinx.HLE.HOS.Services.Am
 {
-    class StorageHelper
+    internal class StorageHelper
     {
         private const uint LaunchParamsMagic = 0xc79497ca;
 
diff --git a/Ryujinx.HLE/HOS/Services/Apm/IManager.cs b/Ryujinx.HLE/HOS/Services/Apm/IManager.cs
index ae27aaf91f..f4aa71e8e2 100644
--- a/Ryujinx.HLE/HOS/Services/Apm/IManager.cs
+++ b/Ryujinx.HLE/HOS/Services/Apm/IManager.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Apm
 {
-    class IManager : IpcService
+    internal class IManager : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Apm/ISession.cs b/Ryujinx.HLE/HOS/Services/Apm/ISession.cs
index fb9d14b3be..3a70567440 100644
--- a/Ryujinx.HLE/HOS/Services/Apm/ISession.cs
+++ b/Ryujinx.HLE/HOS/Services/Apm/ISession.cs
@@ -4,7 +4,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Apm
 {
-    class ISession : IpcService
+    internal class ISession : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Apm/PerformanceConfiguration.cs b/Ryujinx.HLE/HOS/Services/Apm/PerformanceConfiguration.cs
index b24adfb361..1d0a673de9 100644
--- a/Ryujinx.HLE/HOS/Services/Apm/PerformanceConfiguration.cs
+++ b/Ryujinx.HLE/HOS/Services/Apm/PerformanceConfiguration.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Services.Apm
 {
-    enum PerformanceConfiguration : uint
+    internal enum PerformanceConfiguration : uint
     {
         PerformanceConfiguration1  = 0x00010000,
         PerformanceConfiguration2  = 0x00010001,
diff --git a/Ryujinx.HLE/HOS/Services/Apm/PerformanceMode.cs b/Ryujinx.HLE/HOS/Services/Apm/PerformanceMode.cs
index c4ab3cf2d2..59bd55d8f8 100644
--- a/Ryujinx.HLE/HOS/Services/Apm/PerformanceMode.cs
+++ b/Ryujinx.HLE/HOS/Services/Apm/PerformanceMode.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Services.Apm
 {
-    enum PerformanceMode
+    internal enum PerformanceMode
     {
         Handheld = 0,
         Docked   = 1
diff --git a/Ryujinx.HLE/HOS/Services/Aud/AudErr.cs b/Ryujinx.HLE/HOS/Services/Aud/AudErr.cs
index 675ea8c7c9..fbd17b9511 100644
--- a/Ryujinx.HLE/HOS/Services/Aud/AudErr.cs
+++ b/Ryujinx.HLE/HOS/Services/Aud/AudErr.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Services.Aud
 {
-    static class AudErr
+    internal static class AudErr
     {
         public const int DeviceNotFound        = 1;
         public const int UnsupportedRevision   = 2;
diff --git a/Ryujinx.HLE/HOS/Services/Aud/AudioOut/AudioOutData.cs b/Ryujinx.HLE/HOS/Services/Aud/AudioOut/AudioOutData.cs
index e25ebe6640..46f81ad879 100644
--- a/Ryujinx.HLE/HOS/Services/Aud/AudioOut/AudioOutData.cs
+++ b/Ryujinx.HLE/HOS/Services/Aud/AudioOut/AudioOutData.cs
@@ -3,7 +3,7 @@ using System.Runtime.InteropServices;
 namespace Ryujinx.HLE.HOS.Services.Aud.AudioOut
 {
     [StructLayout(LayoutKind.Sequential)]
-    struct AudioOutData
+    internal struct AudioOutData
     {
         public long NextBufferPtr;
         public long SampleBufferPtr;
diff --git a/Ryujinx.HLE/HOS/Services/Aud/AudioOut/IAudioOut.cs b/Ryujinx.HLE/HOS/Services/Aud/AudioOut/IAudioOut.cs
index fb9295b72e..847101671a 100644
--- a/Ryujinx.HLE/HOS/Services/Aud/AudioOut/IAudioOut.cs
+++ b/Ryujinx.HLE/HOS/Services/Aud/AudioOut/IAudioOut.cs
@@ -7,7 +7,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Aud.AudioOut
 {
-    class IAudioOut : IpcService, IDisposable
+    internal class IAudioOut : IpcService, IDisposable
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/AudioConsts.cs b/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/AudioConsts.cs
index 773ef6dd66..d473a4d871 100644
--- a/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/AudioConsts.cs
+++ b/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/AudioConsts.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Services.Aud.AudioRenderer
 {
-    static class AudioConsts
+    internal static class AudioConsts
     {
         public const int HostSampleRate    = 48000;
         public const int HostChannelsCount = 2;
diff --git a/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/BehaviorIn.cs b/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/BehaviorIn.cs
index 69b6d52247..1f48e7c452 100644
--- a/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/BehaviorIn.cs
+++ b/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/BehaviorIn.cs
@@ -3,7 +3,7 @@ using System.Runtime.InteropServices;
 namespace Ryujinx.HLE.HOS.Services.Aud.AudioRenderer
 {
     [StructLayout(LayoutKind.Sequential, Size = 0x10, Pack = 4)]
-    struct BehaviorIn
+    internal struct BehaviorIn
     {
         public long Unknown0;
         public long Unknown8;
diff --git a/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/BiquadFilter.cs b/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/BiquadFilter.cs
index 51dddf20e5..ae4716f201 100644
--- a/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/BiquadFilter.cs
+++ b/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/BiquadFilter.cs
@@ -3,7 +3,7 @@ using System.Runtime.InteropServices;
 namespace Ryujinx.HLE.HOS.Services.Aud.AudioRenderer
 {
     [StructLayout(LayoutKind.Sequential, Size = 0xc, Pack = 1)]
-    struct BiquadFilter
+    internal struct BiquadFilter
     {
         public byte  Enable;
         public byte  Padding;
diff --git a/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/IAudioRenderer.cs b/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/IAudioRenderer.cs
index d672705c5e..87a168572b 100644
--- a/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/IAudioRenderer.cs
+++ b/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/IAudioRenderer.cs
@@ -13,7 +13,7 @@ using System.Runtime.Intrinsics.X86;
 
 namespace Ryujinx.HLE.HOS.Services.Aud.AudioRenderer
 {
-    class IAudioRenderer : IpcService, IDisposable
+    internal class IAudioRenderer : IpcService, IDisposable
     {
         //This is the amount of samples that are going to be appended
         //each time that RequestUpdateAudioRenderer is called. Ideally,
diff --git a/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/MemoryPoolContext.cs b/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/MemoryPoolContext.cs
index 2b68c40d52..c97c5a4a21 100644
--- a/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/MemoryPoolContext.cs
+++ b/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/MemoryPoolContext.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Services.Aud.AudioRenderer
 {
-    class MemoryPoolContext
+    internal class MemoryPoolContext
     {
         public MemoryPoolOut OutStatus;
 
diff --git a/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/MemoryPoolIn.cs b/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/MemoryPoolIn.cs
index f6e424ee6f..057c5615a0 100644
--- a/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/MemoryPoolIn.cs
+++ b/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/MemoryPoolIn.cs
@@ -3,7 +3,7 @@ using System.Runtime.InteropServices;
 namespace Ryujinx.HLE.HOS.Services.Aud.AudioRenderer
 {
     [StructLayout(LayoutKind.Sequential, Size = 0x20, Pack = 4)]
-    struct MemoryPoolIn
+    internal struct MemoryPoolIn
     {
         public long            Address;
         public long            Size;
diff --git a/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/MemoryPoolOut.cs b/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/MemoryPoolOut.cs
index f0621e3e6f..1ba764cdf6 100644
--- a/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/MemoryPoolOut.cs
+++ b/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/MemoryPoolOut.cs
@@ -3,7 +3,7 @@ using System.Runtime.InteropServices;
 namespace Ryujinx.HLE.HOS.Services.Aud.AudioRenderer
 {
     [StructLayout(LayoutKind.Sequential, Size = 0x10, Pack = 4)]
-    struct MemoryPoolOut
+    internal struct MemoryPoolOut
     {
         public MemoryPoolState State;
         public int             Unknown14;
diff --git a/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/MemoryPoolState.cs b/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/MemoryPoolState.cs
index 6a37c1afc6..26f281b364 100644
--- a/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/MemoryPoolState.cs
+++ b/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/MemoryPoolState.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Services.Aud.AudioRenderer
 {
-    enum MemoryPoolState
+    internal enum MemoryPoolState
     {
         Invalid       = 0,
         Unknown       = 1,
diff --git a/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/PlayState.cs b/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/PlayState.cs
index f09bf46e2e..dac304414b 100644
--- a/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/PlayState.cs
+++ b/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/PlayState.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Services.Aud.AudioRenderer
 {
-    enum PlayState : byte
+    internal enum PlayState : byte
     {
         Playing = 0,
         Stopped = 1,
diff --git a/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/Resampler.cs b/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/Resampler.cs
index 9714f6d8b9..a307d4e825 100644
--- a/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/Resampler.cs
+++ b/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/Resampler.cs
@@ -2,7 +2,7 @@ using System;
 
 namespace Ryujinx.HLE.HOS.Services.Aud.AudioRenderer
 {
-    static class Resampler
+    internal static class Resampler
     {
 #region "LookUp Tables"
         private static short[] _curveLut0 = new short[]
diff --git a/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/UpdateDataHeader.cs b/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/UpdateDataHeader.cs
index a71e865d20..838648a09a 100644
--- a/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/UpdateDataHeader.cs
+++ b/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/UpdateDataHeader.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Services.Aud.AudioRenderer
 {
-    struct UpdateDataHeader
+    internal struct UpdateDataHeader
     {
         public int Revision;
         public int BehaviorSize;
diff --git a/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/VoiceChannelResourceIn.cs b/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/VoiceChannelResourceIn.cs
index 2a6f424f99..fcd4e1df30 100644
--- a/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/VoiceChannelResourceIn.cs
+++ b/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/VoiceChannelResourceIn.cs
@@ -3,7 +3,7 @@ using System.Runtime.InteropServices;
 namespace Ryujinx.HLE.HOS.Services.Aud.AudioRenderer
 {
     [StructLayout(LayoutKind.Sequential, Size = 0x70, Pack = 1)]
-    struct VoiceChannelResourceIn
+    internal struct VoiceChannelResourceIn
     {
         //???
     }
diff --git a/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/VoiceContext.cs b/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/VoiceContext.cs
index a877081d55..2912e3c497 100644
--- a/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/VoiceContext.cs
+++ b/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/VoiceContext.cs
@@ -4,7 +4,7 @@ using System;
 
 namespace Ryujinx.HLE.HOS.Services.Aud.AudioRenderer
 {
-    class VoiceContext
+    internal class VoiceContext
     {
         private bool _acquired;
         private bool _bufferReload;
diff --git a/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/VoiceIn.cs b/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/VoiceIn.cs
index fc83b65b59..89de8609e0 100644
--- a/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/VoiceIn.cs
+++ b/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/VoiceIn.cs
@@ -3,7 +3,7 @@ using System.Runtime.InteropServices;
 namespace Ryujinx.HLE.HOS.Services.Aud.AudioRenderer
 {
     [StructLayout(LayoutKind.Sequential, Size = 0x170, Pack = 1)]
-    struct VoiceIn
+    internal struct VoiceIn
     {
         public int VoiceSlot;
         public int NodeId;
diff --git a/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/VoiceOut.cs b/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/VoiceOut.cs
index 6551acdb52..fe3000fa74 100644
--- a/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/VoiceOut.cs
+++ b/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/VoiceOut.cs
@@ -3,7 +3,7 @@ using System.Runtime.InteropServices;
 namespace Ryujinx.HLE.HOS.Services.Aud.AudioRenderer
 {
     [StructLayout(LayoutKind.Sequential, Size = 0x10, Pack = 4)]
-    struct VoiceOut
+    internal struct VoiceOut
     {
         public long PlayedSamplesCount;
         public int  PlayedWaveBuffersCount;
diff --git a/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/WaveBuffer.cs b/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/WaveBuffer.cs
index bb188877e6..77137efd20 100644
--- a/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/WaveBuffer.cs
+++ b/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/WaveBuffer.cs
@@ -3,7 +3,7 @@ using System.Runtime.InteropServices;
 namespace Ryujinx.HLE.HOS.Services.Aud.AudioRenderer
 {
     [StructLayout(LayoutKind.Sequential, Size = 0x38, Pack = 1)]
-    struct WaveBuffer
+    internal struct WaveBuffer
     {
         public long  Position;
         public long  Size;
diff --git a/Ryujinx.HLE/HOS/Services/Aud/AudioRendererParameter.cs b/Ryujinx.HLE/HOS/Services/Aud/AudioRendererParameter.cs
index 4d01a0de3c..2cc47ae56a 100644
--- a/Ryujinx.HLE/HOS/Services/Aud/AudioRendererParameter.cs
+++ b/Ryujinx.HLE/HOS/Services/Aud/AudioRendererParameter.cs
@@ -3,7 +3,7 @@
 namespace Ryujinx.HLE.HOS.Services.Aud
 {
     [StructLayout(LayoutKind.Sequential)]
-    struct AudioRendererParameter
+    internal struct AudioRendererParameter
     {
         public int SampleRate;
         public int SampleCount;
diff --git a/Ryujinx.HLE/HOS/Services/Aud/IAudioDevice.cs b/Ryujinx.HLE/HOS/Services/Aud/IAudioDevice.cs
index 3abb3205c2..ce5d223d1f 100644
--- a/Ryujinx.HLE/HOS/Services/Aud/IAudioDevice.cs
+++ b/Ryujinx.HLE/HOS/Services/Aud/IAudioDevice.cs
@@ -8,7 +8,7 @@ using System.Text;
 
 namespace Ryujinx.HLE.HOS.Services.Aud
 {
-    class IAudioDevice : IpcService
+    internal class IAudioDevice : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Aud/IAudioOutManager.cs b/Ryujinx.HLE/HOS/Services/Aud/IAudioOutManager.cs
index dd476f606a..c51b1017f6 100644
--- a/Ryujinx.HLE/HOS/Services/Aud/IAudioOutManager.cs
+++ b/Ryujinx.HLE/HOS/Services/Aud/IAudioOutManager.cs
@@ -11,7 +11,7 @@ using static Ryujinx.HLE.HOS.ErrorCode;
 
 namespace Ryujinx.HLE.HOS.Services.Aud
 {
-    class IAudioOutManager : IpcService
+    internal class IAudioOutManager : IpcService
     {
         private const string DefaultAudioOutput = "DeviceOut";
 
diff --git a/Ryujinx.HLE/HOS/Services/Aud/IAudioRendererManager.cs b/Ryujinx.HLE/HOS/Services/Aud/IAudioRendererManager.cs
index bd0cfd1d67..9f219eed12 100644
--- a/Ryujinx.HLE/HOS/Services/Aud/IAudioRendererManager.cs
+++ b/Ryujinx.HLE/HOS/Services/Aud/IAudioRendererManager.cs
@@ -9,7 +9,7 @@ using static Ryujinx.HLE.HOS.ErrorCode;
 
 namespace Ryujinx.HLE.HOS.Services.Aud
 {
-    class IAudioRendererManager : IpcService
+    internal class IAudioRendererManager : IpcService
     {
         private const int Rev0Magic = ('R' << 0)  |
                                       ('E' << 8)  |
diff --git a/Ryujinx.HLE/HOS/Services/Aud/IHardwareOpusDecoder.cs b/Ryujinx.HLE/HOS/Services/Aud/IHardwareOpusDecoder.cs
index db638dbea9..996570bc2b 100644
--- a/Ryujinx.HLE/HOS/Services/Aud/IHardwareOpusDecoder.cs
+++ b/Ryujinx.HLE/HOS/Services/Aud/IHardwareOpusDecoder.cs
@@ -6,7 +6,7 @@ using static Ryujinx.HLE.HOS.ErrorCode;
 
 namespace Ryujinx.HLE.HOS.Services.Aud
 {
-    class IHardwareOpusDecoder : IpcService
+    internal class IHardwareOpusDecoder : IpcService
     {
         private const int FixedSampleRate = 48000;
 
diff --git a/Ryujinx.HLE/HOS/Services/Aud/IHardwareOpusDecoderManager.cs b/Ryujinx.HLE/HOS/Services/Aud/IHardwareOpusDecoderManager.cs
index fbe6688f6f..8d1298a11d 100644
--- a/Ryujinx.HLE/HOS/Services/Aud/IHardwareOpusDecoderManager.cs
+++ b/Ryujinx.HLE/HOS/Services/Aud/IHardwareOpusDecoderManager.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Aud
 {
-    class IHardwareOpusDecoderManager : IpcService
+    internal class IHardwareOpusDecoderManager : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Aud/SampleFormat.cs b/Ryujinx.HLE/HOS/Services/Aud/SampleFormat.cs
index 8da8038178..eb69acdca3 100644
--- a/Ryujinx.HLE/HOS/Services/Aud/SampleFormat.cs
+++ b/Ryujinx.HLE/HOS/Services/Aud/SampleFormat.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Services.Aud
 {
-    enum SampleFormat : byte
+    internal enum SampleFormat : byte
     {
         Invalid  = 0,
         PcmInt8  = 1,
diff --git a/Ryujinx.HLE/HOS/Services/Bcat/IBcatService.cs b/Ryujinx.HLE/HOS/Services/Bcat/IBcatService.cs
index 2fe3f06446..1517cf7959 100644
--- a/Ryujinx.HLE/HOS/Services/Bcat/IBcatService.cs
+++ b/Ryujinx.HLE/HOS/Services/Bcat/IBcatService.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Bcat
 {
-    class IBcatService : IpcService
+    internal class IBcatService : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Bcat/IDeliveryCacheStorageService.cs b/Ryujinx.HLE/HOS/Services/Bcat/IDeliveryCacheStorageService.cs
index df8c1838a4..479691fcf4 100644
--- a/Ryujinx.HLE/HOS/Services/Bcat/IDeliveryCacheStorageService.cs
+++ b/Ryujinx.HLE/HOS/Services/Bcat/IDeliveryCacheStorageService.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Bcat
 {
-    class IDeliveryCacheStorageService : IpcService
+    internal class IDeliveryCacheStorageService : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Bcat/IServiceCreator.cs b/Ryujinx.HLE/HOS/Services/Bcat/IServiceCreator.cs
index 4dceceb7fa..2960cf21f5 100644
--- a/Ryujinx.HLE/HOS/Services/Bcat/IServiceCreator.cs
+++ b/Ryujinx.HLE/HOS/Services/Bcat/IServiceCreator.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Bcat
 {
-    class IServiceCreator : IpcService
+    internal class IServiceCreator : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Bsd/BsdIoctl.cs b/Ryujinx.HLE/HOS/Services/Bsd/BsdIoctl.cs
index 15fc7a8278..0ca611363f 100644
--- a/Ryujinx.HLE/HOS/Services/Bsd/BsdIoctl.cs
+++ b/Ryujinx.HLE/HOS/Services/Bsd/BsdIoctl.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Services.Bsd
 {
-    enum BsdIoctl
+    internal enum BsdIoctl
     {
         AtMark = 0x40047307,
     }
diff --git a/Ryujinx.HLE/HOS/Services/Bsd/BsdSocket.cs b/Ryujinx.HLE/HOS/Services/Bsd/BsdSocket.cs
index 2786da1364..ebc9fe0422 100644
--- a/Ryujinx.HLE/HOS/Services/Bsd/BsdSocket.cs
+++ b/Ryujinx.HLE/HOS/Services/Bsd/BsdSocket.cs
@@ -2,7 +2,7 @@ using System.Net.Sockets;
 
 namespace Ryujinx.HLE.HOS.Services.Bsd
 {
-    class BsdSocket
+    internal class BsdSocket
     {
         public int Family;
         public int Type;
diff --git a/Ryujinx.HLE/HOS/Services/Bsd/IClient.cs b/Ryujinx.HLE/HOS/Services/Bsd/IClient.cs
index 2dc9c6f2e6..8384282486 100644
--- a/Ryujinx.HLE/HOS/Services/Bsd/IClient.cs
+++ b/Ryujinx.HLE/HOS/Services/Bsd/IClient.cs
@@ -8,7 +8,7 @@ using System.Text;
 
 namespace Ryujinx.HLE.HOS.Services.Bsd
 {
-    class IClient : IpcService
+    internal class IClient : IpcService
     {
 
         private static Dictionary<WsaError, LinuxError> _errorMap = new Dictionary<WsaError, LinuxError>
diff --git a/Ryujinx.HLE/HOS/Services/Bsd/PollEvent.cs b/Ryujinx.HLE/HOS/Services/Bsd/PollEvent.cs
index 3f3e4463eb..c553921616 100644
--- a/Ryujinx.HLE/HOS/Services/Bsd/PollEvent.cs
+++ b/Ryujinx.HLE/HOS/Services/Bsd/PollEvent.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Services.Bsd
 {
-    class PollEvent
+    internal class PollEvent
     {
         public enum EventTypeMask
         {
diff --git a/Ryujinx.HLE/HOS/Services/Caps/IAlbumAccessorService.cs b/Ryujinx.HLE/HOS/Services/Caps/IAlbumAccessorService.cs
index 37cdc0fa88..863bf6b4cd 100644
--- a/Ryujinx.HLE/HOS/Services/Caps/IAlbumAccessorService.cs
+++ b/Ryujinx.HLE/HOS/Services/Caps/IAlbumAccessorService.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Caps
 {
-    class IAlbumAccessorService : IpcService
+    internal class IAlbumAccessorService : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Caps/IScreenshotService.cs b/Ryujinx.HLE/HOS/Services/Caps/IScreenshotService.cs
index 9295795075..26aaa7b244 100644
--- a/Ryujinx.HLE/HOS/Services/Caps/IScreenshotService.cs
+++ b/Ryujinx.HLE/HOS/Services/Caps/IScreenshotService.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Caps
 {
-    class IScreenshotService : IpcService
+    internal class IScreenshotService : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Es/IETicketService.cs b/Ryujinx.HLE/HOS/Services/Es/IETicketService.cs
index 9c0f517372..400d9aee4f 100644
--- a/Ryujinx.HLE/HOS/Services/Es/IETicketService.cs
+++ b/Ryujinx.HLE/HOS/Services/Es/IETicketService.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Es
 {
-    class IeTicketService : IpcService
+    internal class IeTicketService : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Friend/IFriendService.cs b/Ryujinx.HLE/HOS/Services/Friend/IFriendService.cs
index bfce89d025..98dfd00c16 100644
--- a/Ryujinx.HLE/HOS/Services/Friend/IFriendService.cs
+++ b/Ryujinx.HLE/HOS/Services/Friend/IFriendService.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Friend
 {
-    class IFriendService : IpcService
+    internal class IFriendService : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Friend/IFriendServiceTypes.cs b/Ryujinx.HLE/HOS/Services/Friend/IFriendServiceTypes.cs
index 31459f7d68..9db271e0cd 100644
--- a/Ryujinx.HLE/HOS/Services/Friend/IFriendServiceTypes.cs
+++ b/Ryujinx.HLE/HOS/Services/Friend/IFriendServiceTypes.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Services.Friend
 {
-    enum PresenceStatusFilter
+    internal enum PresenceStatusFilter
     {
         None,
         Online,
@@ -8,7 +8,7 @@ namespace Ryujinx.HLE.HOS.Services.Friend
         OnlineOrOnlinePlay
     }
 
-    struct FriendFilter
+    internal struct FriendFilter
     {
         public PresenceStatusFilter PresenceStatus;
         public bool                 IsFavoriteOnly;
diff --git a/Ryujinx.HLE/HOS/Services/Friend/IServiceCreator.cs b/Ryujinx.HLE/HOS/Services/Friend/IServiceCreator.cs
index 69e3b3accb..66226c022f 100644
--- a/Ryujinx.HLE/HOS/Services/Friend/IServiceCreator.cs
+++ b/Ryujinx.HLE/HOS/Services/Friend/IServiceCreator.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Friend
 {
-    class IServiceCreator : IpcService
+    internal class IServiceCreator : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/FspSrv/FileSystemType.cs b/Ryujinx.HLE/HOS/Services/FspSrv/FileSystemType.cs
index 20fc9bdc43..c2e6c47d44 100644
--- a/Ryujinx.HLE/HOS/Services/FspSrv/FileSystemType.cs
+++ b/Ryujinx.HLE/HOS/Services/FspSrv/FileSystemType.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Services.FspSrv
 {
-    enum FileSystemType
+    internal enum FileSystemType
     {
         Logo               = 2,
         ContentControl     = 3,
diff --git a/Ryujinx.HLE/HOS/Services/FspSrv/FsErr.cs b/Ryujinx.HLE/HOS/Services/FspSrv/FsErr.cs
index 16ef03be30..c765d824fd 100644
--- a/Ryujinx.HLE/HOS/Services/FspSrv/FsErr.cs
+++ b/Ryujinx.HLE/HOS/Services/FspSrv/FsErr.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Services.FspSrv
 {
-    static class FsErr
+    internal static class FsErr
     {
         public const int PathDoesNotExist  = 1;
         public const int PathAlreadyExists = 2;
diff --git a/Ryujinx.HLE/HOS/Services/FspSrv/IDirectory.cs b/Ryujinx.HLE/HOS/Services/FspSrv/IDirectory.cs
index 664072d640..340af1c003 100644
--- a/Ryujinx.HLE/HOS/Services/FspSrv/IDirectory.cs
+++ b/Ryujinx.HLE/HOS/Services/FspSrv/IDirectory.cs
@@ -7,7 +7,7 @@ using System.Text;
 
 namespace Ryujinx.HLE.HOS.Services.FspSrv
 {
-    class IDirectory : IpcService, IDisposable
+    internal class IDirectory : IpcService, IDisposable
     {
         private const int DirectoryEntrySize = 0x310;
 
diff --git a/Ryujinx.HLE/HOS/Services/FspSrv/IFile.cs b/Ryujinx.HLE/HOS/Services/FspSrv/IFile.cs
index 76c01f4bdb..90437ab616 100644
--- a/Ryujinx.HLE/HOS/Services/FspSrv/IFile.cs
+++ b/Ryujinx.HLE/HOS/Services/FspSrv/IFile.cs
@@ -5,7 +5,7 @@ using System.IO;
 
 namespace Ryujinx.HLE.HOS.Services.FspSrv
 {
-    class IFile : IpcService, IDisposable
+    internal class IFile : IpcService, IDisposable
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/FspSrv/IFileSystem.cs b/Ryujinx.HLE/HOS/Services/FspSrv/IFileSystem.cs
index ba7f989cb3..b234259309 100644
--- a/Ryujinx.HLE/HOS/Services/FspSrv/IFileSystem.cs
+++ b/Ryujinx.HLE/HOS/Services/FspSrv/IFileSystem.cs
@@ -9,7 +9,7 @@ using static Ryujinx.HLE.Utilities.StringUtils;
 
 namespace Ryujinx.HLE.HOS.Services.FspSrv
 {
-    class IFileSystem : IpcService
+    internal class IFileSystem : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/FspSrv/IFileSystemProxy.cs b/Ryujinx.HLE/HOS/Services/FspSrv/IFileSystemProxy.cs
index cf260f375e..020c098c38 100644
--- a/Ryujinx.HLE/HOS/Services/FspSrv/IFileSystemProxy.cs
+++ b/Ryujinx.HLE/HOS/Services/FspSrv/IFileSystemProxy.cs
@@ -12,7 +12,7 @@ using static Ryujinx.HLE.Utilities.StringUtils;
 
 namespace Ryujinx.HLE.HOS.Services.FspSrv
 {
-    class IFileSystemProxy : IpcService
+    internal class IFileSystemProxy : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/FspSrv/IStorage.cs b/Ryujinx.HLE/HOS/Services/FspSrv/IStorage.cs
index 500b5106af..26b073320d 100644
--- a/Ryujinx.HLE/HOS/Services/FspSrv/IStorage.cs
+++ b/Ryujinx.HLE/HOS/Services/FspSrv/IStorage.cs
@@ -4,7 +4,7 @@ using System.IO;
 
 namespace Ryujinx.HLE.HOS.Services.FspSrv
 {
-    class IStorage : IpcService
+    internal class IStorage : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Hid/IActiveVibrationDeviceList.cs b/Ryujinx.HLE/HOS/Services/Hid/IActiveVibrationDeviceList.cs
index ea7dd2ea2c..388effbd14 100644
--- a/Ryujinx.HLE/HOS/Services/Hid/IActiveVibrationDeviceList.cs
+++ b/Ryujinx.HLE/HOS/Services/Hid/IActiveVibrationDeviceList.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Hid
 {
-    class IActiveApplicationDeviceList : IpcService
+    internal class IActiveApplicationDeviceList : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Hid/IAppletResource.cs b/Ryujinx.HLE/HOS/Services/Hid/IAppletResource.cs
index 974c09d88a..e092700314 100644
--- a/Ryujinx.HLE/HOS/Services/Hid/IAppletResource.cs
+++ b/Ryujinx.HLE/HOS/Services/Hid/IAppletResource.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Hid
 {
-    class IAppletResource : IpcService
+    internal class IAppletResource : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Hid/IHidServer.cs b/Ryujinx.HLE/HOS/Services/Hid/IHidServer.cs
index b279e8119d..6db7cf7879 100644
--- a/Ryujinx.HLE/HOS/Services/Hid/IHidServer.cs
+++ b/Ryujinx.HLE/HOS/Services/Hid/IHidServer.cs
@@ -7,7 +7,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Hid
 {
-    class IHidServer : IpcService
+    internal class IHidServer : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/IIpcService.cs b/Ryujinx.HLE/HOS/Services/IIpcService.cs
index f6bafe978d..d7f54794fb 100644
--- a/Ryujinx.HLE/HOS/Services/IIpcService.cs
+++ b/Ryujinx.HLE/HOS/Services/IIpcService.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services
 {
-    interface IIpcService
+    internal interface IIpcService
     {
         IReadOnlyDictionary<int, ServiceProcessRequest> Commands { get; }
     }
diff --git a/Ryujinx.HLE/HOS/Services/IpcService.cs b/Ryujinx.HLE/HOS/Services/IpcService.cs
index ec43430e3f..4e2ad21426 100644
--- a/Ryujinx.HLE/HOS/Services/IpcService.cs
+++ b/Ryujinx.HLE/HOS/Services/IpcService.cs
@@ -7,7 +7,7 @@ using System.IO;
 
 namespace Ryujinx.HLE.HOS.Services
 {
-    abstract class IpcService : IIpcService
+    internal abstract class IpcService : IIpcService
     {
         public abstract IReadOnlyDictionary<int, ServiceProcessRequest> Commands { get; }
 
diff --git a/Ryujinx.HLE/HOS/Services/Irs/IIrSensorServer.cs b/Ryujinx.HLE/HOS/Services/Irs/IIrSensorServer.cs
index aae0c119e8..81e0d91513 100644
--- a/Ryujinx.HLE/HOS/Services/Irs/IIrSensorServer.cs
+++ b/Ryujinx.HLE/HOS/Services/Irs/IIrSensorServer.cs
@@ -4,7 +4,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Irs
 {
-    class IIrSensorServer : IpcService
+    internal class IIrSensorServer : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Ldr/IRoInterface.cs b/Ryujinx.HLE/HOS/Services/Ldr/IRoInterface.cs
index 131755d7c3..f55dd6ad67 100644
--- a/Ryujinx.HLE/HOS/Services/Ldr/IRoInterface.cs
+++ b/Ryujinx.HLE/HOS/Services/Ldr/IRoInterface.cs
@@ -15,7 +15,7 @@ using static Ryujinx.HLE.HOS.ErrorCode;
 namespace Ryujinx.HLE.HOS.Services.Ldr
 {
     [StructLayout(LayoutKind.Explicit, Size = 0x350)]
-    unsafe struct NrrHeader
+    internal unsafe struct NrrHeader
     {
         [FieldOffset(0)]
         public uint  Magic;
@@ -48,7 +48,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldr
         public uint HashCount;
     }
 
-    class NrrInfo
+    internal class NrrInfo
     {
         public NrrHeader    Header     { get; private set; }
         public List<byte[]> Hashes     { get; private set; }
@@ -62,7 +62,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldr
         }
     }
 
-    class NroInfo
+    internal class NroInfo
     {
         public NxRelocatableObject Executable { get; private set; }
 
@@ -93,7 +93,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldr
         }
     }
 
-    class IRoInterface : IpcService
+    internal class IRoInterface : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Ldr/LoaderErr.cs b/Ryujinx.HLE/HOS/Services/Ldr/LoaderErr.cs
index ba77a5cc13..09e3d7f6b2 100644
--- a/Ryujinx.HLE/HOS/Services/Ldr/LoaderErr.cs
+++ b/Ryujinx.HLE/HOS/Services/Ldr/LoaderErr.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Services.Ldr
 {
-    static class LoaderErr
+    internal static class LoaderErr
     {
         public const int InvalidMemoryState = 51;
         public const int InvalidNro         = 52;
diff --git a/Ryujinx.HLE/HOS/Services/Lm/ILogService.cs b/Ryujinx.HLE/HOS/Services/Lm/ILogService.cs
index c365d4faad..c96897e8c4 100644
--- a/Ryujinx.HLE/HOS/Services/Lm/ILogService.cs
+++ b/Ryujinx.HLE/HOS/Services/Lm/ILogService.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Lm
 {
-    class ILogService : IpcService
+    internal class ILogService : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Lm/ILogger.cs b/Ryujinx.HLE/HOS/Services/Lm/ILogger.cs
index ad55937cf5..f494c00b0a 100644
--- a/Ryujinx.HLE/HOS/Services/Lm/ILogger.cs
+++ b/Ryujinx.HLE/HOS/Services/Lm/ILogger.cs
@@ -6,7 +6,7 @@ using System.Text;
 
 namespace Ryujinx.HLE.HOS.Services.Lm
 {
-    class ILogger : IpcService
+    internal class ILogger : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Lm/LmLogField.cs b/Ryujinx.HLE/HOS/Services/Lm/LmLogField.cs
index 9547463466..943c826ab9 100644
--- a/Ryujinx.HLE/HOS/Services/Lm/LmLogField.cs
+++ b/Ryujinx.HLE/HOS/Services/Lm/LmLogField.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Services.Lm
 {
-    enum LmLogField
+    internal enum LmLogField
     {
         Start       = 0,
         Stop        = 1,
diff --git a/Ryujinx.HLE/HOS/Services/Lm/LmLogLevel.cs b/Ryujinx.HLE/HOS/Services/Lm/LmLogLevel.cs
index 70554c42c0..2b2f8d5e5e 100644
--- a/Ryujinx.HLE/HOS/Services/Lm/LmLogLevel.cs
+++ b/Ryujinx.HLE/HOS/Services/Lm/LmLogLevel.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Services.Lm
 {
-    enum LmLogLevel
+    internal enum LmLogLevel
     {
         Trace,
         Info,
diff --git a/Ryujinx.HLE/HOS/Services/Lr/ILocationResolver.cs b/Ryujinx.HLE/HOS/Services/Lr/ILocationResolver.cs
index c6ad577794..28ee337663 100644
--- a/Ryujinx.HLE/HOS/Services/Lr/ILocationResolver.cs
+++ b/Ryujinx.HLE/HOS/Services/Lr/ILocationResolver.cs
@@ -10,7 +10,7 @@ using static Ryujinx.HLE.Utilities.StringUtils;
 
 namespace Ryujinx.HLE.HOS.Services.Lr
 {
-    class ILocationResolver : IpcService
+    internal class ILocationResolver : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Lr/ILocationResolverManager.cs b/Ryujinx.HLE/HOS/Services/Lr/ILocationResolverManager.cs
index fed4696b77..b3daa7b3f8 100644
--- a/Ryujinx.HLE/HOS/Services/Lr/ILocationResolverManager.cs
+++ b/Ryujinx.HLE/HOS/Services/Lr/ILocationResolverManager.cs
@@ -4,7 +4,7 @@ using Ryujinx.HLE.FileSystem;
 
 namespace Ryujinx.HLE.HOS.Services.Lr
 {
-    class ILocationResolverManager : IpcService
+    internal class ILocationResolverManager : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Lr/LrErr.cs b/Ryujinx.HLE/HOS/Services/Lr/LrErr.cs
index 5c87b73be6..946c183191 100644
--- a/Ryujinx.HLE/HOS/Services/Lr/LrErr.cs
+++ b/Ryujinx.HLE/HOS/Services/Lr/LrErr.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Services.Lr
 {
-    class LrErr
+    internal class LrErr
     {
         public const int ProgramLocationEntryNotFound = 2;
         public const int AccessDenied                 = 5;
diff --git a/Ryujinx.HLE/HOS/Services/Mm/IRequest.cs b/Ryujinx.HLE/HOS/Services/Mm/IRequest.cs
index b894bb7722..20952732cf 100644
--- a/Ryujinx.HLE/HOS/Services/Mm/IRequest.cs
+++ b/Ryujinx.HLE/HOS/Services/Mm/IRequest.cs
@@ -4,7 +4,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Mm
 {
-    class IRequest : IpcService
+    internal class IRequest : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Ncm/IContentManager.cs b/Ryujinx.HLE/HOS/Services/Ncm/IContentManager.cs
index e8ce637019..eb72aaedd6 100644
--- a/Ryujinx.HLE/HOS/Services/Ncm/IContentManager.cs
+++ b/Ryujinx.HLE/HOS/Services/Ncm/IContentManager.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Ncm
 {
-    class IContentManager : IpcService
+    internal class IContentManager : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Ncm/IContentStorage.cs b/Ryujinx.HLE/HOS/Services/Ncm/IContentStorage.cs
index 40e0951492..3e0fdb1d65 100644
--- a/Ryujinx.HLE/HOS/Services/Ncm/IContentStorage.cs
+++ b/Ryujinx.HLE/HOS/Services/Ncm/IContentStorage.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Ncm
 {
-    class IContentStorage : IpcService
+    internal class IContentStorage : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Nfp/DeviceState.cs b/Ryujinx.HLE/HOS/Services/Nfp/DeviceState.cs
index 0452789362..c1567fdbd3 100644
--- a/Ryujinx.HLE/HOS/Services/Nfp/DeviceState.cs
+++ b/Ryujinx.HLE/HOS/Services/Nfp/DeviceState.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Services.Nfp
 {
-    enum DeviceState
+    internal enum DeviceState
     {
         Initialized = 0
     }
diff --git a/Ryujinx.HLE/HOS/Services/Nfp/IUser.cs b/Ryujinx.HLE/HOS/Services/Nfp/IUser.cs
index 1a3f7df742..9285794c65 100644
--- a/Ryujinx.HLE/HOS/Services/Nfp/IUser.cs
+++ b/Ryujinx.HLE/HOS/Services/Nfp/IUser.cs
@@ -7,7 +7,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Nfp
 {
-    class IUser : IpcService
+    internal class IUser : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Nfp/IUserManager.cs b/Ryujinx.HLE/HOS/Services/Nfp/IUserManager.cs
index a0e1b636f4..d87eea2011 100644
--- a/Ryujinx.HLE/HOS/Services/Nfp/IUserManager.cs
+++ b/Ryujinx.HLE/HOS/Services/Nfp/IUserManager.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Nfp
 {
-    class IUserManager : IpcService
+    internal class IUserManager : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Nfp/State.cs b/Ryujinx.HLE/HOS/Services/Nfp/State.cs
index 0b4b3c1b05..4e02eb7448 100644
--- a/Ryujinx.HLE/HOS/Services/Nfp/State.cs
+++ b/Ryujinx.HLE/HOS/Services/Nfp/State.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Services.Nfp
 {
-    enum State
+    internal enum State
     {
         NonInitialized = 0,
         Initialized = 1
diff --git a/Ryujinx.HLE/HOS/Services/Nifm/IGeneralService.cs b/Ryujinx.HLE/HOS/Services/Nifm/IGeneralService.cs
index a38a63b4ed..45469b4e7d 100644
--- a/Ryujinx.HLE/HOS/Services/Nifm/IGeneralService.cs
+++ b/Ryujinx.HLE/HOS/Services/Nifm/IGeneralService.cs
@@ -11,7 +11,7 @@ using static Ryujinx.HLE.HOS.ErrorCode;
 
 namespace Ryujinx.HLE.HOS.Services.Nifm
 {
-    class IGeneralService : IpcService
+    internal class IGeneralService : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Nifm/IRequest.cs b/Ryujinx.HLE/HOS/Services/Nifm/IRequest.cs
index c6ab761634..36924ce6df 100644
--- a/Ryujinx.HLE/HOS/Services/Nifm/IRequest.cs
+++ b/Ryujinx.HLE/HOS/Services/Nifm/IRequest.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Nifm
 {
-    class IRequest : IpcService
+    internal class IRequest : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Nifm/IStaticService.cs b/Ryujinx.HLE/HOS/Services/Nifm/IStaticService.cs
index 74325a6f0e..4a9834fc46 100644
--- a/Ryujinx.HLE/HOS/Services/Nifm/IStaticService.cs
+++ b/Ryujinx.HLE/HOS/Services/Nifm/IStaticService.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Nifm
 {
-    class IStaticService : IpcService
+    internal class IStaticService : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Nifm/NifmErr.cs b/Ryujinx.HLE/HOS/Services/Nifm/NifmErr.cs
index 3abeb8389f..1bf766630b 100644
--- a/Ryujinx.HLE/HOS/Services/Nifm/NifmErr.cs
+++ b/Ryujinx.HLE/HOS/Services/Nifm/NifmErr.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Services.Nifm
 {
-    static class NifmErr
+    internal static class NifmErr
     {
         public const int NoInternetConnection = 300;
     }
diff --git a/Ryujinx.HLE/HOS/Services/Ns/IAddOnContentManager.cs b/Ryujinx.HLE/HOS/Services/Ns/IAddOnContentManager.cs
index e195e71ffa..f2bf6e8a12 100644
--- a/Ryujinx.HLE/HOS/Services/Ns/IAddOnContentManager.cs
+++ b/Ryujinx.HLE/HOS/Services/Ns/IAddOnContentManager.cs
@@ -4,7 +4,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Ns
 {
-    class IAddOnContentManager : IpcService
+    internal class IAddOnContentManager : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Ns/IApplicationManagerInterface.cs b/Ryujinx.HLE/HOS/Services/Ns/IApplicationManagerInterface.cs
index a47b2a53f1..a874a88c90 100644
--- a/Ryujinx.HLE/HOS/Services/Ns/IApplicationManagerInterface.cs
+++ b/Ryujinx.HLE/HOS/Services/Ns/IApplicationManagerInterface.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Ns
 {
-    class IApplicationManagerInterface : IpcService
+    internal class IApplicationManagerInterface : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Ns/IServiceGetterInterface.cs b/Ryujinx.HLE/HOS/Services/Ns/IServiceGetterInterface.cs
index f893369b76..592f247667 100644
--- a/Ryujinx.HLE/HOS/Services/Ns/IServiceGetterInterface.cs
+++ b/Ryujinx.HLE/HOS/Services/Ns/IServiceGetterInterface.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Ns
 {
-    class IServiceGetterInterface : IpcService
+    internal class IServiceGetterInterface : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Ns/ISystemUpdateInterface.cs b/Ryujinx.HLE/HOS/Services/Ns/ISystemUpdateInterface.cs
index 993aa94388..2cca24f4df 100644
--- a/Ryujinx.HLE/HOS/Services/Ns/ISystemUpdateInterface.cs
+++ b/Ryujinx.HLE/HOS/Services/Ns/ISystemUpdateInterface.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Ns
 {
-    class ISystemUpdateInterface : IpcService
+    internal class ISystemUpdateInterface : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Ns/IVulnerabilityManagerInterface.cs b/Ryujinx.HLE/HOS/Services/Ns/IVulnerabilityManagerInterface.cs
index 1fa92f9bf1..4b8143fa15 100644
--- a/Ryujinx.HLE/HOS/Services/Ns/IVulnerabilityManagerInterface.cs
+++ b/Ryujinx.HLE/HOS/Services/Ns/IVulnerabilityManagerInterface.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Ns
 {
-    class IVulnerabilityManagerInterface : IpcService
+    internal class IVulnerabilityManagerInterface : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Nv/INvDrvServices.cs b/Ryujinx.HLE/HOS/Services/Nv/INvDrvServices.cs
index 0051904094..02b7f6ed2f 100644
--- a/Ryujinx.HLE/HOS/Services/Nv/INvDrvServices.cs
+++ b/Ryujinx.HLE/HOS/Services/Nv/INvDrvServices.cs
@@ -12,7 +12,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Nv
 {
-    class INvDrvServices : IpcService
+    internal class INvDrvServices : IpcService
     {
         private delegate int IoctlProcessor(ServiceCtx context, int cmd);
 
diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvFd.cs b/Ryujinx.HLE/HOS/Services/Nv/NvFd.cs
index b6c654e4ea..03b1f2394e 100644
--- a/Ryujinx.HLE/HOS/Services/Nv/NvFd.cs
+++ b/Ryujinx.HLE/HOS/Services/Nv/NvFd.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Services.Nv
 {
-    class NvFd
+    internal class NvFd
     {
         public string Name { get; private set; }
 
diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvGpuAS/NvGpuASAllocSpace.cs b/Ryujinx.HLE/HOS/Services/Nv/NvGpuAS/NvGpuASAllocSpace.cs
index bca2f9f4a1..4f5085253b 100644
--- a/Ryujinx.HLE/HOS/Services/Nv/NvGpuAS/NvGpuASAllocSpace.cs
+++ b/Ryujinx.HLE/HOS/Services/Nv/NvGpuAS/NvGpuASAllocSpace.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Services.Nv.NvGpuAS
 {
-    struct NvGpuASAllocSpace
+    internal struct NvGpuASAllocSpace
     {
         public int  Pages;
         public int  PageSize;
diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvGpuAS/NvGpuASCtx.cs b/Ryujinx.HLE/HOS/Services/Nv/NvGpuAS/NvGpuASCtx.cs
index 67b80e33e7..6f04de5d9d 100644
--- a/Ryujinx.HLE/HOS/Services/Nv/NvGpuAS/NvGpuASCtx.cs
+++ b/Ryujinx.HLE/HOS/Services/Nv/NvGpuAS/NvGpuASCtx.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Nv.NvGpuAS
 {
-    class NvGpuASCtx
+    internal class NvGpuASCtx
     {
         public NvGpuVmm Vmm { get; private set; }
 
diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvGpuAS/NvGpuASIoctl.cs b/Ryujinx.HLE/HOS/Services/Nv/NvGpuAS/NvGpuASIoctl.cs
index 8e128a0d3a..b386f188f6 100644
--- a/Ryujinx.HLE/HOS/Services/Nv/NvGpuAS/NvGpuASIoctl.cs
+++ b/Ryujinx.HLE/HOS/Services/Nv/NvGpuAS/NvGpuASIoctl.cs
@@ -8,7 +8,7 @@ using System.Collections.Concurrent;
 
 namespace Ryujinx.HLE.HOS.Services.Nv.NvGpuAS
 {
-    class NvGpuASIoctl
+    internal class NvGpuASIoctl
     {
         private const int FlagFixedOffset = 1;
 
diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvGpuAS/NvGpuASMapBufferEx.cs b/Ryujinx.HLE/HOS/Services/Nv/NvGpuAS/NvGpuASMapBufferEx.cs
index 4bdb4bf7ce..3254983607 100644
--- a/Ryujinx.HLE/HOS/Services/Nv/NvGpuAS/NvGpuASMapBufferEx.cs
+++ b/Ryujinx.HLE/HOS/Services/Nv/NvGpuAS/NvGpuASMapBufferEx.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Services.Nv.NvGpuAS
 {
-    struct NvGpuASMapBufferEx
+    internal struct NvGpuASMapBufferEx
     {
         public int  Flags;
         public int  Kind;
diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvGpuAS/NvGpuASRemap.cs b/Ryujinx.HLE/HOS/Services/Nv/NvGpuAS/NvGpuASRemap.cs
index a24221bac5..f9595f8c45 100644
--- a/Ryujinx.HLE/HOS/Services/Nv/NvGpuAS/NvGpuASRemap.cs
+++ b/Ryujinx.HLE/HOS/Services/Nv/NvGpuAS/NvGpuASRemap.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Services.Nv.NvGpuAS
 {
-    struct NvGpuASRemap
+    internal struct NvGpuASRemap
     {
         public short Flags;
         public short Kind;
diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvGpuAS/NvGpuASUnmapBuffer.cs b/Ryujinx.HLE/HOS/Services/Nv/NvGpuAS/NvGpuASUnmapBuffer.cs
index beb07fe2e8..c751e71951 100644
--- a/Ryujinx.HLE/HOS/Services/Nv/NvGpuAS/NvGpuASUnmapBuffer.cs
+++ b/Ryujinx.HLE/HOS/Services/Nv/NvGpuAS/NvGpuASUnmapBuffer.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Services.Nv.NvGpuAS
 {
-    struct NvGpuASUnmapBuffer
+    internal struct NvGpuASUnmapBuffer
     {
         public long Offset;
     }
diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvGpuGpu/NvGpuGpuGetActiveSlotMask.cs b/Ryujinx.HLE/HOS/Services/Nv/NvGpuGpu/NvGpuGpuGetActiveSlotMask.cs
index e20d21f967..05fed1a52d 100644
--- a/Ryujinx.HLE/HOS/Services/Nv/NvGpuGpu/NvGpuGpuGetActiveSlotMask.cs
+++ b/Ryujinx.HLE/HOS/Services/Nv/NvGpuGpu/NvGpuGpuGetActiveSlotMask.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Services.Nv.NvGpuGpu
 {
-    struct NvGpuGpuGetActiveSlotMask
+    internal struct NvGpuGpuGetActiveSlotMask
     {
         public int Slot;
         public int Mask;
diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvGpuGpu/NvGpuGpuGetCharacteristics.cs b/Ryujinx.HLE/HOS/Services/Nv/NvGpuGpu/NvGpuGpuGetCharacteristics.cs
index 9a925138ed..89d313f109 100644
--- a/Ryujinx.HLE/HOS/Services/Nv/NvGpuGpu/NvGpuGpuGetCharacteristics.cs
+++ b/Ryujinx.HLE/HOS/Services/Nv/NvGpuGpu/NvGpuGpuGetCharacteristics.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Services.Nv.NvGpuGpu
 {
-    struct NvGpuGpuGetCharacteristics
+    internal struct NvGpuGpuGetCharacteristics
     {
         public long BufferSize;
         public long BufferAddress;
diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvGpuGpu/NvGpuGpuGetTpcMasks.cs b/Ryujinx.HLE/HOS/Services/Nv/NvGpuGpu/NvGpuGpuGetTpcMasks.cs
index 751363c60e..daab6c4fe7 100644
--- a/Ryujinx.HLE/HOS/Services/Nv/NvGpuGpu/NvGpuGpuGetTpcMasks.cs
+++ b/Ryujinx.HLE/HOS/Services/Nv/NvGpuGpu/NvGpuGpuGetTpcMasks.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Services.Nv.NvGpuGpu
 {
-    struct NvGpuGpuGetTpcMasks
+    internal struct NvGpuGpuGetTpcMasks
     {
         public int  MaskBufferSize;
         public int  Reserved;
diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvGpuGpu/NvGpuGpuIoctl.cs b/Ryujinx.HLE/HOS/Services/Nv/NvGpuGpu/NvGpuGpuIoctl.cs
index 5680fb8eb4..4463a984ca 100644
--- a/Ryujinx.HLE/HOS/Services/Nv/NvGpuGpu/NvGpuGpuIoctl.cs
+++ b/Ryujinx.HLE/HOS/Services/Nv/NvGpuGpu/NvGpuGpuIoctl.cs
@@ -5,7 +5,7 @@ using System.Diagnostics;
 
 namespace Ryujinx.HLE.HOS.Services.Nv.NvGpuGpu
 {
-    class NvGpuGpuIoctl
+    internal class NvGpuGpuIoctl
     {
         private static Stopwatch _pTimer;
 
diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvGpuGpu/NvGpuGpuZcullGetCtxSize.cs b/Ryujinx.HLE/HOS/Services/Nv/NvGpuGpu/NvGpuGpuZcullGetCtxSize.cs
index 3ac9f92b60..50eb81dfc8 100644
--- a/Ryujinx.HLE/HOS/Services/Nv/NvGpuGpu/NvGpuGpuZcullGetCtxSize.cs
+++ b/Ryujinx.HLE/HOS/Services/Nv/NvGpuGpu/NvGpuGpuZcullGetCtxSize.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Services.Nv.NvGpuGpu
 {
-    struct NvGpuGpuZcullGetCtxSize
+    internal struct NvGpuGpuZcullGetCtxSize
     {
         public int Size;
     }
diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvGpuGpu/NvGpuGpuZcullGetInfo.cs b/Ryujinx.HLE/HOS/Services/Nv/NvGpuGpu/NvGpuGpuZcullGetInfo.cs
index 4a7cafd544..1068f9da25 100644
--- a/Ryujinx.HLE/HOS/Services/Nv/NvGpuGpu/NvGpuGpuZcullGetInfo.cs
+++ b/Ryujinx.HLE/HOS/Services/Nv/NvGpuGpu/NvGpuGpuZcullGetInfo.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Services.Nv.NvGpuGpu
 {
-    struct NvGpuGpuZcullGetInfo
+    internal struct NvGpuGpuZcullGetInfo
     {
         public int WidthAlignPixels;
         public int HeightAlignPixels;
diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvHelper.cs b/Ryujinx.HLE/HOS/Services/Nv/NvHelper.cs
index d9a1c45267..17fb8cce7d 100644
--- a/Ryujinx.HLE/HOS/Services/Nv/NvHelper.cs
+++ b/Ryujinx.HLE/HOS/Services/Nv/NvHelper.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Services.Nv
 {
-    static class NvHelper
+    internal static class NvHelper
     {
         public static void Crash()
         {
diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvHostChannel/NvChannel.cs b/Ryujinx.HLE/HOS/Services/Nv/NvHostChannel/NvChannel.cs
index 54e709f9d3..b040c58695 100644
--- a/Ryujinx.HLE/HOS/Services/Nv/NvHostChannel/NvChannel.cs
+++ b/Ryujinx.HLE/HOS/Services/Nv/NvHostChannel/NvChannel.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Services.Nv.NvHostChannel
 {
-    class NvChannel
+    internal class NvChannel
     {
         public int Timeout;
     }
diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvHostChannel/NvChannelName.cs b/Ryujinx.HLE/HOS/Services/Nv/NvHostChannel/NvChannelName.cs
index a2b5ea4cbf..6f074f2c1c 100644
--- a/Ryujinx.HLE/HOS/Services/Nv/NvHostChannel/NvChannelName.cs
+++ b/Ryujinx.HLE/HOS/Services/Nv/NvHostChannel/NvChannelName.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Services.Nv.NvHostChannel
 {
-    enum NvChannelName
+    internal enum NvChannelName
     {
         Gpu
     }
diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvHostChannel/NvHostChannelIoctl.cs b/Ryujinx.HLE/HOS/Services/Nv/NvHostChannel/NvHostChannelIoctl.cs
index fdc7317132..45ae146ea4 100644
--- a/Ryujinx.HLE/HOS/Services/Nv/NvHostChannel/NvHostChannelIoctl.cs
+++ b/Ryujinx.HLE/HOS/Services/Nv/NvHostChannel/NvHostChannelIoctl.cs
@@ -8,7 +8,7 @@ using System.Collections.Concurrent;
 
 namespace Ryujinx.HLE.HOS.Services.Nv.NvHostChannel
 {
-    class NvHostChannelIoctl
+    internal class NvHostChannelIoctl
     {
         private class ChannelsPerProcess
         {
diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvHostChannel/NvHostChannelSubmitGpfifo.cs b/Ryujinx.HLE/HOS/Services/Nv/NvHostChannel/NvHostChannelSubmitGpfifo.cs
index edebcfeb28..41dd6f404b 100644
--- a/Ryujinx.HLE/HOS/Services/Nv/NvHostChannel/NvHostChannelSubmitGpfifo.cs
+++ b/Ryujinx.HLE/HOS/Services/Nv/NvHostChannel/NvHostChannelSubmitGpfifo.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Services.Nv.NvHostChannel
 {
-    struct NvHostChannelSubmitGpfifo
+    internal struct NvHostChannelSubmitGpfifo
     {
         public long Address;
         public int  NumEntries;
diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvHostCtrl/NvHostCtrlIoctl.cs b/Ryujinx.HLE/HOS/Services/Nv/NvHostCtrl/NvHostCtrlIoctl.cs
index f13f7a68d3..a6d0f107a7 100644
--- a/Ryujinx.HLE/HOS/Services/Nv/NvHostCtrl/NvHostCtrlIoctl.cs
+++ b/Ryujinx.HLE/HOS/Services/Nv/NvHostCtrl/NvHostCtrlIoctl.cs
@@ -8,7 +8,7 @@ using System.Threading;
 
 namespace Ryujinx.HLE.HOS.Services.Nv.NvHostCtrl
 {
-    class NvHostCtrlIoctl
+    internal class NvHostCtrlIoctl
     {
         private static ConcurrentDictionary<KProcess, NvHostCtrlUserCtx> _userCtxs;
 
diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvHostCtrl/NvHostCtrlSyncPtRead.cs b/Ryujinx.HLE/HOS/Services/Nv/NvHostCtrl/NvHostCtrlSyncPtRead.cs
index 275b613255..b94a6c69c0 100644
--- a/Ryujinx.HLE/HOS/Services/Nv/NvHostCtrl/NvHostCtrlSyncPtRead.cs
+++ b/Ryujinx.HLE/HOS/Services/Nv/NvHostCtrl/NvHostCtrlSyncPtRead.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Services.Nv.NvHostCtrl
 {
-    struct NvHostCtrlSyncptRead
+    internal struct NvHostCtrlSyncptRead
     {
         public int Id;
         public int Value;
diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvHostCtrl/NvHostCtrlSyncPtWait.cs b/Ryujinx.HLE/HOS/Services/Nv/NvHostCtrl/NvHostCtrlSyncPtWait.cs
index 96e2f968cd..ff299925da 100644
--- a/Ryujinx.HLE/HOS/Services/Nv/NvHostCtrl/NvHostCtrlSyncPtWait.cs
+++ b/Ryujinx.HLE/HOS/Services/Nv/NvHostCtrl/NvHostCtrlSyncPtWait.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Services.Nv.NvHostCtrl
 {
-    struct NvHostCtrlSyncptWait
+    internal struct NvHostCtrlSyncptWait
     {
         public int Id;
         public int Thresh;
diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvHostCtrl/NvHostCtrlSyncPtWaitEx.cs b/Ryujinx.HLE/HOS/Services/Nv/NvHostCtrl/NvHostCtrlSyncPtWaitEx.cs
index 6aaa471831..1c97dd1168 100644
--- a/Ryujinx.HLE/HOS/Services/Nv/NvHostCtrl/NvHostCtrlSyncPtWaitEx.cs
+++ b/Ryujinx.HLE/HOS/Services/Nv/NvHostCtrl/NvHostCtrlSyncPtWaitEx.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Services.Nv.NvHostCtrl
 {
-    struct NvHostCtrlSyncptWaitEx
+    internal struct NvHostCtrlSyncptWaitEx
     {
         public int Id;
         public int Thresh;
diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvHostCtrl/NvHostCtrlUserCtx.cs b/Ryujinx.HLE/HOS/Services/Nv/NvHostCtrl/NvHostCtrlUserCtx.cs
index fcb8083692..bde6a4a613 100644
--- a/Ryujinx.HLE/HOS/Services/Nv/NvHostCtrl/NvHostCtrlUserCtx.cs
+++ b/Ryujinx.HLE/HOS/Services/Nv/NvHostCtrl/NvHostCtrlUserCtx.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Services.Nv.NvHostCtrl
 {
-    class NvHostCtrlUserCtx
+    internal class NvHostCtrlUserCtx
     {
         public const int LocksCount  = 16;
         public const int EventsCount = 64;
diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvHostCtrl/NvHostEvent.cs b/Ryujinx.HLE/HOS/Services/Nv/NvHostCtrl/NvHostEvent.cs
index 71e5f1e63b..f0600cf6a5 100644
--- a/Ryujinx.HLE/HOS/Services/Nv/NvHostCtrl/NvHostEvent.cs
+++ b/Ryujinx.HLE/HOS/Services/Nv/NvHostCtrl/NvHostEvent.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Services.Nv.NvHostCtrl
 {
-    class NvHostEvent
+    internal class NvHostEvent
     {
         public int Id;
         public int Thresh;
diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvHostCtrl/NvHostEventState.cs b/Ryujinx.HLE/HOS/Services/Nv/NvHostCtrl/NvHostEventState.cs
index 61870c7f92..0de816c602 100644
--- a/Ryujinx.HLE/HOS/Services/Nv/NvHostCtrl/NvHostEventState.cs
+++ b/Ryujinx.HLE/HOS/Services/Nv/NvHostCtrl/NvHostEventState.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Services.Nv.NvHostCtrl
 {
-    enum NvHostEventState
+    internal enum NvHostEventState
     {
         Registered = 0,
         Waiting    = 1,
diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvHostCtrl/NvHostSyncPt.cs b/Ryujinx.HLE/HOS/Services/Nv/NvHostCtrl/NvHostSyncPt.cs
index d27f7c5348..01a7643163 100644
--- a/Ryujinx.HLE/HOS/Services/Nv/NvHostCtrl/NvHostSyncPt.cs
+++ b/Ryujinx.HLE/HOS/Services/Nv/NvHostCtrl/NvHostSyncPt.cs
@@ -5,7 +5,7 @@ using System.Threading;
 
 namespace Ryujinx.HLE.HOS.Services.Nv.NvHostCtrl
 {
-    class NvHostSyncpt
+    internal class NvHostSyncpt
     {
         public const int SyncptsCount = 192;
 
diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvMap/NvMapAlloc.cs b/Ryujinx.HLE/HOS/Services/Nv/NvMap/NvMapAlloc.cs
index bc61baade7..9909a8b87c 100644
--- a/Ryujinx.HLE/HOS/Services/Nv/NvMap/NvMapAlloc.cs
+++ b/Ryujinx.HLE/HOS/Services/Nv/NvMap/NvMapAlloc.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Services.Nv.NvMap
 {
-    struct NvMapAlloc
+    internal struct NvMapAlloc
     {
         public int  Handle;
         public int  HeapMask;
diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvMap/NvMapCreate.cs b/Ryujinx.HLE/HOS/Services/Nv/NvMap/NvMapCreate.cs
index dd4bff9890..75f22c8b33 100644
--- a/Ryujinx.HLE/HOS/Services/Nv/NvMap/NvMapCreate.cs
+++ b/Ryujinx.HLE/HOS/Services/Nv/NvMap/NvMapCreate.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Services.Nv.NvMap
 {
-    struct NvMapCreate
+    internal struct NvMapCreate
     {
         public int Size;
         public int Handle;
diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvMap/NvMapFree.cs b/Ryujinx.HLE/HOS/Services/Nv/NvMap/NvMapFree.cs
index d946987ef9..22b7c19f52 100644
--- a/Ryujinx.HLE/HOS/Services/Nv/NvMap/NvMapFree.cs
+++ b/Ryujinx.HLE/HOS/Services/Nv/NvMap/NvMapFree.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Services.Nv.NvMap
 {
-    struct NvMapFree
+    internal struct NvMapFree
     {
         public int  Handle;
         public int  Padding;
diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvMap/NvMapFromId.cs b/Ryujinx.HLE/HOS/Services/Nv/NvMap/NvMapFromId.cs
index e49257ea6d..27f2e718bb 100644
--- a/Ryujinx.HLE/HOS/Services/Nv/NvMap/NvMapFromId.cs
+++ b/Ryujinx.HLE/HOS/Services/Nv/NvMap/NvMapFromId.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Services.Nv.NvMap
 {
-    struct NvMapFromId
+    internal struct NvMapFromId
     {
         public int Id;
         public int Handle;
diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvMap/NvMapGetId.cs b/Ryujinx.HLE/HOS/Services/Nv/NvMap/NvMapGetId.cs
index 1f4f32900f..0ff6c43cb6 100644
--- a/Ryujinx.HLE/HOS/Services/Nv/NvMap/NvMapGetId.cs
+++ b/Ryujinx.HLE/HOS/Services/Nv/NvMap/NvMapGetId.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Services.Nv.NvMap
 {
-    struct NvMapGetId
+    internal struct NvMapGetId
     {
         public int Id;
         public int Handle;
diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvMap/NvMapHandle.cs b/Ryujinx.HLE/HOS/Services/Nv/NvMap/NvMapHandle.cs
index 51d074feb7..d421efa1b1 100644
--- a/Ryujinx.HLE/HOS/Services/Nv/NvMap/NvMapHandle.cs
+++ b/Ryujinx.HLE/HOS/Services/Nv/NvMap/NvMapHandle.cs
@@ -2,7 +2,7 @@ using System.Threading;
 
 namespace Ryujinx.HLE.HOS.Services.Nv.NvMap
 {
-    class NvMapHandle
+    internal class NvMapHandle
     {
         public int  Handle;
         public int  Id;
diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvMap/NvMapHandleParam.cs b/Ryujinx.HLE/HOS/Services/Nv/NvMap/NvMapHandleParam.cs
index b360343cd1..75dbcde7f9 100644
--- a/Ryujinx.HLE/HOS/Services/Nv/NvMap/NvMapHandleParam.cs
+++ b/Ryujinx.HLE/HOS/Services/Nv/NvMap/NvMapHandleParam.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Services.Nv.NvMap
 {
-    enum NvMapHandleParam
+    internal enum NvMapHandleParam
     {
         Size  = 1,
         Align = 2,
diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvMap/NvMapIoctl.cs b/Ryujinx.HLE/HOS/Services/Nv/NvMap/NvMapIoctl.cs
index 75a76b91da..8c1d15a6d2 100644
--- a/Ryujinx.HLE/HOS/Services/Nv/NvMap/NvMapIoctl.cs
+++ b/Ryujinx.HLE/HOS/Services/Nv/NvMap/NvMapIoctl.cs
@@ -7,7 +7,7 @@ using System.Collections.Concurrent;
 
 namespace Ryujinx.HLE.HOS.Services.Nv.NvMap
 {
-    class NvMapIoctl
+    internal class NvMapIoctl
     {
         private const int FlagNotFreedYet = 1;
 
diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvMap/NvMapParam.cs b/Ryujinx.HLE/HOS/Services/Nv/NvMap/NvMapParam.cs
index b5213efe59..b3ed817bf6 100644
--- a/Ryujinx.HLE/HOS/Services/Nv/NvMap/NvMapParam.cs
+++ b/Ryujinx.HLE/HOS/Services/Nv/NvMap/NvMapParam.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Services.Nv.NvMap
 {
-    struct NvMapParam
+    internal struct NvMapParam
     {
         public int Handle;
         public int Param;
diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvResult.cs b/Ryujinx.HLE/HOS/Services/Nv/NvResult.cs
index 86ecd97558..e2b3557864 100644
--- a/Ryujinx.HLE/HOS/Services/Nv/NvResult.cs
+++ b/Ryujinx.HLE/HOS/Services/Nv/NvResult.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Services.Nv
 {
-    static class NvResult
+    internal static class NvResult
     {
         public const int NotAvailableInProduction = 196614;
         public const int Success                  = 0;
diff --git a/Ryujinx.HLE/HOS/Services/Pctl/IParentalControlService.cs b/Ryujinx.HLE/HOS/Services/Pctl/IParentalControlService.cs
index 45eb5c5200..106e3035f8 100644
--- a/Ryujinx.HLE/HOS/Services/Pctl/IParentalControlService.cs
+++ b/Ryujinx.HLE/HOS/Services/Pctl/IParentalControlService.cs
@@ -4,7 +4,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Pctl
 {
-    class IParentalControlService : IpcService
+    internal class IParentalControlService : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Pctl/IParentalControlServiceFactory.cs b/Ryujinx.HLE/HOS/Services/Pctl/IParentalControlServiceFactory.cs
index 5b15fc1d3f..31231253f5 100644
--- a/Ryujinx.HLE/HOS/Services/Pctl/IParentalControlServiceFactory.cs
+++ b/Ryujinx.HLE/HOS/Services/Pctl/IParentalControlServiceFactory.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Pctl
 {
-    class IParentalControlServiceFactory : IpcService
+    internal class IParentalControlServiceFactory : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Pl/ISharedFontManager.cs b/Ryujinx.HLE/HOS/Services/Pl/ISharedFontManager.cs
index f68140b5ad..5674eed5dc 100644
--- a/Ryujinx.HLE/HOS/Services/Pl/ISharedFontManager.cs
+++ b/Ryujinx.HLE/HOS/Services/Pl/ISharedFontManager.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Pl
 {
-    class ISharedFontManager : IpcService
+    internal class ISharedFontManager : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Prepo/IPrepoService.cs b/Ryujinx.HLE/HOS/Services/Prepo/IPrepoService.cs
index 202cfc221c..0e7a6edc13 100644
--- a/Ryujinx.HLE/HOS/Services/Prepo/IPrepoService.cs
+++ b/Ryujinx.HLE/HOS/Services/Prepo/IPrepoService.cs
@@ -4,7 +4,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Prepo
 {
-    class IPrepoService : IpcService
+    internal class IPrepoService : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Psm/IPsmServer.cs b/Ryujinx.HLE/HOS/Services/Psm/IPsmServer.cs
index 2f9e0c244e..473f0e8241 100644
--- a/Ryujinx.HLE/HOS/Services/Psm/IPsmServer.cs
+++ b/Ryujinx.HLE/HOS/Services/Psm/IPsmServer.cs
@@ -4,9 +4,9 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Psm
 {
-    class IPsmServer : IpcService
+    internal class IPsmServer : IpcService
     {
-        enum ChargerType
+        private enum ChargerType
         {
             None,
             ChargerOrDock,
diff --git a/Ryujinx.HLE/HOS/Services/Psm/IPsmSession.cs b/Ryujinx.HLE/HOS/Services/Psm/IPsmSession.cs
index 53cb6f7277..7d15454c96 100644
--- a/Ryujinx.HLE/HOS/Services/Psm/IPsmSession.cs
+++ b/Ryujinx.HLE/HOS/Services/Psm/IPsmSession.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Psm
 {
-    class IPsmSession : IpcService
+    internal class IPsmSession : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/ServiceFactory.cs b/Ryujinx.HLE/HOS/Services/ServiceFactory.cs
index 3853d82e6f..a89fc5ae8b 100644
--- a/Ryujinx.HLE/HOS/Services/ServiceFactory.cs
+++ b/Ryujinx.HLE/HOS/Services/ServiceFactory.cs
@@ -29,7 +29,7 @@ using System;
 
 namespace Ryujinx.HLE.HOS.Services
 {
-    static class ServiceFactory
+    internal static class ServiceFactory
     {
         public static IpcService MakeService(Horizon system, string name)
         {
diff --git a/Ryujinx.HLE/HOS/Services/Set/ISettingsServer.cs b/Ryujinx.HLE/HOS/Services/Set/ISettingsServer.cs
index b1062b7ff8..1be04a5da7 100644
--- a/Ryujinx.HLE/HOS/Services/Set/ISettingsServer.cs
+++ b/Ryujinx.HLE/HOS/Services/Set/ISettingsServer.cs
@@ -4,7 +4,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Set
 {
-    class ISettingsServer : IpcService
+    internal class ISettingsServer : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Set/ISystemSettingsServer.cs b/Ryujinx.HLE/HOS/Services/Set/ISystemSettingsServer.cs
index 375c440b09..fdd9136a18 100644
--- a/Ryujinx.HLE/HOS/Services/Set/ISystemSettingsServer.cs
+++ b/Ryujinx.HLE/HOS/Services/Set/ISystemSettingsServer.cs
@@ -10,7 +10,7 @@ using Ryujinx.HLE.FileSystem;
 
 namespace Ryujinx.HLE.HOS.Services.Set
 {
-    class ISystemSettingsServer : IpcService
+    internal class ISystemSettingsServer : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Set/NxSettings.cs b/Ryujinx.HLE/HOS/Services/Set/NxSettings.cs
index 7d1dd2ed78..db2f61ebc0 100644
--- a/Ryujinx.HLE/HOS/Services/Set/NxSettings.cs
+++ b/Ryujinx.HLE/HOS/Services/Set/NxSettings.cs
@@ -2,7 +2,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Set
 {
-    static class NxSettings
+    internal static class NxSettings
 	{
 		//Generated automatically from a Switch 3.0 config file (Tid: 0100000000000818).
 		public static Dictionary<string, object> Settings = new Dictionary<string, object>()
diff --git a/Ryujinx.HLE/HOS/Services/Sfdnsres/GaiError.cs b/Ryujinx.HLE/HOS/Services/Sfdnsres/GaiError.cs
index 65d5457707..293e5dbb8d 100644
--- a/Ryujinx.HLE/HOS/Services/Sfdnsres/GaiError.cs
+++ b/Ryujinx.HLE/HOS/Services/Sfdnsres/GaiError.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Services.Sfdnsres
 {
-    enum GaiError
+    internal enum GaiError
     {
         Success,
         AddressFamily,
diff --git a/Ryujinx.HLE/HOS/Services/Sfdnsres/IResolver.cs b/Ryujinx.HLE/HOS/Services/Sfdnsres/IResolver.cs
index 473bac1cf0..f1508408e4 100644
--- a/Ryujinx.HLE/HOS/Services/Sfdnsres/IResolver.cs
+++ b/Ryujinx.HLE/HOS/Services/Sfdnsres/IResolver.cs
@@ -10,7 +10,7 @@ using static Ryujinx.HLE.HOS.ErrorCode;
 
 namespace Ryujinx.HLE.HOS.Services.Sfdnsres
 {
-    class IResolver : IpcService
+    internal class IResolver : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Sfdnsres/NetDBError.cs b/Ryujinx.HLE/HOS/Services/Sfdnsres/NetDBError.cs
index c08215fd8d..5eeea52027 100644
--- a/Ryujinx.HLE/HOS/Services/Sfdnsres/NetDBError.cs
+++ b/Ryujinx.HLE/HOS/Services/Sfdnsres/NetDBError.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Services.Sfdnsres
 {
-    enum NetDbError
+    internal enum NetDbError
     {
         Internal = -1,
         Success,
diff --git a/Ryujinx.HLE/HOS/Services/Sm/IUserInterface.cs b/Ryujinx.HLE/HOS/Services/Sm/IUserInterface.cs
index 274fdfddb2..94bdd168e8 100644
--- a/Ryujinx.HLE/HOS/Services/Sm/IUserInterface.cs
+++ b/Ryujinx.HLE/HOS/Services/Sm/IUserInterface.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Sm
 {
-    class IUserInterface : IpcService
+    internal class IUserInterface : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Spl/IRandomInterface.cs b/Ryujinx.HLE/HOS/Services/Spl/IRandomInterface.cs
index f004de2f30..d5abc1ef3a 100644
--- a/Ryujinx.HLE/HOS/Services/Spl/IRandomInterface.cs
+++ b/Ryujinx.HLE/HOS/Services/Spl/IRandomInterface.cs
@@ -5,7 +5,7 @@ using System.Security.Cryptography;
 
 namespace Ryujinx.HLE.HOS.Services.Spl
 {
-    class IRandomInterface : IpcService, IDisposable
+    internal class IRandomInterface : IpcService, IDisposable
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Ssl/ISslContext.cs b/Ryujinx.HLE/HOS/Services/Ssl/ISslContext.cs
index 11c206b843..cdee8d6676 100644
--- a/Ryujinx.HLE/HOS/Services/Ssl/ISslContext.cs
+++ b/Ryujinx.HLE/HOS/Services/Ssl/ISslContext.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Ssl
 {
-    class ISslContext : IpcService
+    internal class ISslContext : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Ssl/ISslService.cs b/Ryujinx.HLE/HOS/Services/Ssl/ISslService.cs
index 0e75a6a86c..d2ba1cd3b4 100644
--- a/Ryujinx.HLE/HOS/Services/Ssl/ISslService.cs
+++ b/Ryujinx.HLE/HOS/Services/Ssl/ISslService.cs
@@ -4,7 +4,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Ssl
 {
-    class ISslService : IpcService
+    internal class ISslService : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Time/IStaticService.cs b/Ryujinx.HLE/HOS/Services/Time/IStaticService.cs
index 1132377df8..2fefd285a3 100644
--- a/Ryujinx.HLE/HOS/Services/Time/IStaticService.cs
+++ b/Ryujinx.HLE/HOS/Services/Time/IStaticService.cs
@@ -4,7 +4,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Time
 {
-    class IStaticService : IpcService
+    internal class IStaticService : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Time/ISteadyClock.cs b/Ryujinx.HLE/HOS/Services/Time/ISteadyClock.cs
index 92d33ddb93..b3e4adb135 100644
--- a/Ryujinx.HLE/HOS/Services/Time/ISteadyClock.cs
+++ b/Ryujinx.HLE/HOS/Services/Time/ISteadyClock.cs
@@ -4,7 +4,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Time
 {
-    class ISteadyClock : IpcService
+    internal class ISteadyClock : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Time/ISystemClock.cs b/Ryujinx.HLE/HOS/Services/Time/ISystemClock.cs
index e16cbf710b..2b2e620edd 100644
--- a/Ryujinx.HLE/HOS/Services/Time/ISystemClock.cs
+++ b/Ryujinx.HLE/HOS/Services/Time/ISystemClock.cs
@@ -4,7 +4,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Time
 {
-    class ISystemClock : IpcService
+    internal class ISystemClock : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Time/ITimeZoneService.cs b/Ryujinx.HLE/HOS/Services/Time/ITimeZoneService.cs
index c6497800c3..4c6dc81e67 100644
--- a/Ryujinx.HLE/HOS/Services/Time/ITimeZoneService.cs
+++ b/Ryujinx.HLE/HOS/Services/Time/ITimeZoneService.cs
@@ -8,7 +8,7 @@ using static Ryujinx.HLE.HOS.ErrorCode;
 
 namespace Ryujinx.HLE.HOS.Services.Time
 {
-    class ITimeZoneService : IpcService
+    internal class ITimeZoneService : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Time/SystemClockType.cs b/Ryujinx.HLE/HOS/Services/Time/SystemClockType.cs
index 54b7df3f81..d4dcf7077a 100644
--- a/Ryujinx.HLE/HOS/Services/Time/SystemClockType.cs
+++ b/Ryujinx.HLE/HOS/Services/Time/SystemClockType.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Services.Time
 {
-    enum SystemClockType
+    internal enum SystemClockType
     {
         User,
         Network,
diff --git a/Ryujinx.HLE/HOS/Services/Vi/Display.cs b/Ryujinx.HLE/HOS/Services/Vi/Display.cs
index 47c7b2aeac..89cec2b8bd 100644
--- a/Ryujinx.HLE/HOS/Services/Vi/Display.cs
+++ b/Ryujinx.HLE/HOS/Services/Vi/Display.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Services.Vi
 {
-    class Display
+    internal class Display
     {
         public string Name { get; private set; }
 
diff --git a/Ryujinx.HLE/HOS/Services/Vi/GbpBuffer.cs b/Ryujinx.HLE/HOS/Services/Vi/GbpBuffer.cs
index 41cbacf962..ad268184c8 100644
--- a/Ryujinx.HLE/HOS/Services/Vi/GbpBuffer.cs
+++ b/Ryujinx.HLE/HOS/Services/Vi/GbpBuffer.cs
@@ -2,7 +2,7 @@ using System.IO;
 
 namespace Ryujinx.HLE.HOS.Services.Android
 {
-    struct GbpBuffer
+    internal struct GbpBuffer
     {
         public int Magic  { get; private set; }
         public int Width  { get; private set; }
diff --git a/Ryujinx.HLE/HOS/Services/Vi/IApplicationDisplayService.cs b/Ryujinx.HLE/HOS/Services/Vi/IApplicationDisplayService.cs
index 6c8d4154c4..3c7f8ae005 100644
--- a/Ryujinx.HLE/HOS/Services/Vi/IApplicationDisplayService.cs
+++ b/Ryujinx.HLE/HOS/Services/Vi/IApplicationDisplayService.cs
@@ -10,7 +10,7 @@ using static Ryujinx.HLE.HOS.Services.Android.Parcel;
 
 namespace Ryujinx.HLE.HOS.Services.Vi
 {
-    class IApplicationDisplayService : IpcService
+    internal class IApplicationDisplayService : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Vi/IApplicationRootService.cs b/Ryujinx.HLE/HOS/Services/Vi/IApplicationRootService.cs
index e5971a69e9..dd33d3c8bd 100644
--- a/Ryujinx.HLE/HOS/Services/Vi/IApplicationRootService.cs
+++ b/Ryujinx.HLE/HOS/Services/Vi/IApplicationRootService.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Vi
 {
-    class IApplicationRootService : IpcService
+    internal class IApplicationRootService : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Vi/IHOSBinderDriver.cs b/Ryujinx.HLE/HOS/Services/Vi/IHOSBinderDriver.cs
index bf2e4ee353..5ea9671954 100644
--- a/Ryujinx.HLE/HOS/Services/Vi/IHOSBinderDriver.cs
+++ b/Ryujinx.HLE/HOS/Services/Vi/IHOSBinderDriver.cs
@@ -7,7 +7,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Vi
 {
-    class IhosBinderDriver : IpcService, IDisposable
+    internal class IhosBinderDriver : IpcService, IDisposable
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Vi/IManagerDisplayService.cs b/Ryujinx.HLE/HOS/Services/Vi/IManagerDisplayService.cs
index de26310f19..10cf062078 100644
--- a/Ryujinx.HLE/HOS/Services/Vi/IManagerDisplayService.cs
+++ b/Ryujinx.HLE/HOS/Services/Vi/IManagerDisplayService.cs
@@ -4,7 +4,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Vi
 {
-    class IManagerDisplayService : IpcService
+    internal class IManagerDisplayService : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Vi/IManagerRootService.cs b/Ryujinx.HLE/HOS/Services/Vi/IManagerRootService.cs
index 30c0cedcfe..8d48ef6e1c 100644
--- a/Ryujinx.HLE/HOS/Services/Vi/IManagerRootService.cs
+++ b/Ryujinx.HLE/HOS/Services/Vi/IManagerRootService.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Vi
 {
-    class IManagerRootService : IpcService
+    internal class IManagerRootService : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Vi/ISystemDisplayService.cs b/Ryujinx.HLE/HOS/Services/Vi/ISystemDisplayService.cs
index dffa814d98..b0e2bd1e9a 100644
--- a/Ryujinx.HLE/HOS/Services/Vi/ISystemDisplayService.cs
+++ b/Ryujinx.HLE/HOS/Services/Vi/ISystemDisplayService.cs
@@ -4,7 +4,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Vi
 {
-    class ISystemDisplayService : IpcService
+    internal class ISystemDisplayService : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Vi/ISystemRootService.cs b/Ryujinx.HLE/HOS/Services/Vi/ISystemRootService.cs
index 365ff48e08..12ca01587f 100644
--- a/Ryujinx.HLE/HOS/Services/Vi/ISystemRootService.cs
+++ b/Ryujinx.HLE/HOS/Services/Vi/ISystemRootService.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Vi
 {
-    class ISystemRootService : IpcService
+    internal class ISystemRootService : IpcService
     {
         private Dictionary<int, ServiceProcessRequest> _commands;
 
diff --git a/Ryujinx.HLE/HOS/Services/Vi/NvFlinger.cs b/Ryujinx.HLE/HOS/Services/Vi/NvFlinger.cs
index af72a6673c..2aac5e7b12 100644
--- a/Ryujinx.HLE/HOS/Services/Vi/NvFlinger.cs
+++ b/Ryujinx.HLE/HOS/Services/Vi/NvFlinger.cs
@@ -14,7 +14,7 @@ using static Ryujinx.HLE.HOS.Services.Android.Parcel;
 
 namespace Ryujinx.HLE.HOS.Services.Android
 {
-    class NvFlinger : IDisposable
+    internal class NvFlinger : IDisposable
     {
         private delegate long ServiceProcessParcel(ServiceCtx context, BinaryReader parcelReader);
 
diff --git a/Ryujinx.HLE/HOS/Services/Vi/Parcel.cs b/Ryujinx.HLE/HOS/Services/Vi/Parcel.cs
index 63c5a82ff3..b432683252 100644
--- a/Ryujinx.HLE/HOS/Services/Vi/Parcel.cs
+++ b/Ryujinx.HLE/HOS/Services/Vi/Parcel.cs
@@ -3,7 +3,7 @@ using System.IO;
 
 namespace Ryujinx.HLE.HOS.Services.Android
 {
-    static class Parcel
+    internal static class Parcel
     {
         public static byte[] GetParcelData(byte[] parcel)
         {
diff --git a/Ryujinx.HLE/HOS/SystemState/AppletStateMgr.cs b/Ryujinx.HLE/HOS/SystemState/AppletStateMgr.cs
index f46a7c30e9..85e594d2b2 100644
--- a/Ryujinx.HLE/HOS/SystemState/AppletStateMgr.cs
+++ b/Ryujinx.HLE/HOS/SystemState/AppletStateMgr.cs
@@ -4,7 +4,7 @@ using System.Collections.Concurrent;
 
 namespace Ryujinx.HLE.HOS.SystemState
 {
-    class AppletStateMgr
+    internal class AppletStateMgr
     {
         private ConcurrentQueue<MessageInfo> _messages;
 
diff --git a/Ryujinx.HLE/HOS/SystemState/UserProfile.cs b/Ryujinx.HLE/HOS/SystemState/UserProfile.cs
index 9240389c62..113e35ec82 100644
--- a/Ryujinx.HLE/HOS/SystemState/UserProfile.cs
+++ b/Ryujinx.HLE/HOS/SystemState/UserProfile.cs
@@ -3,7 +3,7 @@ using System;
 
 namespace Ryujinx.HLE.HOS.SystemState
 {
-    class UserProfile
+    internal class UserProfile
     {
         private static readonly DateTime Epoch = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
 
diff --git a/Ryujinx.HLE/Input/HidProController.cs b/Ryujinx.HLE/Input/HidProController.cs
index f08fb0857f..c1bb46f0f5 100644
--- a/Ryujinx.HLE/Input/HidProController.cs
+++ b/Ryujinx.HLE/Input/HidProController.cs
@@ -2,7 +2,7 @@
 {
     public class HidProController : HidControllerBase
     {
-        bool _wired = false;
+        private bool _wired = false;
 
         public HidProController(Switch device) : base(HidControllerType.ProController, device)
         {
diff --git a/Ryujinx.HLE/Input/IHidDevice.cs b/Ryujinx.HLE/Input/IHidDevice.cs
index 0b07e767fc..dc6886ea2d 100644
--- a/Ryujinx.HLE/Input/IHidDevice.cs
+++ b/Ryujinx.HLE/Input/IHidDevice.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.Input
 {
-    interface IHidDevice
+    internal interface IHidDevice
     {
         long Offset    { get; }
         bool Connected { get; }
diff --git a/Ryujinx.HLE/Loaders/Compression/BackwardsLz.cs b/Ryujinx.HLE/Loaders/Compression/BackwardsLz.cs
index 166ae60a9d..90f2b5d3a8 100644
--- a/Ryujinx.HLE/Loaders/Compression/BackwardsLz.cs
+++ b/Ryujinx.HLE/Loaders/Compression/BackwardsLz.cs
@@ -3,7 +3,7 @@ using System.IO;
 
 namespace Ryujinx.HLE.Loaders.Compression
 {
-    static class BackwardsLz
+    internal static class BackwardsLz
     {
         private class BackwardsReader
         {
diff --git a/Ryujinx.HLE/Loaders/Compression/Lz4.cs b/Ryujinx.HLE/Loaders/Compression/Lz4.cs
index e405b107bb..782c598efa 100644
--- a/Ryujinx.HLE/Loaders/Compression/Lz4.cs
+++ b/Ryujinx.HLE/Loaders/Compression/Lz4.cs
@@ -2,7 +2,7 @@ using System;
 
 namespace Ryujinx.HLE.Loaders.Compression
 {
-    static class Lz4
+    internal static class Lz4
     {
         public static byte[] Decompress(byte[] cmp, int decLength)
         {
diff --git a/Ryujinx.HLE/Loaders/Elf/ElfDynamic.cs b/Ryujinx.HLE/Loaders/Elf/ElfDynamic.cs
index f489e85aff..52b613dc19 100644
--- a/Ryujinx.HLE/Loaders/Elf/ElfDynamic.cs
+++ b/Ryujinx.HLE/Loaders/Elf/ElfDynamic.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.Loaders.Elf
 {
-    struct ElfDynamic
+    internal struct ElfDynamic
     {
         public ElfDynamicTag Tag { get; private set; }
 
diff --git a/Ryujinx.HLE/Loaders/Elf/ElfSymbol.cs b/Ryujinx.HLE/Loaders/Elf/ElfSymbol.cs
index b655816f14..160bdc4dc0 100644
--- a/Ryujinx.HLE/Loaders/Elf/ElfSymbol.cs
+++ b/Ryujinx.HLE/Loaders/Elf/ElfSymbol.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.Loaders.Elf
 {
-    struct ElfSymbol
+    internal struct ElfSymbol
     {
         public string Name { get; private set; }
 
diff --git a/Ryujinx.HLE/Loaders/Elf/ElfSymbolBinding.cs b/Ryujinx.HLE/Loaders/Elf/ElfSymbolBinding.cs
index 92274fded4..a99788c490 100644
--- a/Ryujinx.HLE/Loaders/Elf/ElfSymbolBinding.cs
+++ b/Ryujinx.HLE/Loaders/Elf/ElfSymbolBinding.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.Loaders.Elf
 {
-    enum ElfSymbolBinding
+    internal enum ElfSymbolBinding
     {
         StbLocal  = 0,
         StbGlobal = 1,
diff --git a/Ryujinx.HLE/Loaders/Elf/ElfSymbolType.cs b/Ryujinx.HLE/Loaders/Elf/ElfSymbolType.cs
index 4110d4c3ec..78c12a4f60 100644
--- a/Ryujinx.HLE/Loaders/Elf/ElfSymbolType.cs
+++ b/Ryujinx.HLE/Loaders/Elf/ElfSymbolType.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.Loaders.Elf
 {
-    enum ElfSymbolType
+    internal enum ElfSymbolType
     {
         SttNoType  = 0,
         SttObject  = 1,
diff --git a/Ryujinx.HLE/Loaders/Elf/ElfSymbolVisibility.cs b/Ryujinx.HLE/Loaders/Elf/ElfSymbolVisibility.cs
index f026fca899..9eed47d4bf 100644
--- a/Ryujinx.HLE/Loaders/Elf/ElfSymbolVisibility.cs
+++ b/Ryujinx.HLE/Loaders/Elf/ElfSymbolVisibility.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.Loaders.Elf
 {
-    enum ElfSymbolVisibility
+    internal enum ElfSymbolVisibility
     {
         StvDefault   = 0,
         StvInternal  = 1,
diff --git a/Ryujinx.HLE/Loaders/Executables/IExecutable.cs b/Ryujinx.HLE/Loaders/Executables/IExecutable.cs
index 440e8f5fae..35f8b1097d 100644
--- a/Ryujinx.HLE/Loaders/Executables/IExecutable.cs
+++ b/Ryujinx.HLE/Loaders/Executables/IExecutable.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.Loaders.Executables
 {
-    interface IExecutable
+    internal interface IExecutable
     {
         byte[] Text { get; }
         byte[] Ro   { get; }
diff --git a/Ryujinx.HLE/Loaders/Executables/KernelInitialProcess.cs b/Ryujinx.HLE/Loaders/Executables/KernelInitialProcess.cs
index 8b09bfcd2d..c950a81904 100644
--- a/Ryujinx.HLE/Loaders/Executables/KernelInitialProcess.cs
+++ b/Ryujinx.HLE/Loaders/Executables/KernelInitialProcess.cs
@@ -3,7 +3,7 @@ using System.IO;
 
 namespace Ryujinx.HLE.Loaders.Executables
 {
-    class KernelInitialProcess : IExecutable
+    internal class KernelInitialProcess : IExecutable
     {
         public string Name { get; private set; }
 
diff --git a/Ryujinx.HLE/Loaders/Executables/NxRelocatableObject.cs b/Ryujinx.HLE/Loaders/Executables/NxRelocatableObject.cs
index eb3ca94a98..38e299cbdc 100644
--- a/Ryujinx.HLE/Loaders/Executables/NxRelocatableObject.cs
+++ b/Ryujinx.HLE/Loaders/Executables/NxRelocatableObject.cs
@@ -2,7 +2,7 @@ using System.IO;
 
 namespace Ryujinx.HLE.Loaders.Executables
 {
-    class NxRelocatableObject : IExecutable
+    internal class NxRelocatableObject : IExecutable
     {
         public byte[] Text { get; private set; }
         public byte[] Ro   { get; private set; }
diff --git a/Ryujinx.HLE/Loaders/Executables/NxStaticObject.cs b/Ryujinx.HLE/Loaders/Executables/NxStaticObject.cs
index c0b2e94756..06a798f35d 100644
--- a/Ryujinx.HLE/Loaders/Executables/NxStaticObject.cs
+++ b/Ryujinx.HLE/Loaders/Executables/NxStaticObject.cs
@@ -4,7 +4,7 @@ using System.IO;
 
 namespace Ryujinx.HLE.Loaders.Executables
 {
-    class NxStaticObject : IExecutable
+    internal class NxStaticObject : IExecutable
     {
         public byte[] Text { get; private set; }
         public byte[] Ro   { get; private set; }
diff --git a/Ryujinx.HLE/Loaders/Npdm/ACI0.cs b/Ryujinx.HLE/Loaders/Npdm/ACI0.cs
index 55f3319d01..aee9930510 100644
--- a/Ryujinx.HLE/Loaders/Npdm/ACI0.cs
+++ b/Ryujinx.HLE/Loaders/Npdm/ACI0.cs
@@ -3,7 +3,7 @@ using System.IO;
 
 namespace Ryujinx.HLE.Loaders.Npdm
 {
-    class Aci0
+    internal class Aci0
     {
         private const int Aci0Magic = 'A' << 0 | 'C' << 8 | 'I' << 16 | '0' << 24;
 
diff --git a/Ryujinx.HLE/Loaders/Npdm/ACID.cs b/Ryujinx.HLE/Loaders/Npdm/ACID.cs
index 57c5cf3e84..26bddf6db8 100644
--- a/Ryujinx.HLE/Loaders/Npdm/ACID.cs
+++ b/Ryujinx.HLE/Loaders/Npdm/ACID.cs
@@ -3,7 +3,7 @@ using System.IO;
 
 namespace Ryujinx.HLE.Loaders.Npdm
 {
-    class Acid
+    internal class Acid
     {
         private const int AcidMagic = 'A' << 0 | 'C' << 8 | 'I' << 16 | 'D' << 24;
 
diff --git a/Ryujinx.HLE/Loaders/Npdm/FsAccessControl.cs b/Ryujinx.HLE/Loaders/Npdm/FsAccessControl.cs
index 3359435dcb..8c772e7558 100644
--- a/Ryujinx.HLE/Loaders/Npdm/FsAccessControl.cs
+++ b/Ryujinx.HLE/Loaders/Npdm/FsAccessControl.cs
@@ -2,7 +2,7 @@
 
 namespace Ryujinx.HLE.Loaders.Npdm
 {
-    class FsAccessControl
+    internal class FsAccessControl
     {
         public int   Version            { get; private set; }
         public ulong PermissionsBitmask { get; private set; }
diff --git a/Ryujinx.HLE/Loaders/Npdm/FsAccessHeader.cs b/Ryujinx.HLE/Loaders/Npdm/FsAccessHeader.cs
index 564b8dc391..fd4bdec9f2 100644
--- a/Ryujinx.HLE/Loaders/Npdm/FsAccessHeader.cs
+++ b/Ryujinx.HLE/Loaders/Npdm/FsAccessHeader.cs
@@ -4,7 +4,7 @@ using System.IO;
 
 namespace Ryujinx.HLE.Loaders.Npdm
 {
-    class FsAccessHeader
+    internal class FsAccessHeader
     {
         public int   Version            { get; private set; }
         public ulong PermissionsBitmask { get; private set; }
diff --git a/Ryujinx.HLE/Loaders/Npdm/KernelAccessControl.cs b/Ryujinx.HLE/Loaders/Npdm/KernelAccessControl.cs
index d8e40d0b99..b27a1bfb87 100644
--- a/Ryujinx.HLE/Loaders/Npdm/KernelAccessControl.cs
+++ b/Ryujinx.HLE/Loaders/Npdm/KernelAccessControl.cs
@@ -2,7 +2,7 @@
 
 namespace Ryujinx.HLE.Loaders.Npdm
 {
-    class KernelAccessControl
+    internal class KernelAccessControl
     {
         public int[] Capabilities { get; private set; }
 
diff --git a/Ryujinx.HLE/Loaders/Npdm/Npdm.cs b/Ryujinx.HLE/Loaders/Npdm/Npdm.cs
index cef2673e12..55442e6bc6 100644
--- a/Ryujinx.HLE/Loaders/Npdm/Npdm.cs
+++ b/Ryujinx.HLE/Loaders/Npdm/Npdm.cs
@@ -7,7 +7,7 @@ namespace Ryujinx.HLE.Loaders.Npdm
     //https://github.com/SciresM/hactool/blob/master/npdm.c
     //https://github.com/SciresM/hactool/blob/master/npdm.h
     //http://switchbrew.org/index.php?title=NPDM
-    class Npdm
+    internal class Npdm
     {
         private const int MetaMagic = 'M' << 0 | 'E' << 8 | 'T' << 16 | 'A' << 24;
 
diff --git a/Ryujinx.HLE/Loaders/Npdm/ServiceAccessControl.cs b/Ryujinx.HLE/Loaders/Npdm/ServiceAccessControl.cs
index 368dbae757..338e301d0d 100644
--- a/Ryujinx.HLE/Loaders/Npdm/ServiceAccessControl.cs
+++ b/Ryujinx.HLE/Loaders/Npdm/ServiceAccessControl.cs
@@ -5,7 +5,7 @@ using System.Text;
 
 namespace Ryujinx.HLE.Loaders.Npdm
 {
-    class ServiceAccessControl
+    internal class ServiceAccessControl
     {
         public IReadOnlyDictionary<string, bool> Services { get; private set; }
 
diff --git a/Ryujinx.HLE/Utilities/EndianSwap.cs b/Ryujinx.HLE/Utilities/EndianSwap.cs
index df08191ac6..2282c523e8 100644
--- a/Ryujinx.HLE/Utilities/EndianSwap.cs
+++ b/Ryujinx.HLE/Utilities/EndianSwap.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.Utilities
 {
-    static class EndianSwap
+    internal static class EndianSwap
     {
         public static ushort Swap16(ushort value) => (ushort)(((value >> 8) & 0xff) | (value << 8));
 
diff --git a/Ryujinx.HLE/Utilities/IntUtils.cs b/Ryujinx.HLE/Utilities/IntUtils.cs
index a7178d80cb..d1dcfbf094 100644
--- a/Ryujinx.HLE/Utilities/IntUtils.cs
+++ b/Ryujinx.HLE/Utilities/IntUtils.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.Utilities
 {
-    static class IntUtils
+    internal static class IntUtils
     {
         public static int AlignUp(int value, int size)
         {
diff --git a/Ryujinx.HLE/Utilities/StringUtils.cs b/Ryujinx.HLE/Utilities/StringUtils.cs
index e6602f48f3..1b3eb128fd 100644
--- a/Ryujinx.HLE/Utilities/StringUtils.cs
+++ b/Ryujinx.HLE/Utilities/StringUtils.cs
@@ -7,7 +7,7 @@ using System.Text;
 
 namespace Ryujinx.HLE.Utilities
 {
-    static class StringUtils
+    internal static class StringUtils
     {
         public static byte[] GetFixedLengthBytes(string inputString, int size, Encoding encoding)
         {
diff --git a/Ryujinx.HLE/Utilities/StructReader.cs b/Ryujinx.HLE/Utilities/StructReader.cs
index 441dfd1951..0a71db85c0 100644
--- a/Ryujinx.HLE/Utilities/StructReader.cs
+++ b/Ryujinx.HLE/Utilities/StructReader.cs
@@ -3,7 +3,7 @@ using System.Runtime.InteropServices;
 
 namespace Ryujinx.HLE.Utilities
 {
-    class StructReader
+    internal class StructReader
     {
         private MemoryManager _memory;
 
diff --git a/Ryujinx.HLE/Utilities/StructWriter.cs b/Ryujinx.HLE/Utilities/StructWriter.cs
index 86cfeedd77..7ef3dfda11 100644
--- a/Ryujinx.HLE/Utilities/StructWriter.cs
+++ b/Ryujinx.HLE/Utilities/StructWriter.cs
@@ -3,7 +3,7 @@ using System.Runtime.InteropServices;
 
 namespace Ryujinx.HLE.Utilities
 {
-    class StructWriter
+    internal class StructWriter
     {
         private MemoryManager _memory;