diff --git a/bsp/lh2.h b/bsp/lh2.h
index 6c9170a81..6511f1406 100644
--- a/bsp/lh2.h
+++ b/bsp/lh2.h
@@ -15,9 +15,9 @@
  * @}
  */
 
-#include <nrf.h>
 #include <stdint.h>
 #include <stdbool.h>
+#include <nrf.h>
 
 #include "gpio.h"
 
diff --git a/bsp/nrf/board.c b/bsp/nrf/board.c
index 8de57f6bc..006988cc7 100644
--- a/bsp/nrf/board.c
+++ b/bsp/nrf/board.c
@@ -8,8 +8,7 @@
  *
  * @copyright Inria, 2022
  */
-#include <stdio.h>
-#include <stdlib.h>
+
 #include <nrf.h>
 
 #include "board.h"
diff --git a/bsp/nrf/lh2_default.c b/bsp/nrf/lh2_default.c
index 6f6b041d4..524ed7b2b 100644
--- a/bsp/nrf/lh2_default.c
+++ b/bsp/nrf/lh2_default.c
@@ -12,7 +12,6 @@
  */
 #include <stdio.h>
 #include <stdint.h>
-#include <stdlib.h>
 #include <string.h>
 #include <stdbool.h>
 #include <nrf.h>
diff --git a/bsp/nrf/lh2_nrf5340_net.c b/bsp/nrf/lh2_nrf5340_net.c
index 36df0e16b..dde8dde2a 100644
--- a/bsp/nrf/lh2_nrf5340_net.c
+++ b/bsp/nrf/lh2_nrf5340_net.c
@@ -20,12 +20,10 @@ void db_lh2_init(db_lh2_t *lh2, const gpio_t *gpio_d, const gpio_t *gpio_e) {
     (void)gpio_e;
 }
 
