diff --git a/src/drivers/blinkm/blinkm.cpp b/src/drivers/blinkm/blinkm.cpp
index 9719abfc023c269667a4d4db024822e75d5c4714..0fd6289ad2bbc6a1aeb136662168d3a483b9b3e7 100644
--- a/src/drivers/blinkm/blinkm.cpp
+++ b/src/drivers/blinkm/blinkm.cpp
@@ -112,7 +112,6 @@
 
 #include <perf/perf_counter.h>
 #include <systemlib/err.h>
-#include <systemlib/systemlib.h>
 
 #include <board_config.h>
 
diff --git a/src/drivers/boards/aerofc-v1/init.c b/src/drivers/boards/aerofc-v1/init.c
index 5412e76d53d1265f22cac9d1bf7e6941980f89bb..c64cc10e5c9fe35281fc1b2b5debb09ddf934993 100644
--- a/src/drivers/boards/aerofc-v1/init.c
+++ b/src/drivers/boards/aerofc-v1/init.c
@@ -73,7 +73,6 @@
 #include <systemlib/cpuload.h>
 #include <systemlib/err.h>
 #include <systemlib/hardfault_log.h>
-#include <systemlib/systemlib.h>
 #include <parameters/param.h>
 
 # if defined(FLASH_BASED_PARAMS)
diff --git a/src/drivers/boards/auav-x21/init.c b/src/drivers/boards/auav-x21/init.c
index b1a3f4490a90f417ee63991679e88abae8d1b017..3ae6834da0a2caf252b7917e41e6bd6650f2e5d6 100644
--- a/src/drivers/boards/auav-x21/init.c
+++ b/src/drivers/boards/auav-x21/init.c
@@ -78,7 +78,6 @@
 
 #include <systemlib/hardfault_log.h>
 
