diff --git a/sys/auto_init/saul/auto_init_adc.c b/sys/auto_init/saul/auto_init_adc.c
index 9e5e5d3bd4fc780d837357753357cb0eecbe451a..5668e3adffcc597d80976cd2894098d999a2013e 100644
--- a/sys/auto_init/saul/auto_init_adc.c
+++ b/sys/auto_init/saul/auto_init_adc.c
@@ -25,7 +25,7 @@
 #include "saul_reg.h"
 #include "saul/periph.h"
 #include "adc_params.h"
-#include "periph/gpio.h"
+#include "periph/adc.h"
 
 /**
  * @brief   Define the number of configured sensors
diff --git a/sys/auto_init/saul/auto_init_bme280.c b/sys/auto_init/saul/auto_init_bme280.c
index 08ab7009031e1c3d5a3238cc6b9b05067149a57e..94fd1e2c4a604cf791e78f977823ec62c716878c 100644
--- a/sys/auto_init/saul/auto_init_bme280.c
+++ b/sys/auto_init/saul/auto_init_bme280.c
@@ -22,9 +22,8 @@
 
 #include "log.h"
 #include "saul_reg.h"
-
-#include "bme280_params.h"
 #include "bme280.h"
+#include "bme280_params.h"
 
 /**
  * @brief   Allocation of memory for device descriptors
diff --git a/sys/auto_init/saul/auto_init_bmp180.c b/sys/auto_init/saul/auto_init_bmp180.c
index 7e3e31b769ce2658963e1837632a93f8db7392b3..c0f0b423490fc4866d6aae1672d03e2fdfbcaa72 100644
--- a/sys/auto_init/saul/auto_init_bmp180.c
+++ b/sys/auto_init/saul/auto_init_bmp180.c
@@ -22,7 +22,7 @@
 
 #include "log.h"
 #include "saul_reg.h"
-
+#include "bmp180.h"
 #include "bmp180_params.h"
 
 /**
diff --git a/sys/auto_init/saul/auto_init_hdc1000.c b/sys/auto_init/saul/auto_init_hdc1000.c
index 68efec34fb8cb913dbb4d1d02eea1ca2fd1c8955..6f0fb32aa946ec6abe7333b087545bb6796c872a 100644
--- a/sys/auto_init/saul/auto_init_hdc1000.c
+++ b/sys/auto_init/saul/auto_init_hdc1000.c
@@ -23,7 +23,6 @@
 
 #include "log.h"
 #include "saul_reg.h"
-
 #include "hdc1000.h"
 #include "hdc1000_params.h"
 
diff --git a/sys/auto_init/saul/auto_init_io1_xplained.c b/sys/auto_init/saul/auto_init_io1_xplained.c
index 4f288dbd2e1c60689b40f9fb623b678556469b21..4bb2d58196dd6421732dba8dca82d9ac786606cf 100644
--- a/sys/auto_init/saul/auto_init_io1_xplained.c
+++ b/sys/auto_init/saul/auto_init_io1_xplained.c
@@ -22,7 +22,6 @@
 
 #include "log.h"
 #include "saul_reg.h"
-
 #include "io1_xplained.h"
 #include "io1_xplained_params.h"
 
diff --git a/sys/auto_init/saul/auto_init_jc42.c b/sys/auto_init/saul/auto_init_jc42.c
index 5bec7c423c7c3ba47be03f5eb2038717bd3978c0..42cd51482d7adb4b4fab269dd30c1619ccfe40dd 100644
--- a/sys/auto_init/saul/auto_init_jc42.c
+++ b/sys/auto_init/saul/auto_init_jc42.c
@@ -22,7 +22,6 @@
 
 #include "log.h"
 #include "saul_reg.h"
-
 #include "jc42.h"
 #include "jc42_params.h"
 
diff --git a/sys/auto_init/saul/auto_init_mma8x5x.c b/sys/auto_init/saul/auto_init_mma8x5x.c
index 8c816d2d65d099c2aee6fe5f0b42103402547f36..c52999ea0e72846eb092118ad4da444f1fb845ab 100644
--- a/sys/auto_init/saul/auto_init_mma8x5x.c
+++ b/sys/auto_init/saul/auto_init_mma8x5x.c
@@ -24,7 +24,6 @@
 
 #include "log.h"
 #include "saul_reg.h"
-
 #include "mma8x5x.h"
 #include "mma8x5x_params.h"
 
diff --git a/sys/auto_init/saul/auto_init_si70xx.c b/sys/auto_init/saul/auto_init_si70xx.c
index 1161e8be392ab7da0089cdc1bd237dd0e2394d40..061ef71d852fa6dfc8457ddfd35a75ea1ee22013 100644
--- a/sys/auto_init/saul/auto_init_si70xx.c
+++ b/sys/auto_init/saul/auto_init_si70xx.c
@@ -22,9 +22,8 @@
 
 #include "log.h"
 #include "saul_reg.h"
-
-#include "si70xx_params.h"
 #include "si70xx.h"
+#include "si70xx_params.h"
 
 /**
  * @brief   Define the number of configured sensors
diff --git a/sys/auto_init/saul/auto_init_tsl2561.c b/sys/auto_init/saul/auto_init_tsl2561.c
index d1a07dbc8f4412e76647d5110e0380cf6a37d5b0..6a5735c06557f03dfe55ea167f27df6a7271f60f 100644
--- a/sys/auto_init/saul/auto_init_tsl2561.c
+++ b/sys/auto_init/saul/auto_init_tsl2561.c
@@ -22,7 +22,7 @@
 
 #include "log.h"
 #include "saul_reg.h"
-
+#include "tsl2561.h"
 #include "tsl2561_params.h"
 
 /**
diff --git a/sys/auto_init/saul/auto_init_veml6070.c b/sys/auto_init/saul/auto_init_veml6070.c
index e92822c506fea1455e1ddb4661944b88da9c846e..83735fd207725c0c87ecf0b502dfe830a6c4a0a0 100644
--- a/sys/auto_init/saul/auto_init_veml6070.c
+++ b/sys/auto_init/saul/auto_init_veml6070.c
@@ -22,7 +22,7 @@
 
 #include "log.h"
 #include "saul_reg.h"
-
+#include "veml6070.h"
 #include "veml6070_params.h"
 
 /**