diff --git a/include/aidge/backend/cpu/operator/ConvImpl_kernels.hpp b/include/aidge/backend/cpu/operator/ConvImpl_kernels.hpp
index 703772605657d5d5eeb06df80ec4aa9341366de5..4e1861b4cea222f6c9f816d8d2eb42e2252eab1a 100644
--- a/include/aidge/backend/cpu/operator/ConvImpl_kernels.hpp
+++ b/include/aidge/backend/cpu/operator/ConvImpl_kernels.hpp
@@ -13,16 +13,12 @@
 #define AIDGE_CPU_OPERATOR_CONVIMPL_KERNELS_H_
 
 #include <array>
-#include <memory>
-#include <tuple>
-#include <vector>
+#include <cstdint>
+#include <fmt/base.h>
 
-#include "aidge/backend/cpu/operator/OperatorImpl.hpp"
 #include "aidge/backend/cpu/operator/ConvImpl.hpp"
-#include "aidge/operator/Conv.hpp"
 #include "aidge/utils/Registrar.hpp"
 #include "aidge/utils/Types.h"
-#include "aidge/backend/cpu/data/GetCPUPtr.h"
 
 namespace Aidge {
 using std::array;
diff --git a/src/operator/ConvImpl.cpp b/src/operator/ConvImpl.cpp
index 782a58d39b39f2bede1e79c9fb9c7a5807ef8f26..ffbb75c12214a16b9f6968de9d33d7d67af61ca4 100644
--- a/src/operator/ConvImpl.cpp
+++ b/src/operator/ConvImpl.cpp
@@ -13,14 +13,9 @@
 #include "aidge/backend/cpu/operator/ConvImpl_kernels.hpp"
 
 #include <cassert>
-#include <chrono>  // std::chrono::milliseconds
-#include <numeric> // std::accumulate
-#include <thread>  // std::this_thread::sleep_for
-#include <vector>
 
 #include "aidge/backend/cpu/data/GetCPUPtr.h"
 #include "aidge/operator/Conv.hpp"
-#include "aidge/utils/Types.h"
 
 namespace Aidge {
 
diff --git a/unit_tests/operator/Test_ClipImpl.cpp b/unit_tests/operator/Test_ClipImpl.cpp
index 99147ac93bd659dd91897f6b7f1f3f33e5552ef6..3d75ad78807d0e4d23ec231f5df485e8574a03ee 100644
--- a/unit_tests/operator/Test_ClipImpl.cpp
+++ b/unit_tests/operator/Test_ClipImpl.cpp
@@ -315,5 +315,5 @@ TEST_CASE("[cpu/operator] Clip", "[Clip][CPU]")
         Log::info("total time: {}\n", duration.count());
     }
  }
-} // namespace Aidge
-}
\ No newline at end of file
+}
+}  // namespace Aidge
diff --git a/unit_tests/operator/Test_ConvImpl.cpp b/unit_tests/operator/Test_ConvImpl.cpp
index 69e806cba87dc91db2b5223c6ff4a7b00c6a4df6..59ec16dd80ee98c09c79d5943c503e945abf5cdb 100644
--- a/unit_tests/operator/Test_ConvImpl.cpp
+++ b/unit_tests/operator/Test_ConvImpl.cpp
@@ -17,6 +17,7 @@
 #include "aidge/backend/cpu/operator/ConvImpl.hpp"
 #include "aidge/data/Data.hpp"  // DataType
 #include "aidge/data/Tensor.hpp"
+#include "aidge/filler/Filler.hpp"
 #include "aidge/graph/Node.hpp"
 #include "aidge/operator/Conv.hpp"
 #include "aidge/utils/TensorUtils.hpp"