diff --git a/src/main/drivers/accgyro/accgyro.h b/src/main/drivers/accgyro/accgyro.h
index 8c83cb0e57..9ef8b90ee6 100644
--- a/src/main/drivers/accgyro/accgyro.h
+++ b/src/main/drivers/accgyro/accgyro.h
@@ -27,7 +27,7 @@
 #include "drivers/bus.h"
 #include "drivers/sensor.h"
 #include "drivers/accgyro/accgyro_mpu.h"
-#include "sensors/gyro.h"
+
 #pragma GCC diagnostic push
 #if defined(SIMULATOR_BUILD) && defined(SIMULATOR_MULTITHREAD)
 #include <pthread.h>
@@ -39,6 +39,25 @@
 #define MPU_I2C_INSTANCE I2C_DEVICE
 #endif
 
+typedef enum {
+    GYRO_NONE = 0,
+    GYRO_DEFAULT,
+    GYRO_MPU6050,
+    GYRO_L3G4200D,
+    GYRO_MPU3050,
+    GYRO_L3GD20,
+    GYRO_MPU6000,
+    GYRO_MPU6500,
+    GYRO_MPU9250,
+    GYRO_ICM20601,
+    GYRO_ICM20602,
+    GYRO_ICM20608G,
+    GYRO_ICM20649,
+    GYRO_ICM20689,
+    GYRO_BMI160,
+    GYRO_FAKE
+} gyroHardware_e;
+
 typedef enum {
     GYRO_HARDWARE_LPF_NORMAL,
     GYRO_HARDWARE_LPF_1KHZ_SAMPLE,
@@ -88,7 +107,7 @@ typedef struct gyroDev_s {
     uint8_t mpuDividerDrops;
     ioTag_t mpuIntExtiTag;
     uint8_t gyroHasOverflowProtection;
-    gyroSensor_e gyroHardware;
+    gyroHardware_e gyroHardware;
 } gyroDev_t;
 
 typedef struct accDev_s {
diff --git a/src/main/sensors/gyro.c b/src/main/sensors/gyro.c
index 6cbaa52df9..f5215b739d 100644
--- a/src/main/sensors/gyro.c
+++ b/src/main/sensors/gyro.c
@@ -267,9 +267,9 @@ const mpuDetectionResult_t *gyroMpuDetectionResult(void)
 #endif
 }
 
-STATIC_UNIT_TESTED gyroSensor_e gyroDetect(gyroDev_t *dev)
+STATIC_UNIT_TESTED gyroHardware_e gyroDetect(gyroDev_t *dev)
 {
-    gyroSensor_e gyroHardware = GYRO_DEFAULT;
+    gyroHardware_e gyroHardware = GYRO_DEFAULT;
 
     switch (gyroHardware) {
     case GYRO_DEFAULT:
@@ -450,7 +450,7 @@ static bool gyroInitSensor(gyroSensor_t *gyroSensor)
     mpuResetFn = gyroSensor->gyroDev.mpuConfiguration.resetFn; // must be set after mpuDetect
 #endif
 
-    const gyroSensor_e gyroHardware = gyroDetect(&gyroSensor->gyroDev);
+    const gyroHardware_e gyroHardware = gyroDetect(&gyroSensor->gyroDev);
     gyroSensor->gyroDev.gyroHardware = gyroHardware;
     if (gyroHardware == GYRO_NONE) {
         return false;
diff --git a/src/main/sensors/gyro.h b/src/main/sensors/gyro.h
index c22c28a2b4..e289667420 100644
--- a/src/main/sensors/gyro.h
+++ b/src/main/sensors/gyro.h
@@ -29,25 +29,6 @@
 
 #include "pg/pg.h"
 
-typedef enum {
-    GYRO_NONE = 0,
-    GYRO_DEFAULT,
-    GYRO_MPU6050,
-    GYRO_L3G4200D,
-    GYRO_MPU3050,
-    GYRO_L3GD20,
-    GYRO_MPU6000,
-    GYRO_MPU6500,
-    GYRO_MPU9250,
-    GYRO_ICM20601,
-    GYRO_ICM20602,
-    GYRO_ICM20608G,
-    GYRO_ICM20649,
-    GYRO_ICM20689,
-    GYRO_BMI160,
-    GYRO_FAKE
-} gyroSensor_e;
-
 typedef struct gyro_s {
     uint32_t targetLooptime;
     float gyroADCf[XYZ_AXIS_COUNT];
diff --git a/src/test/unit/sensor_gyro_unittest.cc b/src/test/unit/sensor_gyro_unittest.cc
index a88cdaf276..b132e44683 100644
--- a/src/test/unit/sensor_gyro_unittest.cc
+++ b/src/test/unit/sensor_gyro_unittest.cc
@@ -40,7 +40,7 @@ extern "C" {
     #include "sensors/acceleration.h"
     #include "sensors/sensors.h"
 
-    STATIC_UNIT_TESTED gyroSensor_e gyroDetect(gyroDev_t *dev);
+    STATIC_UNIT_TESTED gyroHardware_e gyroDetect(gyroDev_t *dev);
     struct gyroSensor_s;
     STATIC_UNIT_TESTED void performGyroCalibration(struct gyroSensor_s *gyroSensor, uint8_t gyroMovementCalibrationThreshold);
     STATIC_UNIT_TESTED bool fakeGyroRead(gyroDev_t *gyro);
@@ -57,7 +57,7 @@ extern gyroDev_t * const gyroDevPtr;
 
 TEST(SensorGyro, Detect)
 {
-    const gyroSensor_e detected = gyroDetect(gyroDevPtr);
+    const gyroHardware_e detected = gyroDetect(gyroDevPtr);
     EXPECT_EQ(GYRO_FAKE, detected);
     EXPECT_EQ(GYRO_FAKE, detectedSensors[SENSOR_INDEX_GYRO]);
 }