diff --git a/sys/auto_init/auto_init.c b/sys/auto_init/auto_init.c
index 883ed40eef003759beab102ed827309058ba296c..9abb26f47bbc1eef5ae48f31f0649a74ecca6b96 100644
--- a/sys/auto_init/auto_init.c
+++ b/sys/auto_init/auto_init.c
@@ -284,42 +284,106 @@ void auto_init(void)
 #ifdef MODULE_AUTO_INIT_SAUL
     DEBUG("auto_init SAUL\n");
 
+#ifdef MODULE_SAUL_ADC
+    extern void auto_init_adc(void);
+    auto_init_adc();
+#endif
 #ifdef MODULE_SAUL_GPIO
     extern void auto_init_gpio(void);
     auto_init_gpio();
 #endif
-#ifdef MODULE_SAUL_ADC
-    extern void auto_init_adc(void);
-    auto_init_adc();
+#ifdef MODULE_ADCXX1C
+    extern void auto_init_adcxx1c(void);
+    auto_init_adcxx1c();
 #endif
-#ifdef MODULE_LSM303DLHC
-    extern void auto_init_lsm303dlhc(void);
-    auto_init_lsm303dlhc();
+#ifdef MODULE_ADS101X
+    extern void auto_init_ads101x(void);
+    auto_init_ads101x();
 #endif
-#ifdef MODULE_LPS331AP
-    extern void auto_init_lps331ap(void);
-    auto_init_lps331ap();
+#ifdef MODULE_ADXL345
+    extern void auto_init_adxl345(void);
+    auto_init_adxl345();
+#endif
+#ifdef MODULE_BMP180
+    extern void auto_init_bmp180(void);
+    auto_init_bmp180();
+#endif
+#if defined(MODULE_BME280) || defined(MODULE_BMP280)
+    extern void auto_init_bmx280(void);
+    auto_init_bmx280();
+#endif
+#ifdef MODULE_BMX055
+    extern void auto_init_bmx055(void);
+    auto_init_bmx055();
+#endif
+#ifdef MODULE_DHT
+    extern void auto_init_dht(void);
+    auto_init_dht();
+#endif
+#ifdef MODULE_FXOS8700
+    extern void auto_init_fxos8700(void);
+    auto_init_fxos8700();
+#endif
+#ifdef MODULE_GROVE_LEDBAR
+    extern void auto_init_grove_ledbar(void);
+    auto_init_grove_ledbar();
+#endif
+#ifdef MODULE_HDC1000
+    extern void auto_init_hdc1000(void);
+    auto_init_hdc1000();
+#endif
+#ifdef MODULE_HTS221
+    extern void auto_init_hts221(void);
+    auto_init_hts221();
+#endif
+#ifdef MODULE_IO1_XPLAINED
+    extern void auto_init_io1_xplained(void);
+    auto_init_io1_xplained();
 #endif
 #ifdef MODULE_ISL29020
     extern void auto_init_isl29020(void);
     auto_init_isl29020();
 #endif
+#ifdef MODULE_JC42
+    extern void auto_init_jc42(void);
+    auto_init_jc42();
+#endif
 #ifdef MODULE_L3G4200D
     extern void auto_init_l3g4200d(void);
     auto_init_l3g4200d();
 #endif
+#ifdef MODULE_LIS2DH12
+    extern void auto_init_lis2dh12(void);
+    auto_init_lis2dh12();
+#endif
 #ifdef MODULE_LIS3DH
     extern void auto_init_lis3dh(void);
     auto_init_lis3dh();
 #endif
 #ifdef MODULE_LIS3MDL
-extern void auto_init_lis3mdl(void);
-auto_init_lis3mdl();
+    extern void auto_init_lis3mdl(void);
+    auto_init_lis3mdl();
+#endif
+#ifdef MODULE_LPS331AP
+    extern void auto_init_lps331ap(void);
+    auto_init_lps331ap();
+#endif
+#ifdef MODULE_LSM303DLHC
+    extern void auto_init_lsm303dlhc(void);
+    auto_init_lsm303dlhc();
+#endif
+#ifdef MODULE_LSM6DSL
+    extern void auto_init_lsm6dsl(void);
+    auto_init_lsm6dsl();
 #endif
 #ifdef MODULE_MAG3110
     extern void auto_init_mag3110(void);
     auto_init_mag3110();
 #endif
