From 45ac1fc32f4842c3c17ce66841f17fbece698db9 Mon Sep 17 00:00:00 2001
From: momo5502 <mauriceheumann@gmail.com>
Date: Tue, 6 Jan 2026 11:29:35 +0100
Subject: [PATCH] Cleanup headers

---
 src/common/platform/file_management.hpp  | 2 ++
 src/common/platform/kernel_mapped.hpp    | 6 ++++++
 src/common/platform/network.hpp          | 3 +++
 src/common/platform/primitives.hpp       | 3 ++-
 src/common/platform/threading.hpp        | 2 ++
 src/common/platform/win_pefile.hpp       | 2 ++
 src/common/platform/window.hpp           | 2 ++
 src/windows-emulator/minidump_loader.cpp | 5 +++--
 8 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/common/platform/file_management.hpp b/src/common/platform/file_management.hpp
index a324a744..fdc84294 100644
--- a/src/common/platform/file_management.hpp
+++ b/src/common/platform/file_management.hpp
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "kernel_mapped.hpp"
+
 // NOLINTBEGIN(modernize-use-using,cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
 
 #define ACCESS_MASK              DWORD
diff --git a/src/common/platform/kernel_mapped.hpp b/src/common/platform/kernel_mapped.hpp
index bd416403..cad0ecf0 100644
--- a/src/common/platform/kernel_mapped.hpp
+++ b/src/common/platform/kernel_mapped.hpp
@@ -2,6 +2,12 @@
 
 #include <cstdint>
 
+#include "primitives.hpp"
+#include "traits.hpp"
+#include "unicode.hpp"
+#include "status.hpp"
+#include "process.hpp"
+
 // NOLINTBEGIN(modernize-use-using,cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
 
 #ifndef NT_SUCCESS
diff --git a/src/common/platform/network.hpp b/src/common/platform/network.hpp
index 1bd2f8e2..78d2a845 100644
--- a/src/common/platform/network.hpp
+++ b/src/common/platform/network.hpp
@@ -1,5 +1,8 @@
 #pragma once
 
+#include "traits.hpp"
+#include "primitives.hpp"
+
 template <typename Traits>
 struct EMU_WSABUF
 {
diff --git a/src/common/platform/primitives.hpp b/src/common/platform/primitives.hpp
index 4fc111b4..4c7795ea 100644
--- a/src/common/platform/primitives.hpp
+++ b/src/common/platform/primitives.hpp
@@ -1,13 +1,14 @@
 #pragma once
 
 #include <cstdint>
+#include "compiler.hpp"
 
 // NOLINTBEGIN(modernize-use-using)
 
 #ifdef OS_WINDOWS
 
 #include "../utils/win.hpp"
-#include "winnt.h"
+#include <winnt.h>
 
 #else
 
diff --git a/src/common/platform/threading.hpp b/src/common/platform/threading.hpp
index 4fe7deaf..822875fb 100644
--- a/src/common/platform/threading.hpp
+++ b/src/common/platform/threading.hpp
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "kernel_mapped.hpp"
+
 // NOLINTBEGIN(modernize-use-using,cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
 
 typedef enum _THREADINFOCLASS
diff --git a/src/common/platform/win_pefile.hpp b/src/common/platform/win_pefile.hpp
index 8bae3298..82770ce9 100644
--- a/src/common/platform/win_pefile.hpp
+++ b/src/common/platform/win_pefile.hpp
@@ -7,6 +7,8 @@
 #include <system_error>
 #include <variant>
 
+#include "primitives.hpp"
+
 // NOLINTBEGIN(modernize-use-using,cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
 
 #define IMAGE_DIRECTORY_ENTRY_EXPORT          0 // Export Directory
diff --git a/src/common/platform/window.hpp b/src/common/platform/window.hpp
index 31607d2a..3d1216a3 100644
--- a/src/common/platform/window.hpp
+++ b/src/common/platform/window.hpp
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "kernel_mapped.hpp"
+
 // NOLINTBEGIN(modernize-use-using,cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
 
 using pointer = uint64_t;
diff --git a/src/windows-emulator/minidump_loader.cpp b/src/windows-emulator/minidump_loader.cpp
index 6b93bf97..ee21d006 100644
--- a/src/windows-emulator/minidump_loader.cpp
+++ b/src/windows-emulator/minidump_loader.cpp
@@ -1,12 +1,13 @@
 #include "std_include.hpp"
+
 #include "minidump_loader.hpp"
 #include "windows_emulator.hpp"
 #include "windows_objects.hpp"
 #include "emulator_thread.hpp"
-#include "common/platform/unicode.hpp"
-#include "common/platform/kernel_mapped.hpp"
 #include "memory_utils.hpp"
 
+#include <platform/platform.hpp>
+
 #include <minidump/minidump.hpp>
 
 namespace minidump_loader