-#include <systemlib/systemlib.h>
 #include <parameters/param.h>
 
 /****************************************************************************
diff --git a/src/drivers/boards/crazyflie/init.c b/src/drivers/boards/crazyflie/init.c
index b5781ea4af336631f172faafe3ae3a70124d7145..93d7b3151e3160768dd61669e6edc146a076af79 100644
--- a/src/drivers/boards/crazyflie/init.c
+++ b/src/drivers/boards/crazyflie/init.c
@@ -71,7 +71,6 @@
 #include <systemlib/cpuload.h>
 #include <systemlib/err.h>
 #include <systemlib/hardfault_log.h>
-#include <systemlib/systemlib.h>
 #include <parameters/param.h>
 
 /****************************************************************************
diff --git a/src/drivers/boards/esc35-v1/init.c b/src/drivers/boards/esc35-v1/init.c
index 15bce9f6c6e01078169085d8ec9c00c8c9d2c870..807e86715567a920a19b2c12aa111b474f0d3a59 100644
--- a/src/drivers/boards/esc35-v1/init.c
+++ b/src/drivers/boards/esc35-v1/init.c
@@ -72,7 +72,6 @@
 #include <parameters/param.h>
 
 #if defined(CONFIG_HAVE_CXX) && defined(CONFIG_HAVE_CXXINITIALIZE)
-#include <systemlib/systemlib.h>
 #endif
 
 # if defined(FLASH_BASED_PARAMS)
diff --git a/src/drivers/boards/mindpx-v2/init.c b/src/drivers/boards/mindpx-v2/init.c
index 5291c7f67088895f41ff4491be3e3dae8f373dd2..8adf137d5860df6a549b0aee5eb431b85d581855 100644
--- a/src/drivers/boards/mindpx-v2/init.c
+++ b/src/drivers/boards/mindpx-v2/init.c
@@ -78,7 +78,6 @@
 
 #include <systemlib/hardfault_log.h>
 
-#include <systemlib/systemlib.h>
 #include <parameters/param.h>
 
 /****************************************************************************
diff --git a/src/drivers/boards/nxphlite-v3/init.c b/src/drivers/boards/nxphlite-v3/init.c
index ed58b3247def3aeb9efc4174fff9bcd9bafb4b7e..5f15a372ecea2a5a5ae0bdf0801055ed34197e59 100644
--- a/src/drivers/boards/nxphlite-v3/init.c
+++ b/src/drivers/boards/nxphlite-v3/init.c
@@ -80,7 +80,6 @@
 #include <systemlib/hardfault_log.h>
 #endif
 
-#include <systemlib/systemlib.h>
 
 /****************************************************************************
  * Pre-Processor Definitions
diff --git a/src/drivers/boards/omnibus-f4sd/init.c b/src/drivers/boards/omnibus-f4sd/init.c
index e0522668b2b2d7b4c27b2c9e5abdc6c9459a083f..bbad226b7e84ebcf8f951ee48f4249134dd70251 100644
--- a/src/drivers/boards/omnibus-f4sd/init.c
+++ b/src/drivers/boards/omnibus-f4sd/init.c
@@ -78,7 +78,6 @@
 
 #include <systemlib/hardfault_log.h>
 
-#include <systemlib/systemlib.h>
 #include <parameters/param.h>
 
 /****************************************************************************
diff --git a/src/drivers/boards/px4-same70xplained-v1/init.c b/src/drivers/boards/px4-same70xplained-v1/init.c
index a043cddc6db329162ba08c8e7f8564ea79c65c24..da2c9e892688981015225b78b411152d06171a77 100644
--- a/src/drivers/boards/px4-same70xplained-v1/init.c
+++ b/src/drivers/boards/px4-same70xplained-v1/init.c
@@ -80,7 +80,6 @@
 
 #include <systemlib/hardfault_log.h>
 
-#include <systemlib/systemlib.h>
 #include <parameters/param.h>
 
 /****************************************************************************
diff --git a/src/drivers/boards/px4cannode-v1/init.c b/src/drivers/boards/px4cannode-v1/init.c
index 28a31ba540ec7db576dd535a26c6f7afb0417660..2906b68018fe55f1c776e5d770819810e806a8c5 100644
--- a/src/drivers/boards/px4cannode-v1/init.c
+++ b/src/drivers/boards/px4cannode-v1/init.c
@@ -72,7 +72,6 @@
 #include <parameters/param.h>
 
 #if defined(CONFIG_HAVE_CXX) && defined(CONFIG_HAVE_CXXINITIALIZE)
-#include <systemlib/systemlib.h>
 #endif
 
 #include "board_config.h"
diff --git a/src/drivers/boards/px4esc-v1/init.c b/src/drivers/boards/px4esc-v1/init.c
index ff443ced2a708148634dafbeb42867a44868afa2..b55c9aee02b5a519fecd0771cd68986dcc8b515d 100644
--- a/src/drivers/boards/px4esc-v1/init.c
+++ b/src/drivers/boards/px4esc-v1/init.c
@@ -72,7 +72,6 @@
 #include <parameters/param.h>
 
 #if defined(CONFIG_HAVE_CXX) && defined(CONFIG_HAVE_CXXINITIALIZE)
-#include <systemlib/systemlib.h>
 #endif
 
 # if defined(FLASH_BASED_PARAMS)
diff --git a/src/drivers/boards/px4flow-v2/init.c b/src/drivers/boards/px4flow-v2/init.c
index 3865e099e88f94732374d0dc4337a0256ae80c35..2ff3fb6e5447895661728fa9617faf16cc919035 100644
--- a/src/drivers/boards/px4flow-v2/init.c
+++ b/src/drivers/boards/px4flow-v2/init.c
@@ -71,7 +71,6 @@
 #include <systemlib/cpuload.h>
 
 #if defined(CONFIG_HAVE_CXX) && defined(CONFIG_HAVE_CXXINITIALIZE)
-#include <systemlib/systemlib.h>
 #endif
 
 #include "board_config.h"
diff --git a/src/drivers/boards/px4fmu-v2/init.c b/src/drivers/boards/px4fmu-v2/init.c
index 65a8108cd4367d2ead3b840c7528a04411f76958..629f037db6cdae9ea4d8145df53101e8d5bea31c 100644
--- a/src/drivers/boards/px4fmu-v2/init.c
+++ b/src/drivers/boards/px4fmu-v2/init.c
@@ -78,7 +78,6 @@
 
 #include <systemlib/hardfault_log.h>
 
-#include <systemlib/systemlib.h>
 #include <parameters/param.h>
 
 /****************************************************************************
diff --git a/src/drivers/boards/px4fmu-v4/init.c b/src/drivers/boards/px4fmu-v4/init.c
index 78f79431ad31ba155ba0013d31742b0cd0afc8fa..74f0381b5035d1295cb74ec90af272c94423983d 100644
--- a/src/drivers/boards/px4fmu-v4/init.c
+++ b/src/drivers/boards/px4fmu-v4/init.c
@@ -79,7 +79,6 @@
 
 #include <systemlib/hardfault_log.h>
 
-#include <systemlib/systemlib.h>
 #include <parameters/param.h>
 
 /****************************************************************************
diff --git a/src/drivers/boards/px4fmu-v4pro/init.c b/src/drivers/boards/px4fmu-v4pro/init.c
index 0df6f3414b0a4fc6d530364b8e4321bf178abe1e..232cbe757c54a9a99867449cbf9bed19497dd79e 100644
--- a/src/drivers/boards/px4fmu-v4pro/init.c
+++ b/src/drivers/boards/px4fmu-v4pro/init.c
@@ -79,7 +79,6 @@
 
 #include <systemlib/hardfault_log.h>
 
-#include <systemlib/systemlib.h>
 #include <parameters/param.h>
 
 /****************************************************************************
diff --git a/src/drivers/boards/px4fmu-v5/init.c b/src/drivers/boards/px4fmu-v5/init.c
index 58668fe47d639b7a9804db184abfc8c4a22debad..3d8c785862b89014d8d4c2e85dc16898c0135150 100644
--- a/src/drivers/boards/px4fmu-v5/init.c
+++ b/src/drivers/boards/px4fmu-v5/init.c
@@ -81,7 +81,6 @@
 
 #include <systemlib/hardfault_log.h>
 
-#include <systemlib/systemlib.h>
 #include <parameters/param.h>
 
 #include "up_internal.h"
diff --git a/src/drivers/boards/px4nucleoF767ZI-v1/init.c b/src/drivers/boards/px4nucleoF767ZI-v1/init.c
index 41a724c4f710fd10a0f718d6ac1ece94bbe4ee27..1c76942ea62f8b5345ae06c1c1070459f1eeb554 100644
--- a/src/drivers/boards/px4nucleoF767ZI-v1/init.c
+++ b/src/drivers/boards/px4nucleoF767ZI-v1/init.c
@@ -79,7 +79,6 @@
 
 #include <systemlib/hardfault_log.h>
 
-#include <systemlib/systemlib.h>
 #include <parameters/param.h>
 
 #include "up_internal.h"
diff --git a/src/drivers/boards/s2740vc-v1/init.c b/src/drivers/boards/s2740vc-v1/init.c
index 3c5a6f5ecb90adcdf999e6123c37160d33834641..80d83a74834103a74196c07a8275a2cbc5173059 100644
--- a/src/drivers/boards/s2740vc-v1/init.c
+++ b/src/drivers/boards/s2740vc-v1/init.c
@@ -72,7 +72,6 @@
 #include <parameters/param.h>
 
 #if defined(CONFIG_HAVE_CXX) && defined(CONFIG_HAVE_CXXINITIALIZE)
-#include <systemlib/systemlib.h>
 #endif
 
 #include "board_config.h"
diff --git a/src/drivers/boards/tap-v1/init.c b/src/drivers/boards/tap-v1/init.c
index 28f03c66d0a399e57418f5abfe82b6fa1a87b38f..a19bfc47cf1f10b1a91807717a20271e6277fdae 100644
--- a/src/drivers/boards/tap-v1/init.c
+++ b/src/drivers/boards/tap-v1/init.c
@@ -71,7 +71,6 @@
 #include <systemlib/cpuload.h>
 #include <systemlib/err.h>
 #include <systemlib/hardfault_log.h>
-#include <systemlib/systemlib.h>
 #include <parameters/param.h>
 
 # if defined(FLASH_BASED_PARAMS)
diff --git a/src/drivers/boards/zubaxgnss-v1/gnss_init.c b/src/drivers/boards/zubaxgnss-v1/gnss_init.c
index 44407b4626b8bde7caef4e30b4ef7f27213d75f5..55a101a3ae494131982959dc0cd2edaca01d163b 100644
--- a/src/drivers/boards/zubaxgnss-v1/gnss_init.c
+++ b/src/drivers/boards/zubaxgnss-v1/gnss_init.c
@@ -71,7 +71,6 @@
 #include <systemlib/cpuload.h>
 
 #if defined(CONFIG_HAVE_CXX) && defined(CONFIG_HAVE_CXXINITIALIZE)
-#include <systemlib/systemlib.h>
 #endif
 
 #include "board_config.h"
diff --git a/src/drivers/camera_trigger/camera_trigger.cpp b/src/drivers/camera_trigger/camera_trigger.cpp
index 9ad7769d020da639429f0cc3c5d282c660f221cf..d171da41680a797b10f10e09a3eb8b8625493e44 100644
--- a/src/drivers/camera_trigger/camera_trigger.cpp
+++ b/src/drivers/camera_trigger/camera_trigger.cpp
@@ -51,7 +51,6 @@
 #include <mathlib/mathlib.h>
 #include <matrix/math.hpp>
 #include <px4_workqueue.h>
-#include <systemlib/systemlib.h>
 #include <systemlib/err.h>
 #include <parameters/param.h>
 #include <systemlib/mavlink_log.h>
diff --git a/src/drivers/gps/gps.cpp b/src/drivers/gps/gps.cpp
index 28df516af83bb63440a226c1af7a39800892cd1b..36f7a9607bb926042d75bade40fbc991b4e729e9 100644
--- a/src/drivers/gps/gps.cpp
+++ b/src/drivers/gps/gps.cpp
@@ -70,7 +70,6 @@
 #include <arch/board/board.h>
 #include <drivers/drv_hrt.h>
 #include <mathlib/mathlib.h>
-#include <systemlib/systemlib.h>
 #include <systemlib/err.h>
 #include <parameters/param.h>
 #include <drivers/drv_gps.h>
diff --git a/src/drivers/md25/md25_main.cpp b/src/drivers/md25/md25_main.cpp
index 0857417471a93d02c5eb2d3be2d4abb3e64cddaf..e100e9f7c16caa1180ec45df25e4107d27f419bd 100644
--- a/src/drivers/md25/md25_main.cpp
+++ b/src/drivers/md25/md25_main.cpp
@@ -51,7 +51,6 @@
 #include <string.h>
 #include <math.h>
 
-#include <systemlib/systemlib.h>
 #include <parameters/param.h>
 
 #include <arch/board/board.h>
diff --git a/src/drivers/mkblctrl/mkblctrl.cpp b/src/drivers/mkblctrl/mkblctrl.cpp
index 342ffdf437c7ba1fa318472fe4c4cc87bec40b04..300e6ec549d1d18a7bfaf6c3cd35a67fb41136ed 100644
--- a/src/drivers/mkblctrl/mkblctrl.cpp
+++ b/src/drivers/mkblctrl/mkblctrl.cpp
@@ -71,7 +71,6 @@
 #include <drivers/drv_mixer.h>
 #include <drivers/drv_tone_alarm.h>
 
-#include <systemlib/systemlib.h>
 #include <systemlib/err.h>
 #include <lib/mixer/mixer.h>
 
diff --git a/src/drivers/oreoled/oreoled.cpp b/src/drivers/oreoled/oreoled.cpp
index e595e5e0fc2426f8b075fb436f6d3919f9b464c1..79407d0eb76bd71071f5939b0c6b712d5f716f14 100644
--- a/src/drivers/oreoled/oreoled.cpp
+++ b/src/drivers/oreoled/oreoled.cpp
@@ -61,7 +61,6 @@
 
 #include <perf/perf_counter.h>
 #include <systemlib/err.h>
-#include <systemlib/systemlib.h>
 
 #include <board_config.h>
 
diff --git a/src/drivers/pca8574/pca8574.cpp b/src/drivers/pca8574/pca8574.cpp
index 6f6b22eb41dd461ac003736f3dee1fe0a65e8176..8d6c05c1d264485412e8256f6ad8d708a310114b 100644
--- a/src/drivers/pca8574/pca8574.cpp
+++ b/src/drivers/pca8574/pca8574.cpp
@@ -59,7 +59,6 @@
 
 #include <perf/perf_counter.h>
 #include <systemlib/err.h>
-#include <systemlib/systemlib.h>
 
 #include <board_config.h>
 
diff --git a/src/drivers/pca9685/pca9685.cpp b/src/drivers/pca9685/pca9685.cpp
index 329e20c47025274538b516aea697ab3605d19496..ff010396df9bc78186d99332d6edb9c8dc9c790d 100644
--- a/src/drivers/pca9685/pca9685.cpp
+++ b/src/drivers/pca9685/pca9685.cpp
@@ -67,7 +67,6 @@
 
 #include <perf/perf_counter.h>
 #include <systemlib/err.h>
-#include <systemlib/systemlib.h>
 
 #include <uORB/uORB.h>
 #include <uORB/topics/actuator_controls.h>
diff --git a/src/drivers/px4io/px4io.cpp b/src/drivers/px4io/px4io.cpp
index d0a556a970ab865920601d9199fbbb51f7e9f6d0..dc4a949864f8da680e7e4489641e501f473987a9 100644
--- a/src/drivers/px4io/px4io.cpp
+++ b/src/drivers/px4io/px4io.cpp
@@ -70,7 +70,6 @@
 #include <lib/mixer/mixer.h>
 #include <perf/perf_counter.h>
 #include <systemlib/err.h>
-#include <systemlib/systemlib.h>
 #include <parameters/param.h>
 #include <systemlib/circuit_breaker.h>
 #include <systemlib/mavlink_log.h>
diff --git a/src/drivers/rgbled/rgbled.cpp b/src/drivers/rgbled/rgbled.cpp
index fb0ad7a991ef78333286c563d5f0c04d5469b9f4..f72cf2e7da9c874372d43d8ecedc6b96c5c75bbb 100644
--- a/src/drivers/rgbled/rgbled.cpp
+++ b/src/drivers/rgbled/rgbled.cpp
@@ -59,7 +59,6 @@
 
 #include <perf/perf_counter.h>
 #include <systemlib/err.h>
-#include <systemlib/systemlib.h>
 
 #include <board_config.h>
 
diff --git a/src/drivers/rgbled_pwm/rgbled_pwm.cpp b/src/drivers/rgbled_pwm/rgbled_pwm.cpp
index 42cd2a5d298536e2c10ea3412f46b05420b94b46..ad815792986252f41f3693392ec4fe9ed653e0ae 100644
--- a/src/drivers/rgbled_pwm/rgbled_pwm.cpp
+++ b/src/drivers/rgbled_pwm/rgbled_pwm.cpp
@@ -58,7 +58,6 @@
 
 #include <perf/perf_counter.h>
 #include <systemlib/err.h>
-#include <systemlib/systemlib.h>
 
 #include <board_config.h>
 
diff --git a/src/drivers/roboclaw/roboclaw_main.cpp b/src/drivers/roboclaw/roboclaw_main.cpp
index 8d01930663cdda1939e9bee0d649c0d197da96d0..1cec2f658ebb844279a0451d4bed30f350094feb 100644
--- a/src/drivers/roboclaw/roboclaw_main.cpp
+++ b/src/drivers/roboclaw/roboclaw_main.cpp
@@ -50,7 +50,6 @@
 #include <string.h>
 #include <math.h>
 
-#include <systemlib/systemlib.h>
 #include <parameters/param.h>
 
 #include <arch/board/board.h>
diff --git a/src/drivers/stm32/drv_led_pwm.cpp b/src/drivers/stm32/drv_led_pwm.cpp
index 563f899769ec05a2e5fba907ab7c6456f91445cf..8e9f914b363194f63c923d15323d74815f8595c7 100644
--- a/src/drivers/stm32/drv_led_pwm.cpp
+++ b/src/drivers/stm32/drv_led_pwm.cpp
@@ -54,7 +54,6 @@
 
 #include <perf/perf_counter.h>
 #include <systemlib/err.h>
-#include <systemlib/systemlib.h>
 #include <systemlib/px4_macros.h>
 
 #include <drivers/drv_pwm_output.h>
diff --git a/src/drivers/telemetry/hott/hott_sensors/hott_sensors.cpp b/src/drivers/telemetry/hott/hott_sensors/hott_sensors.cpp
index e6165325052fead59bf44d33ce458e6699ad8499..2e62cb2991c7d661620e99ec0e92f6ae6f742540 100644
--- a/src/drivers/telemetry/hott/hott_sensors/hott_sensors.cpp
+++ b/src/drivers/telemetry/hott/hott_sensors/hott_sensors.cpp
@@ -52,7 +52,6 @@
 #include <sys/ioctl.h>
 #include <unistd.h>
 #include <systemlib/err.h>
-#include <systemlib/systemlib.h>
 
 #include "../comms.h"
 #include "../messages.h"
diff --git a/src/drivers/telemetry/hott/hott_telemetry/hott_telemetry.cpp b/src/drivers/telemetry/hott/hott_telemetry/hott_telemetry.cpp
index f1a6f3917ae4117cfeebd41c31491884e6368b45..909a94a4de39b632e68a6326ee7530f5a46b6614 100644
--- a/src/drivers/telemetry/hott/hott_telemetry/hott_telemetry.cpp
+++ b/src/drivers/telemetry/hott/hott_telemetry/hott_telemetry.cpp
@@ -55,7 +55,6 @@
 #include <unistd.h>
 #include <systemlib/err.h>
 #include <perf/perf_counter.h>
-#include <systemlib/systemlib.h>
 
 #include "../comms.h"
 #include "../messages.h"
diff --git a/src/drivers/telemetry/iridiumsbd/IridiumSBD.cpp b/src/drivers/telemetry/iridiumsbd/IridiumSBD.cpp
index 79493c6cb8caae8fe16bc734012cc87ac65ede7c..42e619bfc26896daaaee3c19ef4023a663e0cca6 100644
--- a/src/drivers/telemetry/iridiumsbd/IridiumSBD.cpp
+++ b/src/drivers/telemetry/iridiumsbd/IridiumSBD.cpp
@@ -45,7 +45,6 @@
 #include <pthread.h>
 
 #include <systemlib/err.h>
-#include <systemlib/systemlib.h>
 #include <parameters/param.h>
 
 #include "drivers/drv_iridiumsbd.h"
diff --git a/src/examples/fixedwing_control/main.cpp b/src/examples/fixedwing_control/main.cpp
index 84c503015a170f88873fe1c1c09be4cb84a128bc..8f26da4be5ee23728eba088529f342b7e1637133 100644
--- a/src/examples/fixedwing_control/main.cpp
+++ b/src/examples/fixedwing_control/main.cpp
@@ -55,7 +55,6 @@
 #include <parameters/param.h>
 #include <perf/perf_counter.h>
 #include <systemlib/pid/pid.h>
-#include <systemlib/systemlib.h>
 #include <uORB/topics/actuator_controls.h>
 #include <uORB/topics/manual_control_setpoint.h>
 #include <uORB/topics/parameter_update.h>
diff --git a/src/examples/matlab_csv_serial/matlab_csv_serial.c b/src/examples/matlab_csv_serial/matlab_csv_serial.c
index 8e6cd45a002935bc96e5b0fc54eb22dba4edc104..3bb0dcdaf353f1bd6d66e8cc61f7770d191f915c 100644
--- a/src/examples/matlab_csv_serial/matlab_csv_serial.c
+++ b/src/examples/matlab_csv_serial/matlab_csv_serial.c
@@ -59,7 +59,6 @@
 #include <drivers/drv_accel.h>
 #include <drivers/drv_gyro.h>
 #include <perf/perf_counter.h>
-#include <systemlib/systemlib.h>
 #include <systemlib/err.h>
 #include <poll.h>
 
diff --git a/src/examples/publisher/publisher_start_nuttx.cpp b/src/examples/publisher/publisher_start_nuttx.cpp
index 54b91ac067db746be1d3d776952ce689d0057758..6a58ad242030de9447f295043cc4351f1d5bcbbf 100644
--- a/src/examples/publisher/publisher_start_nuttx.cpp
+++ b/src/examples/publisher/publisher_start_nuttx.cpp
@@ -39,7 +39,6 @@
 #include <string.h>
 #include <cstdlib>
 #include <systemlib/err.h>
-#include <systemlib/systemlib.h>
 
 extern bool thread_running;
 int daemon_task;             /**< Handle of deamon task / thread */