+#ifdef MODULE_MMA7660
+    extern void auto_init_mma7660(void);
+    auto_init_mma7660();
+#endif
 #ifdef MODULE_MMA8X5X
     extern void auto_init_mma8x5x(void);
     auto_init_mma8x5x();
@@ -329,105 +393,45 @@ auto_init_lis3mdl();
     auto_init_mpl3115a2();
 #endif
 #ifdef MODULE_MPU9150
-extern void auto_init_mpu9150(void);
-auto_init_mpu9150();
-#endif
-#ifdef MODULE_GROVE_LEDBAR
-    extern void auto_init_grove_ledbar(void);
-    auto_init_grove_ledbar();
+    extern void auto_init_mpu9150(void);
+    auto_init_mpu9150();
 #endif
 #ifdef MODULE_PIR
     extern void auto_init_pir(void);
     auto_init_pir();
 #endif
-#ifdef MODULE_SI70XX
-    extern void auto_init_si70xx(void);
-    auto_init_si70xx();
-#endif
-#ifdef MODULE_BMP180
-    extern void auto_init_bmp180(void);
-    auto_init_bmp180();
-#endif
-#ifdef MODULE_BMX055
-    extern void auto_init_bmx055(void);
-    auto_init_bmx055();
-#endif
-#if defined(MODULE_BME280) || defined(MODULE_BMP280)
-    extern void auto_init_bmx280(void);
-    auto_init_bmx280();
-#endif
-#ifdef MODULE_JC42
-    extern void auto_init_jc42(void);
-    auto_init_jc42();
-#endif
-#ifdef MODULE_TSL2561
-    extern void auto_init_tsl2561(void);
-    auto_init_tsl2561();
-#endif
 #ifdef MODULE_PULSE_COUNTER
     extern void auto_init_pulse_counter(void);
     auto_init_pulse_counter();
 #endif
-#ifdef MODULE_HDC1000
-    extern void auto_init_hdc1000(void);
-    auto_init_hdc1000();
+#ifdef MODULE_SHT1X
+    extern void auto_init_sht1x(void);
+    auto_init_sht1x();
 #endif
-#ifdef MODULE_FXOS8700
-    extern void auto_init_fxos8700(void);
-    auto_init_fxos8700();
+#ifdef MODULE_SI114X
+    extern void auto_init_si114x(void);
+    auto_init_si114x();
 #endif
-#ifdef MODULE_HTS221
-    extern void auto_init_hts221(void);
-    auto_init_hts221();
+#ifdef MODULE_SI70XX
+    extern void auto_init_si70xx(void);
+    auto_init_si70xx();
 #endif
-#ifdef MODULE_DHT
-    extern void auto_init_dht(void);
-    auto_init_dht();
+#ifdef MODULE_TCS37727
+    extern void auto_init_tcs37727(void);
+    auto_init_tcs37727();
 #endif
 #ifdef MODULE_TMP006
     extern void auto_init_tmp006(void);
     auto_init_tmp006();
 #endif
-#ifdef MODULE_TCS37727
-    extern void auto_init_tcs37727(void);
-    auto_init_tcs37727();
+#ifdef MODULE_TSL2561
+    extern void auto_init_tsl2561(void);
+    auto_init_tsl2561();
 #endif
 #ifdef MODULE_VEML6070
     extern void auto_init_veml6070(void);
     auto_init_veml6070();
 #endif
