diff --git a/src/drivers/boards/aerocore/aerocore_init.c b/src/drivers/boards/aerocore/aerocore_init.c
index e5a6b08324..7bfded002c 100644
--- a/src/drivers/boards/aerocore/aerocore_init.c
+++ b/src/drivers/boards/aerocore/aerocore_init.c
@@ -66,7 +66,7 @@
 #include <arch/board/board.h>
 
 #include <drivers/drv_hrt.h>
-#include <drivers/drv_led.h>
+#include <drivers/drv_board_led.h>
 
 #include <systemlib/cpuload.h>
 #include <systemlib/perf_counter.h>
diff --git a/src/drivers/boards/aerofc-v1/aerofc_init.c b/src/drivers/boards/aerofc-v1/aerofc_init.c
index 9dae869ac4..ed4fa212de 100644
--- a/src/drivers/boards/aerofc-v1/aerofc_init.c
+++ b/src/drivers/boards/aerofc-v1/aerofc_init.c
@@ -65,7 +65,7 @@
 #include <arch/board/board.h>
 
 #include <drivers/drv_hrt.h>
-#include <drivers/drv_led.h>
+#include <drivers/drv_board_led.h>
 
 #include <dataman/dataman.h>
 
diff --git a/src/drivers/boards/auav-x21/auav_init.c b/src/drivers/boards/auav-x21/auav_init.c
index 5068c2a050..129e68ca84 100644
--- a/src/drivers/boards/auav-x21/auav_init.c
+++ b/src/drivers/boards/auav-x21/auav_init.c
@@ -69,7 +69,7 @@
 #include <arch/board/board.h>
 
 #include <drivers/drv_hrt.h>
-#include <drivers/drv_led.h>
+#include <drivers/drv_board_led.h>
 
 #include <systemlib/px4_macros.h>
 #include <systemlib/cpuload.h>
diff --git a/src/drivers/boards/crazyflie/crazyflie_init.c b/src/drivers/boards/crazyflie/crazyflie_init.c
index 6f60f57c32..5839e6311a 100644
--- a/src/drivers/boards/crazyflie/crazyflie_init.c
+++ b/src/drivers/boards/crazyflie/crazyflie_init.c
@@ -64,7 +64,7 @@
 #include <arch/board/board.h>
 
 #include <drivers/drv_hrt.h>
-#include <drivers/drv_led.h>
+#include <drivers/drv_board_led.h>
 
 #include <systemlib/px4_macros.h>
 #include <systemlib/cpuload.h>
diff --git a/src/drivers/boards/esc35-v1/esc35_init.c b/src/drivers/boards/esc35-v1/esc35_init.c
index a2f40ce359..b003b3d99a 100644
--- a/src/drivers/boards/esc35-v1/esc35_init.c
+++ b/src/drivers/boards/esc35-v1/esc35_init.c
@@ -66,7 +66,7 @@
 #include <arch/board/board.h>
 
 #include <drivers/drv_hrt.h>
-#include <drivers/drv_led.h>
+#include <drivers/drv_board_led.h>
 
 #include <systemlib/cpuload.h>
 #include <systemlib/param/param.h>
diff --git a/src/drivers/boards/mindpx-v2/mindpx2_init.c b/src/drivers/boards/mindpx-v2/mindpx2_init.c
index b067a02dba..247569ff76 100644
--- a/src/drivers/boards/mindpx-v2/mindpx2_init.c
+++ b/src/drivers/boards/mindpx-v2/mindpx2_init.c
@@ -70,7 +70,7 @@
 #include <arch/board/board.h>
 
 #include <drivers/drv_hrt.h>
-#include <drivers/drv_led.h>
+#include <drivers/drv_board_led.h>
 
 #include <systemlib/px4_macros.h>
 #include <systemlib/cpuload.h>
diff --git a/src/drivers/boards/px4-stm32f4discovery/px4discovery_init.c b/src/drivers/boards/px4-stm32f4discovery/px4discovery_init.c
index 548f4506c2..6abe1a989a 100644
--- a/src/drivers/boards/px4-stm32f4discovery/px4discovery_init.c
+++ b/src/drivers/boards/px4-stm32f4discovery/px4discovery_init.c
@@ -68,7 +68,7 @@
 #include <arch/board/board.h>
 
 #include <drivers/drv_hrt.h>
-#include <drivers/drv_led.h>
+#include <drivers/drv_board_led.h>
 
 #include <systemlib/cpuload.h>
 #include <systemlib/perf_counter.h>
