diff --git a/companion/src/CMakeLists.txt b/companion/src/CMakeLists.txt
index 131dee812..d5568888e 100644
--- a/companion/src/CMakeLists.txt
+++ b/companion/src/CMakeLists.txt
@@ -352,8 +352,8 @@ if(WIN32)
   endif()
 
   set(SYSDIR "$ENV{windir}/system32")
-  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../targets/windows/${COMPANION_NSI_IN_FILE} ${CMAKE_CURRENT_BINARY_DIR}/companion.nsi @ONLY)
-  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../targets/windows/${SIMULATOR_NSI_IN_FILE} ${CMAKE_CURRENT_BINARY_DIR}/simulator.nsi @ONLY)
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../targets/windows/${COMPANION_NSI_IN_FILE} ${PROJECT_BINARY_DIR}/companion/companion.nsi @ONLY)
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../targets/windows/${SIMULATOR_NSI_IN_FILE} ${PROJECT_BINARY_DIR}/companion/simulator.nsi @ONLY)
 
   find_program(NSIS_EXE makensis.exe PATHS
     "C:/Program Files/NSIS"
@@ -361,21 +361,21 @@ if(WIN32)
     "C:/Programs/NSIS"
     )
 
-  add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/companion-windows.exe
+  add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/companion/companion-windows.exe
     COMMAND "${NSIS_EXE}" ARGS companion.nsi
-    DEPENDS companion simulator opentx-simulators ${PROJECT_BINARY_DIR}/companion.nsi
+    DEPENDS companion simulator opentx-simulators ${PROJECT_BINARY_DIR}/companion/companion.nsi
     COMMENT "Companion Windows NSIS Installer")
 
-  add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/simulator-install.exe
+  add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/companion/simulator-install.exe
     COMMAND "${NSIS_EXE}" ARGS simulator.nsi
-    DEPENDS simulator opentx-simulators ${PROJECT_BINARY_DIR}/simulator.nsi
+    DEPENDS simulator opentx-simulators ${PROJECT_BINARY_DIR}/companion/simulator.nsi
     COMMENT "Simulator Windows NSIS Installer")
 
   add_custom_target(installer
-    DEPENDS ${PROJECT_BINARY_DIR}/companion-windows.exe
-    DEPENDS ${PROJECT_BINARY_DIR}/simulator-windows.exe
-    SOURCES ${PROJECT_BINARY_DIR}/companion.nsi
-    SOURCES ${PROJECT_BINARY_DIR}/simulator.nsi
+    DEPENDS ${PROJECT_BINARY_DIR}/companion/companion-windows.exe
+    DEPENDS ${PROJECT_BINARY_DIR}/companion/simulator-windows.exe
+    SOURCES ${PROJECT_BINARY_DIR}/companion/companion.nsi
+    SOURCES ${PROJECT_BINARY_DIR}/companion/simulator.nsi
     )
 endif()
 
diff --git a/companion/src/firmwares/opentx/simulator/CMakeLists.txt b/companion/src/firmwares/opentx/simulator/CMakeLists.txt
index 0f1463770..989aec998 100644
--- a/companion/src/firmwares/opentx/simulator/CMakeLists.txt
+++ b/companion/src/firmwares/opentx/simulator/CMakeLists.txt
@@ -9,19 +9,19 @@ set(OPENTX_SRC_FILES
   )
 
 include_directories(
+  ${CMAKE_BINARY_DIR}/radio/src
   ${CMAKE_CURRENT_BINARY_DIR}
+  ${RADIO_BIN_DIRECTORY}
   ${PROJECT_SOURCE_DIR}
   ${COMPANION_SRC_DIRECTORY}/firmwares/opentx
   ${RADIO_SRC_DIRECTORY}
   ${RADIO_SRC_DIRECTORY}/fonts/std
-  ${RADIO_BIN_DIRECTORY}
   ${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
   ${RADIO_SRC_DIRECTORY}/thirdparty/Lua/src
-  ${CMAKE_BINARY_DIR}/radio/src
 )
 
 if(APPLE)