-#ifdef MODULE_IO1_XPLAINED
-    extern void auto_init_io1_xplained(void);
-    auto_init_io1_xplained();
-#endif
-#ifdef MODULE_ADXL345
-    extern void auto_init_adxl345(void);
-    auto_init_adxl345();
-#endif
-#ifdef MODULE_LSM6DSL
-    extern void auto_init_lsm6dsl(void);
-    auto_init_lsm6dsl();
-#endif
-#ifdef MODULE_ADCXX1C
-    extern void auto_init_adcxx1c(void);
-    auto_init_adcxx1c();
-#endif
-#ifdef MODULE_ADS101X
-    extern void auto_init_ads101x(void);
-    auto_init_ads101x();
-#endif
-#ifdef MODULE_LIS2DH12
-    extern void auto_init_lis2dh12(void);
-    auto_init_lis2dh12();
-#endif
-#ifdef MODULE_SI114X
-    extern void auto_init_si114x(void);
-    auto_init_si114x();
-#endif
-#ifdef MODULE_MMA7660
-    extern void auto_init_mma7660(void);
-    auto_init_mma7660();
-#endif
 
 #endif /* MODULE_AUTO_INIT_SAUL */
 
diff --git a/sys/auto_init/saul/auto_init_adcxx1c.c b/sys/auto_init/saul/auto_init_adcxx1c.c
index fafd3e274f11e417c36013fda46c5f4fe48d87dd..fa46cbad017ef2bb94877135c7a8447db1ae4413 100644
--- a/sys/auto_init/saul/auto_init_adcxx1c.c
+++ b/sys/auto_init/saul/auto_init_adcxx1c.c
@@ -21,6 +21,7 @@
 
 #ifdef MODULE_ADCXX1C
 
+#include "assert.h"
 #include "log.h"
 
 #include "saul_reg.h"
diff --git a/sys/auto_init/saul/auto_init_adxl345.c b/sys/auto_init/saul/auto_init_adxl345.c
index 705ebfbdf8a400291438a1127e7ea9bf4bb95541..46c0d4e3f9f799a2ae727577a7f154229b5c2014 100644
--- a/sys/auto_init/saul/auto_init_adxl345.c
+++ b/sys/auto_init/saul/auto_init_adxl345.c
@@ -21,6 +21,7 @@
 
 #ifdef MODULE_ADXL345
 
+#include "assert.h"
 #include "log.h"
 #include "saul_reg.h"
 #include "adxl345.h"
diff --git a/sys/auto_init/saul/auto_init_bmp180.c b/sys/auto_init/saul/auto_init_bmp180.c
index 6f50027b3cb1e84a504e075d387348519fad3232..0245b2a75be4e71a4669ee78f2c181b02796ffe9 100644
--- a/sys/auto_init/saul/auto_init_bmp180.c
+++ b/sys/auto_init/saul/auto_init_bmp180.c
@@ -20,6 +20,7 @@
 
 #ifdef MODULE_BMP180
 
+#include "assert.h"
 #include "log.h"
 #include "saul_reg.h"
 #include "bmp180.h"
diff --git a/sys/auto_init/saul/auto_init_dht.c b/sys/auto_init/saul/auto_init_dht.c
index 69577c8cea203e3ff0e92f43ec126337b9f6ca3b..2be66772290e11b9b92f792688c69d62b32bfacf 100644
--- a/sys/auto_init/saul/auto_init_dht.c
+++ b/sys/auto_init/saul/auto_init_dht.c
@@ -21,6 +21,7 @@
 
 #ifdef MODULE_DHT
 
+#include "assert.h"
 #include "log.h"
 #include "saul_reg.h"
 #include "dht_params.h"
diff --git a/sys/auto_init/saul/auto_init_grove_ledbar.c b/sys/auto_init/saul/auto_init_grove_ledbar.c
index 8222b613c0dc0acdf80d8abfe68aac2ba9634ee9..198454bdca014e7037d79682dbb0c7a71d709f60 100644
--- a/sys/auto_init/saul/auto_init_grove_ledbar.c
+++ b/sys/auto_init/saul/auto_init_grove_ledbar.c
@@ -21,6 +21,7 @@
 
 #ifdef MODULE_GROVE_LEDBAR
 
+#include "assert.h"
 #include "log.h"
 #include "saul_reg.h"
 
