...

src/arch/arch.h

@@ -1,4 +1,21 @@
 #pragma once
 
+#include <stddef.h>
+#include <stdint.h>
+
+typedef struct
+{
+    uint64_t base_address;
+    size_t length;
+} memory_region_t;
+
+typedef struct
+{
+    memory_region_t* regions;
+    size_t num_regions;
+} memory_map_t;
+
 void panic();
-void put_char(char character);
+void put_char(char character);
+
+extern memory_map_t memory_map;

src/arch/mmap.h

@@ -1,18 +0,0 @@
-#pragma once
-
-#include <stddef.h>
-#include <stdint.h>
-
-typedef struct
-{
-    uint64_t base_address;
-    size_t length;
-} memory_region_t;
-
-typedef struct
-{
-    memory_region_t* regions;
-    size_t num_regions;
-} memory_map_t;
-
-extern memory_map_t memory_map;

src/arch/x86_64/mmap.c

@@ -1,5 +1,5 @@
 #include "mmap.h"
-#include "../mmap.h"
+#include "../arch.h"
 #include <stddef.h>
 #include <stdio.h>
 

src/pmm.c

@@ -1,5 +1,5 @@
 #include "pmm.h"
-#include "arch/mmap.h"
+#include "arch/arch.h"
 #include <stddef.h>
 #include <stdio.h>
 #include <string.h>