diff --git a/companion/src/CMakeLists.txt b/companion/src/CMakeLists.txt
index 7704f2ed9..1e105b7ea 100644
--- a/companion/src/CMakeLists.txt
+++ b/companion/src/CMakeLists.txt
@@ -278,7 +278,6 @@ NOW(TIME)
 
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h @ONLY)
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/translations.qrc.in ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc @ONLY)
-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/firmwares/opentx/stamp-opentx.h.in ${CMAKE_CURRENT_BINARY_DIR}/stamp-opentx.h @ONLY)
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/companion.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/companion.desktop @ONLY)
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/simulator.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/simulator.desktop @ONLY)
 
diff --git a/companion/src/firmwares/opentx/simulator/CMakeLists.txt b/companion/src/firmwares/opentx/simulator/CMakeLists.txt
index 062a8f4cd..1bfdcd588 100644
--- a/companion/src/firmwares/opentx/simulator/CMakeLists.txt
+++ b/companion/src/firmwares/opentx/simulator/CMakeLists.txt
@@ -21,7 +21,7 @@ add_custom_target(commondeps
 set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${RADIO_SRC_DIRECTORY}/stamp-opentx.h)
 
 add_custom_target(lua_exports 
-  make PCB=TARANIS lua_exports.inc
+  make PCB=TARANIS lua/lua_exports.inc
   WORKING_DIRECTORY ${RADIO_SRC_DIRECTORY}
 )
 
diff --git a/companion/src/firmwares/opentx/simulator/opentxsimulator.cpp b/companion/src/firmwares/opentx/simulator/opentxsimulator.cpp
index f81d7665e..c573046d1 100644
--- a/companion/src/firmwares/opentx/simulator/opentxsimulator.cpp
+++ b/companion/src/firmwares/opentx/simulator/opentxsimulator.cpp
@@ -282,7 +282,10 @@ namespace NAMESPACE {
 #endif
 
 #if defined(LUA)
-#include "radio/src/lua_api.cpp"
+#include "radio/src/lua/interface.cpp"
+#include "radio/src/lua/api_general.cpp"
+#include "radio/src/lua/api_lcd.cpp"
+#include "radio/src/lua/api_model.cpp"
 #include "radio/src/thirdparty/Lua/src/lapi.c"
 #include "radio/src/thirdparty/Lua/src/lcode.c"
 #include "radio/src/thirdparty/Lua/src/lctype.c"
diff --git a/companion/src/firmwares/opentx/stamp-opentx.h.in b/companion/src/firmwares/opentx/stamp-opentx.h.in
deleted file mode 100644
index 64cb64097..000000000
--- a/companion/src/firmwares/opentx/stamp-opentx.h.in
+++ /dev/null
@@ -1,4 +0,0 @@
-// Automatically generated file (CMake) - do not edit
-#define DATE_STR  "@DATE@"
-#define TIME_STR  "@TIME@"
-#define VERS_STR  "@C9X_VERSION@"
diff --git a/radio/src/lua/interface.cpp b/radio/src/lua/interface.cpp
index b8be613f8..9b7a5f2ec 100644
--- a/radio/src/lua/interface.cpp
+++ b/radio/src/lua/interface.cpp
@@ -37,7 +37,6 @@
 #include <ctype.h>
 #include <stdio.h>
 #include "opentx.h"
-#include "stamp-opentx.h"
 #include "bin_allocator.h"
 #include "lua/lua_api.h"