5 files changed, 5 insertions, 9 deletions
diff --git a/arch/x86_64/CMakeLists.txt b/arch/x86_64/CMakeLists.txt
index 6cc19f59..28199f35 100644
--- a/arch/x86_64/CMakeLists.txt
+++ b/arch/x86_64/CMakeLists.txt
@@ -73,14 +73,10 @@ file(GLOB_RECURSE ARCH_HEADERS
 
 target_sources("x86_64" PUBLIC
     FILE_SET HEADERS
-    BASE_DIRS "arch"
+    BASE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}"
     FILES ${ARCH_HEADERS}
 )
 
-target_include_directories("x86_64" PUBLIC
-    "include"
-)
-
 target_link_libraries("x86_64" PUBLIC
     "acpi::lib"
     "elf::lib"
diff --git a/kapi/CMakeLists.txt b/kapi/CMakeLists.txt
index 7aef788f..79437f21 100644
--- a/kapi/CMakeLists.txt
+++ b/kapi/CMakeLists.txt
@@ -9,7 +9,7 @@ file(GLOB_RECURSE KAPI_HEADERS
 
 target_sources("kapi" PUBLIC
     FILE_SET HEADERS
-    BASE_DIRS "kapi"
+    BASE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}"
     FILES
     ${KAPI_HEADERS}
 )
diff --git a/libs/acpi/CMakeLists.txt b/libs/acpi/CMakeLists.txt
index e21a7ef8..9fc8c719 100644
--- a/libs/acpi/CMakeLists.txt
+++ b/libs/acpi/CMakeLists.txt
@@ -38,7 +38,7 @@ file(GLOB_RECURSE ACPI_HEADERS
 
 target_sources("acpi" PUBLIC
   FILE_SET HEADERS
-  BASE_DIRS "acpi"
+  BASE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}"
   FILES
   ${ACPI_HEADERS}
 )
diff --git a/libs/elf/CMakeLists.txt b/libs/elf/CMakeLists.txt
index bf69678e..5dc83859 100644
--- a/libs/elf/CMakeLists.txt
+++ b/libs/elf/CMakeLists.txt
@@ -23,7 +23,7 @@ file(GLOB_RECURSE ELF_HEADERS
 
 target_sources("elf" INTERFACE
     FILE_SET HEADERS
-    BASE_DIRS "elf"
+    BASE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}"
     FILES
     ${ELF_HEADERS}
 )
diff --git a/libs/multiboot2/CMakeLists.txt b/libs/multiboot2/CMakeLists.txt
index 36070a10..70f40d02 100644
--- a/libs/multiboot2/CMakeLists.txt
+++ b/libs/multiboot2/CMakeLists.txt
@@ -23,7 +23,7 @@ file(GLOB_RECURSE MULTIBOOT2_HEADERS
 
 target_sources("multiboot2" INTERFACE
     FILE_SET HEADERS
-    BASE_DIRS "multiboot2"
+    BASE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}"
     FILES
     ${MULTIBOOT2_HEADERS}
 )