diff --git a/src/loss/classification/BCE.cpp b/src/loss/classification/BCE.cpp
index 296d466cd3583600a3e02d13b7b5a19f5ad5ac76..4ef1d8f9bc0114d18e403afebfbd3a913fb95f3e 100644
--- a/src/loss/classification/BCE.cpp
+++ b/src/loss/classification/BCE.cpp
@@ -28,14 +28,6 @@
 #include "aidge/operator/Ln.hpp"
 #include "aidge/operator/ReduceMean.hpp"
 
-#include "aidge/backend/cpu/operator/AddImpl.hpp"
-#include "aidge/backend/cpu/operator/SubImpl.hpp"
-#include "aidge/backend/cpu/operator/MulImpl.hpp"
-#include "aidge/backend/cpu/operator/DivImpl.hpp"
-#include "aidge/backend/cpu/operator/LnImpl.hpp"
-#include "aidge/backend/cpu/operator/ReduceMeanImpl.hpp"
-
-
 Aidge::Tensor Aidge::loss::BCE(std::shared_ptr<Tensor>& prediction,
                                const std::shared_ptr<Tensor>& target) {
     /*
diff --git a/src/loss/regression/MSE.cpp b/src/loss/regression/MSE.cpp
index 49a9df0ca467d5b86409edf0ed1a0456ef7a7388..f6ad9cfa2fa67e84494c5566f986902e8073b569 100644
--- a/src/loss/regression/MSE.cpp
+++ b/src/loss/regression/MSE.cpp
@@ -12,10 +12,6 @@
 #include <memory>
 #include <numeric>  // std::iota
 
-#include "aidge/backend/cpu/operator/PowImpl.hpp"
-#include "aidge/backend/cpu/operator/ReduceMeanImpl.hpp"
-#include "aidge/backend/cpu/operator/SubImpl.hpp"
-#include "aidge/backend/cpu/operator/MulImpl.hpp"
 #include "aidge/data/Tensor.hpp"
 #include "aidge/graph/GraphView.hpp"
 #include "aidge/graph/OpArgs.hpp"
diff --git a/unit_tests/loss/classification/Test_BCE.cpp b/unit_tests/loss/classification/Test_BCE.cpp
index 39e80121db8e08a9dfdc2a4ab11e548086f1299d..cbcdc80ff8b4ed514c9cbcf21df39443b4ed37db 100644
--- a/unit_tests/loss/classification/Test_BCE.cpp
+++ b/unit_tests/loss/classification/Test_BCE.cpp
@@ -19,9 +19,13 @@
                        // std::uniform_int_distribution
 #include <vector>
 
+#include "aidge/backend/cpu/operator/DivImpl.hpp"
+#include "aidge/backend/cpu/operator/LnImpl.hpp"
+#include "aidge/backend/cpu/operator/ReduceMeanImpl.hpp"
 #include "aidge/loss/LossList.hpp"
 #include "aidge/data/Tensor.hpp"
 #include "aidge/utils/TensorUtils.hpp"
+
 #if USE_AIDGE_BACKEND_CUDA
 #include "aidge/backend/cuda/operator/DivImpl.hpp"
 #include "aidge/backend/cuda/operator/LnImpl.hpp"
diff --git a/unit_tests/loss/regression/Test_MSE.cpp b/unit_tests/loss/regression/Test_MSE.cpp
index 4e30fd00e2d8136a9da8bcb38875e2a4eafa2c98..c0ecd4df4987dd5dc53aad759330df648f420f28 100644
--- a/unit_tests/loss/regression/Test_MSE.cpp
+++ b/unit_tests/loss/regression/Test_MSE.cpp
@@ -19,15 +19,21 @@
                        // std::uniform_int_distribution
 #include <vector>
 
-#include "aidge/loss/LossList.hpp"
+#include "aidge/backend/cpu/operator/MulImpl.hpp"
+#include "aidge/backend/cpu/operator/PowImpl.hpp"
+#include "aidge/backend/cpu/operator/ReduceMeanImpl.hpp"
+#include "aidge/backend/cpu/operator/SubImpl.hpp"
 #include "aidge/data/Tensor.hpp"
+#include "aidge/loss/LossList.hpp"
 #include "aidge/utils/TensorUtils.hpp"
+
 #if USE_AIDGE_BACKEND_CUDA
 #include "aidge/backend/cuda/operator/PowImpl.hpp"
 #include "aidge/backend/cuda/operator/ReduceMeanImpl.hpp"
 #include "aidge/backend/cuda/operator/SubImpl.hpp"
 #include "aidge/backend/cuda/operator/MulImpl.hpp"
 #endif
+
 namespace Aidge {
 TEST_CASE("[loss/regression] MSE", "[loss][regression][MSE]") {
 
diff --git a/unit_tests/metrics/Test_Accuracy.cpp b/unit_tests/metrics/Test_Accuracy.cpp
index 8d849feede215fbadfc684c8da68c1612879b995..fa33bd5956358bf5322776ea49bd04c42ca4370a 100644
--- a/unit_tests/metrics/Test_Accuracy.cpp
+++ b/unit_tests/metrics/Test_Accuracy.cpp
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2023 CEA-List
+ * Copyright (c) 2024 CEA-List
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -10,19 +10,20 @@
  ********************************************************************************/
 
 #include <catch2/catch_test_macros.hpp>
-#include <cstddef>     // std::size_t
 #include <cmath>       //
+#include <cstddef>     // std::size_t
 #include <functional>  // std::multiplies, std::plus
 #include <memory>      // std::make_unique
 #include <numeric>     // std::accumulate
 #include <random>      // std::random_device, std::mt19937,
                        // std::uniform_int_distribution
 #include <vector>
+
 #include "aidge/backend/cpu/operator/ArgMaxImpl.hpp"
 #include "aidge/backend/cpu/operator/AndImpl.hpp"
 #include "aidge/backend/cpu/operator/ReduceSumImpl.hpp"
-#include "aidge/learning/metrics/Accuracy.hpp"
 #include "aidge/data/Tensor.hpp"
+#include "aidge/learning/metrics/Accuracy.hpp"
 #include "aidge/utils/TensorUtils.hpp"
 
 #if USE_AIDGE_BACKEND_CUDA
diff --git a/unit_tests/optimizer/Test_Adam.cpp b/unit_tests/optimizer/Test_Adam.cpp
index 2e9eb8be1cd1a4acbe60f55d1b1c28da412d8a80..a3d7c4b15a02fba8897b736d45d3c6bc373209c0 100644
--- a/unit_tests/optimizer/Test_Adam.cpp
+++ b/unit_tests/optimizer/Test_Adam.cpp
@@ -10,33 +10,33 @@
  ********************************************************************************/
 
 #include <catch2/catch_test_macros.hpp>
-#include <cstddef>  // std::size_t
 #include <cmath>  // std::sqrt, std::pow
+#include <cstddef>  // std::size_t
 #include <memory>
 #include <random>   // std::random_device, std::mt19937, std::uniform_int_distribution
 #include <set>
 #include <vector>
 
-#include "aidge/data/Tensor.hpp"
 #include "aidge/backend/cpu/data/TensorImpl.hpp"
+#include "aidge/backend/cpu/operator/AddImpl.hpp"
+#include "aidge/backend/cpu/operator/DivImpl.hpp"
+#include "aidge/backend/cpu/operator/MulImpl.hpp"
+#include "aidge/backend/cpu/operator/SqrtImpl.hpp"
+#include "aidge/backend/cpu/operator/SubImpl.hpp"
+#include "aidge/data/Tensor.hpp"
 #include "aidge/learning/learningRate/LRScheduler.hpp"
 #include "aidge/learning/learningRate/LRSchedulerList.hpp"
 #include "aidge/learning/optimizer/Optimizer.hpp"
 #include "aidge/learning/optimizer/Adam.hpp"
-#include "aidge/backend/cpu/operator/AddImpl.hpp"
-#include "aidge/backend/cpu/operator/MulImpl.hpp"
-#include "aidge/backend/cpu/operator/SubImpl.hpp"
-#include "aidge/backend/cpu/operator/DivImpl.hpp"
-#include "aidge/backend/cpu/operator/SqrtImpl.hpp"
 #include "aidge/utils/TensorUtils.hpp"
 
 #if USE_AIDGE_BACKEND_CUDA
 #include "aidge/backend/cuda/data/TensorImpl.hpp"
 #include "aidge/backend/cuda/operator/AddImpl.hpp"
-#include "aidge/backend/cuda/operator/MulImpl.hpp"
-#include "aidge/backend/cuda/operator/SubImpl.hpp"
 #include "aidge/backend/cuda/operator/DivImpl.hpp"
+#include "aidge/backend/cuda/operator/MulImpl.hpp"
 #include "aidge/backend/cuda/operator/SqrtImpl.hpp"
+#include "aidge/backend/cuda/operator/SubImpl.hpp"
 #endif
 
 namespace Aidge {