diff --git a/src/examples/segway/segway_main.cpp b/src/examples/segway/segway_main.cpp
index d2f4502c36b3b1729b731eb7c7c4655917d56ec3..671547579a332ef8a98db030026fc8c96c8f290d 100644
--- a/src/examples/segway/segway_main.cpp
+++ b/src/examples/segway/segway_main.cpp
@@ -44,7 +44,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <systemlib/systemlib.h>
 #include <parameters/param.h>
 #include <systemlib/err.h>
 #include <drivers/drv_hrt.h>
diff --git a/src/examples/subscriber/subscriber_start_nuttx.cpp b/src/examples/subscriber/subscriber_start_nuttx.cpp
index 798d6523c765946f0acf6c1b768c4fbc6f34c0c1..5ffa3ed1800ffedc18dff7a61ce73d36c451b68a 100644
--- a/src/examples/subscriber/subscriber_start_nuttx.cpp
+++ b/src/examples/subscriber/subscriber_start_nuttx.cpp
@@ -39,7 +39,6 @@
 #include <string.h>
 #include <cstdlib>
 #include <systemlib/err.h>
-#include <systemlib/systemlib.h>
 
 extern bool thread_running;
 int daemon_task;             /**< Handle of deamon task / thread */
diff --git a/src/examples/uuv_example_app/uuv_example_app.cpp b/src/examples/uuv_example_app/uuv_example_app.cpp
index 8d1cc462032db61aa554f73c12eea05e4608bfe6..36f241c4aeb79138a0902f2a8d64d1a8de9a6bac 100644
--- a/src/examples/uuv_example_app/uuv_example_app.cpp
+++ b/src/examples/uuv_example_app/uuv_example_app.cpp
@@ -54,7 +54,6 @@
 #include <parameters/param.h>
 #include <systemlib/err.h>
 #include <perf/perf_counter.h>
