diff --git a/src/flight_common.h b/src/flight_common.h
index 7ef5d67cf4..be53ac037e 100644
--- a/src/flight_common.h
+++ b/src/flight_common.h
@@ -77,8 +77,8 @@ typedef union {
     rollAndPitchTrims_t_def trims;
 } rollAndPitchTrims_t;
 
-extern int16_t gyroData[FLIGHT_DYNAMICS_INDEX_COUNT]; // see gyro_index_t
-extern int16_t gyroZero[FLIGHT_DYNAMICS_INDEX_COUNT]; // see gyro_index_t
+extern int16_t gyroData[FLIGHT_DYNAMICS_INDEX_COUNT];
+extern int16_t gyroZero[FLIGHT_DYNAMICS_INDEX_COUNT];
 
 extern int16_t gyroADC[XYZ_AXIS_COUNT], accADC[XYZ_AXIS_COUNT], accSmooth[XYZ_AXIS_COUNT];
 extern int32_t accSum[XYZ_AXIS_COUNT];
@@ -86,6 +86,11 @@ extern int16_t axisPID[XYZ_AXIS_COUNT];
 
 extern int16_t heading, magHold;
 
+extern int32_t EstAlt;
+extern int32_t AltHold;
+extern int32_t EstAlt;
+extern int32_t vario;
+
 void mwDisarm(void);
 void setPIDController(int type);
 void resetRollAndPitchTrims(rollAndPitchTrims_t *rollAndPitchTrims);
diff --git a/src/flight_mixer.h b/src/flight_mixer.h
index b2ee549e39..ae1321c1c7 100644
--- a/src/flight_mixer.h
+++ b/src/flight_mixer.h
@@ -56,6 +56,10 @@ typedef struct servoParam_t {
     int8_t forwardFromChannel;              // RX channel index, 0 based.  See CHANNEL_FORWARDING_DISABLED
 } servoParam_t;
 
+extern int16_t motor[MAX_SUPPORTED_MOTORS];
+extern int16_t motor_disarmed[MAX_SUPPORTED_MOTORS];
+extern int16_t servo[MAX_SUPPORTED_SERVOS];
+
 bool isMixerUsingServos(void);
 void mixerInit(void);
 void writeAllMotors(int16_t mc);
diff --git a/src/mw.h b/src/mw.h
index 956827bbe1..5a2e050134 100755
--- a/src/mw.h
+++ b/src/mw.h
@@ -8,8 +8,6 @@
 /* for VBAT monitoring frequency */
 #define VBATFREQ 6        // to read battery voltage - nth number of loop iterations
 
-#define  VERSION  230
-
 #include "gimbal.h"
 #include "flight_mixer.h"
 
diff --git a/src/serial_msp.c b/src/serial_msp.c
index 5d50ef1b5e..cfe3e5583a 100755
--- a/src/serial_msp.c
+++ b/src/serial_msp.c
@@ -1,14 +1,43 @@
-#include "board.h"
-#include "mw.h"
+#include <stdbool.h>
+#include <stdint.h>
+#include <string.h>
 
+#include "platform.h"
+
+#include "common/axis.h"
+
+#include "drivers/system_common.h"
+#include "drivers/accgyro_common.h"
 #include "drivers/serial_common.h"
-#include "serial_common.h"
+#include "drivers/bus_i2c.h"
 
-#include "gps_common.h"
-#include "telemetry_common.h"
+#include "serial_common.h"
 #include "flight_common.h"
-#include "sensors_compass.h"
+#include "flight_mixer.h"
+#include "rc_controls.h"
+#include "boardalignment.h"
+#include "gps_common.h"
+#include "rx_common.h"
+#include "battery.h"
+#include "sensors_common.h"
 #include "sensors_acceleration.h"
+#include "sensors_barometer.h"
+#include "sensors_compass.h"
+#include "sensors_gyro.h"
+#include "failsafe.h"
+
+#include "runtime_config.h"
+#include "config.h"
+#include "config_profile.h"
+#include "config_master.h"
+
+#include "version.h"
+
+#include "serial_msp.h"
+
+extern uint16_t cycleTime; // FIXME dependency on mw.c
+extern uint16_t rssi; // FIXME dependency on mw.c
+extern int16_t debug[4]; // FIXME dependency on mw.c
 
 // Multiwii Serial Protocol 0
 #define MSP_VERSION              0
diff --git a/src/version.h b/src/version.h
new file mode 100644
index 0000000000..fd0c523240
--- /dev/null
+++ b/src/version.h
@@ -0,0 +1,2 @@
+#define  VERSION  230
+