diff --git a/libraries/AP_HAL_Linux/AP_HAL_Linux_Private.h b/libraries/AP_HAL_Linux/AP_HAL_Linux_Private.h
deleted file mode 100644
index 610d8c7782..0000000000
--- a/libraries/AP_HAL_Linux/AP_HAL_Linux_Private.h
+++ /dev/null
@@ -1,47 +0,0 @@
-#pragma once
-
-/* Umbrella header for all private headers of the AP_HAL_Linux module.
- * Only import this header from inside AP_HAL_Linux
- */
-
-#include "UARTDriver.h"
-#include "SPIUARTDriver.h"
-#include "RPIOUARTDriver.h"
-#include "I2CDevice.h"
-#include "AnalogIn_ADS1115.h"
-#include "AnalogIn_IIO.h"
-#include "AnalogIn_Raspilot.h"
-#include "AnalogIn_Navio2.h"
-#include "Storage.h"
-#include "GPIO.h"
-#include "RCInput.h"
-#include "RCInput_AioPRU.h"
-#include "RCInput_RPI.h"
-#include "RCInput_Navio2.h"
-#include "RCInput_UART.h"
-#include "RCInput_UDP.h"
-#include "RCInput_Raspilot.h"
-#include "RCInput_DSM.h"
-#include "RCInput_SBUS.h"
-#include "RCOutput_PRU.h"
-#include "RCOutput_AioPRU.h"
-#include "RCOutput_PCA9685.h"
-#include "RCOutput_Raspilot.h"
-#include "RCOutput_ZYNQ.h"
-#include "RCOutput_Bebop.h"
-#include "RCOutput_Raspilot.h"
-#include "RCOutput_Sysfs.h"
-#include "RCOutput_qflight.h"
-#include "RCOutput_Disco.h"
-#include "Semaphores.h"
-#include "Scheduler.h"
-#include "ToneAlarm.h"
-#include "Util.h"
-#include "Util_RPI.h"
-#include "Heat.h"
-#include "Heat_Pwm.h"
-#include "CameraSensor.h"
-#include "CameraSensor_Mt9v117.h"
-#include "VideoIn.h"
-#include "OpticalFlow_Onboard.h"
-#include "Flow_PX4.h"
diff --git a/libraries/AP_HAL_Linux/HAL_Linux_Class.cpp b/libraries/AP_HAL_Linux/HAL_Linux_Class.cpp
index 60f9b50297..da7b72af6d 100644
--- a/libraries/AP_HAL_Linux/HAL_Linux_Class.cpp
+++ b/libraries/AP_HAL_Linux/HAL_Linux_Class.cpp
@@ -1,3 +1,5 @@
+#include "HAL_Linux_Class.h"
+
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -9,9 +11,39 @@
 #include <AP_HAL_Empty/AP_HAL_Empty_Private.h>
 #include <AP_Module/AP_Module.h>
 
-#include "AP_HAL_Linux_Private.h"
-#include "HAL_Linux_Class.h"
+#include "AnalogIn_ADS1115.h"
+#include "AnalogIn_IIO.h"
+#include "AnalogIn_Navio2.h"
+#include "AnalogIn_Raspilot.h"
+#include "GPIO.h"
+#include "I2CDevice.h"
+#include "OpticalFlow_Onboard.h"
+#include "RCInput.h"
+#include "RCInput_AioPRU.h"
+#include "RCInput_DSM.h"
+#include "RCInput_Navio2.h"
+#include "RCInput_PRU.h"
+#include "RCInput_RPI.h"
+#include "RCInput_Raspilot.h"
+#include "RCInput_SBUS.h"
+#include "RCInput_UART.h"
+#include "RCInput_UDP.h"
+#include "RCOutput_AioPRU.h"
+#include "RCOutput_Bebop.h"
+#include "RCOutput_Disco.h"
+#include "RCOutput_PCA9685.h"
+#include "RCOutput_PRU.h"
+#include "RCOutput_Raspilot.h"
+#include "RCOutput_Sysfs.h"
+#include "RCOutput_ZYNQ.h"
+#include "RPIOUARTDriver.h"
 #include "SPIDevice.h"
+#include "SPIUARTDriver.h"
+#include "Scheduler.h"
+#include "Storage.h"
+#include "UARTDriver.h"
+#include "Util.h"
+#include "Util_RPI.h"
 
 using namespace Linux;
 
diff --git a/libraries/AP_HAL_Linux/Util.h b/libraries/AP_HAL_Linux/Util.h
index 8794d45935..706f7886c9 100644
--- a/libraries/AP_HAL_Linux/Util.h
+++ b/libraries/AP_HAL_Linux/Util.h
@@ -5,6 +5,9 @@
 
 #include "Heat.h"
 #include "Perf.h"
+#if CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_RASPILOT
+#include "ToneAlarm_Raspilot.h"
+#endif
 #include "ToneAlarm.h"
 #include "Semaphores.h"