diff --git a/Devices/cyd-2432s024c/Source/Configuration.cpp b/Devices/cyd-2432s024c/Source/Configuration.cpp
index a6d9b6164..1674ceca4 100644
--- a/Devices/cyd-2432s024c/Source/Configuration.cpp
+++ b/Devices/cyd-2432s024c/Source/Configuration.cpp
@@ -2,7 +2,6 @@
 #include <driver/gpio.h>
 
 #include <Tactility/hal/Configuration.h>
-#include <Tactility/lvgl/LvglSync.h>
 #include <PwmBacklight.h>
 
 static bool initBoot() {
diff --git a/Devices/cyd-2432s024r/Source/Configuration.cpp b/Devices/cyd-2432s024r/Source/Configuration.cpp
index 1f715033f..91782dd35 100644
--- a/Devices/cyd-2432s024r/Source/Configuration.cpp
+++ b/Devices/cyd-2432s024r/Source/Configuration.cpp
@@ -1,8 +1,6 @@
 #include "devices/Display.h"
-#include <driver/gpio.h>
 
 #include <Tactility/hal/Configuration.h>
-#include <Tactility/lvgl/LvglSync.h>
 #include <PwmBacklight.h>
 
 using namespace tt::hal;
diff --git a/Devices/cyd-2432s028r/Source/Configuration.cpp b/Devices/cyd-2432s028r/Source/Configuration.cpp
index bf458b5cb..b979797e1 100644
--- a/Devices/cyd-2432s028r/Source/Configuration.cpp
+++ b/Devices/cyd-2432s028r/Source/Configuration.cpp
@@ -2,7 +2,6 @@
 #include <driver/gpio.h>
 
 #include <Tactility/hal/Configuration.h>
-#include <Tactility/lvgl/LvglSync.h>
 #include <PwmBacklight.h>
 
 using namespace tt::hal;
diff --git a/Devices/cyd-2432s028rv3/Source/Configuration.cpp b/Devices/cyd-2432s028rv3/Source/Configuration.cpp
index bf458b5cb..b979797e1 100644
--- a/Devices/cyd-2432s028rv3/Source/Configuration.cpp
+++ b/Devices/cyd-2432s028rv3/Source/Configuration.cpp
@@ -2,7 +2,6 @@
 #include <driver/gpio.h>
 
 #include <Tactility/hal/Configuration.h>
-#include <Tactility/lvgl/LvglSync.h>
 #include <PwmBacklight.h>
 
 using namespace tt::hal;
diff --git a/Devices/cyd-4848s040c/Source/Configuration.cpp b/Devices/cyd-4848s040c/Source/Configuration.cpp
index e8c7701d1..28f7637c3 100644
--- a/Devices/cyd-4848s040c/Source/Configuration.cpp
+++ b/Devices/cyd-4848s040c/Source/Configuration.cpp
@@ -1,9 +1,6 @@
 #include "devices/St7701Display.h"
-#include <driver/gpio.h>
 
 #include <Tactility/hal/Configuration.h>
-#include <Tactility/kernel/SystemEvents.h>
-#include <Tactility/lvgl/LvglSync.h>
 #include <PwmBacklight.h>
 
 using namespace tt::hal;
diff --git a/Devices/cyd-8048s043c/Source/Configuration.cpp b/Devices/cyd-8048s043c/Source/Configuration.cpp
index d4fc2b98c..fb4a31a9d 100644
--- a/Devices/cyd-8048s043c/Source/Configuration.cpp
+++ b/Devices/cyd-8048s043c/Source/Configuration.cpp
@@ -1,6 +1,5 @@
 #include "PwmBacklight.h"
 #include "devices/Display.h"
-#include <driver/gpio.h>
 
 #include <Tactility/hal/Configuration.h>
 
diff --git a/Devices/cyd-e32r28t/Source/Configuration.cpp b/Devices/cyd-e32r28t/Source/Configuration.cpp
index 387502f4b..620a05fe5 100644
--- a/Devices/cyd-e32r28t/Source/Configuration.cpp
+++ b/Devices/cyd-e32r28t/Source/Configuration.cpp
@@ -1,7 +1,6 @@
 #include "devices/Display.h"
 
 #include <Tactility/hal/Configuration.h>
-#include <Tactility/lvgl/LvglSync.h>
 #include <PwmBacklight.h>
 
 static bool initBoot() {
diff --git a/Devices/cyd-e32r32p/Source/Configuration.cpp b/Devices/cyd-e32r32p/Source/Configuration.cpp
index 77ac6fbc9..a7a18f6a3 100644
--- a/Devices/cyd-e32r32p/Source/Configuration.cpp
+++ b/Devices/cyd-e32r32p/Source/Configuration.cpp
@@ -1,9 +1,7 @@
 #include "devices/Display.h"
 #include "devices/Power.h"
-#include <driver/gpio.h>
 
 #include <Tactility/hal/Configuration.h>
-#include <Tactility/lvgl/LvglSync.h>
 #include <PwmBacklight.h>
 
 using namespace tt::hal;
diff --git a/Devices/elecrow-crowpanel-advance-28/Source/Configuration.cpp b/Devices/elecrow-crowpanel-advance-28/Source/Configuration.cpp
index 1cbf523da..168fa4a68 100644
--- a/Devices/elecrow-crowpanel-advance-28/Source/Configuration.cpp
+++ b/Devices/elecrow-crowpanel-advance-28/Source/Configuration.cpp
@@ -1,6 +1,5 @@
 #include "PwmBacklight.h"
 #include "devices/Display.h"
-#include <driver/gpio.h>
 
 #include <Tactility/hal/Configuration.h>
 
diff --git a/Devices/elecrow-crowpanel-advance-35/Source/Configuration.cpp b/Devices/elecrow-crowpanel-advance-35/Source/Configuration.cpp
index 0e8b0418d..1e27e3438 100644
--- a/Devices/elecrow-crowpanel-advance-35/Source/Configuration.cpp
+++ b/Devices/elecrow-crowpanel-advance-35/Source/Configuration.cpp
@@ -1,5 +1,4 @@
 #include "devices/Display.h"
-#include <driver/gpio.h>
 
 #include <Tactility/hal/Configuration.h>
 #include <PwmBacklight.h>
diff --git a/Devices/elecrow-crowpanel-advance-50/Source/Configuration.cpp b/Devices/elecrow-crowpanel-advance-50/Source/Configuration.cpp
index 73b8fca3c..42d3e88a3 100644
--- a/Devices/elecrow-crowpanel-advance-50/Source/Configuration.cpp
+++ b/Devices/elecrow-crowpanel-advance-50/Source/Configuration.cpp
@@ -1,5 +1,4 @@
 #include "devices/Display.h"
-#include <driver/gpio.h>
 
 #include <Tactility/hal/Configuration.h>
 #include <TCA9534.h>
diff --git a/Devices/elecrow-crowpanel-basic-28/Source/Configuration.cpp b/Devices/elecrow-crowpanel-basic-28/Source/Configuration.cpp
index 59cf64f6b..f413f9d3e 100644
--- a/Devices/elecrow-crowpanel-basic-28/Source/Configuration.cpp
+++ b/Devices/elecrow-crowpanel-basic-28/Source/Configuration.cpp
@@ -1,6 +1,5 @@
 #include "PwmBacklight.h"
 #include "devices/Display.h"
-#include <driver/gpio.h>
 
 #include <Tactility/hal/Configuration.h>
 
diff --git a/Devices/elecrow-crowpanel-basic-35/Source/Configuration.cpp b/Devices/elecrow-crowpanel-basic-35/Source/Configuration.cpp
index 59cf64f6b..f413f9d3e 100644
--- a/Devices/elecrow-crowpanel-basic-35/Source/Configuration.cpp
+++ b/Devices/elecrow-crowpanel-basic-35/Source/Configuration.cpp
@@ -1,6 +1,5 @@
 #include "PwmBacklight.h"
 #include "devices/Display.h"
-#include <driver/gpio.h>
 
 #include <Tactility/hal/Configuration.h>
 
diff --git a/Devices/elecrow-crowpanel-basic-50/Source/Configuration.cpp b/Devices/elecrow-crowpanel-basic-50/Source/Configuration.cpp
index 7fbe23221..0d7f313eb 100644
--- a/Devices/elecrow-crowpanel-basic-50/Source/Configuration.cpp
+++ b/Devices/elecrow-crowpanel-basic-50/Source/Configuration.cpp
@@ -1,5 +1,4 @@
 #include "devices/Display.h"
-#include <driver/gpio.h>
 
 #include <Tactility/hal/Configuration.h>
 #include <PwmBacklight.h>
diff --git a/Devices/guition-jc3248w535c/Source/Axs15231b/Axs15231bDisplay.cpp b/Devices/guition-jc3248w535c/Source/Axs15231b/Axs15231bDisplay.cpp
index e2c8bc4e0..762cd41ab 100644
--- a/Devices/guition-jc3248w535c/Source/Axs15231b/Axs15231bDisplay.cpp
+++ b/Devices/guition-jc3248w535c/Source/Axs15231b/Axs15231bDisplay.cpp
@@ -2,7 +2,6 @@
 
 #include <Tactility/Logger.h>
 #include <Tactility/hal/touch/TouchDevice.h>
-#include <Tactility/lvgl/LvglSync.h>
 #include <Axs15231b/Axs15231bTouch.h>
 #include <EspLcdDisplayDriver.h>
 
diff --git a/Devices/guition-jc3248w535c/Source/Configuration.cpp b/Devices/guition-jc3248w535c/Source/Configuration.cpp
index f35f8e659..cf1a8f69c 100644
--- a/Devices/guition-jc3248w535c/Source/Configuration.cpp
+++ b/Devices/guition-jc3248w535c/Source/Configuration.cpp
@@ -1,5 +1,4 @@
 #include "devices/Display.h"
-#include <driver/gpio.h>
 
 #include <Tactility/hal/Configuration.h>
 #include <PwmBacklight.h>
diff --git a/Devices/guition-jc8048w550c/Source/Configuration.cpp b/Devices/guition-jc8048w550c/Source/Configuration.cpp
index f19ffaf92..3e384edb3 100644
--- a/Devices/guition-jc8048w550c/Source/Configuration.cpp
+++ b/Devices/guition-jc8048w550c/Source/Configuration.cpp
@@ -1,6 +1,5 @@
 #include "PwmBacklight.h"
 #include "devices/Display.h"
-#include <driver/gpio.h>
 
 #include <Tactility/hal/Configuration.h>
 
diff --git a/Devices/lilygo-tdeck/Source/Configuration.cpp b/Devices/lilygo-tdeck/Source/Configuration.cpp
index 3eca6c8e9..fc6af509b 100644
--- a/Devices/lilygo-tdeck/Source/Configuration.cpp
+++ b/Devices/lilygo-tdeck/Source/Configuration.cpp
@@ -5,7 +5,6 @@
 #include "devices/TrackballDevice.h"
 
 #include <Tactility/hal/Configuration.h>
-#include <Tactility/lvgl/LvglSync.h>
 #include <tactility/check.h>
 #include <tactility/device.h>
 
diff --git a/Devices/lilygo-tlora-pager/Source/Configuration.cpp b/Devices/lilygo-tlora-pager/Source/Configuration.cpp
index 9be746363..5309e1aeb 100644
--- a/Devices/lilygo-tlora-pager/Source/Configuration.cpp
+++ b/Devices/lilygo-tlora-pager/Source/Configuration.cpp
@@ -2,7 +2,6 @@
 #include "devices/TpagerEncoder.h"
 #include "devices/TpagerKeyboard.h"
 #include "devices/TpagerPower.h"
-#include <driver/gpio.h>
 #include <tactility/device.h>
 
 #include <Tactility/hal/Configuration.h>
diff --git a/Devices/m5stack-cardputer-adv/Source/Configuration.cpp b/Devices/m5stack-cardputer-adv/Source/Configuration.cpp
index 41906807f..81001b2c2 100644
--- a/Devices/m5stack-cardputer-adv/Source/Configuration.cpp
+++ b/Devices/m5stack-cardputer-adv/Source/Configuration.cpp
@@ -1,7 +1,6 @@
 #include "devices/Display.h"
 #include "devices/CardputerKeyboard.h"
 #include "devices/CardputerPower.h"
-#include <driver/gpio.h>
 
 #include <tactility/device.h>
 #include <Tactility/hal/Configuration.h>
diff --git a/Devices/m5stack-cardputer/Source/Configuration.cpp b/Devices/m5stack-cardputer/Source/Configuration.cpp
index d7f52ed0c..cb40a59d5 100644
--- a/Devices/m5stack-cardputer/Source/Configuration.cpp
+++ b/Devices/m5stack-cardputer/Source/Configuration.cpp
@@ -2,7 +2,6 @@
 #include "devices/CardputerEncoder.h"
 #include "devices/CardputerKeyboard.h"
 #include "devices/CardputerPower.h"
-#include <driver/gpio.h>
 
 #include <PwmBacklight.h>
 #include <Tactility/hal/Configuration.h>
diff --git a/Devices/m5stack-cores3/Source/Configuration.cpp b/Devices/m5stack-cores3/Source/Configuration.cpp
index cad04d565..f848637da 100644
--- a/Devices/m5stack-cores3/Source/Configuration.cpp
+++ b/Devices/m5stack-cores3/Source/Configuration.cpp
@@ -1,6 +1,5 @@
 #include "InitBoot.h"
 #include "devices/Display.h"
-#include <driver/gpio.h>
 
 #include <Tactility/hal/Configuration.h>
 #include <Axp2101Power.h>
diff --git a/Devices/m5stack-stackchan/Source/Configuration.cpp b/Devices/m5stack-stackchan/Source/Configuration.cpp
index 3a1eea9d5..2faa63b30 100644
--- a/Devices/m5stack-stackchan/Source/Configuration.cpp
+++ b/Devices/m5stack-stackchan/Source/Configuration.cpp
@@ -1,6 +1,5 @@
 #include "devices/Display.h"
 #include "devices/Power.h"
-#include <driver/gpio.h>
 
 #include <tactility/device.h>
 #include <tactility/drivers/i2c_controller.h>
diff --git a/Devices/m5stack-stickc-plus2/Source/Configuration.cpp b/Devices/m5stack-stickc-plus2/Source/Configuration.cpp
index d6307a618..c4bc35148 100644
--- a/Devices/m5stack-stickc-plus2/Source/Configuration.cpp
+++ b/Devices/m5stack-stickc-plus2/Source/Configuration.cpp
@@ -1,5 +1,4 @@
 #include "devices/Display.h"
-#include <driver/gpio.h>
 
 #include <Tactility/hal/Configuration.h>
 #include <ButtonControl.h>
diff --git a/Devices/m5stack-sticks3/Source/Configuration.cpp b/Devices/m5stack-sticks3/Source/Configuration.cpp
index 501726d02..6a0fbf159 100644
--- a/Devices/m5stack-sticks3/Source/Configuration.cpp
+++ b/Devices/m5stack-sticks3/Source/Configuration.cpp
@@ -1,6 +1,5 @@
 #include "devices/Display.h"
 #include "devices/Power.h"
-#include <driver/gpio.h>
 
 #include <tactility/device.h>
 #include <tactility/drivers/i2c_controller.h>
diff --git a/Devices/waveshare-s3-lcd-13/Source/Configuration.cpp b/Devices/waveshare-s3-lcd-13/Source/Configuration.cpp
index b8d6553da..6b77798ba 100644
--- a/Devices/waveshare-s3-lcd-13/Source/Configuration.cpp
+++ b/Devices/waveshare-s3-lcd-13/Source/Configuration.cpp
@@ -1,5 +1,4 @@
 #include "devices/Display.h"
-#include <driver/gpio.h>
 
 #include <Tactility/hal/Configuration.h>
 #include <PwmBacklight.h>
diff --git a/Devices/waveshare-s3-touch-lcd-128/Source/Configuration.cpp b/Devices/waveshare-s3-touch-lcd-128/Source/Configuration.cpp
index c78cfff15..626c12a9b 100644
--- a/Devices/waveshare-s3-touch-lcd-128/Source/Configuration.cpp
+++ b/Devices/waveshare-s3-touch-lcd-128/Source/Configuration.cpp
@@ -1,5 +1,4 @@
 #include "devices/Display.h"
-#include <driver/gpio.h>
 
 #include <Tactility/hal/Configuration.h>
 #include <PwmBacklight.h>
diff --git a/Devices/wireless-tag-wt32-sc01-plus/Source/Configuration.cpp b/Devices/wireless-tag-wt32-sc01-plus/Source/Configuration.cpp
index ce0fb67f9..5cb40ebcf 100644
--- a/Devices/wireless-tag-wt32-sc01-plus/Source/Configuration.cpp
+++ b/Devices/wireless-tag-wt32-sc01-plus/Source/Configuration.cpp
@@ -1,5 +1,4 @@
 #include "devices/Display.h"
-#include <driver/gpio.h>
 
 #include <Tactility/hal/Configuration.h>
 #include <PwmBacklight.h>