-void db_lh2_start(db_lh2_t *lh2) {
-    (void)lh2;
+void db_lh2_start(void) {
 }
 
-void db_lh2_stop(db_lh2_t *lh2) {
-    (void)lh2;
+void db_lh2_stop(void) {
 }
 
 void db_lh2_reset(db_lh2_t *lh2) {
diff --git a/bsp/nrf/nvmc.c b/bsp/nrf/nvmc.c
index 95348f36b..4f358cfe7 100644
--- a/bsp/nrf/nvmc.c
+++ b/bsp/nrf/nvmc.c
@@ -14,7 +14,8 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "nrf.h"
+#include <nrf.h>
+
 #include "nvmc.h"
 
 //=========================== defines =========================================
diff --git a/bsp/nrf/partition.c b/bsp/nrf/partition.c
index 58d2feb4f..9d23281a3 100644
--- a/bsp/nrf/partition.c
+++ b/bsp/nrf/partition.c
@@ -9,12 +9,10 @@
  * @copyright Inria, 2023
  */
 
-#include <assert.h>
-#include <stdlib.h>
 #include <stdint.h>
 #include <string.h>
 
-#include "nrf.h"
+#include <nrf.h>
 #include "nvmc.h"
 #include "partition.h"
 
diff --git a/bsp/nrf/pwm_nrf5340_net.c b/bsp/nrf/pwm_nrf5340_net.c
index ed6dfdb35..4d48385a8 100644
--- a/bsp/nrf/pwm_nrf5340_net.c
+++ b/bsp/nrf/pwm_nrf5340_net.c
@@ -9,11 +9,8 @@
  * @copyright Inria, 2022
  */
 
-#include <assert.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <string.h>
-#include <nrf.h>
 
 #include "gpio.h"
 
diff --git a/bsp/nrf/qdec.c b/bsp/nrf/qdec.c
index 7c29cb138..8bbab3c5b 100644
--- a/bsp/nrf/qdec.c
+++ b/bsp/nrf/qdec.c
@@ -8,12 +8,11 @@
  *
  * @copyright Inria, 2023
  */
-#include <nrf.h>
-#include <nrf_peripherals.h>
 #include <assert.h>
 #include <stdint.h>
 #include <stdbool.h>
-#include <stdio.h>
+#include <nrf.h>
+#include <nrf_peripherals.h>
 #include "gpio.h"
 #include "qdec.h"
 
diff --git a/bsp/nrf/qspi.c b/bsp/nrf/qspi.c
index 53b6c1614..8f6e7a653 100644
--- a/bsp/nrf/qspi.c
+++ b/bsp/nrf/qspi.c
@@ -9,11 +9,9 @@
  * @copyright Inria, 2024-present
  */
 
-#include <assert.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <string.h>
 #include <nrf.h>
 
 #include "clock.h"
diff --git a/bsp/nrf/radio_nrf5340_app.c b/bsp/nrf/radio_nrf5340_app.c
index 689104e1b..36e8055c0 100644
--- a/bsp/nrf/radio_nrf5340_app.c
+++ b/bsp/nrf/radio_nrf5340_app.c
@@ -8,17 +8,13 @@
  *
  * @copyright Inria, 2022
  */
-#include <nrf.h>
 #include <stdint.h>
-#include <stdio.h>
-#include <stdbool.h>
-#include <stdlib.h>
 #include <string.h>
+#include <nrf.h>
 
 #include "clock.h"
 #include "ipc.h"
 #include "radio.h"
-#include "timer_hf.h"
 #include "tz.h"
 
 //=========================== variables ========================================
diff --git a/bsp/nrf/rng.c b/bsp/nrf/rng.c
index cd33caaa5..88ecd6552 100644
--- a/bsp/nrf/rng.c
+++ b/bsp/nrf/rng.c
@@ -8,8 +8,6 @@
  *
  * @copyright Inria, 2023
  */
-#include <nrf.h>
-#include <stdint.h>
 
 #if defined(NRF5340_XXAA) && defined(NRF_APPLICATION)
 #include "rng_nrf5340_app.c"
diff --git a/bsp/nrf/rng_nrf5340_app.c b/bsp/nrf/rng_nrf5340_app.c
index ce9e70b7f..e5133afd1 100644
--- a/bsp/nrf/rng_nrf5340_app.c
+++ b/bsp/nrf/rng_nrf5340_app.c
@@ -8,9 +8,8 @@
  *
  * @copyright Inria, 2023
  */
-#include <nrf.h>
-#include <stdbool.h>
 #include <stdint.h>
+#include <nrf.h>
 
 #include "ipc.h"
 #include "rng.h"
diff --git a/bsp/nrf/rpm.c b/bsp/nrf/rpm.c
index f563c428b..ff1b3656b 100644
--- a/bsp/nrf/rpm.c
+++ b/bsp/nrf/rpm.c
@@ -9,8 +9,6 @@
  * @copyright Inria, 2022
  */
 #include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <nrf.h>
 #include "board_config.h"
 #include "rpm.h"
diff --git a/bsp/nrf/saadc.c b/bsp/nrf/saadc.c
index c3381272f..b50d54fa0 100644
--- a/bsp/nrf/saadc.c
+++ b/bsp/nrf/saadc.c
@@ -8,11 +8,11 @@
  *
  * @copyright Inria, 2023
  */
-#include <nrf.h>
-#include <nrf_peripherals.h>
 #include <assert.h>
 #include <stdbool.h>
 #include <stdint.h>
+#include <nrf.h>
+#include <nrf_peripherals.h>
 #include "saadc.h"
 
 //=========================== defines ==========================================
diff --git a/bsp/nrf/spim.c b/bsp/nrf/spim.c
index 49d91c834..63864090a 100644
--- a/bsp/nrf/spim.c
+++ b/bsp/nrf/spim.c
@@ -9,7 +9,6 @@
  * @copyright Inria, 2024-present
  */
 
-#include <assert.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/bsp/nrf/timer.c b/bsp/nrf/timer.c
index 362af6275..b00468b4f 100644
--- a/bsp/nrf/timer.c
+++ b/bsp/nrf/timer.c
@@ -8,11 +8,12 @@
  *
  * @copyright Inria, 2022
  */
-#include <nrf.h>
-#include <nrf_peripherals.h>
+
 #include <assert.h>
 #include <stdbool.h>
 #include <stdint.h>
+#include <nrf.h>
+#include <nrf_peripherals.h>
 #include "clock.h"
 #include "timer.h"
 
diff --git a/bsp/nrf/timer_hf.c b/bsp/nrf/timer_hf.c
index 194d15614..9ff0c2b3b 100644
--- a/bsp/nrf/timer_hf.c
+++ b/bsp/nrf/timer_hf.c
@@ -8,11 +8,11 @@
  *
  * @copyright Inria, 2022
  */
-#include <nrf.h>
-#include <nrf_peripherals.h>
 #include <assert.h>
 #include <stdbool.h>
 #include <stdint.h>
+#include <nrf.h>
+#include <nrf_peripherals.h>
 #include "clock.h"
 #include "timer_hf.h"
 
diff --git a/bsp/nrf/wdt.c b/bsp/nrf/wdt.c
index c504a7df6..8fb7d3046 100644
--- a/bsp/nrf/wdt.c
+++ b/bsp/nrf/wdt.c
@@ -8,8 +8,9 @@
  *
  * @copyright Inria, 2024
  */
-#include <nrf.h>
+
 #include <stdint.h>
+#include <nrf.h>
 
 #include "wdt.h"
 
diff --git a/bsp/partition.h b/bsp/partition.h
index e96e43af4..1ee233ba2 100644
--- a/bsp/partition.h
+++ b/bsp/partition.h
@@ -14,7 +14,6 @@
  */
 
 #include <stdint.h>
-#include <string.h>
 
 #include <nrf.h>
 
diff --git a/bsp/pwm.h b/bsp/pwm.h
index 0177b67c8..3ddf8eaf3 100644
--- a/bsp/pwm.h
+++ b/bsp/pwm.h
@@ -15,8 +15,10 @@
 
 #include <stdint.h>
 #include <stdlib.h>
+
+#include <nrf.h>
+
 #include "gpio.h"
-#include "nrf.h"
 
 //=========================== defines ==========================================
 
diff --git a/bsp/qdec.h b/bsp/qdec.h
index b1472e42a..0fe013f52 100644
--- a/bsp/qdec.h
+++ b/bsp/qdec.h
@@ -13,8 +13,8 @@
  * @}
  */
 
-#include <nrf.h>
 #include <stdint.h>
+#include <nrf.h>
 #include "gpio.h"
 
 //=========================== defines ==========================================
diff --git a/bsp/saadc.h b/bsp/saadc.h
index 434e1dc13..397928575 100644
--- a/bsp/saadc.h
+++ b/bsp/saadc.h
@@ -13,8 +13,8 @@
  * @}
  */
 
-#include <nrf.h>
 #include <stdint.h>
+#include <nrf.h>
 
 typedef enum {
     DB_SAADC_RESOLUTION_8BIT  = SAADC_RESOLUTION_VAL_8bit,   ///< 8-bit resolution
diff --git a/bsp/timer_hf.h b/bsp/timer_hf.h
index f531e0b99..8205ca9b8 100644
--- a/bsp/timer_hf.h
+++ b/bsp/timer_hf.h
@@ -14,8 +14,6 @@
  */
 
 #include <stdint.h>
-#include <nrf.h>
-#include <nrf_peripherals.h>
 
 //=========================== defines ==========================================
 
diff --git a/crypto/ed25519.c b/crypto/ed25519.c
index c6035f28d..2de34f43b 100644
--- a/crypto/ed25519.c
+++ b/crypto/ed25519.c
@@ -14,10 +14,10 @@
 
 #include <nrf.h>
 #include "ed25519.h"
-#include "utils.h"
 
 #if defined(USE_CRYPTOCELL)
 #include "nrf_cc310/include/crys_ec_edw_api.h"
+#include "utils.h"
 #else
 #include "soft_edsign.h"
 #endif
diff --git a/crypto/sha256.c b/crypto/sha256.c
index b6a9673c5..4096f946d 100644
--- a/crypto/sha256.c
+++ b/crypto/sha256.c
@@ -13,9 +13,9 @@
 
 #include <nrf.h>
 #include "sha256.h"
-#include "utils.h"
 
 #if defined(USE_CRYPTOCELL)
+#include "utils.h"
 #include "nrf_cc310/include/crys_hash.h"
 
 static CRYS_HASHUserContext_t _hash_context;
diff --git a/crypto/utils.h b/crypto/utils.h
index f26d78321..f0817d27d 100644
--- a/crypto/utils.h
+++ b/crypto/utils.h
@@ -13,10 +13,6 @@
  * @}
  */
 
-#include <stdlib.h>
-#include <stdbool.h>
-#include <stdint.h>
-
 #include <nrf.h>
 
 //=========================== defines ==========================================
diff --git a/drv/as5048b.h b/drv/as5048b.h
index 04bc68049..96217f7b1 100644
--- a/drv/as5048b.h
+++ b/drv/as5048b.h
@@ -14,7 +14,6 @@
  */
 
 #include <stdint.h>
-#include <stdlib.h>
 #include <nrf.h>
 
 /**
diff --git a/drv/as5048b/as5048b.c b/drv/as5048b/as5048b.c
index c7480002c..c14b9965a 100644
--- a/drv/as5048b/as5048b.c
+++ b/drv/as5048b/as5048b.c
@@ -8,13 +8,11 @@
  *
  */
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <stdint.h>
 #include <math.h>
 
 // Include BSP packages
 #include "board_config.h"
-#include "gpio.h"
 #include "i2c.h"
 #include "as5048b.h"
 
diff --git a/drv/drv.emProject b/drv/drv.emProject
index 3f450ceb3..f49dbf02a 100644
--- a/drv/drv.emProject
+++ b/drv/drv.emProject
@@ -102,24 +102,6 @@
     <file file_name="motors/motors.c" />
     <file file_name="motors.h" />
   </project>
-  <project Name="00drv_tdma_client">
-    <configuration
-      Name="Common"
-      project_dependencies="00bsp_radio(bsp);00bsp_timer_hf(bsp);00bsp_rng(bsp);00drv_dotbot_protocol(drv)"
-      project_directory="tdma_client"
-      project_type="Library" />
-    <file file_name="tdma_client.c" />
-    <file file_name="../tdma_client.h" />
-  </project>
-  <project Name="00drv_tdma_server">
-    <configuration
-      Name="Common"
-      project_dependencies="00bsp_radio(bsp);00bsp_timer_hf(bsp);00drv_dotbot_protocol(drv)"
-      project_directory="tdma_server"
-      project_type="Library" />
-    <file file_name="tdma_server.c" />
-    <file file_name="../tdma_server.h" />
-  </project>
   <project Name="00drv_move">
     <configuration
       Name="Common"
@@ -174,6 +156,24 @@
     <file file_name="rgbled_pwm.c" />
     <file file_name="../rgbled_pwm.h" />
   </project>
+  <project Name="00drv_tdma_client">
+    <configuration
+      Name="Common"
+      project_dependencies="00bsp_radio(bsp);00bsp_timer_hf(bsp);00bsp_rng(bsp);00drv_dotbot_protocol(drv)"
+      project_directory="tdma_client"
+      project_type="Library" />
+    <file file_name="tdma_client.c" />
+    <file file_name="../tdma_client.h" />
+  </project>
+  <project Name="00drv_tdma_server">
+    <configuration
+      Name="Common"
+      project_dependencies="00bsp_radio(bsp);00bsp_timer_hf(bsp);00drv_dotbot_protocol(drv)"
+      project_directory="tdma_server"
+      project_type="Library" />
+    <file file_name="tdma_server.c" />
+    <file file_name="../tdma_server.h" />
+  </project>
   <project Name="00drv_upgate">
     <configuration
       Name="Common"
diff --git a/drv/hdlc/hdlc.c b/drv/hdlc/hdlc.c
index 18c12db3b..72c8972ed 100644
--- a/drv/hdlc/hdlc.c
+++ b/drv/hdlc/hdlc.c
@@ -11,7 +11,6 @@
 
 #include <stdbool.h>
 #include <stdint.h>
-#include <string.h>
 #include "hdlc.h"
 
 //=========================== definitions ======================================
diff --git a/drv/ism330.h b/drv/ism330.h
index 046812b3c..d76674649 100644
--- a/drv/ism330.h
+++ b/drv/ism330.h
@@ -13,8 +13,6 @@
  * @}
  */
 
