diff --git a/src/main/io/osd.c b/src/main/io/osd.c
index eb22c96960..6b19703cbc 100644
--- a/src/main/io/osd.c
+++ b/src/main/io/osd.c
@@ -1754,10 +1754,11 @@ static bool osdDrawSingleElement(uint8_t item)
 
     case OSD_REMAINING_FLIGHT_TIME_BEFORE_RTH:
         {
-            static timeUs_t updatedTimestamp = 0;
             /*static int32_t updatedTimeSeconds = 0;*/
-            timeUs_t currentTimeUs = micros();
             static int32_t timeSeconds = -1;
+#if defined(USE_ADC) && defined(USE_GPS)
+            static timeUs_t updatedTimestamp = 0;
+            timeUs_t currentTimeUs = micros();
             if (cmpTimeUs(currentTimeUs, updatedTimestamp) >= MS2US(1000)) {
 #ifdef USE_WIND_ESTIMATOR
                 timeSeconds = calculateRemainingFlightTimeBeforeRTH(osdConfig()->estimations_wind_compensation);
@@ -1766,10 +1767,13 @@ static bool osdDrawSingleElement(uint8_t item)
 #endif
                 updatedTimestamp = currentTimeUs;
             }
+#endif
             if ((!ARMING_FLAG(ARMED)) || (timeSeconds == -1)) {
                 buff[0] = SYM_FLY_M;
                 strcpy(buff + 1, "--:--");
+#if defined(USE_ADC) && defined(USE_GPS)
                 updatedTimestamp = 0;
+#endif
             } else if (timeSeconds == -2) {
                 // Wind is too strong to come back with cruise throttle
                 buff[0] = SYM_FLY_M;
@@ -1786,9 +1790,10 @@ static bool osdDrawSingleElement(uint8_t item)
         break;
 
     case OSD_REMAINING_DISTANCE_BEFORE_RTH:;
+        static int32_t distanceMeters = -1;
+#if defined(USE_ADC) && defined(USE_GPS)
         static timeUs_t updatedTimestamp = 0;
         timeUs_t currentTimeUs = micros();
-        static int32_t distanceMeters = -1;
         if (cmpTimeUs(currentTimeUs, updatedTimestamp) >= MS2US(1000)) {
 #ifdef USE_WIND_ESTIMATOR
             distanceMeters = calculateRemainingDistanceBeforeRTH(osdConfig()->estimations_wind_compensation);
@@ -1797,6 +1802,7 @@ static bool osdDrawSingleElement(uint8_t item)
 #endif
             updatedTimestamp = currentTimeUs;
         }
+#endif
         buff[0] = SYM_TRIP_DIST;
         if ((!ARMING_FLAG(ARMED)) || (distanceMeters == -1)) {
             buff[4] = SYM_DIST_M;
diff --git a/src/main/target/AIKONF4/target.h b/src/main/target/AIKONF4/target.h
index d0e13b8a12..28ee33cf22 100644
--- a/src/main/target/AIKONF4/target.h
+++ b/src/main/target/AIKONF4/target.h
@@ -146,7 +146,6 @@
 #define TARGET_IO_PORTC         0xffff
 #define TARGET_IO_PORTD         0xffff
 
-#define USE_OSD
 #define USE_MAX7456
 #define MAX7456_SPI_BUS         BUS_SPI3
 #define MAX7456_CS_PIN          SPI3_NSS_PIN
diff --git a/src/main/target/AIRBOTF7/target.h b/src/main/target/AIRBOTF7/target.h
index 4a554cdd56..460d2ae820 100644
--- a/src/main/target/AIRBOTF7/target.h
+++ b/src/main/target/AIRBOTF7/target.h
@@ -59,7 +59,6 @@
 #endif
 
 // *************** OSD *****************************
-#define USE_OSD
 #define USE_MAX7456
 #define MAX7456_SPI_BUS         BUS_SPI2
 #define MAX7456_CS_PIN          PC15
diff --git a/src/main/target/ALIENFLIGHTNGF7/target.h b/src/main/target/ALIENFLIGHTNGF7/target.h
index 9f48f87c37..8e727f1171 100644
--- a/src/main/target/ALIENFLIGHTNGF7/target.h
+++ b/src/main/target/ALIENFLIGHTNGF7/target.h
@@ -138,7 +138,6 @@
 #define I2C1_SCL                PB6
 #define I2C1_SDA                PB7
 
-#define USE_OSD
 #define USE_MAX7456
 #define MAX7456_SPI_BUS         BUS_SPI3
 #define MAX7456_CS_PIN          PB12
diff --git a/src/main/target/ANYFCF7/target.h b/src/main/target/ANYFCF7/target.h
index fbd9683c92..0d9b879e04 100644
--- a/src/main/target/ANYFCF7/target.h
+++ b/src/main/target/ANYFCF7/target.h
@@ -125,7 +125,6 @@
 #define SPI4_MISO_PIN           PE13
 #define SPI4_MOSI_PIN           PE14
 
-#define USE_OSD
 #define USE_MAX7456
 #define MAX7456_SPI_BUS         BUS_SPI3
 #define MAX7456_CS_PIN          SPI3_NSS_PIN
diff --git a/src/main/target/ANYFCM7/target.h b/src/main/target/ANYFCM7/target.h
index 0bb51355ec..2ba9486297 100644
--- a/src/main/target/ANYFCM7/target.h
+++ b/src/main/target/ANYFCM7/target.h
@@ -111,7 +111,6 @@
 #define USE_FLASH_M25P16
 #define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT
 
-#define USE_OSD
 #define USE_MAX7456
 #define MAX7456_SPI_BUS         BUS_SPI3
 #define MAX7456_CS_PIN          SPI3_NSS_PIN
diff --git a/src/main/target/ASGARD32F4/target.h b/src/main/target/ASGARD32F4/target.h
index d9018a5cd9..ea2699dc2f 100644
--- a/src/main/target/ASGARD32F4/target.h
+++ b/src/main/target/ASGARD32F4/target.h
@@ -117,7 +117,6 @@
 #define SPI3_MISO_PIN           PB4
 #define SPI3_MOSI_PIN           PB5
 
-#define USE_OSD
 #define USE_MAX7456
 #define MAX7456_SPI_BUS         BUS_SPI3
 #define MAX7456_CS_PIN          PA15
diff --git a/src/main/target/ASGARD32F7/target.h b/src/main/target/ASGARD32F7/target.h
index 97e2ad210e..dc82fb74be 100644
--- a/src/main/target/ASGARD32F7/target.h
+++ b/src/main/target/ASGARD32F7/target.h
@@ -119,7 +119,6 @@
 #define SPI3_MISO_PIN           PB4
 #define SPI3_MOSI_PIN           PB5
 
-#define USE_OSD
 #define USE_MAX7456
 #define MAX7456_SPI_BUS         BUS_SPI3
 #define MAX7456_CS_PIN          PA15
diff --git a/src/main/target/BEEROTORF4/target.h b/src/main/target/BEEROTORF4/target.h
index 9d86514f9d..9c78cf7738 100644
--- a/src/main/target/BEEROTORF4/target.h
+++ b/src/main/target/BEEROTORF4/target.h
@@ -57,7 +57,6 @@
 #define TEMPERATURE_I2C_BUS     BUS_I2C1
 #define BNO055_I2C_BUS          BUS_I2C1
 
-#define USE_OSD
 #define USE_MAX7456
 #define MAX7456_SPI_BUS         BUS_SPI3
 #define MAX7456_CS_PIN          SPI3_NSS_PIN
diff --git a/src/main/target/BETAFLIGHTF3/target.h b/src/main/target/BETAFLIGHTF3/target.h
index 1c4cc3fe68..71e469db2c 100755
--- a/src/main/target/BETAFLIGHTF3/target.h
+++ b/src/main/target/BETAFLIGHTF3/target.h
@@ -79,7 +79,6 @@
 #define SPI2_MISO_PIN           PB14
 #define SPI2_MOSI_PIN           PB15
 
-#define USE_OSD
 #define USE_MAX7456
 #define MAX7456_SPI_BUS         BUS_SPI1
 #define MAX7456_CS_PIN          PA1
diff --git a/src/main/target/BETAFLIGHTF4/target.h b/src/main/target/BETAFLIGHTF4/target.h
index 872327b41a..4116a52001 100755
--- a/src/main/target/BETAFLIGHTF4/target.h
+++ b/src/main/target/BETAFLIGHTF4/target.h
@@ -45,7 +45,6 @@
 #define BMP280_SPI_BUS		BUS_SPI2
 #define BMP280_CS_PIN           PB3
 
-#define USE_OSD
 #define USE_MAX7456
 #define MAX7456_SPI_BUS		BUS_SPI2
 #define MAX7456_CS_PIN      PB12
diff --git a/src/main/target/CLRACINGF4AIR/target.h b/src/main/target/CLRACINGF4AIR/target.h
index 56c3918aff..45778103a9 100644
--- a/src/main/target/CLRACINGF4AIR/target.h
+++ b/src/main/target/CLRACINGF4AIR/target.h
@@ -64,7 +64,6 @@
 #define BMP280_SPI_BUS          BUS_SPI3
 #define BMP280_CS_PIN           PB3
 
-#define USE_OSD
 #define USE_MAX7456
 #define MAX7456_SPI_BUS         BUS_SPI3
 #define MAX7456_CS_PIN          PA15
diff --git a/src/main/target/DALRCF405/target.h b/src/main/target/DALRCF405/target.h
index 0b37dc2c11..22964f555a 100644
--- a/src/main/target/DALRCF405/target.h
+++ b/src/main/target/DALRCF405/target.h
@@ -66,7 +66,6 @@
 #define SPI3_MISO_PIN           PC11
 #define SPI3_MOSI_PIN           PB5
 
-#define USE_OSD
 #define USE_MAX7456
 #define MAX7456_SPI_BUS         BUS_SPI3
 #define MAX7456_CS_PIN          PA15
diff --git a/src/main/target/DALRCF722DUAL/target.h b/src/main/target/DALRCF722DUAL/target.h
index ca29604c6c..2ff18eeccb 100644
--- a/src/main/target/DALRCF722DUAL/target.h
+++ b/src/main/target/DALRCF722DUAL/target.h
@@ -103,7 +103,6 @@
 #define SPI3_MISO_PIN           PB4
 #define SPI3_MOSI_PIN           PB5
 
-#define USE_OSD
 #define USE_MAX7456
 #define MAX7456_SPI_BUS         BUS_SPI2
 #define MAX7456_CS_PIN          SPI2_NSS_PIN
diff --git a/src/main/target/FF_F35_LIGHTNING/target.h b/src/main/target/FF_F35_LIGHTNING/target.h
index a916b186d7..a415ae541a 100644
--- a/src/main/target/FF_F35_LIGHTNING/target.h
+++ b/src/main/target/FF_F35_LIGHTNING/target.h
@@ -48,7 +48,6 @@
 #define BMP280_CS_PIN           PC5
 #define BMP280_SPI_BUS          BUS_SPI3
 
-#define USE_OSD
 #define USE_MAX7456
 #define MAX7456_CS_PIN          PA4
 #define MAX7456_SPI_BUS         BUS_SPI1
diff --git a/src/main/target/FF_FORTINIF4/target.h b/src/main/target/FF_FORTINIF4/target.h
index 669f4bd440..00c154dd94 100644
--- a/src/main/target/FF_FORTINIF4/target.h
+++ b/src/main/target/FF_FORTINIF4/target.h
@@ -58,7 +58,6 @@
 /*---------------------------------*/
 
 /*-------------OSD-----------------*/
-#define USE_OSD
 #define USE_MAX7456
 #define MAX7456_SPI_BUS         BUS_SPI3
 #define MAX7456_CS_PIN          PB3
diff --git a/src/main/target/FF_PIKOF4/target.h b/src/main/target/FF_PIKOF4/target.h
index 59337ad53b..244ddec53b 100644
--- a/src/main/target/FF_PIKOF4/target.h
+++ b/src/main/target/FF_PIKOF4/target.h
@@ -73,7 +73,6 @@
 
 #if defined(FF_PIKOF4OSD)
 /*-------------OSD-----------------*/
-#define USE_OSD
 #define USE_MAX7456
 #define MAX7456_SPI_BUS         BUS_SPI1
 #define MAX7456_CS_PIN          PA4
diff --git a/src/main/target/FIREWORKSV2/target.h b/src/main/target/FIREWORKSV2/target.h
index a0ea4428da..51ea748abc 100644
--- a/src/main/target/FIREWORKSV2/target.h
+++ b/src/main/target/FIREWORKSV2/target.h
@@ -175,7 +175,6 @@
 #define SPI3_MISO_PIN           PC11
 #define SPI3_MOSI_PIN           PC12
 
-#define USE_OSD
 #define USE_MAX7456
 #define MAX7456_SPI_BUS         BUS_SPI3
 #define MAX7456_CS_PIN          PA15
diff --git a/src/main/target/FISHDRONEF4/target.h b/src/main/target/FISHDRONEF4/target.h
index 45b8b5b865..331de0d918 100644
--- a/src/main/target/FISHDRONEF4/target.h
+++ b/src/main/target/FISHDRONEF4/target.h
@@ -78,7 +78,6 @@
 #define SPI2_MISO_PIN   PC2
 #define SPI2_MOSI_PIN   PC3
 
-#define USE_OSD
 #define USE_MAX7456
 #define MAX7456_SPI_BUS         BUS_SPI2
 #define MAX7456_CS_PIN          SPI2_NSS_PIN
diff --git a/src/main/target/FLYWOOF411/target.h b/src/main/target/FLYWOOF411/target.h
index 34d110d7a5..f949cbf4f6 100644
--- a/src/main/target/FLYWOOF411/target.h
+++ b/src/main/target/FLYWOOF411/target.h
@@ -88,7 +88,6 @@
 #define USE_MAG_LIS3MDL
 
 // *************** SPI OSD *****************************
-#define USE_OSD
 #define USE_MAX7456
 #define MAX7456_SPI_BUS         BUS_SPI2
 #define MAX7456_CS_PIN          PB12
diff --git a/src/main/target/FLYWOOF745/target.h b/src/main/target/FLYWOOF745/target.h
index be57e83f96..266a720ed6 100644
--- a/src/main/target/FLYWOOF745/target.h
+++ b/src/main/target/FLYWOOF745/target.h
@@ -107,7 +107,6 @@
 #define SPI4_MISO_PIN           PE5
 #define SPI4_MOSI_PIN           PE6
 
-#define USE_OSD
 
 #define USE_MAX7456
 #define MAX7456_SPI_BUS         BUS_SPI2
diff --git a/src/main/target/FLYWOOF7DUAL/target.h b/src/main/target/FLYWOOF7DUAL/target.h
index 10b8d285bb..8cae941538 100644
--- a/src/main/target/FLYWOOF7DUAL/target.h
+++ b/src/main/target/FLYWOOF7DUAL/target.h
@@ -73,7 +73,6 @@
 #define M25P16_SPI_BUS          BUS_SPI3
 
 /*** OSD ***/
-#define USE_OSD
 #define USE_MAX7456
 #define MAX7456_CS_PIN          PB12
 #define MAX7456_SPI_BUS         BUS_SPI2
diff --git a/src/main/target/FOXEERF405/target.h b/src/main/target/FOXEERF405/target.h
index 2b8d4e2ac0..2b9f5ae7a0 100644
--- a/src/main/target/FOXEERF405/target.h
+++ b/src/main/target/FOXEERF405/target.h
@@ -72,7 +72,6 @@
 #define M25P16_SPI_BUS          BUS_SPI2
 
 /*** OSD ***/
-#define USE_OSD
 #define USE_MAX7456
 #define MAX7456_SPI_BUS         BUS_SPI3
 #define MAX7456_CS_PIN          PA15
@@ -147,4 +146,5 @@
 #define TARGET_IO_PORTA         0xffff
 #define TARGET_IO_PORTB         0xffff
 #define TARGET_IO_PORTC         0xffff
-#define TARGET_IO_PORTD         (BIT(2))
\ No newline at end of file
+#define TARGET_IO_PORTD         (BIT(2))
+
diff --git a/src/main/target/FOXEERF722DUAL/target.h b/src/main/target/FOXEERF722DUAL/target.h
index b339cef7a9..f946150985 100644
--- a/src/main/target/FOXEERF722DUAL/target.h
+++ b/src/main/target/FOXEERF722DUAL/target.h
@@ -81,7 +81,6 @@
 #define M25P16_SPI_BUS          BUS_SPI2
 
 /*** OSD ***/
-#define USE_OSD
 #define USE_MAX7456
 #define MAX7456_SPI_BUS         BUS_SPI3
 #define MAX7456_CS_PIN          PC3
@@ -158,4 +157,5 @@
 #define TARGET_IO_PORTA         0xffff
 #define TARGET_IO_PORTB         0xffff
 #define TARGET_IO_PORTC         0xffff
-#define TARGET_IO_PORTD         (BIT(2))
\ No newline at end of file
+#define TARGET_IO_PORTD         (BIT(2))
+
diff --git a/src/main/target/FRSKYF3/target.h b/src/main/target/FRSKYF3/target.h
index b046c399cb..304fa22214 100644
--- a/src/main/target/FRSKYF3/target.h
+++ b/src/main/target/FRSKYF3/target.h
@@ -56,7 +56,6 @@
 #define I2C1_SDA                PB7
 
 #define USE_SPI
-#define USE_OSD
 
 // include the max7456 driver
 #define USE_MAX7456
diff --git a/src/main/target/FRSKYF4/target.h b/src/main/target/FRSKYF4/target.h
index 4d950a18a7..9b6cee6b39 100755
--- a/src/main/target/FRSKYF4/target.h
+++ b/src/main/target/FRSKYF4/target.h
@@ -37,7 +37,6 @@
 #define BMP280_SPI_BUS          BUS_SPI3
 #define BMP280_CS_PIN           PB3
 
-#define USE_OSD
 #define USE_MAX7456
 #define MAX7456_SPI_BUS         BUS_SPI3
 #define MAX7456_CS_PIN          PA15
diff --git a/src/main/target/FRSKYPILOT/target.h b/src/main/target/FRSKYPILOT/target.h
index d4da84dde0..2dd56aa73d 100644
--- a/src/main/target/FRSKYPILOT/target.h
+++ b/src/main/target/FRSKYPILOT/target.h
@@ -152,7 +152,6 @@
 #define UART5_AF                1
 
 // OSD
-#define USE_OSD
 #define USE_UART6
 #define UART6_TX_PIN            PC6
 #define UART6_RX_PIN            PC7
diff --git a/src/main/target/FRSKY_ROVERF7/target.h b/src/main/target/FRSKY_ROVERF7/target.h
index 6347cd9bd9..f729d2bd60 100755
--- a/src/main/target/FRSKY_ROVERF7/target.h
+++ b/src/main/target/FRSKY_ROVERF7/target.h
@@ -87,7 +87,6 @@
 #define SPI3_MISO_PIN           PB4
 #define SPI3_MOSI_PIN           PB5
 
-#define USE_OSD
 #define USE_MAX7456
 #define MAX7456_SPI_BUS         BUS_SPI3
 #define MAX7456_CS_PIN          PD2
diff --git a/src/main/target/FURYF4OSD/target.h b/src/main/target/FURYF4OSD/target.h
index d5ccf15a95..5b7b75dd5b 100644
--- a/src/main/target/FURYF4OSD/target.h
+++ b/src/main/target/FURYF4OSD/target.h
@@ -67,7 +67,6 @@
 #define SPI2_MISO_PIN   	      PB14
 #define SPI2_MOSI_PIN   	      PB15
 
-#define USE_OSD
 #define USE_MAX7456
 #define MAX7456_SPI_BUS         BUS_SPI2
 #define MAX7456_CS_PIN          PB12
diff --git a/src/main/target/HGLRCF722/target.h b/src/main/target/HGLRCF722/target.h
index 440a657c1b..a2453b1e61 100644
--- a/src/main/target/HGLRCF722/target.h
+++ b/src/main/target/HGLRCF722/target.h
@@ -92,7 +92,6 @@
 #define SPI2_MISO_PIN           PB14
 #define SPI2_MOSI_PIN           PB15
 
-#define USE_OSD
 #define USE_MAX7456
 #define MAX7456_SPI_BUS         BUS_SPI2
 #define MAX7456_CS_PIN          PB12
@@ -177,4 +176,5 @@
 #define MAX_PWM_OUTPUT_PORTS        8
 #define USE_DSHOT
 #define USE_SERIALSHOT
-#define USE_ESC_SENSOR
\ No newline at end of file
+#define USE_ESC_SENSOR
+
diff --git a/src/main/target/IFLIGHTF4_SUCCEXD/target.h b/src/main/target/IFLIGHTF4_SUCCEXD/target.h
index aee436548c..7d603cc116 100644
--- a/src/main/target/IFLIGHTF4_SUCCEXD/target.h
+++ b/src/main/target/IFLIGHTF4_SUCCEXD/target.h
@@ -49,7 +49,6 @@
 #define SPI2_MISO_PIN           PB14
 #define SPI2_MOSI_PIN           PB15
 
-#define USE_OSD
 #define USE_MAX7456
 #define MAX7456_SPI_BUS         BUS_SPI2
 #define MAX7456_CS_PIN          PB12
diff --git a/src/main/target/IFLIGHTF4_TWING/target.h b/src/main/target/IFLIGHTF4_TWING/target.h
index ab5d0bf5f3..5a3943e11a 100644
--- a/src/main/target/IFLIGHTF4_TWING/target.h
+++ b/src/main/target/IFLIGHTF4_TWING/target.h
@@ -87,7 +87,6 @@
 #define SPI2_MISO_PIN           PB14
 #define SPI2_MOSI_PIN           PB15
 
-#define USE_OSD
 #define USE_MAX7456
 #define MAX7456_SPI_BUS		    BUS_SPI2
 #define MAX7456_CS_PIN          PB12 
diff --git a/src/main/target/IFLIGHTF7_TWING/target.h b/src/main/target/IFLIGHTF7_TWING/target.h
index 2fb765bce7..fb74f2d530 100644
--- a/src/main/target/IFLIGHTF7_TWING/target.h
+++ b/src/main/target/IFLIGHTF7_TWING/target.h
@@ -100,7 +100,6 @@
 #define SPI2_MISO_PIN           PB14
 #define SPI2_MOSI_PIN           PB15
 
-#define USE_OSD
 #define USE_MAX7456
 #define MAX7456_SPI_BUS         BUS_SPI2
 #define MAX7456_CS_PIN          PB12
diff --git a/src/main/target/KAKUTEF4/target.h b/src/main/target/KAKUTEF4/target.h
index 2b0f908a91..f64101ea75 100755
--- a/src/main/target/KAKUTEF4/target.h
+++ b/src/main/target/KAKUTEF4/target.h
@@ -75,7 +75,6 @@
 #   define USE_MAG
 #endif
 
-#define USE_OSD
 #define USE_MAX7456
 #define MAX7456_SPI_BUS         BUS_SPI3
 #define MAX7456_CS_PIN          PB14
diff --git a/src/main/target/KAKUTEF7/target.h b/src/main/target/KAKUTEF7/target.h
index 0d42c7e2d6..97764f6e92 100644
--- a/src/main/target/KAKUTEF7/target.h
+++ b/src/main/target/KAKUTEF7/target.h
@@ -104,7 +104,6 @@
 #define SPI4_MISO_PIN           PE5
 #define SPI4_MOSI_PIN           PE6
 
-#define USE_OSD
 
 #ifndef KAKUTEF7HDV
 #define USE_MAX7456
@@ -179,4 +178,5 @@
 
 #define MAX_PWM_OUTPUT_PORTS       6
 
-#define BNO055_I2C_BUS          BUS_I2C1
\ No newline at end of file
+#define BNO055_I2C_BUS          BUS_I2C1
+
diff --git a/src/main/target/KAKUTEF7MINIV3/target.h b/src/main/target/KAKUTEF7MINIV3/target.h
index 7ecc7a3d1e..6e7188f9f7 100644
--- a/src/main/target/KAKUTEF7MINIV3/target.h
+++ b/src/main/target/KAKUTEF7MINIV3/target.h
@@ -106,7 +106,6 @@
 /*
  * OSD
  */
-#define USE_OSD
 #define USE_MAX7456
 #define MAX7456_SPI_BUS         BUS_SPI3
 #define MAX7456_CS_PIN          PA15
@@ -173,4 +172,5 @@
 #define TARGET_IO_PORTA         0xffff
 #define TARGET_IO_PORTB         0xffff
 #define TARGET_IO_PORTC         0xffff
-#define TARGET_IO_PORTD         (BIT(2))
\ No newline at end of file
+#define TARGET_IO_PORTD         (BIT(2))
+
diff --git a/src/main/target/KROOZX/target.h b/src/main/target/KROOZX/target.h
index 4f5eac5f7c..cde87e45d2 100755
--- a/src/main/target/KROOZX/target.h
+++ b/src/main/target/KROOZX/target.h
@@ -61,7 +61,6 @@
 #define SDCARD_DETECT_INVERTED
 #define SDCARD_DETECT_PIN       PC13
 
-#define USE_OSD
 #ifdef USE_MSP_DISPLAYPORT
 #undef USE_MSP_DISPLAYPORT
 #endif
diff --git a/src/main/target/MAMBAF405US/target.h b/src/main/target/MAMBAF405US/target.h
index adb4c09f1e..969b725bf4 100644
--- a/src/main/target/MAMBAF405US/target.h
+++ b/src/main/target/MAMBAF405US/target.h
@@ -158,7 +158,6 @@
 #define VBAT_SCALE_DEFAULT              1100
 
 // ******* OSD ********
-#define USE_OSD
 #define USE_MAX7456
 #define MAX7456_SPI_BUS                 BUS_SPI2
 #define MAX7456_CS_PIN                  PB12
@@ -199,4 +198,5 @@
 #define TEMPERATURE_I2C_BUS             DEFAULT_I2C_BUS
 #define PITOT_I2C_BUS                   DEFAULT_I2C_BUS
 #define RANGEFINDER_I2C_BUS             DEFAULT_I2C_BUS
-#define BNO055_I2C_BUS                  DEFAULT_I2C_BUS
\ No newline at end of file
+#define BNO055_I2C_BUS                  DEFAULT_I2C_BUS
+
diff --git a/src/main/target/MAMBAF722/target.h b/src/main/target/MAMBAF722/target.h
index 2c1cb07cf7..3efdde2835 100644
--- a/src/main/target/MAMBAF722/target.h
+++ b/src/main/target/MAMBAF722/target.h
@@ -156,7 +156,6 @@
 #define VBAT_SCALE_DEFAULT              1100
 
 // ******* OSD ********
-#define USE_OSD
 #define USE_MAX7456
 #define MAX7456_SPI_BUS                 BUS_SPI2
 #define MAX7456_CS_PIN                  SPI2_NSS_PIN
@@ -207,4 +206,5 @@
 
 #define BNO055_I2C_BUS              DEFAULT_I2C_BUS
 
-#endif
\ No newline at end of file
+#endif
+
diff --git a/src/main/target/MATEKF405/target.h b/src/main/target/MATEKF405/target.h
index a70cc55583..c3dd007b4d 100644
--- a/src/main/target/MATEKF405/target.h
+++ b/src/main/target/MATEKF405/target.h
@@ -76,7 +76,6 @@
 #define SPI2_MISO_PIN   	    PB14
 #define SPI2_MOSI_PIN   	    PB15
 
-#define USE_OSD
 #define USE_MAX7456
 #define MAX7456_SPI_BUS         BUS_SPI2
 #define MAX7456_CS_PIN          PB10
diff --git a/src/main/target/MATEKF405SE/target.h b/src/main/target/MATEKF405SE/target.h
index 75afdea322..805f6cea42 100644
--- a/src/main/target/MATEKF405SE/target.h
+++ b/src/main/target/MATEKF405SE/target.h
@@ -85,7 +85,6 @@
 #define SPI2_MISO_PIN   	    PC2
 #define SPI2_MOSI_PIN   	    PC3
 
-#define USE_OSD
 #define USE_MAX7456
 #define MAX7456_CS_PIN          PB12
 #define MAX7456_SPI_BUS         BUS_SPI2
diff --git a/src/main/target/MATEKF411/target.h b/src/main/target/MATEKF411/target.h
index ac6962a350..b73c6013c7 100755
--- a/src/main/target/MATEKF411/target.h
+++ b/src/main/target/MATEKF411/target.h
@@ -55,7 +55,6 @@
 #define SPI2_MISO_PIN           PB14
 #define SPI2_MOSI_PIN           PB15
 
-#define USE_OSD
 #define USE_MAX7456
 #define MAX7456_SPI_BUS         BUS_SPI2
 #define MAX7456_CS_PIN          PB12
diff --git a/src/main/target/MATEKF411SE/target.h b/src/main/target/MATEKF411SE/target.h
index 2da0393f54..8bb3e933ef 100755
--- a/src/main/target/MATEKF411SE/target.h
+++ b/src/main/target/MATEKF411SE/target.h
@@ -50,7 +50,6 @@
 #define SPI2_MISO_PIN           PB14
 #define SPI2_MOSI_PIN           PB15
 
-#define USE_OSD
 #define USE_MAX7456
 #define MAX7456_SPI_BUS         BUS_SPI2
 #define MAX7456_CS_PIN          PB12
diff --git a/src/main/target/MATEKF722/target.h b/src/main/target/MATEKF722/target.h
index 331ad65821..b1b657e424 100755
--- a/src/main/target/MATEKF722/target.h
+++ b/src/main/target/MATEKF722/target.h
@@ -90,7 +90,6 @@
 #define SPI2_MISO_PIN           PB14
 #define SPI2_MOSI_PIN           PB15
 
-#define USE_OSD
 #define USE_MAX7456
 #define MAX7456_SPI_BUS         BUS_SPI2
 #define MAX7456_CS_PIN          PB10
diff --git a/src/main/target/MATEKF722PX/target.h b/src/main/target/MATEKF722PX/target.h
index ca9dd843a6..83d7d669cb 100755
--- a/src/main/target/MATEKF722PX/target.h
+++ b/src/main/target/MATEKF722PX/target.h
@@ -169,7 +169,6 @@
 #define TARGET_IO_PORTD 0xffff
 
 #define MAX_PWM_OUTPUT_PORTS        10
-#define USE_OSD
 #define USE_DSHOT
 #define USE_SERIALSHOT
 #define USE_ESC_SENSOR
diff --git a/src/main/target/MATEKF722SE/target.h b/src/main/target/MATEKF722SE/target.h
index ecff68fa66..6f62d53406 100644
--- a/src/main/target/MATEKF722SE/target.h
+++ b/src/main/target/MATEKF722SE/target.h
@@ -95,7 +95,6 @@
 #define SPI2_MISO_PIN           PB14
 #define SPI2_MOSI_PIN           PB15
 
-#define USE_OSD
 #define USE_MAX7456
 #define MAX7456_SPI_BUS         BUS_SPI2
 #define MAX7456_CS_PIN          PB12
@@ -195,4 +194,5 @@
 #define USE_SERIALSHOT
 #define USE_ESC_SENSOR
 
-#define BNO055_I2C_BUS          BUS_I2C1
\ No newline at end of file
+#define BNO055_I2C_BUS          BUS_I2C1
+
diff --git a/src/main/target/MATEKF765/target.h b/src/main/target/MATEKF765/target.h
index 8f5b256026..449801cc50 100644
--- a/src/main/target/MATEKF765/target.h
+++ b/src/main/target/MATEKF765/target.h
@@ -98,7 +98,6 @@
 #define SPI2_MISO_PIN           PB14
 #define SPI2_MOSI_PIN           PB15
 
-#define USE_OSD
 #define USE_MAX7456
 #define MAX7456_SPI_BUS         BUS_SPI2
 #define MAX7456_CS_PIN          PB12
diff --git a/src/main/target/MATEKH743/target.h b/src/main/target/MATEKH743/target.h
index 6053f86939..a0864cd140 100644
--- a/src/main/target/MATEKH743/target.h
+++ b/src/main/target/MATEKH743/target.h
@@ -71,7 +71,6 @@
 #define SPI2_MISO_PIN           PB14
 #define SPI2_MOSI_PIN           PB15
 
-#define USE_OSD
 #define USE_MAX7456
 #define MAX7456_SPI_BUS         BUS_SPI2
 #define MAX7456_CS_PIN          PB12
@@ -207,4 +206,5 @@
 #define MAX_PWM_OUTPUT_PORTS        15
 #define USE_DSHOT
 #define USE_ESC_SENSOR
-#define USE_SERIALSHOT
\ No newline at end of file
+#define USE_SERIALSHOT
+
diff --git a/src/main/target/NOX/target.h b/src/main/target/NOX/target.h
index 9a40ea5050..764e889bb4 100755
--- a/src/main/target/NOX/target.h
+++ b/src/main/target/NOX/target.h
@@ -61,7 +61,6 @@
 #define BMP280_CS_PIN           PA9
 
 // *************** SPI OSD *****************************
-#define USE_OSD
 #define USE_MAX7456
 #define MAX7456_SPI_BUS         BUS_SPI2
 #define MAX7456_CS_PIN          PA10
diff --git a/src/main/target/OMNIBUS/target.h b/src/main/target/OMNIBUS/target.h
index 3338db998e..273f41097f 100644
--- a/src/main/target/OMNIBUS/target.h
+++ b/src/main/target/OMNIBUS/target.h
@@ -103,7 +103,6 @@
 #define SDCARD_SPI_BUS          BUS_SPI2
 #define SDCARD_CS_PIN           SPI2_NSS_PIN
 
-#define USE_OSD
 #define USE_MAX7456
 #define MAX7456_SPI_BUS             BUS_SPI1
 #define MAX7456_CS_PIN              PB1
diff --git a/src/main/target/OMNIBUSF4/target.h b/src/main/target/OMNIBUSF4/target.h
index 4027144c8d..fd0991fb94 100644
--- a/src/main/target/OMNIBUSF4/target.h
+++ b/src/main/target/OMNIBUSF4/target.h
@@ -213,7 +213,6 @@
 #define SPI3_MISO_PIN           PC11
 #define SPI3_MOSI_PIN           PC12
 
-#define USE_OSD
 #define USE_MAX7456
 #define MAX7456_SPI_BUS         BUS_SPI3
 #define MAX7456_CS_PIN          PA15
diff --git a/src/main/target/OMNIBUSF7/target.h b/src/main/target/OMNIBUSF7/target.h
index 50e10578b4..8296e531e5 100644
--- a/src/main/target/OMNIBUSF7/target.h
+++ b/src/main/target/OMNIBUSF7/target.h
@@ -126,7 +126,6 @@
 #define SPI4_MISO_PIN           PE5
 #define SPI4_MOSI_PIN           PE6
 
-#define USE_OSD
 #define USE_MAX7456
 #define MAX7456_SPI_BUS         BUS_SPI2
 #define MAX7456_CS_PIN          SPI2_NSS_PIN
diff --git a/src/main/target/OMNIBUSF7NXT/target.h b/src/main/target/OMNIBUSF7NXT/target.h
index 241322b5d6..de7da72927 100644
--- a/src/main/target/OMNIBUSF7NXT/target.h
+++ b/src/main/target/OMNIBUSF7NXT/target.h
@@ -128,7 +128,6 @@
 #define SPI3_MISO_PIN           PC11
 #define SPI3_MOSI_PIN           PC12
 
-#define USE_OSD
 #define USE_MAX7456
 #define MAX7456_SPI_BUS         BUS_SPI2
 #define MAX7456_CS_PIN          PA15
diff --git a/src/main/target/RUSH_BLADE_F7/target.h b/src/main/target/RUSH_BLADE_F7/target.h
index cdae1860b3..1a701ed987 100644
--- a/src/main/target/RUSH_BLADE_F7/target.h
+++ b/src/main/target/RUSH_BLADE_F7/target.h
@@ -141,7 +141,6 @@
 #define TARGET_IO_PORTD 0xffff
 
 #define MAX_PWM_OUTPUT_PORTS        10
-#define USE_OSD
 #define USE_DSHOT
 #define USE_SERIALSHOT
 #define USE_ESC_SENSOR
diff --git a/src/main/target/SPEEDYBEEF4/target.h b/src/main/target/SPEEDYBEEF4/target.h
index 3920653df7..0258ac2974 100644
--- a/src/main/target/SPEEDYBEEF4/target.h
+++ b/src/main/target/SPEEDYBEEF4/target.h
@@ -73,7 +73,6 @@
 #define USE_FLASH_M25P16	
 
 /*** OSD ***/
-#define USE_OSD								
 #define USE_MAX7456							
 #define MAX7456_SPI_BUS         BUS_SPI2	
 #define MAX7456_CS_PIN          PB10		
@@ -171,4 +170,5 @@
 #define TARGET_IO_PORTC         0xffff
 #define TARGET_IO_PORTD         (BIT(2))
 
-#define RANGEFINDER_I2C_BUS BUS_I2C1
\ No newline at end of file
+#define RANGEFINDER_I2C_BUS BUS_I2C1
+
diff --git a/src/main/target/SPEEDYBEEF7/target.h b/src/main/target/SPEEDYBEEF7/target.h
index 71e855af0a..559ad0924e 100644
--- a/src/main/target/SPEEDYBEEF7/target.h
+++ b/src/main/target/SPEEDYBEEF7/target.h
@@ -73,7 +73,6 @@
 
 // OSD -- SPI2
 #define USE_SPI_DEVICE_2
-#define USE_OSD
 #define USE_MAX7456
 #define MAX7456_SPI_BUS         BUS_SPI2
 #define MAX7456_CS_PIN          PB12
diff --git a/src/main/target/SPRACINGF4EVO/target.h b/src/main/target/SPRACINGF4EVO/target.h
index efe89add1e..8722883d01 100755
--- a/src/main/target/SPRACINGF4EVO/target.h
+++ b/src/main/target/SPRACINGF4EVO/target.h
@@ -143,7 +143,6 @@
 // PC4 - NC - Free for ADC12_IN14 / VTX CS
 // PC5 - NC - Free for ADC12_IN15 / VTX Enable / OSD VSYNC
 
-//#define USE_OSD
 //#define USE_MAX7456
 //#define USE_OSD_OVER_MSP_DISPLAYPORT
 
diff --git a/src/main/target/SPRACINGF7DUAL/target.h b/src/main/target/SPRACINGF7DUAL/target.h
index 9bbc2a7455..c41c61732a 100644
--- a/src/main/target/SPRACINGF7DUAL/target.h
+++ b/src/main/target/SPRACINGF7DUAL/target.h
@@ -168,8 +168,6 @@
 
 #define CURRENT_METER_SCALE         300
 
-#define USE_OSD
-
 #define USE_LED_STRIP
 #define WS2811_PIN                      PA1
 
diff --git a/src/main/target/YUPIF4/target.h b/src/main/target/YUPIF4/target.h
index 741f224252..97e389826c 100644
--- a/src/main/target/YUPIF4/target.h
+++ b/src/main/target/YUPIF4/target.h
@@ -74,7 +74,6 @@
 #define USE_BARO_MS5611
 #define USE_BARO_BMP280
 
-#define USE_OSD
 #define USE_MAX7456
 #define MAX7456_SPI_BUS         BUS_SPI1
 #define MAX7456_CS_PIN          PA14
diff --git a/src/main/target/YUPIF7/target.h b/src/main/target/YUPIF7/target.h
index a95336a738..6a146a1c50 100644
--- a/src/main/target/YUPIF7/target.h
+++ b/src/main/target/YUPIF7/target.h
@@ -115,7 +115,6 @@
 #define I2C_DEVICE              (I2CDEV_1)
 
 // OSD
-#define USE_OSD
 #define USE_MAX7456
 #define MAX7456_SPI_BUS         BUS_SPI1
 #define MAX7456_CS_PIN          PA14
diff --git a/src/main/target/ZEEZF7/target.h b/src/main/target/ZEEZF7/target.h
index 4558922417..5ad4f85e6e 100755
--- a/src/main/target/ZEEZF7/target.h
+++ b/src/main/target/ZEEZF7/target.h
@@ -140,7 +140,6 @@
 #define SPI3_MISO_PIN           PC11
 #define SPI3_MOSI_PIN           PB5
 
-#define USE_OSD
 #define USE_MAX7456
 #define MAX7456_SPI_BUS         BUS_SPI3
 #define MAX7456_CS_PIN          PA15
diff --git a/src/main/target/common.h b/src/main/target/common.h
index 068e6b8dde..c110a6112f 100755
--- a/src/main/target/common.h
+++ b/src/main/target/common.h
@@ -127,6 +127,7 @@
 
 #define USE_PWM_DRIVER_PCA9685
 
+#define USE_OSD
 #define USE_FRSKYOSD
 #define USE_DJI_HD_OSD
 #define USE_SMARTPORT_MASTER