diff --git a/include/sta/rtos/handle.tpp b/include/sta/rtos/handle.tpp
index 6c6927c..cd10f3e 100644
--- a/include/sta/rtos/handle.tpp
+++ b/include/sta/rtos/handle.tpp
@@ -5,7 +5,7 @@
 #  error "Internal header. Use <sta/rtos/handle.hpp> instead."
 #endif // !STA_RTOS_HANDLE_HPP
 
-#include <sta/assert.hpp>
+#include <sta/debug/assert.hpp>
 
 
 namespace sta
diff --git a/src/system/events.cpp b/src/system/events.cpp
index 4bbd808..6383047 100644
--- a/src/system/events.cpp
+++ b/src/system/events.cpp
@@ -1,6 +1,6 @@
 #include <sta/rtos/system/events.hpp>
 
-#include <sta/assert.hpp>
+#include <sta/debug/assert.hpp>
 
 #include <cmsis_os2.h>
 #include <FreeRTOS.h>
diff --git a/src/system/startup.cpp b/src/system/startup.cpp
index dc48014..9636bd7 100644
--- a/src/system/startup.cpp
+++ b/src/system/startup.cpp
@@ -2,12 +2,12 @@
 
 #include <sta/rtos/c_api/startup.h>
 
-#include <sta/assert.hpp>
+#include <sta/debug/assert.hpp>
 #include <sta/lang.hpp>
 #include <sta/rtos/system/can_bus.hpp>
 #include <sta/rtos/system/events.hpp>
 #include <sta/rtos/system/watchdog.hpp>
-#include <sta/stm32/init.hpp>
+#include <sta/devices/stm32/init.hpp>
 
 #include <cmsis_os2.h>
 
diff --git a/src/system/watchdog.cpp b/src/system/watchdog.cpp
index 32ebd65..66fde9c 100644
--- a/src/system/watchdog.cpp
+++ b/src/system/watchdog.cpp
@@ -1,7 +1,7 @@
 #include <sta/rtos/system/watchdog.hpp>
 #ifdef STA_RTOS_SYSTEM_WATCHDOG_ENABLE
 
-#include <sta/assert.hpp>
+#include <sta/debug/assert.hpp>
 #include <sta/lang.hpp>
 #include <sta/rtos/defs.hpp>
 #include <sta/rtos/system/events.hpp>