-#include <stdint.h>
-#include <stdlib.h>
 #include <nrf.h>
 #include "gpio.h"
 
diff --git a/drv/ism330/ism330.c b/drv/ism330/ism330.c
index f35e727b7..ecfdd61b2 100644
--- a/drv/ism330/ism330.c
+++ b/drv/ism330/ism330.c
@@ -9,10 +9,8 @@
  * @copyright Inria, 2023
  */
 
-#include <assert.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include <stdlib.h>
 
 #include <nrf.h>
 #include "gpio.h"
diff --git a/drv/lis2mdl.h b/drv/lis2mdl.h
index 1564294df..febab9958 100644
--- a/drv/lis2mdl.h
+++ b/drv/lis2mdl.h
@@ -14,7 +14,6 @@
  */
 
 #include <stdint.h>
-#include <stdlib.h>
 #include <stdbool.h>
 #include <nrf.h>
 
diff --git a/drv/lis2mdl/lis2mdl.c b/drv/lis2mdl/lis2mdl.c
index 3c47cad0a..48f1d487f 100644
--- a/drv/lis2mdl/lis2mdl.c
+++ b/drv/lis2mdl/lis2mdl.c
@@ -9,8 +9,8 @@
  */
 
 #include <assert.h>
-#include <math.h>
 #include <stdio.h>
+#include <stdbool.h>
 
 #include "board_config.h"
 #include "gpio.h"
diff --git a/drv/lis3mdl.h b/drv/lis3mdl.h
index f1f02cdae..18c3c11df 100644
--- a/drv/lis3mdl.h
+++ b/drv/lis3mdl.h
@@ -14,7 +14,6 @@
  */
 
 #include <stdint.h>
-#include <stdlib.h>
 #include <stdbool.h>
 #include <nrf.h>
 
diff --git a/drv/lis3mdl/lis3mdl.c b/drv/lis3mdl/lis3mdl.c
index 531f63679..ab1c53fcc 100644
--- a/drv/lis3mdl/lis3mdl.c
+++ b/drv/lis3mdl/lis3mdl.c
@@ -9,8 +9,7 @@
  */
 
 #include <assert.h>
-#include <math.h>
-#include <stdio.h>
+#include <stdbool.h>
 
 #include "gpio.h"
 #include "i2c.h"
diff --git a/drv/lsm6ds.h b/drv/lsm6ds.h
index e3f61011a..188068dd8 100644
--- a/drv/lsm6ds.h
+++ b/drv/lsm6ds.h
@@ -14,7 +14,6 @@
  */
 
 #include <stdint.h>
-#include <stdlib.h>
 #include <stdbool.h>
 #include <nrf.h>
 
diff --git a/drv/lsm6ds/lsm6ds.c b/drv/lsm6ds/lsm6ds.c
index b897f95ac..8325dceac 100644
--- a/drv/lsm6ds/lsm6ds.c
+++ b/drv/lsm6ds/lsm6ds.c
@@ -9,8 +9,7 @@
  */
 
 #include <assert.h>
-#include <math.h>
-#include <stdio.h>
+#include <stdbool.h>
 
 #include "board_config.h"
 #include "gpio.h"
diff --git a/drv/motors.h b/drv/motors.h
index e17d29e93..b19d8a061 100644
--- a/drv/motors.h
+++ b/drv/motors.h
@@ -14,9 +14,8 @@
  * @}
  */
 
+#include <stdint.h>
 #include <nrf.h>
-#include <stdio.h>
-#include <stdlib.h>
 
 /**
  * @brief Configures the PMW0 peripheral to work with the onboard DotBot RGB Motor driver
diff --git a/drv/motors/motors.c b/drv/motors/motors.c
index c3ab3e138..a3d1fa90e 100644
--- a/drv/motors/motors.c
+++ b/drv/motors/motors.c
@@ -8,12 +8,10 @@
  *
  * @copyright Inria, 2022
  */
-#include <stdio.h>
-#include <stdlib.h>
+#include <stdint.h>
 #include <nrf.h>
 
 #include "board_config.h"
-#include "gpio.h"
 #include "motors.h"
 #include "pwm.h"
 
