diff --git a/src/drivers/blinkm/blinkm.cpp b/src/drivers/blinkm/blinkm.cpp
index 9719abfc02..0fd6289ad2 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 5412e76d53..c64cc10e5c 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 b1a3f4490a..3ae6834da0 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 b5781ea4af..93d7b3151e 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 15bce9f6c6..807e867155 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 5291c7f670..8adf137d58 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 ed58b3247d..5f15a372ec 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 e0522668b2..bbad226b7e 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 a043cddc6d..da2c9e8926 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 28a31ba540..2906b68018 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 ff443ced2a..b55c9aee02 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 3865e099e8..2ff3fb6e54 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 65a8108cd4..629f037db6 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 78f79431ad..74f0381b50 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 0df6f3414b..232cbe757c 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 58668fe47d..3d8c785862 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 41a724c4f7..1c76942ea6 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 3c5a6f5ecb..80d83a7483 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 28f03c66d0..a19bfc47cf 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 44407b4626..55a101a3ae 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 9ad7769d02..d171da4168 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 28df516af8..36f7a9607b 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 0857417471..e100e9f7c1 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 342ffdf437..300e6ec549 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 e595e5e0fc..79407d0eb7 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 6f6b22eb41..8d6c05c1d2 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 329e20c470..ff010396df 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 d0a556a970..dc4a949864 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 fb0ad7a991..f72cf2e7da 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 42cd2a5d29..ad81579298 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 8d01930663..1cec2f658e 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 563f899769..8e9f914b36 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 e616532505..2e62cb2991 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 f1a6f3917a..909a94a4de 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 79493c6cb8..42e619bfc2 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 84c503015a..8f26da4be5 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 8e6cd45a00..3bb0dcdaf3 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 54b91ac067..6a58ad2420 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 d2f4502c36..671547579a 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 798d6523c7..5ffa3ed180 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 8d1cc46203..36f241c4ae 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 6b4f30f247..3c91bd1b46 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 0c2a852e5b..8abdd3f664 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 afc6f18130..71e36bdabd 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 46a1c802c3..af501bf6ce 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 29233e0144..98061cf04a 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 651c245282..df70c7de55 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 7ac5e21a9c..90674e153e 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 5676d00a22..8cb56c03fd 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 b3e9425bc5..5af43cdfb1 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 462398cf08..e46d4c2d19 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 aeb4d2a5e0..1dea6ef7ef 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 2e72bf7c5b..5f9e526c84 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 73955c0b26..0000000000
--- 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 03cdc6a630..5d72e0d16a 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 0377553eca..1fc8da265c 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 f02780f692..521a74103b 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 6566da2d65..596899992f 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 8cb0c3c61c..3322c816c9 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 f7cef1b70d..39e99802f7 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 1cffd53e99..390273ada8 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 7eb6251ab5..e20cf5baf0 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 3a87bed9ba..6a3b5e51ae 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 c89fe28adf..8176ff7b55 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 303263b754..39220a3ff1 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 6c5cb5c987..9f4fa1de2b 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 c5d86045fa..76b2e1e150 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 ce296009fe..96ac36bebe 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 650d517921..bbdf805402 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 3c487c13c8..f42c0e1a47 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 9f1a89a734..92d8389d36 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 60caa66858..539f6de364 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 ec599c460c..3c9377b580 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>