diff --git a/src/drivers/boards/px4cannode-v1/px4cannode_init.c b/src/drivers/boards/px4cannode-v1/px4cannode_init.c
index b1de786ae9..8c73d50a13 100644
--- a/src/drivers/boards/px4cannode-v1/px4cannode_init.c
+++ b/src/drivers/boards/px4cannode-v1/px4cannode_init.c
@@ -66,7 +66,7 @@
 #include <arch/board/board.h>
 
 #include <drivers/drv_hrt.h>
-#include <drivers/drv_led.h>
+#include <drivers/drv_board_led.h>
 
 #include <systemlib/cpuload.h>
 #include <systemlib/param/param.h>
diff --git a/src/drivers/boards/px4esc-v1/px4esc_init.c b/src/drivers/boards/px4esc-v1/px4esc_init.c
index 9642cfa952..25763b0dfe 100644
--- a/src/drivers/boards/px4esc-v1/px4esc_init.c
+++ b/src/drivers/boards/px4esc-v1/px4esc_init.c
@@ -66,7 +66,7 @@
 #include <arch/board/board.h>
 
 #include <drivers/drv_hrt.h>
-#include <drivers/drv_led.h>
+#include <drivers/drv_board_led.h>
 
 #include <systemlib/cpuload.h>
 #include <systemlib/param/param.h>
diff --git a/src/drivers/boards/px4flow-v2/px4flow_init.c b/src/drivers/boards/px4flow-v2/px4flow_init.c
index 2d6e1e7e82..50ca65a5e4 100644
--- a/src/drivers/boards/px4flow-v2/px4flow_init.c
+++ b/src/drivers/boards/px4flow-v2/px4flow_init.c
@@ -66,7 +66,7 @@
 #include <arch/board/board.h>
 
 #include <drivers/drv_hrt.h>
-#include <drivers/drv_led.h>
+#include <drivers/drv_board_led.h>
 
 #include <systemlib/cpuload.h>
 
diff --git a/src/drivers/boards/px4fmu-v1/px4fmu_init.c b/src/drivers/boards/px4fmu-v1/px4fmu_init.c
index 4ea27657d2..a646a076dd 100644
--- a/src/drivers/boards/px4fmu-v1/px4fmu_init.c
+++ b/src/drivers/boards/px4fmu-v1/px4fmu_init.c
@@ -66,7 +66,7 @@
 #include <arch/board/board.h>
 
 #include <drivers/drv_hrt.h>
-#include <drivers/drv_led.h>
+#include <drivers/drv_board_led.h>
 
 #include <systemlib/cpuload.h>
 #include <systemlib/param/param.h>
diff --git a/src/drivers/boards/px4fmu-v2/px4fmu2_init.c b/src/drivers/boards/px4fmu-v2/px4fmu2_init.c
index 5778334d03..7f57c43b32 100644
--- a/src/drivers/boards/px4fmu-v2/px4fmu2_init.c
+++ b/src/drivers/boards/px4fmu-v2/px4fmu2_init.c
@@ -69,7 +69,7 @@
 #include <arch/board/board.h>
 
 #include <drivers/drv_hrt.h>
-#include <drivers/drv_led.h>
+#include <drivers/drv_board_led.h>
 
 #include <systemlib/px4_macros.h>
 #include <systemlib/cpuload.h>
diff --git a/src/drivers/boards/px4fmu-v4/px4fmu_init.c b/src/drivers/boards/px4fmu-v4/px4fmu_init.c
index 42826aa9f5..c985808061 100644
--- a/src/drivers/boards/px4fmu-v4/px4fmu_init.c
+++ b/src/drivers/boards/px4fmu-v4/px4fmu_init.c
@@ -70,7 +70,7 @@
 #include <arch/board/board.h>
 
 #include <drivers/drv_hrt.h>
-#include <drivers/drv_led.h>
+#include <drivers/drv_board_led.h>
 
 #include <systemlib/px4_macros.h>
 #include <systemlib/cpuload.h>
diff --git a/src/drivers/boards/px4fmu-v4pro/px4fmu_init.c b/src/drivers/boards/px4fmu-v4pro/px4fmu_init.c
index 3c2a68d423..1a0c09c8b7 100644
--- a/src/drivers/boards/px4fmu-v4pro/px4fmu_init.c
+++ b/src/drivers/boards/px4fmu-v4pro/px4fmu_init.c
@@ -70,7 +70,7 @@
 #include <arch/board/board.h>
 
 #include <drivers/drv_hrt.h>
-#include <drivers/drv_led.h>
+#include <drivers/drv_board_led.h>
 
 #include <systemlib/px4_macros.h>
 #include <systemlib/cpuload.h>