diff --git a/sys/auto_init/saul/auto_init_hdc1000.c b/sys/auto_init/saul/auto_init_hdc1000.c
index e7aaa853dd620bbfd6679a0adb401069a263a294..bb443d586ab9e511b52c6f9bc8a3b866a9904399 100644
--- a/sys/auto_init/saul/auto_init_hdc1000.c
+++ b/sys/auto_init/saul/auto_init_hdc1000.c
@@ -21,6 +21,7 @@
 
 #ifdef MODULE_HDC1000
 
+#include "assert.h"
 #include "log.h"
 #include "saul_reg.h"
 #include "hdc1000.h"
diff --git a/sys/auto_init/saul/auto_init_hts221.c b/sys/auto_init/saul/auto_init_hts221.c
index 63cc8d3b3189433587b7ad83dc2fba552e5cb347..119820593a79033cbcaf1fddc26ad78f57382ae6 100644
--- a/sys/auto_init/saul/auto_init_hts221.c
+++ b/sys/auto_init/saul/auto_init_hts221.c
@@ -21,6 +21,7 @@
 
 #ifdef MODULE_HTS221
 
+#include "assert.h"
 #include "log.h"
 #include "saul_reg.h"
 #include "hts221.h"
diff --git a/sys/auto_init/saul/auto_init_io1_xplained.c b/sys/auto_init/saul/auto_init_io1_xplained.c
index 296f3b2ef9dd226911c1d2bb1a31f721d27899f8..51aede77bbee4e73923e7546a78f4998f634dd64 100644
--- a/sys/auto_init/saul/auto_init_io1_xplained.c
+++ b/sys/auto_init/saul/auto_init_io1_xplained.c
@@ -20,6 +20,7 @@
 
 #ifdef MODULE_IO1_XPLAINED
 
+#include "assert.h"
 #include "log.h"
 #include "saul_reg.h"
 #include "io1_xplained.h"
diff --git a/sys/auto_init/saul/auto_init_isl29020.c b/sys/auto_init/saul/auto_init_isl29020.c
index 91f83188a847b77f79bac5be3641d2e98026943d..d2203da2eb921906757d8c663621055ef14a5754 100644
--- a/sys/auto_init/saul/auto_init_isl29020.c
+++ b/sys/auto_init/saul/auto_init_isl29020.c
@@ -21,6 +21,7 @@
 
 #ifdef MODULE_ISL29020
 
+#include "assert.h"
 #include "log.h"
 #include "saul_reg.h"
 #include "isl29020.h"
diff --git a/sys/auto_init/saul/auto_init_jc42.c b/sys/auto_init/saul/auto_init_jc42.c
index 28c89a94b127a59d8ab6188427801d169293306b..f00c7061328859c7de2c16f599930951ee435144 100644
--- a/sys/auto_init/saul/auto_init_jc42.c
+++ b/sys/auto_init/saul/auto_init_jc42.c
@@ -20,6 +20,7 @@
 
 #ifdef MODULE_JC42
 
+#include "assert.h"
 #include "log.h"
 #include "saul_reg.h"
 #include "jc42.h"
diff --git a/sys/auto_init/saul/auto_init_l3g4200d.c b/sys/auto_init/saul/auto_init_l3g4200d.c
index 36d3182314e5d3b55976583812b2a421efcdab32..0e90cfca8a03fb4ad9f417495bd7f28ca9e83677 100644
--- a/sys/auto_init/saul/auto_init_l3g4200d.c
+++ b/sys/auto_init/saul/auto_init_l3g4200d.c
@@ -21,6 +21,7 @@
 
 #ifdef MODULE_L3G4200D
 
+#include "assert.h"
 #include "log.h"
 #include "saul_reg.h"
 #include "l3g4200d.h"
diff --git a/sys/auto_init/saul/auto_init_lis3dh.c b/sys/auto_init/saul/auto_init_lis3dh.c
index 2cfdff78bf4e618576b5b32de00fb981b2e69670..813880bf1b96d903c1a50534f4ac8fa77bb80df6 100644
--- a/sys/auto_init/saul/auto_init_lis3dh.c
+++ b/sys/auto_init/saul/auto_init_lis3dh.c
@@ -21,6 +21,7 @@
 
 #ifdef MODULE_LIS3DH
 
