3 files changed, 7 insertions, 11 deletions
diff --git a/libs/elf/CMakeLists.txt b/libs/elf/CMakeLists.txt
index 66e59ee..f254094 100644
--- a/libs/elf/CMakeLists.txt
+++ b/libs/elf/CMakeLists.txt
@@ -1,13 +1,13 @@
 add_library("elf" INTERFACE)
 add_library("libs::elf" ALIAS "elf")
 
+file(GLOB_RECURSE ELF_HEADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "include/**.hpp")
+
 target_sources("elf" INTERFACE
     FILE_SET HEADERS
     BASE_DIRS "include"
     FILES
-    "include/elf/format.hpp"
-    "include/elf/section_header.hpp"
-
+    ${ELF_HEADERS}
 )
 
 target_include_directories("elf" INTERFACE
diff --git a/libs/kstd/CMakeLists.txt b/libs/kstd/CMakeLists.txt
index 877a04e..b0c9c63 100644
--- a/libs/kstd/CMakeLists.txt
+++ b/libs/kstd/CMakeLists.txt
@@ -17,7 +17,7 @@ target_sources("kstd" PRIVATE
     "src/mutex.cpp"
 )
 
-file(GLOB_RECURSE KSTD_HEADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "include/**.hpp")
+file(GLOB_RECURSE KSTD_HEADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "include/kstd/*")
 
 target_sources("kstd" PUBLIC
     FILE_SET HEADERS
diff --git a/libs/multiboot2/CMakeLists.txt b/libs/multiboot2/CMakeLists.txt
index b306b66..7384a3d 100644
--- a/libs/multiboot2/CMakeLists.txt
+++ b/libs/multiboot2/CMakeLists.txt
@@ -1,17 +1,13 @@
 add_library("multiboot2" INTERFACE)
 add_library("libs::multiboot2" ALIAS "multiboot2")
 
+file(GLOB_RECURSE MULTIBOOT2_HEADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "include/**.hpp")
+
 target_sources("multiboot2" INTERFACE
     FILE_SET HEADERS
     BASE_DIRS "include"
     FILES
-    "include/multiboot2/constants.hpp"
-    "include/multiboot2/information.hpp"
-
-    "include/multiboot2/impl/data.hpp"
-    "include/multiboot2/impl/ids.hpp"
-    "include/multiboot2/impl/iterator.hpp"
-    "include/multiboot2/impl/tag.hpp"
+    ${MULTIBOOT2_HEADERS}
 )
 
 target_include_directories("multiboot2" INTERFACE