-#include <systemlib/systemlib.h>
 #include <systemlib/circuit_breaker.h>
 // internal libraries
 #include <lib/mathlib/mathlib.h>
diff --git a/src/modules/camera_feedback/camera_feedback.hpp b/src/modules/camera_feedback/camera_feedback.hpp
index 6b4f30f247614193b817052089a7e3ff3dc14fbb..3c91bd1b467f37bd84e1852924b6255d5c9de638 100644
--- a/src/modules/camera_feedback/camera_feedback.hpp
+++ b/src/modules/camera_feedback/camera_feedback.hpp
@@ -45,7 +45,6 @@
 #include <stdbool.h>
 #include <poll.h>
 #include <mathlib/mathlib.h>
-#include <systemlib/systemlib.h>
 #include <systemlib/err.h>
 #include <parameters/param.h>
 
diff --git a/src/modules/gpio_led/gpio_led.c b/src/modules/gpio_led/gpio_led.c
index 0c2a852e5bd38574b8b6fc193ee0fbd41e39f757..8abdd3f664ef8aa27f0bebb7084fd54996f59a41 100644
--- a/src/modules/gpio_led/gpio_led.c
+++ b/src/modules/gpio_led/gpio_led.c
@@ -49,7 +49,6 @@
 #include <px4_log.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/clock.h>