+#include "assert.h"
 #include "log.h"
 #include "saul_reg.h"
 #include "lis3dh.h"
diff --git a/sys/auto_init/saul/auto_init_lis3mdl.c b/sys/auto_init/saul/auto_init_lis3mdl.c
index 5c9676d07651b273c72de3cea9ca43bc4f9c4e29..bf1f76f0c3103fb5ca7344e4a753014b751368a2 100644
--- a/sys/auto_init/saul/auto_init_lis3mdl.c
+++ b/sys/auto_init/saul/auto_init_lis3mdl.c
@@ -21,6 +21,7 @@
 
 #ifdef MODULE_LIS3MDL
 
+#include "assert.h"
 #include "log.h"
 #include "saul_reg.h"
 #include "lis3mdl.h"
diff --git a/sys/auto_init/saul/auto_init_lps331ap.c b/sys/auto_init/saul/auto_init_lps331ap.c
index 56cbb20b6c297537af18b32628b3ca34cb17d28c..c1725c0bb230e9bfab1a2c545a75e2f642c32044 100644
--- a/sys/auto_init/saul/auto_init_lps331ap.c
+++ b/sys/auto_init/saul/auto_init_lps331ap.c
@@ -21,6 +21,7 @@
 
 #ifdef MODULE_LPS331AP
 
+#include "assert.h"
 #include "log.h"
 #include "saul_reg.h"
 #include "lps331ap.h"
diff --git a/sys/auto_init/saul/auto_init_lsm303dlhc.c b/sys/auto_init/saul/auto_init_lsm303dlhc.c
index 05ac6d117ddbd415d8f4e2c237ab8034de36e4db..4eea70799519d040aa9e1a046a494902e3845853 100644
--- a/sys/auto_init/saul/auto_init_lsm303dlhc.c
+++ b/sys/auto_init/saul/auto_init_lsm303dlhc.c
@@ -21,6 +21,7 @@
 
 #ifdef MODULE_LSM303DLHC
 
+#include "assert.h"
 #include "log.h"
 #include "saul_reg.h"
 #include "lsm303dlhc.h"
diff --git a/sys/auto_init/saul/auto_init_lsm6dsl.c b/sys/auto_init/saul/auto_init_lsm6dsl.c
index 170bfe29ea816dc3d9b7c2fca3b32475b2eba7e3..b6e2969204d43c37b32a787a3940ec15a47b2250 100644
--- a/sys/auto_init/saul/auto_init_lsm6dsl.c
+++ b/sys/auto_init/saul/auto_init_lsm6dsl.c
@@ -21,6 +21,7 @@
 
 #ifdef MODULE_LSM6DSL
 
+#include "assert.h"
 #include "log.h"
 #include "saul_reg.h"
 #include "lsm6dsl.h"
diff --git a/sys/auto_init/saul/auto_init_mag3110.c b/sys/auto_init/saul/auto_init_mag3110.c
index 90a8f5a4fd1093e4789f63670510a2a9d86ea50e..5874e68f8bdb72754d4e8a63d6489ba84b0af7e7 100644
--- a/sys/auto_init/saul/auto_init_mag3110.c
+++ b/sys/auto_init/saul/auto_init_mag3110.c
@@ -21,6 +21,7 @@
 
 #ifdef MODULE_MAG3110
 
+#include "assert.h"
 #include "log.h"
 #include "saul_reg.h"
 
diff --git a/sys/auto_init/saul/auto_init_mma7660.c b/sys/auto_init/saul/auto_init_mma7660.c
index 5d3662863e87947ff5ecbead49a18af945b31ac0..f4d220b8ef29e4bba9b443ec294c07cb9cf083f3 100644
--- a/sys/auto_init/saul/auto_init_mma7660.c
+++ b/sys/auto_init/saul/auto_init_mma7660.c
@@ -21,6 +21,7 @@
 
 #ifdef MODULE_MMA7660
 
