diff --git a/CI/file_name_exceptions.txt b/CI/file_name_exceptions.txt
index 95ecafa856..a388ebf630 100644
--- a/CI/file_name_exceptions.txt
+++ b/CI/file_name_exceptions.txt
@@ -7,8 +7,3 @@ apps/openmw/mwsound/sound_buffer.cpp
 apps/openmw/mwsound/sound_buffer.hpp
 apps/openmw/mwsound/sound_decoder.hpp
 apps/openmw/mwsound/sound_output.hpp
-components/crashcatcher/windows_crashcatcher.cpp
-components/crashcatcher/windows_crashcatcher.hpp
-components/crashcatcher/windows_crashmonitor.cpp
-components/crashcatcher/windows_crashmonitor.hpp
-components/crashcatcher/windows_crashshm.hpp
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 217839ce61..2385b4ca83 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -390,10 +390,10 @@ copy_resource_file("lua_ui/content.lua" "${OPENMW_RESOURCES_ROOT}" "resources/lu
 
 if(WIN32)
     add_component_dir (crashcatcher
-        windows_crashcatcher
-        windows_crashmonitor
-        windows_crashshm
+        windowscrashcatcher
         windowscrashdumppathhelpers
+        windowscrashmonitor
+        windowscrashshm
     )
 elseif(NOT ANDROID)
     add_component_dir (crashcatcher
diff --git a/components/crashcatcher/crashcatcher.hpp b/components/crashcatcher/crashcatcher.hpp
index 16b416cf98..60f749e57a 100644
--- a/components/crashcatcher/crashcatcher.hpp
+++ b/components/crashcatcher/crashcatcher.hpp
@@ -1,5 +1,5 @@
-#ifndef CRASHCATCHER_H
-#define CRASHCATCHER_H
+#ifndef OPENMW_COMPONENTS_CRASHCATCHER_CRASHCATCHER_HPP
+#define OPENMW_COMPONENTS_CRASHCATCHER_CRASHCATCHER_HPP
 
 #include <filesystem>
 
diff --git a/components/crashcatcher/windows_crashcatcher.cpp b/components/crashcatcher/windowscrashcatcher.cpp
similarity index 98%
rename from components/crashcatcher/windows_crashcatcher.cpp
rename to components/crashcatcher/windowscrashcatcher.cpp
index 23dfac549c..40c54834ac 100644
--- a/components/crashcatcher/windows_crashcatcher.cpp
+++ b/components/crashcatcher/windowscrashcatcher.cpp
@@ -1,17 +1,18 @@
-#include "windows_crashcatcher.hpp"
+#include "windowscrashcatcher.hpp"
 
 #include <cassert>
 #include <cwchar>
 #include <sstream>
 #include <thread>
 
-#include "windows_crashmonitor.hpp"
-#include "windows_crashshm.hpp"
-#include "windowscrashdumppathhelpers.hpp"
 #include <SDL_messagebox.h>
 
 #include <components/misc/strings/conversion.hpp>
 
+#include "windowscrashdumppathhelpers.hpp"
+#include "windowscrashmonitor.hpp"
+#include "windowscrashshm.hpp"
+
 namespace Crash
 {
     namespace
diff --git a/components/crashcatcher/windows_crashcatcher.hpp b/components/crashcatcher/windowscrashcatcher.hpp
similarity index 94%
rename from components/crashcatcher/windows_crashcatcher.hpp
rename to components/crashcatcher/windowscrashcatcher.hpp
index 89678c9ada..ea53fcb520 100644
--- a/components/crashcatcher/windows_crashcatcher.hpp
+++ b/components/crashcatcher/windowscrashcatcher.hpp
@@ -1,11 +1,12 @@
-#ifndef WINDOWS_CRASHCATCHER_HPP
-#define WINDOWS_CRASHCATCHER_HPP
+#ifndef OPENMW_COMPONENTS_CRASHCATCHER_WINDOWSCRASHCATCHER_HPP
+#define OPENMW_COMPONENTS_CRASHCATCHER_WINDOWSCRASHCATCHER_HPP
 
 #include <filesystem>
 
-#include <components/crashcatcher/crashcatcher.hpp>
 #include <components/misc/windows.hpp>
 
+#include "crashcatcher.hpp"
+
 namespace Crash
 {
 
@@ -78,4 +79,4 @@ namespace Crash
 
 } // namespace Crash
 
-#endif // WINDOWS_CRASHCATCHER_HPP
+#endif
diff --git a/components/crashcatcher/windowscrashdumppathhelpers.hpp b/components/crashcatcher/windowscrashdumppathhelpers.hpp
index fa64969301..9e11c57834 100644
--- a/components/crashcatcher/windowscrashdumppathhelpers.hpp
+++ b/components/crashcatcher/windowscrashdumppathhelpers.hpp
@@ -1,8 +1,10 @@
-#ifndef COMPONENTS_CRASH_WINDOWSCRASHDUMPPATHHELPERS_H
-#include "windows_crashshm.hpp"
+#ifndef OPENMW_COMPONENTS_CRASHCATCHER_WINDOWSCRASHDUMPPATHHELPERS_HPP
+#define OPENMW_COMPONENTS_CRASHCATCHER_WINDOWSCRASHDUMPPATHHELPERS_HPP
 
 #include <filesystem>
 
+#include "windowscrashshm.hpp"
+
 namespace Crash
 {
     std::filesystem::path getCrashDumpPath(const CrashSHM& crashShm);
diff --git a/components/crashcatcher/windows_crashmonitor.cpp b/components/crashcatcher/windowscrashmonitor.cpp
similarity index 99%
rename from components/crashcatcher/windows_crashmonitor.cpp
rename to components/crashcatcher/windowscrashmonitor.cpp
index 3708283efa..a92c310f63 100644
--- a/components/crashcatcher/windows_crashmonitor.cpp
+++ b/components/crashcatcher/windowscrashmonitor.cpp
@@ -1,4 +1,4 @@
-#include "windows_crashmonitor.hpp"
+#include "windowscrashmonitor.hpp"
 
 #include <Psapi.h>
 #include <components/misc/windows.hpp>
@@ -10,12 +10,13 @@
 
 #include <SDL_messagebox.h>
 
-#include "windows_crashcatcher.hpp"
-#include "windows_crashshm.hpp"
-#include "windowscrashdumppathhelpers.hpp"
 #include <components/debug/debuglog.hpp>
 #include <components/misc/strings/conversion.hpp>
 
+#include "windowscrashcatcher.hpp"
+#include "windowscrashdumppathhelpers.hpp"
+#include "windowscrashshm.hpp"
+
 namespace Crash
 {
     std::unordered_map<HWINEVENTHOOK, CrashMonitor*> CrashMonitor::smEventHookOwners{};
diff --git a/components/crashcatcher/windows_crashmonitor.hpp b/components/crashcatcher/windowscrashmonitor.hpp
similarity index 90%
rename from components/crashcatcher/windows_crashmonitor.hpp
rename to components/crashcatcher/windowscrashmonitor.hpp
index 16e173169e..cb650df6dd 100644
--- a/components/crashcatcher/windows_crashmonitor.hpp
+++ b/components/crashcatcher/windowscrashmonitor.hpp
@@ -1,5 +1,5 @@
-#ifndef WINDOWS_CRASHMONITOR_HPP
-#define WINDOWS_CRASHMONITOR_HPP
+#ifndef OPENMW_COMPONENTS_CRASHCATCHER_WINDOWSCRASHMONITOR_HPP
+#define OPENMW_COMPONENTS_CRASHCATCHER_WINDOWSCRASHMONITOR_HPP
 
 #include <components/misc/windows.hpp>
 
@@ -60,4 +60,4 @@ namespace Crash
 
 } // namespace Crash
 
-#endif // WINDOWS_CRASHMONITOR_HPP
+#endif
diff --git a/components/crashcatcher/windows_crashshm.hpp b/components/crashcatcher/windowscrashshm.hpp
similarity index 89%
rename from components/crashcatcher/windows_crashshm.hpp
rename to components/crashcatcher/windowscrashshm.hpp
index b919757890..a9357710ca 100644
--- a/components/crashcatcher/windows_crashshm.hpp
+++ b/components/crashcatcher/windowscrashshm.hpp
@@ -1,5 +1,5 @@
-#ifndef WINDOWS_CRASHSHM_HPP
-#define WINDOWS_CRASHSHM_HPP
+#ifndef OPENMW_COMPONENTS_CRASHCATCHER_WINDOWSCRASHSHM_HPP
+#define OPENMW_COMPONENTS_CRASHCATCHER_WINDOWSCRASHSHM_HPP
 
 #include <components/misc/windows.hpp>
 
@@ -44,4 +44,4 @@ namespace Crash
 
 } // namespace Crash
 
-#endif // WINDOWS_CRASHSHM_HPP
+#endif
diff --git a/components/debug/debugging.cpp b/components/debug/debugging.cpp
index 32aec8f0fc..11d74be606 100644
--- a/components/debug/debugging.cpp
+++ b/components/debug/debugging.cpp
@@ -22,7 +22,7 @@
 #include <components/misc/strings/lower.hpp>
 
 #ifdef _WIN32
-#include <components/crashcatcher/windows_crashcatcher.hpp>
+#include <components/crashcatcher/windowscrashcatcher.hpp>
 #include <components/files/conversion.hpp>
 #include <components/misc/windows.hpp>