-#include <systemlib/systemlib.h>
 #include <systemlib/err.h>
 #include <uORB/uORB.h>
 #include <uORB/topics/vehicle_status.h>
diff --git a/src/modules/land_detector/land_detector_main.cpp b/src/modules/land_detector/land_detector_main.cpp
index afc6f1813073e636b3cca7ae19e3cb41031ed4ba..71e36bdabd91311356b8c59b76785a7447c57ba3 100644
--- a/src/modules/land_detector/land_detector_main.cpp
+++ b/src/modules/land_detector/land_detector_main.cpp
@@ -44,7 +44,6 @@
 #include <px4_defines.h>
 #include <px4_posix.h>
 #include <px4_tasks.h>
-#include <systemlib/systemlib.h>
 
 #include "FixedwingLandDetector.h"
 #include "MulticopterLandDetector.h"
diff --git a/src/modules/landing_target_estimator/landing_target_estimator_main.cpp b/src/modules/landing_target_estimator/landing_target_estimator_main.cpp
index 46a1c802c34cefaa6f082c68985771cf10d2c80c..af501bf6ce577573f541003ff3787a3d6722dd7a 100644
--- a/src/modules/landing_target_estimator/landing_target_estimator_main.cpp
+++ b/src/modules/landing_target_estimator/landing_target_estimator_main.cpp
@@ -50,7 +50,6 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <drivers/drv_hrt.h>
-#include <systemlib/systemlib.h>
 #include <systemlib/err.h>
 
 #include "LandingTargetEstimator.h"
diff --git a/src/modules/load_mon/load_mon.cpp b/src/modules/load_mon/load_mon.cpp
index 29233e0144731b54ccd40731078dbe221c04df2a..98061cf04aacc4a8ddeb09cdc4e91efd67b0af8f 100644
--- a/src/modules/load_mon/load_mon.cpp
+++ b/src/modules/load_mon/load_mon.cpp
@@ -51,7 +51,6 @@
 
 #include <drivers/drv_hrt.h>
 