+#include "assert.h"
 #include "log.h"
 #include "saul_reg.h"
 #include "mma7660.h"
diff --git a/sys/auto_init/saul/auto_init_mma8x5x.c b/sys/auto_init/saul/auto_init_mma8x5x.c
index 3c39398193648bb2192bac0155a2e8831a4ced3a..4dcc0344c47e3e08330d1a89484d5170434af92c 100644
--- a/sys/auto_init/saul/auto_init_mma8x5x.c
+++ b/sys/auto_init/saul/auto_init_mma8x5x.c
@@ -22,6 +22,7 @@
 
 #ifdef MODULE_MMA8X5X
 
+#include "assert.h"
 #include "log.h"
 #include "saul_reg.h"
 #include "mma8x5x.h"
diff --git a/sys/auto_init/saul/auto_init_mpl3115a2.c b/sys/auto_init/saul/auto_init_mpl3115a2.c
index 66830d5c5f11d6df0ca2d662250498b7857af650..ea113530bd62be8e1bc78ccc0f6780830e8dbd6d 100644
--- a/sys/auto_init/saul/auto_init_mpl3115a2.c
+++ b/sys/auto_init/saul/auto_init_mpl3115a2.c
@@ -21,6 +21,7 @@
 
 #ifdef MODULE_MPL3115A2
 
+#include "assert.h"
 #include "log.h"
 #include "saul_reg.h"
 
diff --git a/sys/auto_init/saul/auto_init_mpu9150.c b/sys/auto_init/saul/auto_init_mpu9150.c
index 2b62bc1a7810865bb7fcac121402f7aae322bf4a..9e6a38530fcfe2d4e3ffa2cb2374e44cef6e38c1 100644
--- a/sys/auto_init/saul/auto_init_mpu9150.c
+++ b/sys/auto_init/saul/auto_init_mpu9150.c
@@ -21,6 +21,7 @@
 
 #ifdef MODULE_MPU9150
 
+#include "assert.h"
 #include "log.h"
 #include "saul_reg.h"
 #include "mpu9150.h"
diff --git a/sys/auto_init/saul/auto_init_pulse_counter.c b/sys/auto_init/saul/auto_init_pulse_counter.c
index 32c52761a4ee63c19aa0334cfd5661369b7bb810..b0ca423648c5d2d6d4cfa4a7b6a4b2e599413f7e 100644
--- a/sys/auto_init/saul/auto_init_pulse_counter.c
+++ b/sys/auto_init/saul/auto_init_pulse_counter.c
@@ -21,6 +21,7 @@
 
 #ifdef MODULE_PULSE_COUNTER
 
+#include "assert.h"
 #include "log.h"
 #include "saul_reg.h"
 #include "pulse_counter_params.h"
diff --git a/sys/auto_init/auto_init_sht1x.c b/sys/auto_init/saul/auto_init_sht1x.c
similarity index 100%
rename from sys/auto_init/auto_init_sht1x.c
rename to sys/auto_init/saul/auto_init_sht1x.c
diff --git a/sys/auto_init/saul/auto_init_si114x.c b/sys/auto_init/saul/auto_init_si114x.c
index 9869b9b3766bef8fc1794d424fab4e37c560963e..21fe84bc56ff064261ae8ba228b6ead07229669c 100644
--- a/sys/auto_init/saul/auto_init_si114x.c
+++ b/sys/auto_init/saul/auto_init_si114x.c
@@ -21,6 +21,7 @@
 
 #ifdef MODULE_SI114X
 
+#include "assert.h"
 #include "log.h"
 #include "saul_reg.h"
 #include "si114x.h"
diff --git a/sys/auto_init/saul/auto_init_si70xx.c b/sys/auto_init/saul/auto_init_si70xx.c
index e433a11e2828667438301b5f8b2f5aeb6641bef9..609326e13d5ad797bd0ea10e7f8f9c05d18d95f9 100644
--- a/sys/auto_init/saul/auto_init_si70xx.c
+++ b/sys/auto_init/saul/auto_init_si70xx.c
@@ -20,6 +20,7 @@
 
 #ifdef MODULE_SI70XX
 
