diff --git a/src/gui/menu_general.cpp b/src/gui/menu_general.cpp
index e88c60cc6..74a3652d5 100644
--- a/src/gui/menu_general.cpp
+++ b/src/gui/menu_general.cpp
@@ -34,10 +34,10 @@
  *
  */
 
-#include "opentx.h"
+#include "../opentx.h"
 
 const pm_uchar sticks[] PROGMEM = {
-#include "bitmaps/sticks.lbm"
+#include "../bitmaps/sticks.lbm"
 };
 
 enum EnumTabDiag {
diff --git a/src/gui/menu_model.cpp b/src/gui/menu_model.cpp
index 9339f312d..bfff52732 100644
--- a/src/gui/menu_model.cpp
+++ b/src/gui/menu_model.cpp
@@ -34,7 +34,7 @@
  *
  */
 
-#include "opentx.h"
+#include "../opentx.h"
 
 #define WCHART 32
 #define X0     (LCD_W-WCHART-2)
diff --git a/src/gui/menus.cpp b/src/gui/menus.cpp
index b5d0bf476..4a02785c3 100644
--- a/src/gui/menus.cpp
+++ b/src/gui/menus.cpp
@@ -34,7 +34,7 @@
  *
  */
 
-#include "opentx.h"
+#include "../opentx.h"
 
 vertpos_t s_pgOfs;
 int8_t s_editMode;
diff --git a/src/gui/view_channels.cpp b/src/gui/view_channels.cpp
index c89019023..b3d940757 100644
--- a/src/gui/view_channels.cpp
+++ b/src/gui/view_channels.cpp
@@ -34,7 +34,7 @@
  *
  */
 
-#include "opentx.h"
+#include "../opentx.h"
 
 void menuChannelsView(uint8_t event)
 {
diff --git a/src/gui/view_main.cpp b/src/gui/view_main.cpp
index 5e711e63a..e95305101 100644
--- a/src/gui/view_main.cpp
+++ b/src/gui/view_main.cpp
@@ -34,7 +34,7 @@
  *
  */
 
-#include "opentx.h"
+#include "../opentx.h"
 
 #if LCD_W >= 212
 #define BIGSIZE       MIDSIZE
@@ -98,11 +98,11 @@
 
 #if defined(PCBTARANIS)
   const pm_uchar logo_taranis[] PROGMEM = {
-  #include "bitmaps/logo_taranis.lbm"
+  #include "../bitmaps/logo_taranis.lbm"
   };
 
   const pm_uchar icons[] PROGMEM = {
-  #include "bitmaps/icons.lbm"
+  #include "../bitmaps/icons.lbm"
   };
 
   #define ICON_RSSI     0, 9
diff --git a/src/gui/view_statistics.cpp b/src/gui/view_statistics.cpp
index e0eed373b..625bbe928 100644
--- a/src/gui/view_statistics.cpp
+++ b/src/gui/view_statistics.cpp
@@ -34,7 +34,7 @@
  *
  */
 
-#include "opentx.h"
+#include "../opentx.h"
 
 void menuStatisticsView(uint8_t event)
 {
diff --git a/src/gui/view_telemetry.cpp b/src/gui/view_telemetry.cpp
index 0541192f7..2f70ff6d4 100644
--- a/src/gui/view_telemetry.cpp
+++ b/src/gui/view_telemetry.cpp
@@ -34,7 +34,7 @@
  *
  */
 
-#include "opentx.h"
+#include "../opentx.h"
 
 #if defined(FRSKY_HUB)
 uint8_t barsThresholds[THLD_MAX];
diff --git a/src/protocols/pulses_arm.cpp b/src/protocols/pulses_arm.cpp
index ed3a64b35..497c426fb 100644
--- a/src/protocols/pulses_arm.cpp
+++ b/src/protocols/pulses_arm.cpp
@@ -34,7 +34,7 @@
  *
  */
 
-#include "opentx.h"
+#include "../opentx.h"
 
 uint8_t s_pulses_paused = 0;
 uint8_t s_current_protocol[NUM_MODULES] = { MODULES_INIT(255) };
diff --git a/src/protocols/pulses_avr.cpp b/src/protocols/pulses_avr.cpp
index 13f0c7e31..0ee8fc44b 100644
--- a/src/protocols/pulses_avr.cpp
+++ b/src/protocols/pulses_avr.cpp
@@ -34,7 +34,7 @@
  *
  */
 
-#include "opentx.h"
+#include "../opentx.h"
 
 uint16_t nextMixerEndTime = 0;
 #define SCHEDULE_MIXER_END(delay) nextMixerEndTime = getTmr16KHz() + (delay) - 2*16/*2ms*/
diff --git a/src/targets/gruvin9x/board_gruvin9x.cpp b/src/targets/gruvin9x/board_gruvin9x.cpp
index f9406d149..87a0b4189 100644
--- a/src/targets/gruvin9x/board_gruvin9x.cpp
+++ b/src/targets/gruvin9x/board_gruvin9x.cpp
@@ -34,7 +34,7 @@
  *
  */
 
-#include "../opentx.h"
+#include "../../opentx.h"
 
 #ifndef SIMU
 inline void boardInit()
diff --git a/src/targets/gruvin9x/somo14d.cpp b/src/targets/gruvin9x/somo14d.cpp
index 0e1bd86cd..48dd4d4b9 100644
--- a/src/targets/gruvin9x/somo14d.cpp
+++ b/src/targets/gruvin9x/somo14d.cpp
@@ -43,7 +43,7 @@
  old DSM2 code) which seemed to much for the interrupt. 
  */
 
-#include "../opentx.h"
+#include "../../opentx.h"
 
 // Start and stop bits need to be 2ms in duration. Start bit is low, stop bit is high
 #define SOMOSSBIT    5 //The 2ms of a stop/start bit
diff --git a/src/targets/sky9x/audio_driver.cpp b/src/targets/sky9x/audio_driver.cpp
index 4775353c6..a69e4f0a4 100644
--- a/src/targets/sky9x/audio_driver.cpp
+++ b/src/targets/sky9x/audio_driver.cpp
@@ -34,7 +34,7 @@
  *
  */
 
-#include "../opentx.h"
+#include "../../opentx.h"
 
 uint32_t currentFrequency = 0;
 
diff --git a/src/targets/sky9x/board_sky9x.cpp b/src/targets/sky9x/board_sky9x.cpp
index fa46e6c89..c263e2dd0 100644
--- a/src/targets/sky9x/board_sky9x.cpp
+++ b/src/targets/sky9x/board_sky9x.cpp
@@ -34,7 +34,7 @@
  *
  */
 
-#include "../opentx.h"
+#include "../../opentx.h"
 
 #if defined(DEBUG) && !defined(SIMU)
 void DEBUG_UART_Configure( uint32_t baudrate, uint32_t masterClock);
diff --git a/src/targets/sky9x/coproc_driver.cpp b/src/targets/sky9x/coproc_driver.cpp
index b06c9dd06..8591a52ae 100644
--- a/src/targets/sky9x/coproc_driver.cpp
+++ b/src/targets/sky9x/coproc_driver.cpp
@@ -34,7 +34,7 @@
  *
  */
 
-#include "../opentx.h"
+#include "../../opentx.h"
 
 int8_t coprocVolumeRequired ;
 uint8_t coprocVolumeReadPending ;
diff --git a/src/targets/sky9x/eeprom_driver.cpp b/src/targets/sky9x/eeprom_driver.cpp
index 71a9891c5..33f5a8333 100644
--- a/src/targets/sky9x/eeprom_driver.cpp
+++ b/src/targets/sky9x/eeprom_driver.cpp
@@ -34,7 +34,7 @@
  *
  */
 
-#include "../opentx.h"
+#include "../../opentx.h"
 
 extern volatile uint32_t Spi_complete; // TODO in the driver ?
 
diff --git a/src/targets/sky9x/haptic_driver.cpp b/src/targets/sky9x/haptic_driver.cpp
index 8feadc79c..729feec11 100644
--- a/src/targets/sky9x/haptic_driver.cpp
+++ b/src/targets/sky9x/haptic_driver.cpp
@@ -34,7 +34,7 @@
  *
  */
 
-#include "../opentx.h"
+#include "../../opentx.h"
 
 void hapticOff()
 {
diff --git a/src/targets/sky9x/keys_driver.cpp b/src/targets/sky9x/keys_driver.cpp
index 512f57e4e..604db4f8b 100644
--- a/src/targets/sky9x/keys_driver.cpp
+++ b/src/targets/sky9x/keys_driver.cpp
@@ -34,7 +34,7 @@
  *
  */
 
-#include "../opentx.h"
+#include "../../opentx.h"
 
 
 // keys:
diff --git a/src/targets/sky9x/pulses_driver.cpp b/src/targets/sky9x/pulses_driver.cpp
index 096301c9c..6f1bdeac2 100644
--- a/src/targets/sky9x/pulses_driver.cpp
+++ b/src/targets/sky9x/pulses_driver.cpp
@@ -34,7 +34,7 @@
  *
  */
 
-#include "../opentx.h"
+#include "../../opentx.h"
 
 volatile uint32_t ppmStreamIndex[NUM_MODULES] = { MODULES_INIT(0) };  // Modified in interrupt routine
 
diff --git a/src/targets/sky9x/pwr_driver.cpp b/src/targets/sky9x/pwr_driver.cpp
index c204cef77..6d51d53cd 100644
--- a/src/targets/sky9x/pwr_driver.cpp
+++ b/src/targets/sky9x/pwr_driver.cpp
@@ -34,7 +34,7 @@
  *
  */
 
-#include "../opentx.h"
+#include "../../opentx.h"
 
 uint32_t pwrCheck()
 {
diff --git a/src/targets/stock/board_stock.cpp b/src/targets/stock/board_stock.cpp
index bec14017d..1edeb9cb0 100644
--- a/src/targets/stock/board_stock.cpp
+++ b/src/targets/stock/board_stock.cpp
@@ -34,7 +34,7 @@
  *
  */
 
-#include "../opentx.h"
+#include "../../opentx.h"
 
 #if defined(ROTARY_ENCODER_NAVIGATION)
 
diff --git a/src/targets/stock/voice.cpp b/src/targets/stock/voice.cpp
index 2c15b2763..f83276053 100644
--- a/src/targets/stock/voice.cpp
+++ b/src/targets/stock/voice.cpp
@@ -34,7 +34,7 @@
  *
  */
 
-#include "../opentx.h"
+#include "../../opentx.h"
 
 struct t_voice Voice ;
 
diff --git a/src/targets/taranis/audio_driver.cpp b/src/targets/taranis/audio_driver.cpp
index f3723f755..9b2813a44 100644
--- a/src/targets/taranis/audio_driver.cpp
+++ b/src/targets/taranis/audio_driver.cpp
@@ -34,7 +34,7 @@
  *
  */
 
-#include "../opentx.h"
+#include "../../opentx.h"
 
 bool dacIdle = true;
 uint32_t currentFrequency = 0;
diff --git a/src/targets/taranis/board_taranis.cpp b/src/targets/taranis/board_taranis.cpp
index 0d87101da..d1e68cf29 100644
--- a/src/targets/taranis/board_taranis.cpp
+++ b/src/targets/taranis/board_taranis.cpp
@@ -34,7 +34,7 @@
  *
  */
 
-#include "../opentx.h"
+#include "../../opentx.h"
 extern "C" {
 #include "STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_OTG_Driver/inc/usb_dcd_int.h"
 }
diff --git a/src/targets/taranis/keys_driver.cpp b/src/targets/taranis/keys_driver.cpp
index 7a0b2ec49..069e70da8 100644
--- a/src/targets/taranis/keys_driver.cpp
+++ b/src/targets/taranis/keys_driver.cpp
@@ -34,7 +34,7 @@
  *
  */
 
-#include "../opentx.h"
+#include "../../opentx.h"
 
 // TODO FrSky code included PIN_BIND and PIN_POWER
 
diff --git a/src/targets/taranis/pulses_driver.cpp b/src/targets/taranis/pulses_driver.cpp
index aa07622e9..7aec18f81 100644
--- a/src/targets/taranis/pulses_driver.cpp
+++ b/src/targets/taranis/pulses_driver.cpp
@@ -34,7 +34,7 @@
  *
  */
 
-#include "../opentx.h"
+#include "../../opentx.h"
 
 void setupPulses(unsigned int port);
 void setupPulsesPPM(unsigned int port);
diff --git a/src/targets/taranis/pwr_driver.cpp b/src/targets/taranis/pwr_driver.cpp
index 329f12425..dd43832c6 100644
--- a/src/targets/taranis/pwr_driver.cpp
+++ b/src/targets/taranis/pwr_driver.cpp
@@ -34,7 +34,7 @@
  *
  */
 
-#include "../opentx.h"
+#include "../../opentx.h"
 
 void pwrOff()
 {
diff --git a/src/targets/taranis/rtc_driver.cpp b/src/targets/taranis/rtc_driver.cpp
index 7a705d457..dee53fe0a 100644
--- a/src/targets/taranis/rtc_driver.cpp
+++ b/src/targets/taranis/rtc_driver.cpp
@@ -34,7 +34,7 @@
  *
  */
 
-#include "../opentx.h"
+#include "../../opentx.h"
 
 void rtcSetTime(struct gtm * t)
 {
diff --git a/src/targets/taranis/trainer_driver.cpp b/src/targets/taranis/trainer_driver.cpp
index 4f9b79b4d..13a4d82c2 100644
--- a/src/targets/taranis/trainer_driver.cpp
+++ b/src/targets/taranis/trainer_driver.cpp
@@ -34,7 +34,7 @@
  *
  */
 
-#include "../opentx.h"
+#include "../../opentx.h"
 
 uint8_t currentTrainerMode;
 uint16_t * TrainerPulsePtr;
diff --git a/src/telemetry/frsky.cpp b/src/telemetry/frsky.cpp
index b8d14c0fb..661e2fb46 100644
--- a/src/telemetry/frsky.cpp
+++ b/src/telemetry/frsky.cpp
@@ -34,7 +34,7 @@
  *
  */
 
-#include "opentx.h"
+#include "../opentx.h"
 
 // Enumerate FrSky packet codes
 #define LINKPKT         0xfe