diff --git a/variants/xiao_c6/target.cpp b/variants/xiao_c6/XiaoC6Board.cpp
similarity index 99%
rename from variants/xiao_c6/target.cpp
rename to variants/xiao_c6/XiaoC6Board.cpp
index ff77474a..555fed62 100644
--- a/variants/xiao_c6/target.cpp
+++ b/variants/xiao_c6/XiaoC6Board.cpp
@@ -47,3 +47,5 @@ mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);  // create new random identity
 }
+
+
diff --git a/src/helpers/esp32/XiaoC6Board.h b/variants/xiao_c6/XiaoC6Board.h
similarity index 100%
rename from src/helpers/esp32/XiaoC6Board.h
rename to variants/xiao_c6/XiaoC6Board.h
diff --git a/variants/xiao_c6/platformio.ini b/variants/xiao_c6/platformio.ini
index c27df55e..95dede08 100644
--- a/variants/xiao_c6/platformio.ini
+++ b/variants/xiao_c6/platformio.ini
@@ -28,6 +28,7 @@ build_flags =
   -D DISABLE_WIFI_OTA=1
 build_src_filter = ${esp32c6_base.build_src_filter}
   +<../variants/xiao_c6>
+  +<XiaoC6Board.cpp>
 
 [env:Xiao_C6_Repeater]
 extends = Xiao_C6
diff --git a/variants/xiao_c6/target.h b/variants/xiao_c6/target.h
index e1469228..0fbb0bb2 100644
--- a/variants/xiao_c6/target.h
+++ b/variants/xiao_c6/target.h
@@ -2,9 +2,9 @@
 
 #define RADIOLIB_STATIC_ONLY 1
 #include <RadioLib.h>
+#include <XiaoC6Board.h>
 #include <helpers/radiolib/RadioLibWrappers.h>
 #include <helpers/ESP32Board.h>
-#include <helpers/esp32/XiaoC6Board.h>
 #include <helpers/radiolib/CustomSX1262Wrapper.h>
 #include <helpers/AutoDiscoverRTCClock.h>
 #include <helpers/SensorManager.h>