diff --git a/drv/move/move.c b/drv/move/move.c
index 6ae5db0d1..b4535c03e 100644
--- a/drv/move/move.c
+++ b/drv/move/move.c
@@ -12,6 +12,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <math.h>
 #include "board.h"
 #include "board_config.h"
diff --git a/drv/n25q128.h b/drv/n25q128.h
index 0d48b6777..f767afe7c 100644
--- a/drv/n25q128.h
+++ b/drv/n25q128.h
@@ -15,7 +15,6 @@
 
 #include <stdint.h>
 #include <stdlib.h>
-#include <stdbool.h>
 #include <nrf.h>
 
 #include "gpio.h"
diff --git a/drv/n25q128/n25q128.c b/drv/n25q128/n25q128.c
index d8a3cdea8..fc1993c7b 100644
--- a/drv/n25q128/n25q128.c
+++ b/drv/n25q128/n25q128.c
@@ -10,7 +10,6 @@
 
 #include <assert.h>
 #include <stdio.h>
-#include <string.h>
 
 #include "gpio.h"
 #include "spim.h"
diff --git a/drv/ota.h b/drv/ota.h
index 92ab7f4b4..84d559296 100644
--- a/drv/ota.h
+++ b/drv/ota.h
@@ -14,6 +14,7 @@
  */
 
 #include <stdint.h>
+#include <stdlib.h>
 #include "partition.h"
 
 //=========================== defines ==========================================
diff --git a/drv/ota/ota.c b/drv/ota/ota.c
index 8e7913bc8..708bf41f2 100644
--- a/drv/ota/ota.c
+++ b/drv/ota/ota.c
@@ -8,10 +8,10 @@
  *
  * @copyright Inria, 2023
  */
-#include <nrf.h>
-#include <assert.h>
 #include <stdbool.h>
 #include <stdint.h>
+#include <string.h>
+#include <nrf.h>
 
 #include "nvmc.h"
 #include "ota.h"
diff --git a/drv/pid.h b/drv/pid.h
index deef7a6fb..a7dec768d 100644
--- a/drv/pid.h
+++ b/drv/pid.h
@@ -13,7 +13,6 @@
  * @}
  */
 
-#include <stdbool.h>
 #include <stdint.h>
 
 //=========================== defines ==========================================
diff --git a/drv/pid/pid.c b/drv/pid/pid.c
index d18b7d6f7..f98e57796 100644
--- a/drv/pid/pid.c
+++ b/drv/pid/pid.c
@@ -8,11 +8,10 @@
  *
  * @copyright Inria, 2022
  */
-#include <nrf.h>
 #include <assert.h>
-#include <stdbool.h>
 #include <stdint.h>
 #include "pid.h"
+#include <nrf.h>
 
 void db_pid_init(pid_t *pid, float input, float target,
                  float kp, float ki, float kd,
diff --git a/drv/protocol/protocol.c b/drv/protocol/protocol.c
index 1a28f9c54..c09b2b11e 100644
--- a/drv/protocol/protocol.c
+++ b/drv/protocol/protocol.c
@@ -11,7 +11,6 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <stdio.h>
 #include "device.h"
 #include "protocol.h"
 #include "rng.h"
diff --git a/drv/rgbled.h b/drv/rgbled.h
index 6a71330ca..1ba45c2d9 100644
--- a/drv/rgbled.h
+++ b/drv/rgbled.h
@@ -13,9 +13,8 @@
  * @}
  */
 
+#include <stdint.h>
 #include <nrf.h>
-#include <stdio.h>
-#include <stdlib.h>
 
 /**
  * @brief Configures the SPIM peripheral to work with the onboard DotBot RGB LED driver
diff --git a/drv/rgbled/rgbled.c b/drv/rgbled/rgbled.c
index 93eedb1b0..b57cf648e 100644
--- a/drv/rgbled/rgbled.c
+++ b/drv/rgbled/rgbled.c
@@ -9,8 +9,7 @@
  * @copyright Inria, 2022
  */
 #include <nrf.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <stdint.h>
 #include <string.h>
 #include "gpio.h"
 #include "rgbled.h"
diff --git a/drv/rgbled_pwm.h b/drv/rgbled_pwm.h
index 50f35fa2f..cdc31bd05 100644
--- a/drv/rgbled_pwm.h
+++ b/drv/rgbled_pwm.h
@@ -13,7 +13,6 @@
  * @}
  */
 
-#include <stdlib.h>
 #include <stdint.h>
 
 #include "gpio.h"
diff --git a/drv/rgbled_pwm/rgbled_pwm.c b/drv/rgbled_pwm/rgbled_pwm.c
index 350ca4fe0..591db0074 100644
--- a/drv/rgbled_pwm/rgbled_pwm.c
+++ b/drv/rgbled_pwm/rgbled_pwm.c
@@ -9,9 +9,7 @@
  * @copyright Inria, 2023
  */
 
-#include <stdbool.h>
 #include <stdint.h>
-#include <string.h>
 
 #include "rgbled_pwm.h"
 #include "pwm.h"
diff --git a/drv/tdma_client.h b/drv/tdma_client.h
index d6dd20190..f4ecea4f6 100644
--- a/drv/tdma_client.h
+++ b/drv/tdma_client.h
@@ -14,9 +14,7 @@
  */
 
 #include <stdint.h>
-#include <stdlib.h>
 #include <nrf.h>
-#include "gpio.h"
 #include "radio.h"
 #include "protocol.h"
 
diff --git a/drv/tdma_client/tdma_client_default.c b/drv/tdma_client/tdma_client_default.c
index f249437c2..9d818a771 100644
--- a/drv/tdma_client/tdma_client_default.c
+++ b/drv/tdma_client/tdma_client_default.c
@@ -10,12 +10,10 @@
  */
 #include <nrf.h>
 #include <stdint.h>
-#include <stdio.h>
 #include <string.h>
 #include <stdbool.h>
 
 #include "tdma_client.h"
-#include "clock.h"
 #include "radio.h"
 #include "rng.h"
 #include "timer_hf.h"
diff --git a/drv/tdma_server.h b/drv/tdma_server.h
index d459af2cf..5fb541fc9 100644
--- a/drv/tdma_server.h
+++ b/drv/tdma_server.h
@@ -14,7 +14,6 @@
  */
 
 #include <stdint.h>
-#include <stdlib.h>
 #include <nrf.h>
 #include "gpio.h"
 #include "radio.h"
diff --git a/drv/upgate/upgate.c b/drv/upgate/upgate.c
index ebc1dedce..1f1059fd1 100644
--- a/drv/upgate/upgate.c
+++ b/drv/upgate/upgate.c
@@ -8,12 +8,11 @@
  *
  * @copyright Inria, 2024-present
  */
-#include <nrf.h>
 #include <assert.h>
-#include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
+#include <nrf.h>
 
 #include "gpio.h"
 #include "n25q128.h"
diff --git a/drv/uzlib.h b/drv/uzlib.h
index 2ae400098..5554e6381 100644
--- a/drv/uzlib.h
+++ b/drv/uzlib.h
@@ -35,7 +35,6 @@
 #ifndef UZLIB_H_INCLUDED
 #define UZLIB_H_INCLUDED
 
