kapi: clean up directory names

10 files changed, 18 insertions, 22 deletions

diff --git a/arch/x86_64/kapi/boot_modules.cpp b/arch/x86_64/kapi/boot_modules.cpp
index 9ca867a5..f910bdbc 100644
--- a/arch/x86_64/kapi/boot_modules.cpp
+++ b/arch/x86_64/kapi/boot_modules.cpp
@@ -4,8 +4,8 @@
 #include <arch/boot/ld.hpp>
 
 #include <kapi/boot.hpp>
-#include <kapi/boot_module/boot_module.hpp>
-#include <kapi/boot_module/boot_module_registry.hpp>
+#include <kapi/boot_modules/boot_module.hpp>
+#include <kapi/boot_modules/boot_module_registry.hpp>
 #include <kapi/memory.hpp>
 #include <kapi/system.hpp>
 
diff --git a/kapi/kapi/boot_modules.hpp b/kapi/kapi/boot_modules.hpp
index 56fefe4f..18995303 100644
--- a/kapi/kapi/boot_modules.hpp
+++ b/kapi/kapi/boot_modules.hpp
@@ -1,9 +1,9 @@
 #ifndef TEACHOS_KAPI_BOOT_MODULES_HPP
 #define TEACHOS_KAPI_BOOT_MODULES_HPP
 