-#include <systemlib/systemlib.h>
 #include <systemlib/cpuload.h>
 #include <perf/perf_counter.h>
 
diff --git a/src/modules/mavlink/mavlink_main.cpp b/src/modules/mavlink/mavlink_main.cpp
index 651c24528225411ab299cc9e4977ca9b7972330b..df70c7de5506e6cfe0ddc9443452998bfce2364f 100644
--- a/src/modules/mavlink/mavlink_main.cpp
+++ b/src/modules/mavlink/mavlink_main.cpp
@@ -68,7 +68,6 @@
 #include <parameters/param.h>
 #include <systemlib/err.h>
 #include <perf/perf_counter.h>
-#include <systemlib/systemlib.h>
 #include <systemlib/mavlink_log.h>
 #include <lib/ecl/geo/geo.h>
 #include <dataman/dataman.h>
diff --git a/src/modules/mavlink/mavlink_receiver.cpp b/src/modules/mavlink/mavlink_receiver.cpp
index 7ac5e21a9c16231fd87a7f07db931ffeb4e26a78..90674e153e69514fb3b14cb44bddd5c662229496 100644
--- a/src/modules/mavlink/mavlink_receiver.cpp
+++ b/src/modules/mavlink/mavlink_receiver.cpp
@@ -84,7 +84,6 @@
 #include <conversion/rotation.h>
 
 #include <parameters/param.h>
-#include <systemlib/systemlib.h>
 #include <systemlib/mavlink_log.h>
 #include <systemlib/err.h>
 #include <systemlib/airspeed.h>
diff --git a/src/modules/navigator/navigator_main.cpp b/src/modules/navigator/navigator_main.cpp
index 5676d00a22da83bbf355606fc5dca35c585b2b6d..8cb56c03fd2324d55c7d0a1f0cf04d1676b0eeba 100644
--- a/src/modules/navigator/navigator_main.cpp
+++ b/src/modules/navigator/navigator_main.cpp
@@ -59,7 +59,6 @@
 #include <px4_posix.h>
 #include <px4_tasks.h>
 #include <systemlib/mavlink_log.h>
-#include <systemlib/systemlib.h>
 #include <uORB/topics/fw_pos_ctrl_status.h>
 #include <uORB/topics/home_position.h>
 #include <uORB/topics/mission.h>
diff --git a/src/modules/px4iofirmware/px4io.c b/src/modules/px4iofirmware/px4io.c
index b3e9425bc558785fed614902811ac81ecf3377b8..5af43cdfb1ff5ef0bd46b805147cc4d1c26842a7 100644
--- a/src/modules/px4iofirmware/px4io.c
+++ b/src/modules/px4iofirmware/px4io.c
@@ -56,7 +56,6 @@
 
 #include <perf/perf_counter.h>
 #include <systemlib/pwm_limit/pwm_limit.h>
-#include <systemlib/systemlib.h>
 
 #include <stm32_uart.h>
 
diff --git a/src/modules/px4iofirmware/registers.c b/src/modules/px4iofirmware/registers.c
index 462398cf08595b9c3fd182aba88c321a73c51521..e46d4c2d196ea0064c702edc6813212cd4b87b71 100644
--- a/src/modules/px4iofirmware/registers.c
+++ b/src/modules/px4iofirmware/registers.c
@@ -47,7 +47,6 @@
 
 #include <drivers/drv_hrt.h>
 #include <drivers/drv_pwm_output.h>
-#include <systemlib/systemlib.h>
 #include <stm32_pwr.h>
 #include <rc/dsm.h>
 #include <rc/sbus.h>
diff --git a/src/modules/sdlog2/sdlog2.c b/src/modules/sdlog2/sdlog2.c
index aeb4d2a5e009d14c7b23682c648df37629e9e0be..1dea6ef7ef333d87565cf8e73b44933a52fbeec5 100644
--- a/src/modules/sdlog2/sdlog2.c
+++ b/src/modules/sdlog2/sdlog2.c
@@ -101,7 +101,6 @@
 #include <uORB/topics/cpuload.h>
 #include <uORB/topics/task_stack_info.h>
 
-#include <systemlib/systemlib.h>
 #include <parameters/param.h>
 #include <perf/perf_counter.h>
 #include <systemlib/printload.h>
diff --git a/src/modules/sensors/sensors.cpp b/src/modules/sensors/sensors.cpp
index 2e72bf7c5bad62f7463000df4cc2661dae4e9c91..5f9e526c84c8c03c95af2651d0890fd7c7d5cde4 100644
--- a/src/modules/sensors/sensors.cpp
+++ b/src/modules/sensors/sensors.cpp
@@ -69,7 +69,6 @@
 #include <drivers/drv_px4flow.h>
 
 #include <systemlib/airspeed.h>
-#include <systemlib/systemlib.h>
 #include <parameters/param.h>
 #include <systemlib/err.h>
 #include <perf/perf_counter.h>
diff --git a/src/modules/systemlib/systemlib.h b/src/modules/systemlib/systemlib.h
deleted file mode 100644
index 73955c0b268de7e7ee23309af0e503473c029ed3..0000000000000000000000000000000000000000
--- a/src/modules/systemlib/systemlib.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/****************************************************************************
- *
- *   Copyright (C) 2012 PX4 Development Team. All rights reserved.
- *   Author: Lorenz Meier <lm@inf.ethz.ch>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name PX4 nor the names of its contributors may be
- *    used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- ****************************************************************************/
-
-/**
- * @file systemlib.h
- * Definition of commonly used low-level system-call like functions.
- */
-
-#ifndef SYSTEMLIB_H_
-#define SYSTEMLIB_H_
-
-#endif /* SYSTEMLIB_H_ */
diff --git a/src/modules/uavcan/uavcan_main.cpp b/src/modules/uavcan/uavcan_main.cpp
index 03cdc6a630bd57d921c5bc36bde138e134c76794..5d72e0d16a595a697cf97871c02452eb2c63c665 100644
--- a/src/modules/uavcan/uavcan_main.cpp
+++ b/src/modules/uavcan/uavcan_main.cpp
@@ -49,7 +49,6 @@
 #include <cstring>
 #include <fcntl.h>
 #include <systemlib/err.h>