-#include <stdlib.h>
 #include <stdint.h>
 #include <stdbool.h>
 
diff --git a/drv/uzlib/defl_static.c b/drv/uzlib/defl_static.c
index 5211ee08c..6d7325284 100644
--- a/drv/uzlib/defl_static.c
+++ b/drv/uzlib/defl_static.c
@@ -32,7 +32,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <stdlib.h>
 #include <stdint.h>
-#include <string.h>
 #include <assert.h>
 #include "uzlib.h"
 #include "defl_static.h"
diff --git a/drv/uzlib/genlz77.c b/drv/uzlib/genlz77.c
index bca1b0880..a08e1d952 100644
--- a/drv/uzlib/genlz77.c
+++ b/drv/uzlib/genlz77.c
@@ -29,7 +29,6 @@
  */
 #include <stdint.h>
 #include <string.h>
-#include <stdio.h>
 #include "uzlib.h"
 
 #if 0
diff --git a/drv/uzlib/tinflate.c b/drv/uzlib/tinflate.c
index a8c0368f1..509d19db8 100644
--- a/drv/uzlib/tinflate.c
+++ b/drv/uzlib/tinflate.c
@@ -32,8 +32,6 @@
  *    any source distribution.
  */
 
-#include <assert.h>
-#include <string.h>
 #include "tinf.h"
 
 #define UZLIB_DUMP_ARRAY(heading, arr, size) \
diff --git a/nRF/System/cpu.c b/nRF/System/cpu.c
index 32e9f2f88..4aa9bb44a 100644
--- a/nRF/System/cpu.c
+++ b/nRF/System/cpu.c
@@ -8,9 +8,6 @@
  *
  * @copyright Inria, 2024-present
  */
-#include <stdio.h>
-#include <stdlib.h>
-#include <nrf.h>
 
 /**
  * @file
@@ -21,9 +18,7 @@
  *
  */
 
-#include <stdlib.h>
 #include <stdint.h>
-#include <stdio.h>
 #include <nrf.h>
 
 extern __NO_RETURN int main(void);
diff --git a/otap/partition1/main.c b/otap/partition1/main.c
index cda559b10..3b7c00438 100644
--- a/otap/partition1/main.c
+++ b/otap/partition1/main.c
@@ -16,10 +16,12 @@
 #include "board_config.h"
 #include "gpio.h"
 #include "radio.h"
-#include "timer.h"
 
 #include "ota.h"
 #include "partition.h"
+#ifdef DB_LED2_PIN
+#include "timer.h"
+#endif
 
 //=========================== defines ==========================================
 
diff --git a/projects/01bsp_device/main.c b/projects/01bsp_device/main.c
index 0b825cf53..3f9605465 100644
--- a/projects/01bsp_device/main.c
+++ b/projects/01bsp_device/main.c
@@ -9,7 +9,6 @@
  */
 #include <nrf.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include "device.h"
 
 int main(void) {
diff --git a/projects/01bsp_gpio/01bsp_gpio.c b/projects/01bsp_gpio/01bsp_gpio.c
index 5e89ef518..b1a479e51 100644
--- a/projects/01bsp_gpio/01bsp_gpio.c
+++ b/projects/01bsp_gpio/01bsp_gpio.c
@@ -8,8 +8,6 @@
  *
  */
 #include <nrf.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include "board_config.h"
 #include "gpio.h"
 
@@ -72,7 +70,4 @@ int main(void) {
     while (1) {
         __WFE();
     }
-
-    // one last instruction, doesn't do anything, it's just to have a place to put a breakpoint.
-    __NOP();
 }
diff --git a/projects/01bsp_i2c/01bsp_i2c.c b/projects/01bsp_i2c/01bsp_i2c.c
index 04a34f618..c043d0491 100644
--- a/projects/01bsp_i2c/01bsp_i2c.c
+++ b/projects/01bsp_i2c/01bsp_i2c.c
@@ -9,7 +9,6 @@
  */
 #include <nrf.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include "board.h"
 #include "board_config.h"
 #include "i2c.h"
diff --git a/projects/01bsp_lighthouse/01bsp_lighthouse.c b/projects/01bsp_lighthouse/01bsp_lighthouse.c
index 2520b37c4..ac204207a 100644
--- a/projects/01bsp_lighthouse/01bsp_lighthouse.c
+++ b/projects/01bsp_lighthouse/01bsp_lighthouse.c
@@ -12,8 +12,6 @@
  *
  */
 #include <nrf.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include "board.h"
 #include "board_config.h"
 #include "lh2.h"
@@ -44,7 +42,4 @@ int main(void) {
         // the location function has to be running all the time
         db_lh2_process_location(&_lh2);
     }
-
-    // one last instruction, doesn't do anything, it's just to have a place to put a breakpoint.
-    __NOP();
 }
diff --git a/projects/01bsp_qdec/01bsp_qdec.c b/projects/01bsp_qdec/01bsp_qdec.c
index 350bd0177..55a932f6a 100644
--- a/projects/01bsp_qdec/01bsp_qdec.c
+++ b/projects/01bsp_qdec/01bsp_qdec.c
@@ -10,9 +10,7 @@
 #include <nrf.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include "board_config.h"
-#include "gpio.h"
 #include "qdec.h"
 #include "timer.h"
 
diff --git a/projects/01bsp_qspi/main.c b/projects/01bsp_qspi/main.c
index 823e4264a..912ca226b 100644
--- a/projects/01bsp_qspi/main.c
+++ b/projects/01bsp_qspi/main.c
@@ -9,7 +9,6 @@
  */
 #include <assert.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <stdbool.h>
 #include <string.h>
 #include <nrf.h>
diff --git a/projects/01bsp_radio_txrx/01bsp_radio_txrx.c b/projects/01bsp_radio_txrx/01bsp_radio_txrx.c
index cc2b71caf..30ac3ac0e 100644
--- a/projects/01bsp_radio_txrx/01bsp_radio_txrx.c
+++ b/projects/01bsp_radio_txrx/01bsp_radio_txrx.c
@@ -10,9 +10,8 @@
  * @copyright Inria, 2022-2024
  *
  */
-#include <nrf.h>
 #include <stdio.h>
-#include <stdlib.h>
+#include <nrf.h>
 // Include BSP packages
 #include "board.h"
 #include "board_config.h"
diff --git a/projects/01bsp_rng/01bsp_rng.c b/projects/01bsp_rng/01bsp_rng.c
index 65fc42e4f..2f34c3e41 100644
--- a/projects/01bsp_rng/01bsp_rng.c
+++ b/projects/01bsp_rng/01bsp_rng.c
@@ -29,7 +29,4 @@ int main(void) {
 
         db_timer_hf_delay_ms(0, 100);
     }
