diff --git a/sw/airborne/arm7/servos_csc.h b/sw/airborne/arm7/servos_csc.h
index 028475a4ad..da21438743 100644
--- a/sw/airborne/arm7/servos_csc.h
+++ b/sw/airborne/arm7/servos_csc.h
@@ -2,6 +2,8 @@
 #define SERVOS_CSC_H
 
 #include "LPC21xx.h"
+#include "airframe.h"
+#include "actuators.h"
 #include "sys_time.h"
 #include "csc_ap_link.h"
 #include "csc_msg_def.h"
@@ -10,13 +12,11 @@
 #define ChopServo(x,a,b) Chop(x, a, b)
 #define SERVO_COUNT 4
 
-#define Actuator(i) csc_servo_values[i]
-
-extern uint16_t csc_servo_values[SERVO_COUNT];
+#define Actuator(i) actuators[i]
 
 static inline void ActuatorsCommit(void)
 {
-  csc_ap_send_msg(CSC_SERVO_CMD_ID, (uint8_t *)&csc_servo_values, sizeof(struct CscServoCmd));
+  csc_ap_send_msg(CSC_SERVO_CMD_ID, (uint8_t *)&actuators, sizeof(struct CscServoCmd));
 }
 
 #endif /* SERVOS_CSC_H */