diff --git a/src/drivers/boards/px4fmu-v5/px4fmu_init.c b/src/drivers/boards/px4fmu-v5/px4fmu_init.c
index f2739d90dc..cbce071e64 100644
--- a/src/drivers/boards/px4fmu-v5/px4fmu_init.c
+++ b/src/drivers/boards/px4fmu-v5/px4fmu_init.c
@@ -70,7 +70,7 @@
 #include <arch/board/board.h>
 
 #include <drivers/drv_hrt.h>
-#include <drivers/drv_led.h>
+#include <drivers/drv_board_led.h>
 
 #include <systemlib/px4_macros.h>
 #include <systemlib/cpuload.h>
diff --git a/src/drivers/boards/px4io-v1/px4io_init.c b/src/drivers/boards/px4io-v1/px4io_init.c
index fc5206fe82..a94b20a7f1 100644
--- a/src/drivers/boards/px4io-v1/px4io_init.c
+++ b/src/drivers/boards/px4io-v1/px4io_init.c
@@ -62,7 +62,7 @@
 #include <arch/board/board.h>
 
 #include <drivers/drv_hrt.h>
-#include <drivers/drv_led.h>
+#include <drivers/drv_board_led.h>
 #include <drivers/drv_pwm_output.h>
 
 /****************************************************************************
diff --git a/src/drivers/boards/px4nucleoF767ZI-v1/px4nucleo_init.c b/src/drivers/boards/px4nucleoF767ZI-v1/px4nucleo_init.c
index 396692b5d7..fdf66a2dc0 100644
--- a/src/drivers/boards/px4nucleoF767ZI-v1/px4nucleo_init.c
+++ b/src/drivers/boards/px4nucleoF767ZI-v1/px4nucleo_init.c
@@ -70,7 +70,7 @@
 #include <arch/board/board.h>
 
 #include <drivers/drv_hrt.h>
-#include <drivers/drv_led.h>
+#include <drivers/drv_board_led.h>
 
 #include <systemlib/px4_macros.h>
 #include <systemlib/cpuload.h>
diff --git a/src/drivers/boards/s2740vc-v1/s2740vc_init.c b/src/drivers/boards/s2740vc-v1/s2740vc_init.c
index bb9e32580e..bfdf9ac3ce 100644
--- a/src/drivers/boards/s2740vc-v1/s2740vc_init.c
+++ b/src/drivers/boards/s2740vc-v1/s2740vc_init.c
@@ -66,7 +66,7 @@
 #include <arch/board/board.h>
 
 #include <drivers/drv_hrt.h>
-#include <drivers/drv_led.h>
+#include <drivers/drv_board_led.h>
 
 #include <systemlib/cpuload.h>
 #include <systemlib/param/param.h>
diff --git a/src/drivers/boards/tap-v1/tap_init.c b/src/drivers/boards/tap-v1/tap_init.c
index b77009e566..e06aadd57c 100644
--- a/src/drivers/boards/tap-v1/tap_init.c
+++ b/src/drivers/boards/tap-v1/tap_init.c
@@ -65,7 +65,7 @@
 #include <arch/board/board.h>
 
 #include <drivers/drv_hrt.h>
-#include <drivers/drv_led.h>
+#include <drivers/drv_board_led.h>
 
 #include <systemlib/px4_macros.h>
 #include <systemlib/cpuload.h>
diff --git a/src/drivers/boards/zubaxgnss-v1/zubax_gnss_init.c b/src/drivers/boards/zubaxgnss-v1/zubax_gnss_init.c
index e6dca9d057..1a80fc62f0 100644
--- a/src/drivers/boards/zubaxgnss-v1/zubax_gnss_init.c
+++ b/src/drivers/boards/zubaxgnss-v1/zubax_gnss_init.c
@@ -66,7 +66,7 @@
 #include <arch/board/board.h>
 
 #include <drivers/drv_hrt.h>
-#include <drivers/drv_led.h>
+#include <drivers/drv_board_led.h>
 
 #include <systemlib/cpuload.h>
 
diff --git a/src/drivers/drv_led.h b/src/drivers/drv_board_led.h
similarity index 96%
rename from src/drivers/drv_led.h
rename to src/drivers/drv_board_led.h
index 3e191d20a6..62993c86e2 100644
--- a/src/drivers/drv_led.h
+++ b/src/drivers/drv_board_led.h
@@ -32,9 +32,9 @@
  ****************************************************************************/
 
 /**
- * @file drv_led.h
+ * @file drv_board_led.h
  *
- * LED driver API
+ * LED driver API to control the onboard LED(s) via ioctl() interface
  */
 
 #pragma once
diff --git a/src/drivers/led/led.cpp b/src/drivers/led/led.cpp
index 920567c5ae..d1411d1ae9 100644
--- a/src/drivers/led/led.cpp
+++ b/src/drivers/led/led.cpp
@@ -34,12 +34,12 @@
 /**
  * @file led.cpp
  *
- * LED driver.
+ * LED driver to control the onboard LED(s) via ioctl interface.
  */
 
 #include <px4_config.h>
 #include <drivers/device/device.h>