-
-    // one last instruction, doesn't do anything, it's just to have a place to put a breakpoint.
-    __NOP();
 }
diff --git a/projects/01bsp_rpm/01bsp_rpm.c b/projects/01bsp_rpm/01bsp_rpm.c
index dc3332af6..6134dca78 100644
--- a/projects/01bsp_rpm/01bsp_rpm.c
+++ b/projects/01bsp_rpm/01bsp_rpm.c
@@ -11,7 +11,6 @@
  */
 #include <nrf.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include "board.h"
 #include "rpm.h"
 #include "timer.h"
diff --git a/projects/01bsp_spim/01bsp_spim.c b/projects/01bsp_spim/01bsp_spim.c
index 735d50981..68c49067a 100644
--- a/projects/01bsp_spim/01bsp_spim.c
+++ b/projects/01bsp_spim/01bsp_spim.c
@@ -12,7 +12,6 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include "gpio.h"
 #include "spim.h"
 
diff --git a/projects/01bsp_timer/01bsp_timer.c b/projects/01bsp_timer/01bsp_timer.c
index b50c7d8d7..7e027133a 100644
--- a/projects/01bsp_timer/01bsp_timer.c
+++ b/projects/01bsp_timer/01bsp_timer.c
@@ -14,7 +14,6 @@
  */
 #include <nrf.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include "board_config.h"
 #include "gpio.h"
 #include "timer.h"
diff --git a/projects/01bsp_timer_hf/01bsp_timer_hf.c b/projects/01bsp_timer_hf/01bsp_timer_hf.c
index 33bf436b2..60dab0705 100644
--- a/projects/01bsp_timer_hf/01bsp_timer_hf.c
+++ b/projects/01bsp_timer_hf/01bsp_timer_hf.c
@@ -14,7 +14,6 @@
  */
 #include <nrf.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include "board_config.h"
 #include "gpio.h"
 #include "timer_hf.h"
diff --git a/projects/01bsp_uart/01bsp_uart.c b/projects/01bsp_uart/01bsp_uart.c
index c331a0d66..883b5e3fb 100644
--- a/projects/01bsp_uart/01bsp_uart.c
+++ b/projects/01bsp_uart/01bsp_uart.c
@@ -7,12 +7,11 @@
  * @copyright Inria, 2022
  *
  */
+
+#include <stdint.h>
 #include <nrf.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include "board.h"
 #include "board_config.h"
-#include "gpio.h"
 #include "uart.h"
 
 //=========================== defines ==========================================
@@ -52,7 +51,4 @@ int main(void) {
     while (1) {
         __WFE();
     }
-
-    // one last instruction, doesn't do anything, it's just to have a place to put a breakpoint.
-    __NOP();
 }
diff --git a/projects/01bsp_wdt/main.c b/projects/01bsp_wdt/main.c
index 4819fb6b0..8621a0ccd 100644
--- a/projects/01bsp_wdt/main.c
+++ b/projects/01bsp_wdt/main.c
@@ -7,9 +7,9 @@
  * @copyright Inria, 2024
  *
  */
-#include <nrf.h>
 #include <stdio.h>
-#include <stdlib.h>
+#include <stdint.h>
+#include <nrf.h>
 #include "board_config.h"
 #include "gpio.h"
 #include "timer_hf.h"
diff --git a/projects/01crypto_ed25519/main.c b/projects/01crypto_ed25519/main.c
index 6946858a7..177f4a008 100644
--- a/projects/01crypto_ed25519/main.c
+++ b/projects/01crypto_ed25519/main.c
@@ -7,10 +7,9 @@
  * @copyright Inria, 2023
  *
  */
-#include <nrf.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
+#include <nrf.h>
 #include "ed25519.h"
 
 #include "private_key.h"
diff --git a/projects/01crypto_sha256/main.c b/projects/01crypto_sha256/main.c
index ecf063475..8242b6631 100644
--- a/projects/01crypto_sha256/main.c
+++ b/projects/01crypto_sha256/main.c
@@ -7,10 +7,9 @@
  * @copyright Inria, 2023
  *
  */
-#include <nrf.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
+#include <nrf.h>
 #include "sha256.h"
 
 #include "expected_sha256.h"
diff --git a/projects/01drv_as5048b/01drv_as5048b.c b/projects/01drv_as5048b/01drv_as5048b.c
index c466bad63..39110fe20 100644
--- a/projects/01drv_as5048b/01drv_as5048b.c
+++ b/projects/01drv_as5048b/01drv_as5048b.c
@@ -10,7 +10,6 @@
  *
  */
 #include <stdio.h>
-#include <stdlib.h>
 #include <nrf.h>
 
 #include "timer_hf.h"
diff --git a/projects/01drv_imu/01drv_imu.c b/projects/01drv_imu/01drv_imu.c
index 4fb0cb4d6..131d61b3c 100644
--- a/projects/01drv_imu/01drv_imu.c
+++ b/projects/01drv_imu/01drv_imu.c
@@ -8,7 +8,7 @@
  *
  */
 #include <stdio.h>
-#include <stdlib.h>
+#include <stdint.h>
 #include <nrf.h>
 #include <stdbool.h>
 
@@ -53,6 +53,4 @@ int main(void) {
         }
         __WFE();
     }
-    // one last instruction, doesn't do anything, it's just to have a place to put a breakpoint.
-    __NOP();
 }
diff --git a/projects/01drv_ism330/01drv_ism330.c b/projects/01drv_ism330/01drv_ism330.c
index adc5cf3a2..5474d4faf 100644
--- a/projects/01drv_ism330/01drv_ism330.c
+++ b/projects/01drv_ism330/01drv_ism330.c
@@ -8,7 +8,6 @@
  *
  */
 #include <nrf.h>
-#include <stdlib.h>
 #include "board.h"
 #include "board_config.h"
 #include "timer_hf.h"
@@ -34,11 +33,9 @@ int main(void) {
         // Read Accelerometer data
         db_ism330_accel_read(&acc_data);
         db_timer_hf_delay_ms(0, 250);
-        __NOP();  // A place for a breakpoint
 
         // Read Gyroscope data
         db_ism330_gyro_read(&gyro_data);
         db_timer_hf_delay_ms(0, 250);
-        __NOP();  // A place for a breakpoint
     }
 }
diff --git a/projects/01drv_lis2mdl/01drv_lis2mdl.c b/projects/01drv_lis2mdl/01drv_lis2mdl.c
index 007f265ec..50bd54d62 100644
--- a/projects/01drv_lis2mdl/01drv_lis2mdl.c
+++ b/projects/01drv_lis2mdl/01drv_lis2mdl.c
@@ -10,9 +10,7 @@
  *
  */
 #include <stdio.h>
-#include <stdlib.h>
 #include <nrf.h>
-#include <stdbool.h>
 
 // Include BSP packages
 
@@ -24,15 +22,8 @@
 typedef struct {
 } drv_lis2mdl_vars_t;
 
