diff --git a/companion/src/CMakeLists.txt b/companion/src/CMakeLists.txt
index 2149f2691..1158f53e6 100644
--- a/companion/src/CMakeLists.txt
+++ b/companion/src/CMakeLists.txt
@@ -341,15 +341,15 @@ IF( WIN32 )
     "C:/Program Files (x86)/NSIS"    
     "C:/Programs/NSIS"
   )
-  
+
   ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/companionInstall.exe
                      COMMAND "${NSIS_EXE}" ARGS companion.nsi
-                     DEPENDS companion simulator ${PROJECT_BINARY_DIR}/companion.nsi
+                     DEPENDS companion simulator opentx-simulators ${PROJECT_BINARY_DIR}/companion.nsi
                      COMMENT "Companion Windows NSIS Installer")
 
   ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/simulatorInstall.exe
                      COMMAND "${NSIS_EXE}" ARGS simulator.nsi
-                     DEPENDS simulator ${PROJECT_BINARY_DIR}/simulator.nsi
+                     DEPENDS simulator opentx-simulators ${PROJECT_BINARY_DIR}/simulator.nsi
                      COMMENT "Simulator Windows NSIS Installer")
 
   ADD_CUSTOM_TARGET( installer
diff --git a/companion/src/firmwares/opentx/simulator/CMakeLists.txt b/companion/src/firmwares/opentx/simulator/CMakeLists.txt
index 66e49b7a6..c3b255596 100644
--- a/companion/src/firmwares/opentx/simulator/CMakeLists.txt
+++ b/companion/src/firmwares/opentx/simulator/CMakeLists.txt
@@ -47,6 +47,9 @@ include_directories(
   ${RADIO_SRC_DIRECTORY}/fonts/std
   ${RADIO_SRC_DIRECTORY}/lua/src
   ${RADIO_SRC_DIRECTORY}/thirdparty
+  ${RADIO_SRC_DIRECTORY}/thirdparty/FatFs
+  ${RADIO_SRC_DIRECTORY}/thirdparty/FatFs/option
+  ${RADIO_SRC_DIRECTORY}/thirdparty/CoOS
 )
 
 if(DEFINED TRANSLATIONS)
@@ -83,6 +86,18 @@ add_library(opentx-taranis${SUFFIX}-simulator SHARED ${OPENTX_SRC_FILES})
 add_library(opentx-taranisplus${SUFFIX}-simulator SHARED ${OPENTX_SRC_FILES})
 add_library(opentx-taranisx9e${SUFFIX}-simulator SHARED ${OPENTX_SRC_FILES})
 
+set(OPENTX_LIBRARIES
+  opentx-9x${SUFFIX}-simulator
+  opentx-9xr${SUFFIX}-simulator
+  opentx-9x128${SUFFIX}-simulator
+  opentx-9xr128${SUFFIX}-simulator
+  opentx-gruvin9x${SUFFIX}-simulator
+  opentx-sky9x${SUFFIX}-simulator
+  opentx-taranis${SUFFIX}-simulator
+  opentx-taranisplus${SUFFIX}-simulator
+  opentx-taranisx9e${SUFFIX}-simulator
+)
+
 # 9X with ATmega64
 target_include_directories(opentx-9x${SUFFIX}-simulator PRIVATE ${RADIO_SRC_DIRECTORY}/targets/stock)
 target_compile_definitions(opentx-9x${SUFFIX}-simulator PRIVATE PCBSTD PCB9X CPUM64 ${COMMON_DEFINITIONS})
@@ -127,3 +142,7 @@ target_link_libraries(opentx-taranisplus${SUFFIX}-simulator PRIVATE ${COMMON_LIB
 target_include_directories(opentx-taranisx9e${SUFFIX}-simulator PRIVATE ${RADIO_SRC_DIRECTORY}/targets/taranis)
 target_compile_definitions(opentx-taranisx9e${SUFFIX}-simulator PRIVATE PCBTARANIS REVPLUS REV9E CPUARM CPUSTM32 STM32F40_41xxx VOICE SDCARD ${COMMON_DEFINITIONS})
 target_link_libraries(opentx-taranisx9e${SUFFIX}-simulator PRIVATE ${COMMON_LIBRARIES})
+
+ADD_CUSTOM_TARGET(opentx-simulators
+  DEPENDS ${OPENTX_LIBRARIES}
+)
diff --git a/companion/src/firmwares/opentx/simulator/opentxsimulator.cpp b/companion/src/firmwares/opentx/simulator/opentxsimulator.cpp
index 72245cf52..19368b784 100644
--- a/companion/src/firmwares/opentx/simulator/opentxsimulator.cpp
+++ b/companion/src/firmwares/opentx/simulator/opentxsimulator.cpp
@@ -514,7 +514,7 @@ class OpenTxSimulatorFactory: public SimulatorFactory
 
 }
 
-extern "C" __declspec(dllexport) SimulatorFactory *registerSimu()
+extern "C" DLLEXPORT SimulatorFactory *registerSimu()
 {
   return new NAMESPACE::OpenTxSimulatorFactory();
 }
diff --git a/companion/src/firmwares/opentx/simulator/opentxsimulator.h b/companion/src/firmwares/opentx/simulator/opentxsimulator.h
index 72b225351..fd705881e 100644
--- a/companion/src/firmwares/opentx/simulator/opentxsimulator.h
+++ b/companion/src/firmwares/opentx/simulator/opentxsimulator.h
@@ -59,9 +59,15 @@
 #error "Unknown board"
 #endif
 
+#if defined __GNUC__
+  #define DLLEXPORT
+#else
+  #define DLLEXPORT __declspec(dllexport)
+#endif
+
 namespace NAMESPACE {
 
-class __declspec(dllexport) OpenTxSimulator : public SimulatorInterface {
+class DLLEXPORT OpenTxSimulator : public SimulatorInterface {
 
   public:
 
diff --git a/radio/src/audio_arm.h b/radio/src/audio_arm.h
index b3a5fb5ba..15b2a8639 100644
--- a/radio/src/audio_arm.h
+++ b/radio/src/audio_arm.h
@@ -38,7 +38,7 @@
 #define audio_h
 
 #include <stddef.h>
-#include "FatFs/ff.h"
+#include "ff.h"
 
 #define AUDIO_FILENAME_MAXLEN (42)      //max length example: /SOUNDS/fr/123456789012/1234567890-off.wav
 #define AUDIO_QUEUE_LENGTH    (20)
diff --git a/radio/src/logs.cpp b/radio/src/logs.cpp
index 25cbbd71b..581e5f18b 100644
--- a/radio/src/logs.cpp
+++ b/radio/src/logs.cpp
@@ -35,7 +35,7 @@
  */
 
 #include "opentx.h"
-#include "FatFs/ff.h"
+#include "ff.h"
 
 FIL g_oLogFile = {0};
 const pm_char * g_logError = NULL;
diff --git a/radio/src/sdcard.cpp b/radio/src/sdcard.cpp
index ad128d63a..2870bb11b 100644
--- a/radio/src/sdcard.cpp
+++ b/radio/src/sdcard.cpp
@@ -35,8 +35,8 @@
  */
 
 #include <stdint.h>
-#include "FatFs/diskio.h"
-#include "FatFs/ff.h"
+#include "diskio.h"
+#include "ff.h"
 
 #define LIST_NONE_SD_FILE  1
 
diff --git a/radio/src/sdcard.h b/radio/src/sdcard.h
index 5f43512b9..3519a7cd2 100644
--- a/radio/src/sdcard.h
+++ b/radio/src/sdcard.h
@@ -37,7 +37,7 @@
 #ifndef _SDCARD_H_
 #define _SDCARD_H_
 
-#include "FatFs/ff.h"
+#include "ff.h"
 
 #define ROOT_PATH           "/"
 #define MODELS_PATH         ROOT_PATH "MODELS"      // no trailing slash = important
diff --git a/radio/src/targets/simu/simpgmspace.cpp b/radio/src/targets/simu/simpgmspace.cpp
index 0d04bbab6..67f1e7be0 100644
--- a/radio/src/targets/simu/simpgmspace.cpp
+++ b/radio/src/targets/simu/simpgmspace.cpp
@@ -644,7 +644,7 @@ namespace simu {
   #include <libgen.h>
 #endif
 }
-#include "FatFs/ff.h"
+#include "ff.h"
 
 #if defined WIN32 || !defined __GNUC__
 #include <direct.h>
diff --git a/radio/src/targets/taranis/bootloader/Makefile b/radio/src/targets/taranis/bootloader/Makefile
index 8733bee13..4b9b02a55 100755
--- a/radio/src/targets/taranis/bootloader/Makefile
+++ b/radio/src/targets/taranis/bootloader/Makefile
@@ -28,6 +28,7 @@ BINX = $(CP) -O binary
 OBJDIR = .
 
 THIRDPARTY = ../../../thirdparty
+FATFSDIR = $(THIRDPARTY)/FatFs
 
 ifeq ($(PCBREV), REV9E)
   MCU = cortex-m4
@@ -81,7 +82,7 @@ endif
 # PCB revision
 PCBREV =
 
-EXTRAINCDIRS = $(THIRDPARTY)
+EXTRAINCDIRS = $(THIRDPARTY) $(FATFSDIR) $(FATFSDIR)/option
 
 STM32USBPATH = ../../../thirdparty/STM32_USB-Host-Device_Lib_V2.1.0/Libraries