-#include <drivers/drv_led.h>
+#include <drivers/drv_board_led.h>
 #include <stdio.h>
 
 /*
diff --git a/src/modules/commander/commander.cpp b/src/modules/commander/commander.cpp
index e3b0e7a6a7..fe72b4a7ae 100644
--- a/src/modules/commander/commander.cpp
+++ b/src/modules/commander/commander.cpp
@@ -63,7 +63,6 @@
 /* PX4 headers */
 #include <dataman/dataman.h>
 #include <drivers/drv_hrt.h>
-#include <drivers/drv_led.h>
 #include <drivers/drv_tone_alarm.h>
 #include <geo/geo.h>
 #include <navigator/navigation.h>
diff --git a/src/modules/commander/commander_helper.cpp b/src/modules/commander/commander_helper.cpp
index 118744f7ec..15e1c8130e 100644
--- a/src/modules/commander/commander_helper.cpp
+++ b/src/modules/commander/commander_helper.cpp
@@ -59,8 +59,6 @@
 #include <systemlib/param/param.h>
 #include <drivers/drv_hrt.h>
 #include <drivers/drv_tone_alarm.h>
-#include <drivers/drv_led.h>
-#include <drivers/drv_rgbled.h>
 
 #include "commander_helper.h"
 #include "DevMgr.hpp"
diff --git a/src/modules/commander/commander_helper.h b/src/modules/commander/commander_helper.h
index af2fa7f204..df105c09c7 100644
--- a/src/modules/commander/commander_helper.h
+++ b/src/modules/commander/commander_helper.h
@@ -47,6 +47,7 @@
 #include <uORB/topics/actuator_armed.h>
 #include <uORB/topics/vehicle_control_mode.h>
 #include <drivers/drv_rgbled.h>
+#include <drivers/drv_board_led.h>
 
 
 bool is_multirotor(const struct vehicle_status_s *current_status);
@@ -68,6 +69,7 @@ void tune_failsafe(bool use_buzzer);
 
 int blink_msg_state();
 
+/* methods to control the onboard LED(s) */
 int led_init(void);
 void led_deinit(void);
 int led_toggle(int led);
diff --git a/src/modules/simulator/simulator.cpp b/src/modules/simulator/simulator.cpp
index 3bc26e8017..ed51648bd5 100644
--- a/src/modules/simulator/simulator.cpp
+++ b/src/modules/simulator/simulator.cpp
@@ -47,7 +47,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
-#include <drivers/drv_led.h>
+#include <drivers/drv_board_led.h>
 
 #include "simulator.h"
 
diff --git a/src/modules/syslink/syslink_main.cpp b/src/modules/syslink/syslink_main.cpp
index a161b7aea8..22bb043418 100644
--- a/src/modules/syslink/syslink_main.cpp
+++ b/src/modules/syslink/syslink_main.cpp
@@ -55,7 +55,7 @@
 #include <mqueue.h>
 
 #include <drivers/drv_rc_input.h>
-#include <drivers/drv_led.h>
+#include <drivers/drv_board_led.h>
 
 #include <systemlib/err.h>
 
diff --git a/src/platforms/posix/drivers/ledsim/led.cpp b/src/platforms/posix/drivers/ledsim/led.cpp
index 161514cd93..6dbe2aa145 100644
--- a/src/platforms/posix/drivers/ledsim/led.cpp
+++ b/src/platforms/posix/drivers/ledsim/led.cpp
@@ -38,7 +38,7 @@
  */
 
 #include <px4_config.h>
-#include <drivers/drv_led.h>
+#include <drivers/drv_board_led.h>
 #include <stdio.h>
 
 #include "VirtDevObj.hpp"
diff --git a/src/systemcmds/tests/test_dataman.c b/src/systemcmds/tests/test_dataman.c
index 193c1cd019..c85bf118ae 100644
--- a/src/systemcmds/tests/test_dataman.c
+++ b/src/systemcmds/tests/test_dataman.c
@@ -49,7 +49,7 @@
 
 #include <arch/board/board.h>
 
-#include <drivers/drv_led.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_led.c b/src/systemcmds/tests/test_led.c
index db308fc2cf..2783ce24eb 100644
--- a/src/systemcmds/tests/test_led.c
+++ b/src/systemcmds/tests/test_led.c
@@ -49,7 +49,7 @@
 
 #include <arch/board/board.h>
 
-#include <drivers/drv_led.h>
+#include <drivers/drv_board_led.h>
 
 #include "tests_main.h"