diff --git a/flight/modules/Altitude/revolution/altitude.c b/flight/modules/Altitude/revolution/altitude.c
index 6cd1e5750..9d7c47b02 100644
--- a/flight/modules/Altitude/revolution/altitude.c
+++ b/flight/modules/Altitude/revolution/altitude.c
@@ -42,7 +42,9 @@
 #include "barosensor.h" // object that will be updated by the module
 #include "revosettings.h"
 #include <mathmisc.h>
+#include <pios_ms5611.h>
 #if defined(PIOS_INCLUDE_HCSR04)
+#include <pios_hcsr04.h>
 #include "sonaraltitude.h" // object that will be updated by the module
 #endif
 #include "taskinfo.h"
diff --git a/flight/pios/common/pios_mpu6000.c b/flight/pios/common/pios_mpu6000.c
index bf00cfa18..c6079beb0 100644
--- a/flight/pios/common/pios_mpu6000.c
+++ b/flight/pios/common/pios_mpu6000.c
@@ -30,7 +30,7 @@
  */
 
 #include "pios.h"
-
+#include <pios_mpu6000.h>
 #ifdef PIOS_INCLUDE_MPU6000
 
 #include <pios_constants.h>
diff --git a/flight/pios/common/pios_ms5611.c b/flight/pios/common/pios_ms5611.c
index 3268289b4..51088fec0 100644
--- a/flight/pios/common/pios_ms5611.c
+++ b/flight/pios/common/pios_ms5611.c
@@ -29,9 +29,8 @@
  */
 
 #include "pios.h"
-
 #ifdef PIOS_INCLUDE_MS5611
-
+#include <pios_ms5611.h>
 #define POW2(x) (1 << x)
 
 // TODO: Clean this up.  Getting around old constant.
diff --git a/flight/pios/pios.h b/flight/pios/pios.h
index db25c274d..7cc6008d0 100644
--- a/flight/pios/pios.h
+++ b/flight/pios/pios.h
@@ -182,49 +182,6 @@
 #endif
 #endif
 
-/* PIOS sensor interfaces */
-#ifdef PIOS_INCLUDE_ADXL345
-/* ADXL345 3-Axis Accelerometer */
-#include <pios_adxl345.h>
-#endif
-
-#ifdef PIOS_INCLUDE_BMA180
-/* BMA180 3-Axis Accelerometer */
-#include <pios_bma180.h>
-#endif
-
-#ifdef PIOS_INCLUDE_L3GD20
-/* L3GD20 3-Axis Gyro */
-#include <pios_l3gd20.h>
-#endif
-
-#ifdef PIOS_INCLUDE_MPU6000
-/* MPU6000 3-Axis Gyro/Accelerometer */
-/* #define PIOS_MPU6000_ACCEL */
-#include <pios_mpu6000.h>
-#endif
-
-#ifdef PIOS_INCLUDE_HMC5843
-/* HMC5843 3-Axis Digital Compass */
-#include <pios_hmc5843.h>
-#endif
-
-#ifdef PIOS_INCLUDE_HMC5X83
-/* HMC5883/HMC5983 3-Axis Digital Compass */
-/* #define PIOS_HMC5x83_HAS_GPIOS */
-#include <pios_hmc5x83.h>
-#endif
-
-#ifdef PIOS_INCLUDE_BMP085
-/* BMP085 Barometric Pressure Sensor */
-#include <pios_bmp085.h>
-#endif
-
-#ifdef PIOS_INCLUDE_MS5611
-/* MS5611 Barometric Pressure Sensor */
-#include <pios_ms5611.h>
-#endif
-
 #ifdef PIOS_INCLUDE_MPXV
 /* MPXV5004, MPXV7002 based Airspeed Sensor */
 #include <pios_mpxv.h>