diff --git a/src/modules/systemlib/mixer/CMakeLists.txt b/src/modules/systemlib/mixer/CMakeLists.txt
index 429615d14b..bb2b4422a5 100644
--- a/src/modules/systemlib/mixer/CMakeLists.txt
+++ b/src/modules/systemlib/mixer/CMakeLists.txt
@@ -30,6 +30,13 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 ############################################################################
+
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+add_custom_command(OUTPUT mixer_multirotor.generated.h
+	COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/multi_tables.py
+	> mixer_multirotor.generated.h)
+
 px4_add_module(
 	MODULE modules__systemlib__mixer
 	SRCS
@@ -38,6 +45,7 @@ px4_add_module(
 		mixer_multirotor.cpp
 		mixer_simple.cpp
 		mixer_load.c
+		mixer_multirotor.generated.h
 	DEPENDS
 		platforms__common
 	)
diff --git a/src/platforms/common/CMakeLists.txt b/src/platforms/common/CMakeLists.txt
index c60f47764e..b7a003b506 100644
--- a/src/platforms/common/CMakeLists.txt
+++ b/src/platforms/common/CMakeLists.txt
@@ -35,6 +35,10 @@ set(depends
 	prebuild_targets
 	)
 
+if(${OS} STREQUAL "posix")
+	list(APPEND depends git_eigen git_mavlink)
+endif()
+
 px4_add_module(
 	MODULE platforms__common
 	SRCS