diff --git a/variants/xiao_c3/platformio.ini b/variants/xiao_c3/platformio.ini
index 95142269..c5254b46 100644
--- a/variants/xiao_c3/platformio.ini
+++ b/variants/xiao_c3/platformio.ini
@@ -3,9 +3,6 @@ extends = esp32_base
 board = seeed_xiao_esp32c3
 build_flags =
   ${esp32_base.build_flags}
-  ${sensor_base.build_flags}
-  -UENV_INCLUDE_GPS
-  -UENV_INCLUDE_VL53L0X
   -I variants/xiao_c3
   -D ESP32_CPU_FREQ=80
   -D PIN_VBAT_READ=D0
@@ -29,7 +26,6 @@ build_src_filter = ${esp32_base.build_src_filter}
   +<helpers/sensors>
 lib_deps =
   ${esp32_base.lib_deps}
-  ${sensor_base.lib_deps}
 
 [env:Xiao_C3_repeater]
 extends = Xiao_esp32_C3
@@ -37,6 +33,9 @@ build_src_filter = ${Xiao_esp32_C3.build_src_filter}
   +<../examples/simple_repeater/*.cpp>
 build_flags =
   ${Xiao_esp32_C3.build_flags}
+  ${sensor_base.build_flags}
+  -UENV_INCLUDE_GPS
+  -UENV_INCLUDE_VL53L0X
   -D ADVERT_NAME='"Xiao C3 Repeater"'
   -D ADVERT_LAT=0.0
   -D ADVERT_LON=0.0
@@ -46,6 +45,7 @@ build_flags =
 ;  -D MESH_DEBUG=1
 lib_deps =
   ${Xiao_esp32_C3.lib_deps}
+  ${sensor_base.lib_deps}
   ${esp32_ota.lib_deps}
   bakercp/CRC32 @ ^2.0.0
 
@@ -55,6 +55,9 @@ build_src_filter = ${Xiao_esp32_C3.build_src_filter}
   +<../examples/simple_room_server/*.cpp>
 build_flags =
   ${Xiao_esp32_C3.build_flags}
+  ${sensor_base.build_flags}
+  -UENV_INCLUDE_GPS
+  -UENV_INCLUDE_VL53L0X
   -D ADVERT_NAME='"Xiao C3 Room"'
   -D ADVERT_LAT=0.0
   -D ADVERT_LON=0.0
@@ -64,6 +67,7 @@ build_flags =
 ;  -D MESH_DEBUG=1
 lib_deps =
   ${Xiao_esp32_C3.lib_deps}
+  ${sensor_base.lib_deps}
   ${esp32_ota.lib_deps}
   bakercp/CRC32 @ ^2.0.0