diff --git a/Tools/CPUInfo/make.inc b/Tools/CPUInfo/make.inc
deleted file mode 100644
index c611640fcf..0000000000
--- a/Tools/CPUInfo/make.inc
+++ /dev/null
@@ -1,26 +0,0 @@
-LIBRARIES += AP_ADC
-LIBRARIES += AP_AHRS
-LIBRARIES += AP_Airspeed
-LIBRARIES += AP_Baro
-LIBRARIES += AP_BattMonitor
-LIBRARIES += AP_Common
-LIBRARIES += AP_Compass
-LIBRARIES += AP_Declination
-LIBRARIES += AP_GPS
-LIBRARIES += AP_InertialSensor
-LIBRARIES += AP_Math
-LIBRARIES += AP_Mission
-LIBRARIES += AP_NavEKF2
-LIBRARIES += AP_NavEKF3
-LIBRARIES += AP_Notify
-LIBRARIES += AP_OpticalFlow
-LIBRARIES += AP_Param
-LIBRARIES += AP_Rally
-LIBRARIES += AP_RangeFinder
-LIBRARIES += AP_Scheduler
-LIBRARIES += AP_Terrain
-LIBRARIES += AP_Vehicle
-LIBRARIES += DataFlash
-LIBRARIES += Filter
-LIBRARIES += GCS_MAVLink
-LIBRARIES += StorageManager
diff --git a/Tools/Hello/make.inc b/Tools/Hello/make.inc
deleted file mode 100644
index 786da96f87..0000000000
--- a/Tools/Hello/make.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-LIBRARIES += AP_ADC
-LIBRARIES += AP_AHRS
-LIBRARIES += AP_Airspeed
-LIBRARIES += AP_Baro
-LIBRARIES += AP_Common
-LIBRARIES += AP_Compass
-LIBRARIES += AP_Declination
-LIBRARIES += AP_GPS
-LIBRARIES += AP_InertialSensor
-LIBRARIES += AP_Math
-LIBRARIES += AP_Notify
-LIBRARIES += AP_Param
-LIBRARIES += AP_Vehicle
-LIBRARIES += DataFlash
-LIBRARIES += Filter
-LIBRARIES += GCS_MAVLink
-LIBRARIES += AP_NavEKF2
-LIBRARIES += AP_NavEKF3
-LIBRARIES += AP_RangeFinder
-LIBRARIES += AP_Mission
-LIBRARIES += AP_Rally
-LIBRARIES += AP_Terrain
-LIBRARIES += AP_OpticalFlow
-LIBRARIES += StorageManager
-
diff --git a/Tools/Replay/make.inc b/Tools/Replay/make.inc
deleted file mode 100644
index 20aa26e524..0000000000
--- a/Tools/Replay/make.inc
+++ /dev/null
@@ -1,33 +0,0 @@
-LIBRARIES += AP_Common
-LIBRARIES += AP_Param
-LIBRARIES += StorageManager
-LIBRARIES += AP_Math
-LIBRARIES += AP_AccelCal
-LIBRARIES += AP_ADC
-LIBRARIES += AP_Declination
-LIBRARIES += Filter
-LIBRARIES += AP_Buffer
-LIBRARIES += AP_Airspeed
-LIBRARIES += AP_Vehicle
-LIBRARIES += AP_Notify
-LIBRARIES += DataFlash
-LIBRARIES += GCS_MAVLink
-LIBRARIES += AP_GPS
-LIBRARIES += AP_AHRS
-LIBRARIES += AP_Compass
-LIBRARIES += AP_Baro
-LIBRARIES += AP_InertialSensor
-LIBRARIES += AP_NavEKF2
-LIBRARIES += AP_NavEKF3
-LIBRARIES += AP_Mission
-LIBRARIES += AP_Rally
-LIBRARIES += AP_BattMonitor
-LIBRARIES += AP_Terrain
-LIBRARIES += AP_OpticalFlow
-LIBRARIES += Parameters
-LIBRARIES += AP_SerialManager
-LIBRARIES += RC_Channel
-LIBRARIES += AP_RangeFinder
-LIBRARIES += VehicleType
-LIBRARIES += AP_Frsky_Telem
-LIBRARIES += AP_Beacon
diff --git a/libraries/AP_HAL_Linux/examples/BusTest/make.inc b/libraries/AP_HAL_Linux/examples/BusTest/make.inc
deleted file mode 100644
index 262ec49227..0000000000
--- a/libraries/AP_HAL_Linux/examples/BusTest/make.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-LIBRARIES += AP_Common
-LIBRARIES += AP_Math
-LIBRARIES += AP_Param
-LIBRARIES += StorageManager
-LIBRARIES += AP_ADC