diff --git a/cmake/posix/configs/config-posix-sitl.cmake b/cmake/posix/configs/config-posix-sitl.cmake
index 647a30b87a..ece121908c 100644
--- a/cmake/posix/configs/config-posix-sitl.cmake
+++ b/cmake/posix/configs/config-posix-sitl.cmake
@@ -1,5 +1,9 @@
 function(px4_set_config_modules out_module_list)
 	set(config_module_list
+		drivers/led
+		drivers/device
+		drivers/boards/sitl
+		platforms/common
 		platforms/posix/px4_layer
 		platforms/posix/work_queue
 		platforms/posix/drivers/adcsim
@@ -14,7 +18,10 @@ function(px4_set_config_modules out_module_list)
 		systemcmds/ver
 		systemcmds/esc_calib
 		systemcmds/reboot
+		modules/uORB
+		modules/systemlib
 		modules/sensors
+		modules/simulator
 		modules/mavlink
 		modules/attitude_estimator_ekf
 		modules/attitude_estimator_q
@@ -34,6 +41,8 @@ function(px4_set_config_modules out_module_list)
 		modules/commander
 		modules/controllib
 		lib/mathlib
+		lib/mathlib/math/filter
+		lib/conversion
 		lib/ecl
 		lib/external_lgpl
 		lib/geo
diff --git a/src/firmware/posix/CMakeLists.txt b/src/firmware/posix/CMakeLists.txt
index df3c99ab59..58f6024b54 100644
--- a/src/firmware/posix/CMakeLists.txt
+++ b/src/firmware/posix/CMakeLists.txt
@@ -17,8 +17,10 @@ px4_posix_generate_builtin_commands(
 
 add_executable(mainapp builtin_commands.cpp)
 target_link_libraries(mainapp
+	-Wl,--start-group
 	${module_list}
 	pthread m
+	-Wl,--end-group
 	)
 
 # vim: set noet ft=cmake fenc=utf-8 ff=unix :