-#include <kapi/boot_module/boot_module.hpp>           // IWYU pragma: export
-#include <kapi/boot_module/boot_module_registry.hpp>  // IWYU pragma: export
-#include <kapi/boot_module/bus.hpp>                   // IWYU pragma: export
+#include <kapi/boot_modules/boot_module.hpp>           // IWYU pragma: export
+#include <kapi/boot_modules/boot_module_registry.hpp>  // IWYU pragma: export
+#include <kapi/boot_modules/bus.hpp>                   // IWYU pragma: export
 
 namespace kapi::boot_modules
 {
diff --git a/kapi/kapi/boot_module/boot_module.hpp b/kapi/kapi/boot_modules/boot_module.hpp
index 608e5341..85de7ab0 100644
--- a/kapi/kapi/boot_module/boot_module.hpp
+++ b/kapi/kapi/boot_modules/boot_module.hpp
@@ -1,5 +1,5 @@
-#ifndef TEACHOS_KAPI_BOOT_MODULE_BOOT_MODULE_HPP
-#define TEACHOS_KAPI_BOOT_MODULE_BOOT_MODULE_HPP
+#ifndef TEACHOS_KAPI_BOOT_MODULES_BOOT_MODULE_HPP
+#define TEACHOS_KAPI_BOOT_MODULES_BOOT_MODULE_HPP
 
 // IWYU pragma: private, include <kapi/boot_modules.hpp>
 
diff --git a/kapi/kapi/boot_module/boot_module_registry.hpp b/kapi/kapi/boot_modules/boot_module_registry.hpp
index fdffa757..7f490ae3 100644
--- a/kapi/kapi/boot_module/boot_module_registry.hpp
+++ b/kapi/kapi/boot_modules/boot_module_registry.hpp
@@ -1,9 +1,9 @@
-#ifndef TEACHOS_KAPI_BOOT_MODULE_BOOT_MODULE_REGISTRY_HPP
-#define TEACHOS_KAPI_BOOT_MODULE_BOOT_MODULE_REGISTRY_HPP
+#ifndef TEACHOS_KAPI_BOOT_MODULES_BOOT_MODULE_REGISTRY_HPP
+#define TEACHOS_KAPI_BOOT_MODULES_BOOT_MODULE_REGISTRY_HPP
 
 // IWYU pragma: private, include <kapi/boot_modules.hpp>
 
-#include <kapi/boot_module/boot_module.hpp>
+#include <kapi/boot_modules/boot_module.hpp>
 
 #include <kstd/vector.hpp>
 
diff --git a/kapi/kapi/boot_module/bus.hpp b/kapi/kapi/boot_modules/bus.hpp
index 2dc1e1b7..9cab7edb 100644
--- a/kapi/kapi/boot_module/bus.hpp
+++ b/kapi/kapi/boot_modules/bus.hpp
@@ -1,8 +1,10 @@
-#ifndef TEACHOS_KAPI_BOOT_MODULE_BUS_HPP
-#define TEACHOS_KAPI_BOOT_MODULE_BUS_HPP
+#ifndef TEACHOS_KAPI_BOOT_MODULES_BUS_HPP
+#define TEACHOS_KAPI_BOOT_MODULES_BUS_HPP
 
-#include <kapi/boot_module/boot_module.hpp>
-#include <kapi/boot_module/boot_module_registry.hpp>
+// IWYU pragma: private, include <kapi/boot_modules.hpp>
+
+#include <kapi/boot_modules/boot_module.hpp>
+#include <kapi/boot_modules/boot_module_registry.hpp>
 #include <kapi/devices.hpp>
 
 #include <kstd/result.hpp>
diff --git a/kernel/kapi/boot_module/bus.cpp b/kernel/kapi/boot_module/bus.cpp
index 83c97f8e..aab1403b 100644
--- a/kernel/kapi/boot_module/bus.cpp
+++ b/kernel/kapi/boot_module/bus.cpp
@@ -1,4 +1,4 @@
-#include <kapi/boot_module/bus.hpp>
+#include <kapi/boot_modules/bus.hpp>
 
 #include <kapi/boot_modules.hpp>
 #include <kapi/devices.hpp>
diff --git a/kernel/kernel/devices/storage.cpp b/kernel/kernel/devices/storage.cpp
index 1f74b9af..28f96de2 100644
--- a/kernel/kernel/devices/storage.cpp
+++ b/kernel/kernel/devices/storage.cpp
@@ -1,9 +1,7 @@
 #include <kernel/devices/storage.hpp>
 
-#include <kapi/boot_module/bus.hpp>
 #include <kapi/boot_modules.hpp>
 #include <kapi/devices.hpp>
-#include <kapi/devices/driver_registry.hpp>
 
 #include <kstd/memory.hpp>
 
diff --git a/kernel/kernel/drivers/storage/ram_disk.cpp b/kernel/kernel/drivers/storage/ram_disk.cpp
index 69256a56..cd5368cb 100644
--- a/kernel/kernel/drivers/storage/ram_disk.cpp
+++ b/kernel/kernel/drivers/storage/ram_disk.cpp
@@ -3,7 +3,6 @@
 #include <kernel/devices/block_device_utils.hpp>
 #include <kernel/filesystem/reserved_numbers.hpp>
 
-#include <kapi/boot_module/bus.hpp>
 #include <kapi/boot_modules.hpp>
 #include <kapi/devices.hpp>
 #include <kapi/system.hpp>
diff --git a/kernel/kernel/test_support/filesystem/storage_boot_module_fixture.cpp b/kernel/kernel/test_support/filesystem/storage_boot_module_fixture.cpp
index fbdb01e0..5bddd956 100644
--- a/kernel/kernel/test_support/filesystem/storage_boot_module_fixture.cpp
+++ b/kernel/kernel/test_support/filesystem/storage_boot_module_fixture.cpp
@@ -3,8 +3,6 @@
 #include <kernel/devices/storage.hpp>
 #include <kernel/test_support/boot_modules.hpp>
 
-#include <kapi/boot_module/boot_module.hpp>
-#include <kapi/boot_module/bus.hpp>
 #include <kapi/boot_modules.hpp>
 #include <kapi/devices.hpp>
 #include <kapi/memory.hpp>
diff --git a/kernel/kernel/test_support/filesystem/storage_boot_module_fixture.hpp b/kernel/kernel/test_support/filesystem/storage_boot_module_fixture.hpp
index 48bddf31..663a8032 100644
--- a/kernel/kernel/test_support/filesystem/storage_boot_module_fixture.hpp
+++ b/kernel/kernel/test_support/filesystem/storage_boot_module_fixture.hpp
@@ -1,8 +1,7 @@
 #ifndef TEACHOS_KERNEL_TEST_SUPPORT_FILESYSTEM_STORAGE_BOOT_MODULE_FIXTURE_HPP
 #define TEACHOS_KERNEL_TEST_SUPPORT_FILESYSTEM_STORAGE_BOOT_MODULE_FIXTURE_HPP
 
-#include <kapi/boot_module/boot_module_registry.hpp>
-#include <kapi/boot_module/bus.hpp>
+#include <kapi/boot_modules.hpp>
 
 #include <kstd/memory.hpp>