diff --git a/Drivers/cst66xx-module/source/cst66xx.cpp b/Drivers/cst66xx-module/source/cst66xx.cpp
index 31a23f508..736be7d4c 100644
--- a/Drivers/cst66xx-module/source/cst66xx.cpp
+++ b/Drivers/cst66xx-module/source/cst66xx.cpp
@@ -8,7 +8,7 @@
 #include <tactility/device.h>
 #include <tactility/driver.h>
 #include <tactility/drivers/gpio.h>
-#include <tactility/drivers/gpio_descriptor.h>
+#include <tactility/drivers/gpio_controller.h>
 #include <tactility/drivers/i2c_controller.h>
 #include <tactility/drivers/pointer.h>
 #include <tactility/error.h>
diff --git a/TactilityKernel/source/drivers/gpio_controller.cpp b/TactilityKernel/source/drivers/gpio_controller.cpp
index 9825d02d6..ed3d5fc91 100644
--- a/TactilityKernel/source/drivers/gpio_controller.cpp
+++ b/TactilityKernel/source/drivers/gpio_controller.cpp
@@ -1,10 +1,9 @@
 // SPDX-License-Identifier: Apache-2.0
 
+#include <tactility/concurrent/mutex.h>
 #include <tactility/driver.h>
 #include <tactility/drivers/gpio.h>
 #include <tactility/drivers/gpio_controller.h>
-
-#include <tactility/concurrent/mutex.h>
 #include <tactility/drivers/gpio_descriptor.h>
 
 #include <cstdlib>