diff --git a/flight/Modules/Autotune/autotune.c b/flight/Modules/Autotune/autotune.c
index 96051b076..260f70750 100644
--- a/flight/Modules/Autotune/autotune.c
+++ b/flight/Modules/Autotune/autotune.c
@@ -48,7 +48,8 @@
  *
  */
 
-#include "pios.h"
+#include "openpilot.h"
+
 #include "flightstatus.h"
 #include "hwsettings.h"
 #include "manualcontrolcommand.h"
diff --git a/flight/Modules/Sensors/sensors.c b/flight/Modules/Sensors/sensors.c
index b55d4ad2d..f6584c682 100644
--- a/flight/Modules/Sensors/sensors.c
+++ b/flight/Modules/Sensors/sensors.c
@@ -46,7 +46,8 @@
  *
  */
 
-#include "pios.h"
+#include "openpilot.h"
+
 #include "homelocation.h"
 #include "magnetometer.h"
 #include "magbias.h"
diff --git a/flight/PiOS/Common/pios_gcsrcvr.c b/flight/PiOS/Common/pios_gcsrcvr.c
index 27e13c648..d5451157e 100644
--- a/flight/PiOS/Common/pios_gcsrcvr.c
+++ b/flight/PiOS/Common/pios_gcsrcvr.c
@@ -31,6 +31,8 @@
 /* Project Includes */
 #include "pios.h"
 
+#include "uavobjectmanager.h"
+
 #if defined(PIOS_INCLUDE_GCSRCVR)
 
 #include "pios_gcsrcvr_priv.h"
diff --git a/flight/targets/CopterControl/System/pios_board.c b/flight/targets/CopterControl/System/pios_board.c
index 9072f1e84..167ed8fe0 100644
--- a/flight/targets/CopterControl/System/pios_board.c
+++ b/flight/targets/CopterControl/System/pios_board.c
@@ -32,15 +32,15 @@
  *
  * NOTE: THIS IS THE ONLY PLACE THAT SHOULD EVER INCLUDE THIS FILE
  */
-#include "board_hw_defs.c"
 
-#include <pios.h>
 #include <openpilot.h>
 #include <uavobjectsinit.h>
 #include <hwsettings.h>
 #include <manualcontrolsettings.h>
 #include <gcsreceiver.h>
 
+#include "board_hw_defs.c"
+
 
 /* One slot per selectable receiver group.
  *  eg. PWM, PPM, GCS, DSMMAINPORT, DSMFLEXIPORT, SBUS
diff --git a/flight/targets/Revolution/System/pios_board.c b/flight/targets/Revolution/System/pios_board.c
index 18a49bdd7..369a2a132 100644
--- a/flight/targets/Revolution/System/pios_board.c
+++ b/flight/targets/Revolution/System/pios_board.c
@@ -32,14 +32,14 @@
  *
  * NOTE: THIS IS THE ONLY PLACE THAT SHOULD EVER INCLUDE THIS FILE
  */
-#include "board_hw_defs.c"
 
-#include <pios.h>
 #include <openpilot.h>
 #include <uavobjectsinit.h>
 #include "hwsettings.h"
 #include "manualcontrolsettings.h"
 
+#include "board_hw_defs.c"
+
 /**
  * Sensor configurations 
  */