7 files changed, 5 insertions, 39 deletions
diff --git a/kernel/CMakeLists.txt b/kernel/CMakeLists.txt
index 7bae7b07..91075adc 100644
--- a/kernel/CMakeLists.txt
+++ b/kernel/CMakeLists.txt
@@ -13,7 +13,6 @@ target_sources("kernel_lib" PRIVATE
     "kapi/cpu.cpp"
     "kapi/devices.cpp"
     "kapi/devices/bus.cpp"
-    "kapi/devices/cpu.cpp"
     "kapi/devices/device.cpp"
     "kapi/devices/device_registry.cpp"
     "kapi/devices/driver.cpp"
diff --git a/kernel/kapi/boot_modules/device.cpp b/kernel/kapi/boot_modules/device.cpp
index b9262abf..d60cc406 100644
--- a/kernel/kapi/boot_modules/device.cpp
+++ b/kernel/kapi/boot_modules/device.cpp
@@ -1,6 +1,7 @@
 #include <kapi/boot_modules/device.hpp>
 
 #include <kapi/boot_modules/module.hpp>
+#include <kapi/capabilities/facet_id.hpp>
 #include <kapi/devices.hpp>
 
 #include <kstd/format.hpp>
diff --git a/kernel/kapi/devices/bus.cpp b/kernel/kapi/devices/bus.cpp
index 1398c781..e4b5a2c5 100644
--- a/kernel/kapi/devices/bus.cpp
+++ b/kernel/kapi/devices/bus.cpp
@@ -1,5 +1,6 @@
 #include <kapi/devices/bus.hpp>
 
+#include <kapi/capabilities/facet_id.hpp>
 #include <kapi/devices.hpp>
 #include <kapi/devices/bus_protocol.hpp>
 #include <kapi/devices/driver_registry.hpp>
diff --git a/kernel/kapi/devices/cpu.cpp b/kernel/kapi/devices/cpu.cpp
deleted file mode 100644
index daba34a8..00000000
--- a/kernel/kapi/devices/cpu.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-#include <kapi/devices/cpu.hpp>
-
-#include <kapi/devices.hpp>
-
-#include <kstd/format.hpp>
-
-#include <cstdint>
-
-namespace kapi::devices
-{
-
-  cpu::core::core(std::uint64_t index, std::uint64_t hardware_id, bool is_bsp)
-      : kapi::devices::bus{kstd::format("cpu_core{}", index)}
-      , m_index{index}
-      , m_hardware_id{hardware_id}
-      , m_is_bsp{is_bsp}
-  {}
-
-  auto cpu::core::index() const noexcept -> std::uint64_t
-  {
-    return m_index;
-  }
-
-  auto cpu::core::hardware_id() const -> std::uint64_t
-  {
-    return m_hardware_id;
-  }
-
-  auto cpu::core::is_bsp() const -> bool
-  {
-    return m_is_bsp;
-  }
-
-  cpu::cpu()
-      : kapi::devices::bus{"cpu"}
-  {}
-
-}  // namespace kapi::devices
-\ No newline at end of file
diff --git a/kernel/kapi/devices/device.cpp b/kernel/kapi/devices/device.cpp
index 6f05954a..2576e20a 100644
--- a/kernel/kapi/devices/device.cpp
+++ b/kernel/kapi/devices/device.cpp
@@ -1,5 +1,6 @@
 #include <kapi/devices/device.hpp>
 
+#include <kapi/capabilities/facet_id.hpp>
 #include <kapi/devices.hpp>
 #include <kapi/devices/bus.hpp>
 #include <kapi/devices/resource.hpp>
diff --git a/kernel/kapi/devices/driver.cpp b/kernel/kapi/devices/driver.cpp
index 55b7507b..ee16b4c2 100644
--- a/kernel/kapi/devices/driver.cpp
+++ b/kernel/kapi/devices/driver.cpp
@@ -1,3 +1,4 @@
+#include <kapi/capabilities/facet_id.hpp>
 #include <kapi/devices.hpp>
 
 #include <cstdint>
diff --git a/kernel/kapi/devices/facet_registry.cpp b/kernel/kapi/devices/facet_registry.cpp
index 623ecba2..b2d12c86 100644
--- a/kernel/kapi/devices/facet_registry.cpp
+++ b/kernel/kapi/devices/facet_registry.cpp
@@ -1,5 +1,6 @@
 #include <kapi/devices/facet_registry.hpp>
 
+#include <kapi/capabilities/facet_id.hpp>
 #include <kapi/devices.hpp>
 #include <kapi/system.hpp>
 #include <kapi/test_support/devices.hpp>