-//=========================== variables =========================================
+//=========================== main ============================================
 
-//=========================== prototypes =========================================
-
-//=========================== main =========================================
-
-/**
- *  @brief The program starts executing here.
- */
 int main(void) {
     // Init the magnetometer
     lis2mdl_init(NULL);
@@ -46,6 +37,4 @@ int main(void) {
         }
         __WFE();
     }
-    // one last instruction, doesn't do anything, it's just to have a place to put a breakpoint.
-    __NOP();
 }
diff --git a/projects/01drv_lis3mdl/main.c b/projects/01drv_lis3mdl/main.c
index 590c6ac6e..e1372b619 100644
--- a/projects/01drv_lis3mdl/main.c
+++ b/projects/01drv_lis3mdl/main.c
@@ -7,10 +7,10 @@
  * @copyright Inria, 2023
  *
  */
+#include <stdint.h>
 #include <stdio.h>
-#include <stdlib.h>
+
 #include <nrf.h>
-#include <stdbool.h>
 
 #include "board_config.h"
 #include "board.h"
diff --git a/projects/01drv_lsm6ds/01drv_lsm6ds.c b/projects/01drv_lsm6ds/01drv_lsm6ds.c
index e92e29d09..08220d680 100644
--- a/projects/01drv_lsm6ds/01drv_lsm6ds.c
+++ b/projects/01drv_lsm6ds/01drv_lsm6ds.c
@@ -11,9 +11,7 @@
  *
  */
 #include <stdio.h>
-#include <stdlib.h>
 #include <nrf.h>
-#include <stdbool.h>
 
 // Include BSP packages
 
@@ -38,6 +36,4 @@ int main(void) {
         }
         __WFE();
     }
-    // one last instruction, doesn't do anything, it's just to have a place to put a breakpoint.
-    __NOP();
 }
diff --git a/projects/01drv_lz4/main.c b/projects/01drv_lz4/main.c
index 3b5f1f151..72d72706d 100644
--- a/projects/01drv_lz4/main.c
+++ b/projects/01drv_lz4/main.c
@@ -9,8 +9,6 @@
  */
 #include <assert.h>
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 
 #include <nrf.h>
 
diff --git a/projects/01drv_motors/main.c b/projects/01drv_motors/main.c
index 63498d253..1090a1488 100644
--- a/projects/01drv_motors/main.c
+++ b/projects/01drv_motors/main.c
@@ -11,9 +11,8 @@
  * @copyright Inria, 2022
  *
  */
+#include <stdint.h>
 #include <nrf.h>
-#include <stdio.h>
-#include <stdlib.h>
 // Include BSP packages
 #include "board.h"
 #include "motors.h"
diff --git a/projects/01drv_move/01drv_move.c b/projects/01drv_move/01drv_move.c
index 693f2bbbc..4ee7fc113 100644
--- a/projects/01drv_move/01drv_move.c
+++ b/projects/01drv_move/01drv_move.c
@@ -6,9 +6,7 @@
  * @copyright Inria, 2023
  *
  */
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
+
 #include <nrf.h>
 #include "move.h"
 
diff --git a/projects/01drv_n25q128/main.c b/projects/01drv_n25q128/main.c
index 9904eeab3..af2c84a42 100644
--- a/projects/01drv_n25q128/main.c
+++ b/projects/01drv_n25q128/main.c
@@ -7,13 +7,11 @@
  * @copyright Inria, 2024-present
  *
  */
-#include <stdio.h>
-#include <stdlib.h>
+#include <stdint.h>
 #include <nrf.h>
 #include <stdbool.h>
 
 #include "board_config.h"
-#include "board.h"
 #include "gpio.h"
 #include "n25q128.h"
 
diff --git a/projects/01drv_pid/01drv_pid.c b/projects/01drv_pid/01drv_pid.c
index 2c974f871..f91af6dd9 100644
--- a/projects/01drv_pid/01drv_pid.c
+++ b/projects/01drv_pid/01drv_pid.c
@@ -13,7 +13,6 @@
  *
  */
 #include <stdio.h>
-#include <stdlib.h>
 #include <stdint.h>
 #include <nrf.h>
 #include "motors.h"
diff --git a/projects/01drv_rgbled/main.c b/projects/01drv_rgbled/main.c
index a02c20b3e..fa87b26ac 100644
--- a/projects/01drv_rgbled/main.c
+++ b/projects/01drv_rgbled/main.c
@@ -11,8 +11,6 @@
  *
  */
 #include <nrf.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include "board.h"
 #include "rgbled.h"
 #include "timer.h"
diff --git a/projects/01drv_rgbled_pwm/01drv_rgbled_pwm.c b/projects/01drv_rgbled_pwm/01drv_rgbled_pwm.c
index e5664c00a..7620811b7 100644
--- a/projects/01drv_rgbled_pwm/01drv_rgbled_pwm.c
+++ b/projects/01drv_rgbled_pwm/01drv_rgbled_pwm.c
@@ -9,9 +9,8 @@
  * @copyright Inria, 2023
  *
  */
-#include <nrf.h>
 #include <stdio.h>
-#include <stdlib.h>
+#include <nrf.h>
 #include "board.h"
 #include "rgbled_pwm.h"
 #include "timer.h"
diff --git a/projects/01drv_tdma_client/01drv_tdma_client.c b/projects/01drv_tdma_client/01drv_tdma_client.c
index 1ed7e7ac5..b04a0b2e1 100644
--- a/projects/01drv_tdma_client/01drv_tdma_client.c
+++ b/projects/01drv_tdma_client/01drv_tdma_client.c
@@ -7,10 +7,9 @@
  * @copyright Inria, 2024
  *
  */
-#include <nrf.h>
 #include <stdio.h>
-#include <stdlib.h>
-#include <stdbool.h>
+#include <stdint.h>
+#include <nrf.h>
 
 #include "board_config.h"
 #include "board.h"
diff --git a/projects/01drv_tdma_server/01drv_tdma_server.c b/projects/01drv_tdma_server/01drv_tdma_server.c
index 845f9c4d1..1ddaf2032 100644
--- a/projects/01drv_tdma_server/01drv_tdma_server.c
+++ b/projects/01drv_tdma_server/01drv_tdma_server.c
@@ -7,10 +7,9 @@
  * @copyright Inria, 2024
  *
  */
-#include <nrf.h>
 #include <stdio.h>
-#include <stdlib.h>
-#include <stdbool.h>
+#include <stdint.h>
+#include <nrf.h>
 
 #include "board_config.h"
 #include "board.h"
diff --git a/projects/03app_dotbot/03app_dotbot.c b/projects/03app_dotbot/03app_dotbot.c
index 615234f0a..4d45ce686 100644
--- a/projects/03app_dotbot/03app_dotbot.c
+++ b/projects/03app_dotbot/03app_dotbot.c
@@ -12,11 +12,10 @@
  * @copyright Inria, 2022
  */
 