-#include <systemlib/systemlib.h>
 #include <parameters/param.h>
 #include <lib/mixer/mixer.h>
 #include <systemlib/board_serial.h>
diff --git a/src/modules/uavcan/uavcan_servers.cpp b/src/modules/uavcan/uavcan_servers.cpp
index 0377553eca7cd892a8a89ea882c8a4f7bab97986..1fc8da265cbebdb34cbcfa9f58a6e0ec9b8ad364 100644
--- a/src/modules/uavcan/uavcan_servers.cpp
+++ b/src/modules/uavcan/uavcan_servers.cpp
@@ -42,7 +42,6 @@
 #include <pthread.h>
 #include <mathlib/mathlib.h>
 #include <systemlib/err.h>
-#include <systemlib/systemlib.h>
 #include <parameters/param.h>
 #include <lib/mixer/mixer.h>
 #include <systemlib/board_serial.h>
diff --git a/src/modules/uavcanesc/indication_controller.cpp b/src/modules/uavcanesc/indication_controller.cpp
index f02780f692da58cb71bcf73f9bee7a20f815d5ab..521a74103b13c4aa175a5d1222f9df3e26144c77 100644
--- a/src/modules/uavcanesc/indication_controller.cpp
+++ b/src/modules/uavcanesc/indication_controller.cpp
@@ -32,7 +32,6 @@
  *
  ****************************************************************************/
 
-#include <systemlib/systemlib.h>
 #include "indication_controller.hpp"
 #include <uavcan/equipment/indication/LightsCommand.hpp>
 #include "led.hpp"
diff --git a/src/modules/uavcanesc/uavcanesc_main.cpp b/src/modules/uavcanesc/uavcanesc_main.cpp
index 6566da2d6511163f2044f02d00425179b9472676..596899992f1c64df0bb990966d258c86ce24b4e9 100644
--- a/src/modules/uavcanesc/uavcanesc_main.cpp
+++ b/src/modules/uavcanesc/uavcanesc_main.cpp
@@ -42,7 +42,6 @@
 #include <cstring>
 #include <fcntl.h>
 #include <systemlib/err.h>
-#include <systemlib/systemlib.h>
 #include <parameters/param.h>
 #include <lib/mixer/mixer.h>
 #include <systemlib/board_serial.h>
diff --git a/src/modules/uavcannode/indication_controller.cpp b/src/modules/uavcannode/indication_controller.cpp
index 8cb0c3c61c3063aa7aeec31187dfe6679bc75f95..3322c816c9fa1ce5391aed72b933cdec0de45cf8 100644
--- a/src/modules/uavcannode/indication_controller.cpp
+++ b/src/modules/uavcannode/indication_controller.cpp
@@ -32,7 +32,6 @@
  *
  ****************************************************************************/
 
-#include <systemlib/systemlib.h>
 #include "indication_controller.hpp"
 #include <uavcan/equipment/indication/LightsCommand.hpp>
 #include "led.hpp"
diff --git a/src/modules/uavcannode/sim_controller.cpp b/src/modules/uavcannode/sim_controller.cpp
index f7cef1b70da2dda55ba7f44b3f9d9a86464b2164..39e99802f7ca151a89b9a7d19a035ae11efe97b4 100644
--- a/src/modules/uavcannode/sim_controller.cpp
+++ b/src/modules/uavcannode/sim_controller.cpp
@@ -35,7 +35,6 @@
 #include <px4_config.h>
 
 #include <syslog.h>
-#include <systemlib/systemlib.h>
 
 #include "sim_controller.hpp"
 #include <uavcan/equipment/esc/RawCommand.hpp>
diff --git a/src/modules/uavcannode/uavcannode_main.cpp b/src/modules/uavcannode/uavcannode_main.cpp
index 1cffd53e99e79d0b05ec94d6a3494775e6e749de..390273ada818bedeaab8cf8c9fb009348e8572ad 100644
--- a/src/modules/uavcannode/uavcannode_main.cpp
+++ b/src/modules/uavcannode/uavcannode_main.cpp
@@ -45,7 +45,6 @@
 #include <cstring>
 #include <fcntl.h>
 #include <systemlib/err.h>
-#include <systemlib/systemlib.h>
 #include <parameters/param.h>
 #include <lib/mixer/mixer.h>
 #include <systemlib/board_serial.h>
diff --git a/src/platforms/px4_includes.h b/src/platforms/px4_includes.h
index 7eb6251ab571394eaffd1dca6b7a494434f3fbe6..e20cf5baf097f7bfb9517a8395d246cca25602a9 100644
--- a/src/platforms/px4_includes.h
+++ b/src/platforms/px4_includes.h
@@ -53,7 +53,6 @@
 
 #include <systemlib/err.h>
 #include <parameters/param.h>
