diff --git a/Devices/lilygo-tdeck/Source/Configuration.cpp b/Devices/lilygo-tdeck/Source/Configuration.cpp
index e0c56eaa..4f620ace 100644
--- a/Devices/lilygo-tdeck/Source/Configuration.cpp
+++ b/Devices/lilygo-tdeck/Source/Configuration.cpp
@@ -15,7 +15,7 @@ bool initBoot();
 using namespace tt::hal;
 
 static std::vector<std::shared_ptr<tt::hal::Device>> createDevices() {
-    auto* i2c_internal = device_find_by_name("i2c_internal");
+    auto* i2c_internal = device_find_by_name("i2c0");
     check(i2c_internal);
     return {
         createPower(),
diff --git a/Devices/lilygo-tdeck/Source/devices/KeyboardBacklight.cpp b/Devices/lilygo-tdeck/Source/devices/KeyboardBacklight.cpp
index 41ef5b67..42e70596 100644
--- a/Devices/lilygo-tdeck/Source/devices/KeyboardBacklight.cpp
+++ b/Devices/lilygo-tdeck/Source/devices/KeyboardBacklight.cpp
@@ -1,6 +1,5 @@
 #include "KeyboardBacklight.h"
 #include <KeyboardBacklight/KeyboardBacklight.h>  // Driver
-#include <Tactility/hal/i2c/I2c.h>
 #include <Tactility/settings/KeyboardSettings.h>
 
 // TODO: Add Mutex and consider refactoring into a class
diff --git a/Devices/lilygo-tdeck/Source/devices/TdeckKeyboard.h b/Devices/lilygo-tdeck/Source/devices/TdeckKeyboard.h
index e9599498..5695ce82 100644
--- a/Devices/lilygo-tdeck/Source/devices/TdeckKeyboard.h
+++ b/Devices/lilygo-tdeck/Source/devices/TdeckKeyboard.h
@@ -1,23 +1,22 @@
 #pragma once
 
 #include <Tactility/hal/keyboard/KeyboardDevice.h>
-#include <Tactility/TactilityCore.h>
 
 struct Device;
 
 class TdeckKeyboard final : public tt::hal::keyboard::KeyboardDevice {
 
-    Device* i2cController;
+    ::Device* i2cController;
     lv_indev_t* deviceHandle = nullptr;
 
 public:
 
-    explicit TdeckKeyboard(Device* i2cController) : i2cController(i2cController) {}
+    explicit TdeckKeyboard(::Device* i2cController) : i2cController(i2cController) {}
 
     std::string getName() const override { return "T-Deck Keyboard"; }
     std::string getDescription() const override { return "I2C keyboard"; }
 
-    Device* getI2cController() const { return i2cController; }
+    ::Device* getI2cController() const { return i2cController; }
 
     bool startLvgl(lv_display_t* display) override;
     bool stopLvgl() override;
diff --git a/Devices/lilygo-tlora-pager/Source/devices/TpagerKeyboard.cpp b/Devices/lilygo-tlora-pager/Source/devices/TpagerKeyboard.cpp
index 5bea8162..902da0f2 100644
--- a/Devices/lilygo-tlora-pager/Source/devices/TpagerKeyboard.cpp
+++ b/Devices/lilygo-tlora-pager/Source/devices/TpagerKeyboard.cpp
@@ -1,6 +1,5 @@
 #include "TpagerKeyboard.h"
 
-#include <Tactility/hal/i2c/I2c.h>
 #include <Tactility/Logger.h>
 
 #include <driver/i2c.h>
diff --git a/Devices/m5stack-cores3/Source/devices/Display.cpp b/Devices/m5stack-cores3/Source/devices/Display.cpp
index 7ff3f56f..2c28fe5d 100644
--- a/Devices/m5stack-cores3/Source/devices/Display.cpp
+++ b/Devices/m5stack-cores3/Source/devices/Display.cpp
@@ -4,7 +4,6 @@
 #include <Ft5x06Touch.h>
 #include <Ili934xDisplay.h>
 #include <Tactility/Logger.h>
-#include <Tactility/hal/i2c/I2c.h>
 
 static const auto LOGGER = tt::Logger("CoreS3Display");
 
diff --git a/Devices/m5stack-stackchan/Source/devices/Display.cpp b/Devices/m5stack-stackchan/Source/devices/Display.cpp
index e1da002f..ba6818eb 100644
--- a/Devices/m5stack-stackchan/Source/devices/Display.cpp
+++ b/Devices/m5stack-stackchan/Source/devices/Display.cpp
@@ -4,7 +4,6 @@
 #include <Ft6x36Touch.h>
 #include <Ili934xDisplay.h>
 #include <Tactility/Logger.h>
-#include <Tactility/hal/i2c/I2c.h>
 
 static const auto LOGGER = tt::Logger("StackChanDisplay");
 
diff --git a/Devices/m5stack-tab5/Source/Configuration.cpp b/Devices/m5stack-tab5/Source/Configuration.cpp
index dd9dec53..e1f3348d 100644
--- a/Devices/m5stack-tab5/Source/Configuration.cpp
+++ b/Devices/m5stack-tab5/Source/Configuration.cpp
@@ -7,7 +7,6 @@
 #include <tactility/drivers/i2c_controller.h>
 
 #include <Tactility/hal/Configuration.h>
-#include <Tactility/hal/i2c/I2c.h>
 
 using namespace tt::hal;
 
diff --git a/Drivers/AXP192/Include/Axp192.h b/Drivers/AXP192/Include/Axp192.h
index e771d5c6..cc11bb82 100644
--- a/Drivers/AXP192/Include/Axp192.h
+++ b/Drivers/AXP192/Include/Axp192.h
@@ -3,7 +3,6 @@
 #include <axp192/axp192.h>
 #include <tactility/device.h>
 #include <Tactility/hal/power/PowerDevice.h>
-#include <Tactility/hal/i2c/I2c.h>
 
 #include <memory>