-#include <nrf.h>
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
-#include <stdio.h>
+#include <nrf.h>
 // Include BSP headers
 #include "board.h"
 #include "board_config.h"
diff --git a/projects/03app_dotbot_gateway/03app_dotbot_gateway.c b/projects/03app_dotbot_gateway/03app_dotbot_gateway.c
index e8f81cd31..2b1ea555e 100644
--- a/projects/03app_dotbot_gateway/03app_dotbot_gateway.c
+++ b/projects/03app_dotbot_gateway/03app_dotbot_gateway.c
@@ -1,15 +1,14 @@
-#include <nrf.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <stdbool.h>
 #include <string.h>
+#include <nrf.h>
 // Include BSP headers
 #include "board.h"
 #include "board_config.h"
 #include "gpio.h"
 #include "hdlc.h"
 #include "protocol.h"
-#include "radio.h"
 #include "timer.h"
 #include "uart.h"
 #include "tdma_server.h"
diff --git a/projects/03app_nrf5340_app/main.c b/projects/03app_nrf5340_app/main.c
index 606474bbf..b811a88cd 100644
--- a/projects/03app_nrf5340_app/main.c
+++ b/projects/03app_nrf5340_app/main.c
@@ -8,10 +8,9 @@
  * @copyright Inria, 2023
  */
 
+#include <stdint.h>
 #include <nrf.h>
 
-#include "clock.h"
-#include "ipc.h"
 #include "tz.h"
 
 int main(void) {
diff --git a/projects/03app_nrf5340_net/main.c b/projects/03app_nrf5340_net/main.c
index ccb7dc2b9..2d4f4c99f 100644
--- a/projects/03app_nrf5340_net/main.c
+++ b/projects/03app_nrf5340_net/main.c
@@ -8,7 +8,6 @@
  * @copyright Inria, 2023
  */
 
-#include <stdio.h>
 #include <stdbool.h>
 #include <string.h>
 #include <nrf.h>
@@ -16,7 +15,6 @@
 #include "ipc.h"
 #include "radio.h"
 #include "rng.h"
-#include "gpio.h"
 // Include DRV headers
 #include "tdma_client.h"
 #include "tdma_server.h"
diff --git a/projects/03app_sailbot/03app_sailbot.c b/projects/03app_sailbot/03app_sailbot.c
index d225a3d9c..89482a0fc 100644
--- a/projects/03app_sailbot/03app_sailbot.c
+++ b/projects/03app_sailbot/03app_sailbot.c
@@ -12,13 +12,13 @@
  * @copyright Inria, 2022
  *
  */
+#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <nrf.h>
 #include <stdbool.h>
 #include <string.h>
 #include <math.h>
-#include <assert.h>
+#include <nrf.h>
 
 // Include BSP packages
 #include "device.h"
@@ -30,7 +30,6 @@
 #include "imu.h"
 #include "protocol.h"
 #include "timer.h"
-#include "timer_hf.h"
 #include "gpio.h"
 #include "as5048b.h"
 
diff --git a/projects/03app_sailbot/gps.c b/projects/03app_sailbot/gps.c
index 90112d8b1..3ca7ea140 100644
--- a/projects/03app_sailbot/gps.c
+++ b/projects/03app_sailbot/gps.c
@@ -9,10 +9,10 @@
  */
 #include <stdio.h>
 #include <stdlib.h>
-#include <nrf.h>
 #include <string.h>
 #include <stdint.h>
 #include <assert.h>
+#include <nrf.h>
 #include "gpio.h"
 #include "uart.h"
 #include "gps.h"
diff --git a/projects/03app_sailbot/gps.h b/projects/03app_sailbot/gps.h
index e221b5e3b..f7b5fe9b5 100644
--- a/projects/03app_sailbot/gps.h
+++ b/projects/03app_sailbot/gps.h
@@ -13,9 +13,7 @@
  * @copyright Inria, 2022
  */
 
-#include <nrf.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <stdint.h>
 
 //=========================== defines ==========================================
 
diff --git a/projects/03app_sailbot/servos.c b/projects/03app_sailbot/servos.c
index 33b163fb5..7ca0a0881 100644
--- a/projects/03app_sailbot/servos.c
+++ b/projects/03app_sailbot/servos.c
@@ -7,10 +7,9 @@
  * @copyright Inria, 2022
  *
  */
-#include <stdio.h>
-#include <stdlib.h>
-#include <nrf.h>
+#include <stdint.h>
 #include <string.h>
+#include <nrf.h>
 #include "pwm.h"
 #include "servos.h"
 
diff --git a/projects/03app_sailbot/servos.h b/projects/03app_sailbot/servos.h
index d56c70ab9..fbd0e0694 100644
--- a/projects/03app_sailbot/servos.h
+++ b/projects/03app_sailbot/servos.h
@@ -13,9 +13,7 @@
  * @copyright Inria, 2022
  */
 
-#include <nrf.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <stdint.h>
 
 //=========================== public ======================================
 
diff --git a/projects/03app_xgo/main.c b/projects/03app_xgo/main.c
index c8e786287..f33e5ef0c 100644
--- a/projects/03app_xgo/main.c
+++ b/projects/03app_xgo/main.c
@@ -10,11 +10,11 @@
  * @copyright Inria, 2023
  *
  */
-#include <nrf.h>
 #include <stdlib.h>
 #include <stdbool.h>
 #include <string.h>
 #include <stdio.h>
+#include <nrf.h>
 // Include BSP headers
 #include "device.h"
 #include "protocol.h"
diff --git a/swarmit/motors/main.c b/swarmit/motors/main.c
index 8ea775603..e3a5a66f2 100644
--- a/swarmit/motors/main.c
+++ b/swarmit/motors/main.c
@@ -9,8 +9,7 @@
  */
 
 #include <nrf.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <stdint.h>
 
 #include "board.h"
 #include "motors.h"
diff --git a/swarmit/move/main.c b/swarmit/move/main.c
index f35f0c756..44ebf2714 100644
--- a/swarmit/move/main.c
+++ b/swarmit/move/main.c
@@ -8,9 +8,6 @@
  * @copyright Inria, 2024
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
 #include <nrf.h>
 #include "move.h"
 #include "timer.h"
diff --git a/swarmit/rgbled/main.c b/swarmit/rgbled/main.c
index 0e6b56d20..09d5c5589 100644
--- a/swarmit/rgbled/main.c
+++ b/swarmit/rgbled/main.c
@@ -9,8 +9,6 @@
  */
 
 #include <nrf.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include "board.h"
 #include "rgbled_pwm.h"
 #include "timer.h"
diff --git a/swarmit/timer/main.c b/swarmit/timer/main.c
index 24de5166c..cbfb6f5d4 100644
--- a/swarmit/timer/main.c
+++ b/swarmit/timer/main.c
@@ -9,8 +9,6 @@
  */
 
 #include <nrf.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include "board_config.h"
 #include "gpio.h"
 #include "timer.h"