diff --git a/src/core/file_sys/archive_extsavedata.cpp b/src/core/file_sys/archive_extsavedata.cpp
index 65ad8490e..cde5811fe 100644
--- a/src/core/file_sys/archive_extsavedata.cpp
+++ b/src/core/file_sys/archive_extsavedata.cpp
@@ -17,9 +17,6 @@
 #include "core/file_sys/savedata_archive.h"
 #include "core/hle/service/fs/archive.h"
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// FileSys namespace
-
 SERIALIZE_EXPORT_IMPL(FileSys::ArchiveFactory_ExtSaveData)
 
 namespace FileSys {
diff --git a/src/core/file_sys/archive_extsavedata.h b/src/core/file_sys/archive_extsavedata.h
index 98f23397d..e8d4e5f25 100644
--- a/src/core/file_sys/archive_extsavedata.h
+++ b/src/core/file_sys/archive_extsavedata.h
@@ -12,9 +12,6 @@
 #include "core/file_sys/archive_backend.h"
 #include "core/hle/result.h"
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// FileSys namespace
-
 namespace FileSys {
 
 /// File system interface to the ExtSaveData archive
diff --git a/src/core/file_sys/archive_ncch.cpp b/src/core/file_sys/archive_ncch.cpp
index 142b6d2fe..551998576 100644
--- a/src/core/file_sys/archive_ncch.cpp
+++ b/src/core/file_sys/archive_ncch.cpp
@@ -26,9 +26,6 @@
 #include "mii.app.romfs.h"
 #include "shared_font.app.romfs.h"
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// FileSys namespace
-
 SERIALIZE_EXPORT_IMPL(FileSys::NCCHArchive)
 SERIALIZE_EXPORT_IMPL(FileSys::NCCHFile)
 SERIALIZE_EXPORT_IMPL(FileSys::ArchiveFactory_NCCH)
@@ -243,8 +240,6 @@ u64 NCCHArchive::GetFreeBytes() const {
     return 0;
 }
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
 NCCHFile::NCCHFile(std::vector<u8> buffer, std::unique_ptr<DelayGenerator> delay_generator_)
     : file_buffer(std::move(buffer)) {
     delay_generator = std::move(delay_generator_);
@@ -277,8 +272,6 @@ bool NCCHFile::SetSize(const u64 size) const {
     return false;
 }
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
 ArchiveFactory_NCCH::ArchiveFactory_NCCH() {}
 
 ResultVal<std::unique_ptr<ArchiveBackend>> ArchiveFactory_NCCH::Open(const Path& path,
diff --git a/src/core/file_sys/archive_ncch.h b/src/core/file_sys/archive_ncch.h
index 95fe889ea..09fc28d43 100644
--- a/src/core/file_sys/archive_ncch.h
+++ b/src/core/file_sys/archive_ncch.h
@@ -14,9 +14,6 @@
 #include "core/file_sys/file_backend.h"
 #include "core/hle/result.h"
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// FileSys namespace
-
 namespace Service::FS {
 enum class MediaType : u32;
 } // namespace Service::FS
diff --git a/src/core/file_sys/archive_other_savedata.cpp b/src/core/file_sys/archive_other_savedata.cpp
index 4b9350775..8f6d9ca24 100644
--- a/src/core/file_sys/archive_other_savedata.cpp
+++ b/src/core/file_sys/archive_other_savedata.cpp
@@ -10,9 +10,6 @@
 #include "core/hle/kernel/process.h"
 #include "core/hle/service/fs/archive.h"
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// FileSys namespace
-
 SERIALIZE_EXPORT_IMPL(FileSys::ArchiveFactory_OtherSaveDataPermitted)
 SERIALIZE_EXPORT_IMPL(FileSys::ArchiveFactory_OtherSaveDataGeneral)
 
diff --git a/src/core/file_sys/archive_other_savedata.h b/src/core/file_sys/archive_other_savedata.h
index f002fec7f..cc1a61b4a 100644
--- a/src/core/file_sys/archive_other_savedata.h
+++ b/src/core/file_sys/archive_other_savedata.h
@@ -9,9 +9,6 @@
 #include <boost/serialization/shared_ptr.hpp>
 #include "core/file_sys/archive_source_sd_savedata.h"
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// FileSys namespace
-
 namespace FileSys {
 
 /// File system interface to the OtherSaveDataPermitted archive
diff --git a/src/core/file_sys/archive_savedata.cpp b/src/core/file_sys/archive_savedata.cpp
index fc4bd34fa..f3e2d0943 100644
--- a/src/core/file_sys/archive_savedata.cpp
+++ b/src/core/file_sys/archive_savedata.cpp
@@ -8,9 +8,6 @@
 #include "core/file_sys/archive_savedata.h"
 #include "core/hle/kernel/process.h"
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// FileSys namespace
-
 SERIALIZE_EXPORT_IMPL(FileSys::ArchiveFactory_SaveData)
 
 namespace FileSys {
diff --git a/src/core/file_sys/archive_savedata.h b/src/core/file_sys/archive_savedata.h
index 5bc4b8ecd..c315c33f0 100644
--- a/src/core/file_sys/archive_savedata.h
+++ b/src/core/file_sys/archive_savedata.h
@@ -8,9 +8,6 @@
 #include <boost/serialization/shared_ptr.hpp>
 #include "core/file_sys/archive_source_sd_savedata.h"
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// FileSys namespace
-
 namespace FileSys {
 
 /// File system interface to the SaveData archive
diff --git a/src/core/file_sys/archive_sdmc.cpp b/src/core/file_sys/archive_sdmc.cpp
index 9164d48c6..0e6947493 100644
--- a/src/core/file_sys/archive_sdmc.cpp
+++ b/src/core/file_sys/archive_sdmc.cpp
@@ -13,9 +13,6 @@
 #include "core/file_sys/errors.h"
 #include "core/file_sys/path_parser.h"
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// FileSys namespace
-
 SERIALIZE_EXPORT_IMPL(FileSys::SDMCArchive)
 SERIALIZE_EXPORT_IMPL(FileSys::ArchiveFactory_SDMC)
 
diff --git a/src/core/file_sys/archive_sdmc.h b/src/core/file_sys/archive_sdmc.h
index 265dd7e93..253d3df7c 100644
--- a/src/core/file_sys/archive_sdmc.h
+++ b/src/core/file_sys/archive_sdmc.h
@@ -12,9 +12,6 @@
 #include "core/file_sys/archive_backend.h"
 #include "core/hle/result.h"
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// FileSys namespace
-
 namespace FileSys {
 
 /// Archive backend for SDMC archive
diff --git a/src/core/file_sys/archive_sdmcwriteonly.cpp b/src/core/file_sys/archive_sdmcwriteonly.cpp
index 8272ce789..e0053404d 100644
--- a/src/core/file_sys/archive_sdmcwriteonly.cpp
+++ b/src/core/file_sys/archive_sdmcwriteonly.cpp
@@ -11,9 +11,6 @@
 #include "core/file_sys/errors.h"
 #include "core/file_sys/file_backend.h"
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// FileSys namespace
-
 SERIALIZE_EXPORT_IMPL(FileSys::SDMCWriteOnlyArchive)
 SERIALIZE_EXPORT_IMPL(FileSys::ArchiveFactory_SDMCWriteOnly)
 
diff --git a/src/core/file_sys/archive_sdmcwriteonly.h b/src/core/file_sys/archive_sdmcwriteonly.h
index f4149961c..1bba375ba 100644
--- a/src/core/file_sys/archive_sdmcwriteonly.h
+++ b/src/core/file_sys/archive_sdmcwriteonly.h
@@ -6,9 +6,6 @@
 
 #include "core/file_sys/archive_sdmc.h"
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// FileSys namespace
-
 namespace FileSys {
 
 /**
diff --git a/src/core/file_sys/archive_selfncch.cpp b/src/core/file_sys/archive_selfncch.cpp
index 5cf036278..e707f64a4 100644
--- a/src/core/file_sys/archive_selfncch.cpp
+++ b/src/core/file_sys/archive_selfncch.cpp
@@ -13,9 +13,6 @@
 #include "core/file_sys/ivfc_archive.h"
 #include "core/hle/kernel/process.h"
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// FileSys namespace
-
 SERIALIZE_EXPORT_IMPL(FileSys::ArchiveFactory_SelfNCCH)
 
 namespace FileSys {
diff --git a/src/core/file_sys/archive_selfncch.h b/src/core/file_sys/archive_selfncch.h
index 9f5b353b3..19a001444 100644
--- a/src/core/file_sys/archive_selfncch.h
+++ b/src/core/file_sys/archive_selfncch.h
@@ -17,9 +17,6 @@
 #include "core/hle/result.h"
 #include "core/loader/loader.h"
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// FileSys namespace
-
 namespace FileSys {
 
 struct NCCHData {
diff --git a/src/core/file_sys/archive_source_sd_savedata.cpp b/src/core/file_sys/archive_source_sd_savedata.cpp
index 9afbfd73c..bb3c586d4 100644
--- a/src/core/file_sys/archive_source_sd_savedata.cpp
+++ b/src/core/file_sys/archive_source_sd_savedata.cpp
@@ -11,9 +11,6 @@
 #include "core/file_sys/savedata_archive.h"
 #include "core/hle/service/fs/archive.h"
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// FileSys namespace
-
 SERIALIZE_EXPORT_IMPL(FileSys::ArchiveSource_SDSaveData)
 
 namespace FileSys {
diff --git a/src/core/file_sys/archive_source_sd_savedata.h b/src/core/file_sys/archive_source_sd_savedata.h
index 4ac028a3d..c8ceb047e 100644
--- a/src/core/file_sys/archive_source_sd_savedata.h
+++ b/src/core/file_sys/archive_source_sd_savedata.h
@@ -11,9 +11,6 @@
 #include "core/file_sys/archive_backend.h"
 #include "core/hle/result.h"
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// FileSys namespace
-
 namespace FileSys {
 
 /// A common source of SD save data archive
diff --git a/src/core/file_sys/archive_systemsavedata.cpp b/src/core/file_sys/archive_systemsavedata.cpp
index 08205b77d..3d6b7f34d 100644
--- a/src/core/file_sys/archive_systemsavedata.cpp
+++ b/src/core/file_sys/archive_systemsavedata.cpp
@@ -15,9 +15,6 @@
 #include "core/file_sys/savedata_archive.h"
 #include "core/hle/service/fs/archive.h"
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// FileSys namespace
-
 SERIALIZE_EXPORT_IMPL(FileSys::ArchiveFactory_SystemSaveData)
 
 namespace FileSys {
diff --git a/src/core/file_sys/archive_systemsavedata.h b/src/core/file_sys/archive_systemsavedata.h
index ae70a1935..d81c111e8 100644
--- a/src/core/file_sys/archive_systemsavedata.h
+++ b/src/core/file_sys/archive_systemsavedata.h
@@ -12,9 +12,6 @@
 #include "core/file_sys/archive_backend.h"
 #include "core/hle/result.h"
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// FileSys namespace
-
 namespace FileSys {
 
 /// File system interface to the SystemSaveData archive
diff --git a/src/core/file_sys/cia_container.cpp b/src/core/file_sys/cia_container.cpp
index 8cd987ee0..c2cfd36ad 100644
--- a/src/core/file_sys/cia_container.cpp
+++ b/src/core/file_sys/cia_container.cpp
@@ -10,9 +10,6 @@
 #include "core/file_sys/file_backend.h"
 #include "core/loader/loader.h"
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// FileSys namespace
-
 namespace FileSys {
 
 Loader::ResultStatus CIAContainer::Load(const FileBackend& backend) {
diff --git a/src/core/file_sys/cia_container.h b/src/core/file_sys/cia_container.h
index 021e8b7cd..b50803514 100644
--- a/src/core/file_sys/cia_container.h
+++ b/src/core/file_sys/cia_container.h
@@ -17,9 +17,6 @@ namespace Loader {
 enum class ResultStatus;
 }
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// FileSys namespace
-
 namespace FileSys {
 
 class FileBackend;
diff --git a/src/core/file_sys/directory_backend.h b/src/core/file_sys/directory_backend.h
index 4c9dbb4df..b5a2617bb 100644
--- a/src/core/file_sys/directory_backend.h
+++ b/src/core/file_sys/directory_backend.h
@@ -8,9 +8,6 @@
 #include <cstddef>
 #include "common/common_types.h"
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// FileSys namespace
-
 namespace FileSys {
 
 // Structure of a directory entry, from http://3dbrew.org/wiki/FSDir:Read#Entry_format
diff --git a/src/core/file_sys/disk_archive.cpp b/src/core/file_sys/disk_archive.cpp
index e3e95a08f..ca5e49e86 100644
--- a/src/core/file_sys/disk_archive.cpp
+++ b/src/core/file_sys/disk_archive.cpp
@@ -11,9 +11,6 @@
 #include "core/file_sys/disk_archive.h"
 #include "core/file_sys/errors.h"
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// FileSys namespace
-
 SERIALIZE_EXPORT_IMPL(FileSys::DiskFile)
 SERIALIZE_EXPORT_IMPL(FileSys::DiskDirectory)
 
@@ -54,8 +51,6 @@ bool DiskFile::Close() const {
     return file->Close();
 }
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
 DiskDirectory::DiskDirectory(const std::string& path) {
     directory.size = FileUtil::ScanDirectoryTree(path, directory);
     directory.isDirectory = true;
diff --git a/src/core/file_sys/disk_archive.h b/src/core/file_sys/disk_archive.h
index 2f0e5691a..5843a37d5 100644
--- a/src/core/file_sys/disk_archive.h
+++ b/src/core/file_sys/disk_archive.h
@@ -18,9 +18,6 @@
 #include "core/file_sys/file_backend.h"
 #include "core/hle/result.h"
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// FileSys namespace
-
 namespace FileSys {
 
 class DiskFile : public FileBackend {
diff --git a/src/core/file_sys/file_backend.h b/src/core/file_sys/file_backend.h
index d56fc4c1c..43a7531a4 100644
--- a/src/core/file_sys/file_backend.h
+++ b/src/core/file_sys/file_backend.h
@@ -12,9 +12,6 @@
 #include "core/hle/result.h"
 #include "delay_generator.h"
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// FileSys namespace
-
 namespace FileSys {
 
 class FileBackend : NonCopyable {
diff --git a/src/core/file_sys/ivfc_archive.cpp b/src/core/file_sys/ivfc_archive.cpp
index 10d085164..010a4d42b 100644
--- a/src/core/file_sys/ivfc_archive.cpp
+++ b/src/core/file_sys/ivfc_archive.cpp
@@ -10,9 +10,6 @@
 #include "common/logging/log.h"
 #include "core/file_sys/ivfc_archive.h"
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// FileSys namespace
-
 SERIALIZE_EXPORT_IMPL(FileSys::IVFCFile)
 SERIALIZE_EXPORT_IMPL(FileSys::IVFCFileInMemory)
 SERIALIZE_EXPORT_IMPL(FileSys::IVFCDelayGenerator)
@@ -93,8 +90,6 @@ u64 IVFCArchive::GetFreeBytes() const {
     return 0;
 }
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
 IVFCFile::IVFCFile(std::shared_ptr<RomFSReader> file,
                    std::unique_ptr<DelayGenerator> delay_generator_)
     : romfs_file(std::move(file)) {
@@ -123,8 +118,6 @@ bool IVFCFile::SetSize(const u64 size) const {
     return false;
 }
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
 IVFCFileInMemory::IVFCFileInMemory(std::vector<u8> bytes, u64 offset, u64 size,
                                    std::unique_ptr<DelayGenerator> delay_generator_)
     : romfs_file(std::move(bytes)), data_offset(offset), data_size(size) {
diff --git a/src/core/file_sys/ivfc_archive.h b/src/core/file_sys/ivfc_archive.h
index 145fabb98..09a1f6afc 100644
--- a/src/core/file_sys/ivfc_archive.h
+++ b/src/core/file_sys/ivfc_archive.h
@@ -18,9 +18,6 @@
 #include "core/file_sys/romfs_reader.h"
 #include "core/hle/result.h"
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// FileSys namespace
-
 namespace FileSys {
 
 class IVFCDelayGenerator : public DelayGenerator {
diff --git a/src/core/file_sys/ncch_container.cpp b/src/core/file_sys/ncch_container.cpp
index 1e1b1ec44..0df037f96 100644
--- a/src/core/file_sys/ncch_container.cpp
+++ b/src/core/file_sys/ncch_container.cpp
@@ -17,9 +17,6 @@
 #include "core/hw/aes/key.h"
 #include "core/loader/loader.h"
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// FileSys namespace
-
 namespace FileSys {
 
 static const int kMaxSections = 8;   ///< Maximum number of sections (files) in an ExeFs
diff --git a/src/core/file_sys/ncch_container.h b/src/core/file_sys/ncch_container.h
index 9db1d90be..af127ea63 100644
--- a/src/core/file_sys/ncch_container.h
+++ b/src/core/file_sys/ncch_container.h
@@ -40,9 +40,6 @@ struct NCSD_Header {
 
 static_assert(sizeof(NCSD_Header) == 0x200, "NCCH header structure size is wrong");
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-/// NCCH header (Note: "NCCH" appears to be a publicly unknown acronym)
-
 struct NCCH_Header {
     u8 signature[0x100];
     u32_le magic;
@@ -98,9 +95,6 @@ struct NCCH_Header {
 
 static_assert(sizeof(NCCH_Header) == 0x200, "NCCH header structure size is wrong");
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// ExeFS (executable file system) headers
-
 struct ExeFs_SectionHeader {
     char name[8];
     u32 offset;
@@ -113,9 +107,6 @@ struct ExeFs_Header {
     u8 hashes[8][0x20];
 };
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// ExHeader (executable file system header) headers
-
 struct ExHeader_SystemInfoFlags {
     u8 reserved[5];
     u8 flag;
@@ -223,9 +214,6 @@ struct ExHeader_Header {
 
 static_assert(sizeof(ExHeader_Header) == 0x800, "ExHeader structure size is wrong");
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// FileSys namespace
-
 namespace FileSys {
 
 /**
diff --git a/src/core/file_sys/savedata_archive.cpp b/src/core/file_sys/savedata_archive.cpp
index 28124eb24..bec9eb650 100644
--- a/src/core/file_sys/savedata_archive.cpp
+++ b/src/core/file_sys/savedata_archive.cpp
@@ -9,9 +9,6 @@
 #include "core/file_sys/path_parser.h"
 #include "core/file_sys/savedata_archive.h"
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// FileSys namespace
-
 namespace FileSys {
 
 class SaveDataDelayGenerator : public DelayGenerator {
diff --git a/src/core/file_sys/savedata_archive.h b/src/core/file_sys/savedata_archive.h
index 38b9653d7..f438b182d 100644
--- a/src/core/file_sys/savedata_archive.h
+++ b/src/core/file_sys/savedata_archive.h
@@ -10,9 +10,6 @@
 #include "core/file_sys/file_backend.h"
 #include "core/hle/result.h"
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// FileSys namespace
-
 namespace FileSys {
 
 /// Archive backend for general save data archive type (SaveData and SystemSaveData)
diff --git a/src/core/file_sys/title_metadata.cpp b/src/core/file_sys/title_metadata.cpp
index f028b52d4..fd9498870 100644
--- a/src/core/file_sys/title_metadata.cpp
+++ b/src/core/file_sys/title_metadata.cpp
@@ -10,9 +10,6 @@
 #include "core/file_sys/title_metadata.h"
 #include "core/loader/loader.h"
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// FileSys namespace
-
 namespace FileSys {
 
 Loader::ResultStatus TitleMetadata::Load(const std::string& file_path) {
diff --git a/src/core/file_sys/title_metadata.h b/src/core/file_sys/title_metadata.h
index 6b3623ff7..af7bbc541 100644
--- a/src/core/file_sys/title_metadata.h
+++ b/src/core/file_sys/title_metadata.h
@@ -14,9 +14,6 @@ namespace Loader {
 enum class ResultStatus;
 }
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// FileSys namespace
-
 namespace FileSys {
 
 enum TMDContentTypeFlag : u16 {
diff --git a/src/core/hle/applets/mii_selector.cpp b/src/core/hle/applets/mii_selector.cpp
index be672ed88..15dd2904c 100644
--- a/src/core/hle/applets/mii_selector.cpp
+++ b/src/core/hle/applets/mii_selector.cpp
@@ -15,8 +15,6 @@
 #include "core/hle/kernel/shared_memory.h"
 #include "core/hle/result.h"
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
 namespace HLE::Applets {
 
 ResultCode MiiSelector::ReceiveParameterImpl(const Service::APT::MessageParameter& parameter) {
diff --git a/src/core/hle/applets/swkbd.cpp b/src/core/hle/applets/swkbd.cpp
index 6a1d5706a..df929f716 100644
--- a/src/core/hle/applets/swkbd.cpp
+++ b/src/core/hle/applets/swkbd.cpp
@@ -17,8 +17,6 @@
 #include "core/hle/service/hid/hid.h"
 #include "core/memory.h"
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
 namespace HLE::Applets {
 
 ResultCode SoftwareKeyboard::ReceiveParameterImpl(Service::APT::MessageParameter const& parameter) {
diff --git a/src/core/hle/kernel/address_arbiter.cpp b/src/core/hle/kernel/address_arbiter.cpp
index 7fe8b3291..a8f30bad0 100644
--- a/src/core/hle/kernel/address_arbiter.cpp
+++ b/src/core/hle/kernel/address_arbiter.cpp
@@ -13,9 +13,6 @@
 #include "core/hle/kernel/thread.h"
 #include "core/memory.h"
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// Kernel namespace
-
 namespace Kernel {
 
 void AddressArbiter::WaitThread(std::shared_ptr<Thread> thread, VAddr wait_address) {
diff --git a/src/core/hle/kernel/address_arbiter.h b/src/core/hle/kernel/address_arbiter.h
index 406a3fffd..86b46ed3e 100644
--- a/src/core/hle/kernel/address_arbiter.h
+++ b/src/core/hle/kernel/address_arbiter.h
@@ -22,9 +22,6 @@
 // applications use them as an underlying mechanism to implement thread-safe barriers, events, and
 // semaphores.
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// Kernel namespace
-
 namespace Kernel {
 
 class Thread;
diff --git a/src/core/hle/kernel/config_mem.cpp b/src/core/hle/kernel/config_mem.cpp
index 4b262b501..307405f78 100644
--- a/src/core/hle/kernel/config_mem.cpp
+++ b/src/core/hle/kernel/config_mem.cpp
@@ -6,8 +6,6 @@
 #include "common/archives.h"
 #include "core/hle/kernel/config_mem.h"
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
 SERIALIZE_EXPORT_IMPL(ConfigMem::Handler)
 
 namespace ConfigMem {
diff --git a/src/core/hle/kernel/config_mem.h b/src/core/hle/kernel/config_mem.h
index b592aff7a..196d9d8bf 100644
--- a/src/core/hle/kernel/config_mem.h
+++ b/src/core/hle/kernel/config_mem.h
@@ -17,8 +17,6 @@
 #include "common/swap.h"
 #include "core/memory.h"
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
 namespace ConfigMem {
 
 struct ConfigMemDef {
diff --git a/src/core/hle/kernel/memory.cpp b/src/core/hle/kernel/memory.cpp
index 680503f42..8fb2a85bd 100644
--- a/src/core/hle/kernel/memory.cpp
+++ b/src/core/hle/kernel/memory.cpp
@@ -19,8 +19,6 @@
 #include "core/hle/result.h"
 #include "core/memory.h"
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
 namespace Kernel {
 
 /// Size of the APPLICATION, SYSTEM and BASE memory regions (respectively) for each system
diff --git a/src/core/hle/kernel/shared_page.cpp b/src/core/hle/kernel/shared_page.cpp
index 0bc839804..f1e59416f 100644
--- a/src/core/hle/kernel/shared_page.cpp
+++ b/src/core/hle/kernel/shared_page.cpp
@@ -13,8 +13,6 @@
 #include "core/hle/service/ptm/ptm.h"
 #include "core/movie.h"
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
 SERIALIZE_EXPORT_IMPL(SharedPage::Handler)
 
 namespace boost::serialization {
diff --git a/src/core/hle/kernel/shared_page.h b/src/core/hle/kernel/shared_page.h
index 531cb2a28..505a89ec4 100644
--- a/src/core/hle/kernel/shared_page.h
+++ b/src/core/hle/kernel/shared_page.h
@@ -23,8 +23,6 @@
 #include "common/swap.h"
 #include "core/memory.h"
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
 namespace Core {
 struct TimingEventType;
 class Timing;
diff --git a/src/core/hle/service/fs/fs_user.cpp b/src/core/hle/service/fs/fs_user.cpp
index 0ec46a892..0a6c3c887 100644
--- a/src/core/hle/service/fs/fs_user.cpp
+++ b/src/core/hle/service/fs/fs_user.cpp
@@ -30,9 +30,6 @@ SERVICE_CONSTRUCT_IMPL(Service::FS::FS_USER)
 SERIALIZE_EXPORT_IMPL(Service::FS::FS_USER)
 SERIALIZE_EXPORT_IMPL(Service::FS::ClientSlot)
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// Namespace FS_User
-
 using Kernel::ClientSession;
 using Kernel::ServerSession;
 
diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp
index 0eb4382cb..dafababc5 100644
--- a/src/core/hle/service/service.cpp
+++ b/src/core/hle/service/service.cpp
@@ -192,9 +192,6 @@ std::string ServiceFrameworkBase::GetFunctionName(u32 header) const {
     return handlers.at(header).name;
 }
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// Module interface
-
 static bool AttemptLLE(const ServiceModuleInfo& service_module) {
     if (!Settings::values.lle_modules.at(service_module.name))
         return false;
diff --git a/src/core/loader/3dsx.h b/src/core/loader/3dsx.h
index 4d56a0624..9a1f2081f 100644
--- a/src/core/loader/3dsx.h
+++ b/src/core/loader/3dsx.h
@@ -9,9 +9,6 @@
 #include "common/common_types.h"
 #include "core/loader/loader.h"
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// Loader namespace
-
 namespace Loader {
 
 /// Loads an 3DSX file
diff --git a/src/core/loader/elf.cpp b/src/core/loader/elf.cpp
index 2527471df..0fb3de6e2 100644
--- a/src/core/loader/elf.cpp
+++ b/src/core/loader/elf.cpp
@@ -16,9 +16,6 @@
 
 using Kernel::CodeSet;
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// ELF Header Constants
-
 // File type
 enum ElfType {
     ET_NONE = 0,
@@ -108,9 +105,6 @@ typedef unsigned int Elf32_Off;
 typedef signed int Elf32_Sword;
 typedef unsigned int Elf32_Word;
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// ELF file header
-
 struct Elf32_Ehdr {
     unsigned char e_ident[EI_NIDENT];
     Elf32_Half e_type;
@@ -170,9 +164,6 @@ struct Elf32_Rel {
     Elf32_Word r_info;
 };
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// ElfReader class
-
 typedef int SectionID;
 
 class ElfReader {
@@ -359,9 +350,6 @@ SectionID ElfReader::GetSectionByName(const char* name, int firstSection) const
     return -1;
 }
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// Loader namespace
-
 namespace Loader {
 
 FileType AppLoader_ELF::IdentifyType(FileUtil::IOFile& file) {
diff --git a/src/core/loader/elf.h b/src/core/loader/elf.h
index a43edff41..5ad927761 100644
--- a/src/core/loader/elf.h
+++ b/src/core/loader/elf.h
@@ -9,9 +9,6 @@
 #include "common/common_types.h"
 #include "core/loader/loader.h"
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// Loader namespace
-
 namespace Loader {
 
 /// Loads an ELF/AXF file
diff --git a/src/core/loader/loader.cpp b/src/core/loader/loader.cpp
index 9a172f9fd..30dd1d9a2 100644
--- a/src/core/loader/loader.cpp
+++ b/src/core/loader/loader.cpp
@@ -11,8 +11,6 @@
 #include "core/loader/elf.h"
 #include "core/loader/ncch.h"
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
 namespace Loader {
 
 FileType IdentifyFile(FileUtil::IOFile& file) {
diff --git a/src/core/loader/loader.h b/src/core/loader/loader.h
index f3f2eef82..77206c41b 100644
--- a/src/core/loader/loader.h
+++ b/src/core/loader/loader.h
@@ -20,9 +20,6 @@ struct AddressMapping;
 class Process;
 } // namespace Kernel
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// Loader namespace
-
 namespace Loader {
 
 /// File types supported by CTR
diff --git a/src/core/loader/ncch.cpp b/src/core/loader/ncch.cpp
index 91fbe5800..6fcac276a 100644
--- a/src/core/loader/ncch.cpp
+++ b/src/core/loader/ncch.cpp
@@ -28,9 +28,6 @@
 #include "core/system_titles.h"
 #include "network/network.h"
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// Loader namespace
-
 namespace Loader {
 
 static const u64 UPDATE_MASK = 0x0000000e00000000;
diff --git a/src/core/loader/ncch.h b/src/core/loader/ncch.h
index 3100b0616..93cd22056 100644
--- a/src/core/loader/ncch.h
+++ b/src/core/loader/ncch.h
@@ -10,9 +10,6 @@
 #include "core/file_sys/ncch_container.h"
 #include "core/loader/loader.h"
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// Loader namespace
-
 namespace Loader {
 
 /// Loads an NCCH file (e.g. from a CCI, or the first NCCH in a CXI)
diff --git a/src/video_core/video_core.cpp b/src/video_core/video_core.cpp
index baf18f2e3..8b33aab29 100644
--- a/src/video_core/video_core.cpp
+++ b/src/video_core/video_core.cpp
@@ -16,9 +16,6 @@
 #include "video_core/renderer_software/renderer_software.h"
 #include "video_core/video_core.h"
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// Video Core namespace
-
 namespace VideoCore {
 
 std::unique_ptr<RendererBase> g_renderer{}; ///< Renderer plugin
diff --git a/src/video_core/video_core.h b/src/video_core/video_core.h
index 611a76d7e..94620b958 100644
--- a/src/video_core/video_core.h
+++ b/src/video_core/video_core.h
@@ -20,9 +20,6 @@ namespace Memory {
 class MemorySystem;
 }
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// Video Core namespace
-
 namespace VideoCore {
 
 class RendererBase;