diff --git a/CLC-qthing/SiliconTorch/FxCyanF.cpp b/CLC-qthing/SiliconTorch/FxCyanF.cpp
index 9805186b34b248d9115a85ce2b606dac6f861298..acf2f8729d040ae309740df87510a36041044f72 100644
--- a/CLC-qthing/SiliconTorch/FxCyanF.cpp
+++ b/CLC-qthing/SiliconTorch/FxCyanF.cpp
@@ -1,21 +1,26 @@
 #include "FxCyanF.hpp"
 
+// ESP32 specific
 #include "esp_err.h"
 #include "esp_log.h"
 #include "driver/ledc.h"
 #include "tcpip_adapter.h"
 
+// misc
 #include <nlohmann/json.hpp>
 
+// qthing stuff
 #include <qthing>
 #include <qthing/mqtt_common.hpp>
 
+// C++ system level
 #include <string>
 #include <cstdio>
 #include <cstdlib>
 #include <algorithm>
 #include <functional>
 
+// project specific
 #include "Metrics.hpp"
 
 
diff --git a/CLC-qthing/SiliconTorch/FxCyanF.hpp b/CLC-qthing/SiliconTorch/FxCyanF.hpp
index d1f805bf89819a25de1a768253c62d0685ecf405..f15a5c77853c1ddf6e5408aa5243e8c345f3c435 100644
--- a/CLC-qthing/SiliconTorch/FxCyanF.hpp
+++ b/CLC-qthing/SiliconTorch/FxCyanF.hpp
@@ -1,11 +1,14 @@
 #pragma once
 
+// ESP32 specific
+#include "driver/ledc.h"
+
+// C++ system level
 #include <string>
 #include <functional>
 #include <cinttypes>
 
-#include "driver/ledc.h"
-
+// project specific
 #include "Metrics.hpp"
 #include "PWMChannel.hpp"
 
diff --git a/CLC-qthing/SiliconTorch/Metrics.cpp b/CLC-qthing/SiliconTorch/Metrics.cpp
index 155c716b4662d3bd96c0909105402fb32f0f9c4b..c2170fa4c3a0378f8d060ecb434057355e6f012e 100644
--- a/CLC-qthing/SiliconTorch/Metrics.cpp
+++ b/CLC-qthing/SiliconTorch/Metrics.cpp
@@ -1,16 +1,20 @@
 #include "Metrics.hpp"
 
+// ESP32 specific
 #include "freertos/FreeRTOS.h"
 // #include "freertos/semphr.h"
 #include "freertos/task.h"
 
+// ESP32 specific
 #include "nvs.h"
 #include "nvs_flash.h"
 #include "esp_err.h"
 #include "esp_log.h"
 
+// qthing stuff
 #include <qthing>
 
+// C++ system level
 #include <climits>
 #include <cinttypes>
 
diff --git a/CLC-qthing/SiliconTorch/Metrics.hpp b/CLC-qthing/SiliconTorch/Metrics.hpp
index 0bfb5ae207485fe4b3158e8e82a6e4e0c1f03634..116b8efc0fe87e1dbea7af2d74a1415fdde234b8 100644
--- a/CLC-qthing/SiliconTorch/Metrics.hpp
+++ b/CLC-qthing/SiliconTorch/Metrics.hpp
@@ -1,10 +1,12 @@
 #pragma once
 
+// C++ system level
 #include <map>
 #include <ctime>
 #include <string>
 #include <functional>
 
+// ESP32 specific
 #include "nvs.h"
 
 
diff --git a/CLC-qthing/SiliconTorch/PWMChannel.cpp b/CLC-qthing/SiliconTorch/PWMChannel.cpp
index 411e55e3867c5cfce0d15b54645a155726d657a7..e00bf3353549d616183c739ca067d2060b488edf 100644
--- a/CLC-qthing/SiliconTorch/PWMChannel.cpp
+++ b/CLC-qthing/SiliconTorch/PWMChannel.cpp
@@ -1,5 +1,6 @@
 #include "PWMChannel.hpp"
 
+// ESP32 specific
 #include "driver/gpio.h"
 #include "driver/ledc.h"
 
diff --git a/CLC-qthing/SiliconTorch/PWMChannel.hpp b/CLC-qthing/SiliconTorch/PWMChannel.hpp
index cde5785a3b06aa40c7b552978aea71e6fc78ba6d..420213d312225e34da64f756dde9a18ac390f533 100644
--- a/CLC-qthing/SiliconTorch/PWMChannel.hpp
+++ b/CLC-qthing/SiliconTorch/PWMChannel.hpp
@@ -1,7 +1,6 @@
 #pragma once
 
-#include <qthing>
-
+// ESP32 specific
 #include "driver/ledc.h"