diff --git a/zephyr/modules/owntech_adc_driver/zephyr/public_api/adc.c b/zephyr/modules/owntech_adc_driver/zephyr/public_api/adc.c
index d811e8fc76e99488e22ace6a9dc7cca1309013d7..aacc4d1a6f0363b6c6e3ad55a5c7c040e0e51d7b 100644
--- a/zephyr/modules/owntech_adc_driver/zephyr/public_api/adc.c
+++ b/zephyr/modules/owntech_adc_driver/zephyr/public_api/adc.c
@@ -27,7 +27,7 @@
 // STM32 LL
 #include <stm32_ll_adc.h>
 
-// OwnTech API
+// Current module private functions
 #include "../src/adc_channels.h"
 #include "../src/adc_core.h"
 
diff --git a/zephyr/modules/owntech_data_acquisition/zephyr/public_api/DataAcquisition.cpp b/zephyr/modules/owntech_data_acquisition/zephyr/public_api/DataAcquisition.cpp
index 3b4dea8bfe309ec7a788ee37ee4a46bbf703fd60..028c4c35892cb84fbce8ed4307290ba45391288d 100644
--- a/zephyr/modules/owntech_data_acquisition/zephyr/public_api/DataAcquisition.cpp
+++ b/zephyr/modules/owntech_data_acquisition/zephyr/public_api/DataAcquisition.cpp
@@ -28,12 +28,14 @@
 // Stdlib
 #include <string.h>
 
-// OwnTech Power API
-#include "adc.h"
+// Current module private functions
 #include "../dma/dma.h"
 #include "../data_dispatch/data_dispatch.h"
 #include "../data_conversion/data_conversion.h"
 
+// OwnTech Power API
+#include "adc.h"
+
 // Current class header
 #include "DataAcquisition.h"
 
diff --git a/zephyr/modules/owntech_hardware_configuration/zephyr/public_api/HardwareConfiguration.cpp b/zephyr/modules/owntech_hardware_configuration/zephyr/public_api/HardwareConfiguration.cpp
index 1a7047ac8b36af4e0e315c18e35d7cc74f6ad682..fc0a1288c7a6a4e98a63ce37468f8d69e956e35d 100644
--- a/zephyr/modules/owntech_hardware_configuration/zephyr/public_api/HardwareConfiguration.cpp
+++ b/zephyr/modules/owntech_hardware_configuration/zephyr/public_api/HardwareConfiguration.cpp
@@ -26,7 +26,7 @@
  */
 
 
-// OwnTech headers
+// Current module private functions
 #include "../src/dac_configuration.h"
 #include "../src/ngnd_configuration.h"
 #include "../src/led_configuration.h"
diff --git a/zephyr/modules/owntech_hardware_configuration/zephyr/public_api/HardwareConfiguration.h b/zephyr/modules/owntech_hardware_configuration/zephyr/public_api/HardwareConfiguration.h
index 1ae42afb044ec1b85c74b16774ddaa24497fb28e..479e6292dd19b9220571237250b8c9236da125c1 100644
--- a/zephyr/modules/owntech_hardware_configuration/zephyr/public_api/HardwareConfiguration.h
+++ b/zephyr/modules/owntech_hardware_configuration/zephyr/public_api/HardwareConfiguration.h
@@ -29,14 +29,14 @@
 #ifndef HARDWARECONFIGURATION_H_
 #define HARDWARECONFIGURATION_H_
 
-// Std lib
+// Stdlib
 #include <stdint.h>
 
 // ARM lib
 #include <arm_math.h>
 
 // OwnTech API
-#include "../src/adc_configuration.h"
+#include "adc.h"
 
 
 /** Hardware version. See
diff --git a/zephyr/modules/owntech_ngnd_driver/zephyr/public_api/ngnd.h b/zephyr/modules/owntech_ngnd_driver/zephyr/public_api/ngnd.h
index 0fb8981af013edaf4eea64abf9cca3bc2b19f07d..5a5e89941ad5e1ae7219e7a6cfb4a63ab9439c48 100644
--- a/zephyr/modules/owntech_ngnd_driver/zephyr/public_api/ngnd.h
+++ b/zephyr/modules/owntech_ngnd_driver/zephyr/public_api/ngnd.h
@@ -27,8 +27,11 @@
 #ifndef NGND_H_
 #define NGND_H_
 
+
+// Zephyr
 #include <device.h>
 
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/zephyr/modules/owntech_scheduling/zephyr/public_api/Scheduling.h b/zephyr/modules/owntech_scheduling/zephyr/public_api/Scheduling.h
index 99b807c20be71b64850eda9e2a8ef12beefc7ff7..dca2ceaf489445e4f09ba00fdf4184d778d89cf4 100644
--- a/zephyr/modules/owntech_scheduling/zephyr/public_api/Scheduling.h
+++ b/zephyr/modules/owntech_scheduling/zephyr/public_api/Scheduling.h
@@ -26,10 +26,13 @@
 #define SCHEDULING_H_
 
 
+// Stdlib
 #include <stdint.h>
 
+// Zephyr
 #include <zephyr.h>
 
+
 typedef void (*thread_function_t)();
 
 /////