diff --git a/libraries/AP_Common/examples/AP_Common/AP_Common.cpp b/libraries/AP_Common/examples/AP_Common/AP_Common.cpp
index 3c76e8615c..368845a9ae 100644
--- a/libraries/AP_Common/examples/AP_Common/AP_Common.cpp
+++ b/libraries/AP_Common/examples/AP_Common/AP_Common.cpp
@@ -3,17 +3,8 @@
 // Unit tests for the AP_Common code
 //
 
-#include <AP_HAL/AP_HAL.h>
-#include <stdlib.h>
 #include <AP_Common/AP_Common.h>
-#include <AP_Progmem/AP_Progmem.h>
-#include <AP_Param/AP_Param.h>
-#include <AP_HAL_AVR/AP_HAL_AVR.h>
-#include <AP_HAL_SITL/AP_HAL_SITL.h>
-#include <AP_HAL_Empty/AP_HAL_Empty.h>
-#include <AP_HAL_PX4/AP_HAL_PX4.h>
-#include <AP_Math/AP_Math.h>
-#include <StorageManager/StorageManager.h>
+#include <AP_HAL/AP_HAL.h>
 
 const AP_HAL::HAL& hal = AP_HAL::get_HAL();
 
diff --git a/libraries/AP_Common/examples/AP_Common/Makefile b/libraries/AP_Common/examples/AP_Common/Makefile
new file mode 100644
index 0000000000..f5daf25151
--- /dev/null
+++ b/libraries/AP_Common/examples/AP_Common/Makefile
@@ -0,0 +1 @@
+include ../../../../mk/apm.mk