diff --git a/include/sta/atomic/mutex.hpp b/include/sta/atomic/mutex.hpp
index b0824ab..a41b89f 100644
--- a/include/sta/atomic/mutex.hpp
+++ b/include/sta/atomic/mutex.hpp
@@ -10,7 +10,7 @@
 #include <sta/config.hpp>
 #ifdef STA_ATOMIC_ENABLE
 
-#include <sta/intf/mutex.hpp>
+#include <sta/mutex.hpp>
 
 #include <atomic>
 
diff --git a/include/sta/atomic/signal.hpp b/include/sta/atomic/signal.hpp
index 9f846cf..b84f030 100644
--- a/include/sta/atomic/signal.hpp
+++ b/include/sta/atomic/signal.hpp
@@ -10,7 +10,7 @@
 #include <sta/config.hpp>
 #ifdef STA_ATOMIC_ENABLE
 
-#include <sta/intf/signal.hpp>
+#include <sta/signal.hpp>
 
 #include <atomic>
 
diff --git a/include/sta/printable_uart.hpp b/include/sta/printable_uart.hpp
index 35e62eb..5117dee 100644
--- a/include/sta/printable_uart.hpp
+++ b/include/sta/printable_uart.hpp
@@ -5,7 +5,7 @@
 #ifndef STA_PRINTABLE_UART_HPP
 #define STA_PRINTABLE_UART_HPP
 
-#include <sta/intf/uart.hpp>
+#include <sta/uart.hpp>
 
 #include <cstddef>
 #include <cstdint>
diff --git a/include/sta/spi/device.hpp b/include/sta/spi/device.hpp
index 2c4c589..727e880 100644
--- a/include/sta/spi/device.hpp
+++ b/include/sta/spi/device.hpp
@@ -5,7 +5,7 @@
 #ifndef STA_SPI_DEVICE_HPP
 #define STA_SPI_DEVICE_HPP
 
-#include <sta/intf/gpio_pin.hpp>
+#include <sta/gpio_pin.hpp>
 #include <sta/spi/interface.hpp>
 
 #include <cstddef>
diff --git a/include/sta/spi/interface.hpp b/include/sta/spi/interface.hpp
index a7a7d03..d139860 100644
--- a/include/sta/spi/interface.hpp
+++ b/include/sta/spi/interface.hpp
@@ -5,7 +5,7 @@
 #ifndef STA_SPI_INTERFACE_HPP
 #define STA_SPI_INTERFACE_HPP
 
-#include <sta/intf/mutex.hpp>
+#include <sta/mutex.hpp>
 #include <sta/spi/settings.hpp>
 
 #include <cstddef>
diff --git a/include/sta/stm32/gpio_pin.hpp b/include/sta/stm32/gpio_pin.hpp
index b340551..f93cffc 100644
--- a/include/sta/stm32/gpio_pin.hpp
+++ b/include/sta/stm32/gpio_pin.hpp
@@ -25,7 +25,7 @@
 #include <sta/config.hpp>
 #ifdef STA_STM32_GPIO_ENABLE
 
-#include <sta/intf/gpio_pin.hpp>
+#include <sta/gpio_pin.hpp>
 
 #include <sta/stm32/hal.hpp>
 
diff --git a/include/sta/stm32/uart.hpp b/include/sta/stm32/uart.hpp
index 97fb2dc..e98c30d 100644
--- a/include/sta/stm32/uart.hpp
+++ b/include/sta/stm32/uart.hpp
@@ -33,7 +33,7 @@
 #include <sta/config.hpp>
 #ifdef STA_STM32_UART_ENABLE
 
-#include <sta/intf/uart.hpp>
+#include <sta/uart.hpp>
 
 #include <sta/stm32/hal.hpp>
 
diff --git a/src/mutex.cpp b/src/mutex.cpp
index ba8af2e..b861ebd 100644
--- a/src/mutex.cpp
+++ b/src/mutex.cpp
@@ -1,4 +1,4 @@
-#include <sta/intf/mutex.hpp>
+#include <sta/mutex.hpp>
 
 
 namespace sta
diff --git a/src/uart.cpp b/src/uart.cpp
index 9d06dae..e4eaa35 100644
--- a/src/uart.cpp
+++ b/src/uart.cpp
@@ -1,4 +1,4 @@
-#include <sta/intf/uart.hpp>
+#include <sta/uart.hpp>
 
 #include <sta/printf.hpp>