-#include <systemlib/systemlib.h>
 
 #elif defined(__PX4_POSIX) && !defined(__PX4_QURT)
 /*
@@ -67,7 +66,6 @@
 
 #include <systemlib/err.h>
 #include <parameters/param.h>
-#include <systemlib/systemlib.h>
 
 #elif defined(__PX4_QURT)
 /*
@@ -81,7 +79,6 @@
 
 #include <systemlib/err.h>
 #include <parameters/param.h>
-#include <systemlib/systemlib.h>
 
 #else
 #error "No target platform defined"
diff --git a/src/systemcmds/bl_update/bl_update.c b/src/systemcmds/bl_update/bl_update.c
index 3a87bed9ba56b9d489666f3c563d659bb35c629c..6a3b5e51ae92c3f6818f0eb2fcbd6a2e1077a7c9 100644
--- a/src/systemcmds/bl_update/bl_update.c
+++ b/src/systemcmds/bl_update/bl_update.c
@@ -51,7 +51,6 @@
 
 #include <arch/board/board.h>
 
-#include "systemlib/systemlib.h"
 #include <nuttx/progmem.h>
 
 
diff --git a/src/systemcmds/config/config.c b/src/systemcmds/config/config.c
index c89fe28adf8372005619f27a3f17a9da60e451fb..8176ff7b55dbcb328694d15fe7775a2ba9f2b24b 100644
--- a/src/systemcmds/config/config.c
+++ b/src/systemcmds/config/config.c
@@ -58,7 +58,6 @@
 #include <drivers/drv_mag.h>
 #include <drivers/drv_device.h>
 
-#include "systemlib/systemlib.h"
 #include <parameters/param.h>
 
 __EXPORT int config_main(int argc, char *argv[]);
diff --git a/src/systemcmds/esc_calib/esc_calib.c b/src/systemcmds/esc_calib/esc_calib.c
index 303263b7543d7971c875101805695f6993bbf263..39220a3ff11509824b3dfa1d6c6810789770df66 100644
--- a/src/systemcmds/esc_calib/esc_calib.c
+++ b/src/systemcmds/esc_calib/esc_calib.c
@@ -55,7 +55,6 @@
 
 #include <arch/board/board.h>
 
-#include "systemlib/systemlib.h"
 #include "drivers/drv_pwm_output.h"
 
 #include <uORB/topics/actuator_controls.h>
diff --git a/src/systemcmds/motor_ramp/motor_ramp.cpp b/src/systemcmds/motor_ramp/motor_ramp.cpp
index 6c5cb5c9877a773ac68dfba56d8f8e1e2684f747..9f4fa1de2bd4ed270a4e5408637ef5ae4c3d5ec6 100644
--- a/src/systemcmds/motor_ramp/motor_ramp.cpp
+++ b/src/systemcmds/motor_ramp/motor_ramp.cpp
@@ -56,7 +56,6 @@
 #include <drivers/drv_pwm_output.h>
 #include <platforms/px4_defines.h>
 
-#include "systemlib/systemlib.h"
 #include "systemlib/err.h"
 #include "uORB/topics/actuator_controls.h"
 
diff --git a/src/systemcmds/motor_test/motor_test.c b/src/systemcmds/motor_test/motor_test.c
index c5d86045fa92f946bc8b20f024d4cce37441c0a9..76b2e1e15006d0153f957ee8f1110914bfe1b2d3 100644
--- a/src/systemcmds/motor_test/motor_test.c
+++ b/src/systemcmds/motor_test/motor_test.c
@@ -53,7 +53,6 @@
 #include <uORB/topics/test_motor.h>
 
 
-#include "systemlib/systemlib.h"
 
 
 __EXPORT int motor_test_main(int argc, char *argv[]);
diff --git a/src/systemcmds/mtd/mtd.c b/src/systemcmds/mtd/mtd.c
index ce296009fe18e24398fd9b31559ccf58eebe7a9f..96ac36bebe2ceaeb32ff138490d9f496e7221d97 100644
--- a/src/systemcmds/mtd/mtd.c
+++ b/src/systemcmds/mtd/mtd.c
@@ -62,7 +62,6 @@
 #include <arch/board/board.h>
 
 #include "systemlib/px4_macros.h"
-#include "systemlib/systemlib.h"
 #include <parameters/param.h>
 
 #include <board_config.h>
diff --git a/src/systemcmds/param/param.cpp b/src/systemcmds/param/param.cpp
index 650d517921876d85c82be526dec6c6b2bfdcdc39..bbdf8054028f43717a33c770b15c11054d7bcb18 100644
--- a/src/systemcmds/param/param.cpp
+++ b/src/systemcmds/param/param.cpp
@@ -57,7 +57,6 @@
 
 #include <arch/board/board.h>
 
-#include "systemlib/systemlib.h"
 #include <parameters/param.h>
 #include "systemlib/err.h"
 
diff --git a/src/systemcmds/pwm/pwm.cpp b/src/systemcmds/pwm/pwm.cpp
index 3c487c13c80ea627909c1462b15c52201496d6b0..f42c0e1a4763fa8c760b1946779da94eed9dce38 100644
--- a/src/systemcmds/pwm/pwm.cpp
+++ b/src/systemcmds/pwm/pwm.cpp
@@ -61,7 +61,6 @@
 
 #include <arch/board/board.h>
 
-#include "systemlib/systemlib.h"
 #include "systemlib/err.h"
 #include <parameters/param.h>
 #include "drivers/drv_pwm_output.h"
diff --git a/src/systemcmds/reboot/reboot.c b/src/systemcmds/reboot/reboot.c
index 9f1a89a734710bea8506af3fb736058033193c7a..92d8389d366afaee5f657c6cceb88b91ff972cf6 100644
--- a/src/systemcmds/reboot/reboot.c
+++ b/src/systemcmds/reboot/reboot.c
@@ -43,7 +43,6 @@
 #include <px4_log.h>
 #include <px4_module.h>
 #include <px4_shutdown.h>
-#include <systemlib/systemlib.h>
 #include <string.h>
 
 __EXPORT int reboot_main(int argc, char *argv[]);
diff --git a/src/systemcmds/tests/test_dataman.c b/src/systemcmds/tests/test_dataman.c
index 60caa66858bea7fe623b495648fa1fea9779e523..539f6de364bff337eeeb76a9e9a2d111ac239e4c 100644
--- a/src/systemcmds/tests/test_dataman.c
+++ b/src/systemcmds/tests/test_dataman.c
@@ -50,7 +50,6 @@
 #include <arch/board/board.h>
 
 #include <drivers/drv_board_led.h>
-#include <systemlib/systemlib.h>
 #include <drivers/drv_hrt.h>
 #include <semaphore.h>
 
diff --git a/src/systemcmds/tests/test_mount.c b/src/systemcmds/tests/test_mount.c
index ec599c460c16dadc63a0b4c2038a0909ffd1828d..3c9377b580b93b80968688bb9fd851c7cf95bd12 100644
--- a/src/systemcmds/tests/test_mount.c
+++ b/src/systemcmds/tests/test_mount.c
@@ -48,7 +48,6 @@
 #include <stdio.h>
 #include <stddef.h>
 #include <systemlib/err.h>
-#include <systemlib/systemlib.h>
 #include <perf/perf_counter.h>
 #include <string.h>