+#include "assert.h"
 #include "log.h"
 #include "saul_reg.h"
 #include "si70xx.h"
diff --git a/sys/auto_init/saul/auto_init_tcs37727.c b/sys/auto_init/saul/auto_init_tcs37727.c
index cfa9d5fa12c3f37d3e3946feaec9923652fe0789..1f3ea8018a65b397e0f15b89ef4fbb2d38fb3136 100644
--- a/sys/auto_init/saul/auto_init_tcs37727.c
+++ b/sys/auto_init/saul/auto_init_tcs37727.c
@@ -21,6 +21,7 @@
 
 #ifdef MODULE_TCS37727
 
+#include "assert.h"
 #include "log.h"
 #include "saul_reg.h"
 #include "tcs37727.h"
diff --git a/sys/auto_init/saul/auto_init_tmp006.c b/sys/auto_init/saul/auto_init_tmp006.c
index 302450199e224f25b1403ea33201926630ad5c31..77fbdd5e6b500fa8af36e98bb1b117d3a7008d5a 100644
--- a/sys/auto_init/saul/auto_init_tmp006.c
+++ b/sys/auto_init/saul/auto_init_tmp006.c
@@ -21,6 +21,7 @@
 
 #ifdef MODULE_TMP006
 
+#include "assert.h"
 #include "log.h"
 #include "saul_reg.h"
 
diff --git a/sys/auto_init/saul/auto_init_tsl2561.c b/sys/auto_init/saul/auto_init_tsl2561.c
index 487075e4a3e60cdab1782ce71fe1a259473d273a..ee15bf9c8d53874f4349a51f3265f8707ff9060b 100644
--- a/sys/auto_init/saul/auto_init_tsl2561.c
+++ b/sys/auto_init/saul/auto_init_tsl2561.c
@@ -20,6 +20,7 @@
 
 #ifdef MODULE_TSL2561
 
+#include "assert.h"
 #include "log.h"
 #include "saul_reg.h"
 #include "tsl2561.h"
diff --git a/sys/auto_init/saul/auto_init_veml6070.c b/sys/auto_init/saul/auto_init_veml6070.c
index db872c70e64aaaae7349ca3d0beaf5e5f3e84659..72559e94f293377cee33af66a9a0514e2b6e6b1e 100644
--- a/sys/auto_init/saul/auto_init_veml6070.c
+++ b/sys/auto_init/saul/auto_init_veml6070.c
@@ -20,6 +20,7 @@
 
 #ifdef MODULE_VEML6070
 
+#include "assert.h"
 #include "log.h"
 #include "saul_reg.h"
 #include "veml6070.h"
@@ -28,17 +29,17 @@
 /**
  * @brief   Define the number of configured sensors
  */
-#define VEML6070_NUMOF    (sizeof(veml6070_params) / sizeof(veml6070_params[0]))
+#define VEML6070_NUM    (sizeof(veml6070_params) / sizeof(veml6070_params[0]))
 
 /**
  * @brief   Allocation of memory for device descriptors
  */
-static veml6070_t veml6070_devs[VEML6070_NUMOF];
+static veml6070_t veml6070_devs[VEML6070_NUM];
 
 /**
  * @brief   Memory for the SAUL registry entries
  */
-static saul_reg_t saul_entries[VEML6070_NUMOF];
+static saul_reg_t saul_entries[VEML6070_NUM];
 
 /**
  * @brief   Define the number of saul info
@@ -54,7 +55,7 @@ void auto_init_veml6070(void)
 {
     assert(VEML6070_NUM == VEML6070_INFO_NUM);
 
-    for (unsigned i = 0; i < VEML6070_NUMOF; i++) {
+    for (unsigned i = 0; i < VEML6070_NUM; i++) {
         LOG_DEBUG("[auto_init_saul] initializing veml6070 #%u\n", i);
 
         if (veml6070_init(&veml6070_devs[i],