diff --git a/Tools/ardupilotwaf/px4/cmake/configs/nuttx_px4fmu-common_apm.cmake b/Tools/ardupilotwaf/px4/cmake/configs/nuttx_px4fmu-common_apm.cmake
index cc3872ed0143afd4d79e197ee29e55a640451ca0..25390cab8b85a2244e334e5b209180a4db7e0397 100644
--- a/Tools/ardupilotwaf/px4/cmake/configs/nuttx_px4fmu-common_apm.cmake
+++ b/Tools/ardupilotwaf/px4/cmake/configs/nuttx_px4fmu-common_apm.cmake
@@ -17,9 +17,6 @@ set(config_module_list
     drivers/led
     drivers/px4fmu
     drivers/rgbled
-    drivers/mpu6000
-    drivers/hmc5883
-    drivers/ms5611
     drivers/mb12xx
     drivers/ll40ls
     drivers/trone
diff --git a/Tools/ardupilotwaf/px4/cmake/configs/nuttx_px4fmu-v1_apm.cmake b/Tools/ardupilotwaf/px4/cmake/configs/nuttx_px4fmu-v1_apm.cmake
index 56c05d9458ae0e2a3ff18a94c6320c029b3adbc0..17d351e80dc58d7210607eb486bf53a7a5be0b0e 100644
--- a/Tools/ardupilotwaf/px4/cmake/configs/nuttx_px4fmu-v1_apm.cmake
+++ b/Tools/ardupilotwaf/px4/cmake/configs/nuttx_px4fmu-v1_apm.cmake
@@ -1,6 +1,9 @@
 include(configs/nuttx_px4fmu-common_apm)
 
 list(APPEND config_module_list
+    drivers/mpu6000
+    drivers/hmc5883
+    drivers/ms5611
     drivers/boards/px4fmu-v1
     drivers/px4io
     drivers/px4flow
diff --git a/Tools/ardupilotwaf/px4/cmake/configs/nuttx_px4fmu-v2_apm.cmake b/Tools/ardupilotwaf/px4/cmake/configs/nuttx_px4fmu-v2_apm.cmake
index 4277a151c12083bd1008248fc4c95a0e89508c3c..e7096367ba23090dd5a09d088a6bfa2ce24e043b 100644
--- a/Tools/ardupilotwaf/px4/cmake/configs/nuttx_px4fmu-v2_apm.cmake
+++ b/Tools/ardupilotwaf/px4/cmake/configs/nuttx_px4fmu-v2_apm.cmake
@@ -4,6 +4,9 @@ list(APPEND config_module_list
     drivers/lsm303d
     drivers/l3gd20
     drivers/mpu9250
+    drivers/mpu6000
+    drivers/hmc5883
+    drivers/ms5611
     drivers/boards/px4fmu-v2
     drivers/pwm_input
     modules/uavcan
diff --git a/Tools/ardupilotwaf/px4/cmake/configs/nuttx_px4fmu-v4_apm.cmake b/Tools/ardupilotwaf/px4/cmake/configs/nuttx_px4fmu-v4_apm.cmake
index 44e0378f32720f6b8a34685bcfde071213506c72..927cfd13c5ed984c515f2468d39a7eefb3dac412 100644
--- a/Tools/ardupilotwaf/px4/cmake/configs/nuttx_px4fmu-v4_apm.cmake
+++ b/Tools/ardupilotwaf/px4/cmake/configs/nuttx_px4fmu-v4_apm.cmake
@@ -1,7 +1,6 @@
 include(configs/nuttx_px4fmu-common_apm)
 
 list(APPEND config_module_list
-    drivers/mpu9250
     drivers/boards/px4fmu-v4
     drivers/pwm_input
     modules/uavcan