diff --git a/src/modules/px4iofirmware/CMakeLists.txt b/src/modules/px4iofirmware/CMakeLists.txt
index 095ebc16f2..b29d5b1f86 100644
--- a/src/modules/px4iofirmware/CMakeLists.txt
+++ b/src/modules/px4iofirmware/CMakeLists.txt
@@ -78,10 +78,11 @@ set(srcs
 	${PX4_SOURCE_DIR}/src/drivers/stm32/drv_hrt.c
 	${PX4_SOURCE_DIR}/src/drivers/stm32/drv_io_timer.c
 	${PX4_SOURCE_DIR}/src/drivers/stm32/drv_pwm_servo.c
-	${PX4_SOURCE_DIR}/src/lib/rc/dsm.c
-	${PX4_SOURCE_DIR}/src/lib/rc/sbus.c
-	${PX4_SOURCE_DIR}/src/lib/rc/st24.c
-	${PX4_SOURCE_DIR}/src/lib/rc/sumd.c
+	${PX4_SOURCE_DIR}/src/lib/rc/dsm.cpp
+	${PX4_SOURCE_DIR}/src/lib/rc/sbus.cpp
+	${PX4_SOURCE_DIR}/src/lib/rc/st24.cpp
+	${PX4_SOURCE_DIR}/src/lib/rc/sumd.cpp
+	${PX4_SOURCE_DIR}/src/lib/rc/common_rc.cpp
 	${PX4_SOURCE_DIR}/src/modules/systemlib/mixer/mixer.cpp
 	${PX4_SOURCE_DIR}/src/modules/systemlib/mixer/mixer_group.cpp
 	${PX4_SOURCE_DIR}/src/modules/systemlib/mixer/mixer_helicopter.cpp
diff --git a/src/modules/px4iofirmware/mixer.cpp b/src/modules/px4iofirmware/mixer.cpp
index 830e1519cb..7eb302ed6e 100644
--- a/src/modules/px4iofirmware/mixer.cpp
+++ b/src/modules/px4iofirmware/mixer.cpp
@@ -88,6 +88,7 @@ enum mixer_source {
 	MIX_FAILSAFE,
 	MIX_OVERRIDE_FMU_OK
 };
+
 static volatile mixer_source source;
 
 static int	mixer_callback(uintptr_t handle,