diff --git a/include/aidge/backend/cpu/operator/HeavisideImpl.hpp b/include/aidge/backend/cpu/operator/HeavisideImpl.hpp
index f323e2caec4ff3bff2084557189c6ff5aa1419a2..7a3ba9add1e98580c51a8416adc0d1feb5e1317a 100644
--- a/include/aidge/backend/cpu/operator/HeavisideImpl.hpp
+++ b/include/aidge/backend/cpu/operator/HeavisideImpl.hpp
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2024 CEA-List
+ * Copyright (c) 2025 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
@@ -9,6 +9,9 @@
  *
  ********************************************************************************/
 
+#ifndef AIDGE_CPU_OPERATOR_HEAVISIDEIMPL_H_
+#define AIDGE_CPU_OPERATOR_HEAVISIDEIMPL_H_
+
 #include <cstddef> // std::size_t
 
 #include "aidge/backend/cpu/operator/OperatorImpl.hpp"
@@ -16,9 +19,6 @@
 #include "aidge/utils/Registrar.hpp"
 #include "aidge/utils/future_std/span.hpp"
 
-#ifndef AIDGE_CPU_OPERATOR_HEAVISIDEIMPL_H_
-#define AIDGE_CPU_OPERATOR_HEAVISIDEIMPL_H_
-
 namespace Aidge {
 using HeavisideImplCpu =
     OperatorImpl_cpu<Heaviside_Op,
diff --git a/include/aidge/backend/cpu/operator/HeavisideImpl_kernels.hpp b/include/aidge/backend/cpu/operator/HeavisideImpl_kernels.hpp
index 1340cfebd50e5716ffad78672f76eb5fe283bda3..3fd6ca7de348ff18e75b2a88281d4db980b58774 100644
--- a/include/aidge/backend/cpu/operator/HeavisideImpl_kernels.hpp
+++ b/include/aidge/backend/cpu/operator/HeavisideImpl_kernels.hpp
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2024 CEA-List
+ * Copyright (c) 2025 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
@@ -9,14 +9,17 @@
  *
  ********************************************************************************/
 
-#ifndef AIDGE_CPU_OPERATOR_LEAKYRELUIMPL_KERNELS_H_
-#define AIDGE_CPU_OPERATOR_LEAKYRELUIMPL_KERNELS_H_
+#ifndef AIDGE_CPU_OPERATOR_HEAVISIDEIMPL_KERNELS_H_
+#define AIDGE_CPU_OPERATOR_HEAVISIDEIMPL_KERNELS_H_
+
+#include "aidge/utils/Registrar.hpp"
 
 #include <cstddef> // std::size_t
 
 #include "aidge/backend/cpu/operator/HeavisideImpl.hpp"
 #include "aidge/utils/ErrorHandling.hpp"
 
+
 namespace Aidge {
 
 template <class I, class O>
@@ -40,4 +43,4 @@ REGISTRAR(HeavisideImplCpu,
            nullptr});
 } // namespace Aidge
 
-#endif
+#endif // AIDGE_CPU_OPERATOR_HEAVISIDEIMPL_KERNELS_H__H_
diff --git a/src/operator/HeavisideImpl.cpp b/src/operator/HeavisideImpl.cpp
index 48d6a857be7e20a6729e4e625a0c10b031fa5f72..56ceb9b0b474d416f25d77b533373d4b193532b8 100644
--- a/src/operator/HeavisideImpl.cpp
+++ b/src/operator/HeavisideImpl.cpp
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2024 CEA-List
+ * Copyright (c) 2025 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,12 +10,13 @@
  ********************************************************************************/
 
 #include "aidge/backend/cpu/operator/HeavisideImpl.hpp"
-#include "aidge/backend/cpu/operator/HeavisideImpl_kernels.hpp"
-#include <aidge/backend/cpu/data/GetCPUPtr.h>
-#include <aidge/operator/Heaviside.hpp>
-#include <aidge/utils/ErrorHandling.hpp>
+
 #include <stdexcept>
 
+#include "aidge/backend/cpu/operator/HeavisideImpl_kernels.hpp"
+#include "aidge/backend/cpu/data/GetCPUPtr.h"
+#include "aidge/utils/ErrorHandling.hpp"
+
 template <> void Aidge::HeavisideImplCpu::forward() {
     const Heaviside_Op &op_ = dynamic_cast<const Heaviside_Op &>(mOp);
     std::shared_ptr<Tensor> input0 = op_.getInput(0);
diff --git a/unit_tests/operator/Test_HeavisideImpl.cpp b/unit_tests/operator/Test_HeavisideImpl.cpp
index 77fea35add91a17c93d6360fc436f5d80c7060d7..4cbdf1a0e29f8670e45897236374726dac62bb43 100644
--- a/unit_tests/operator/Test_HeavisideImpl.cpp
+++ b/unit_tests/operator/Test_HeavisideImpl.cpp
@@ -1,12 +1,26 @@
-#include <aidge/operator/Heaviside.hpp>
-#include <aidge/utils/TensorUtils.hpp>
-#include <catch2/catch_test_macros.hpp>
+/********************************************************************************
+ * Copyright (c) 2025 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
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+#include "aidge/backend/cpu/operator/HeavisideImpl_kernels.hpp"
+
 #include <memory>
 #include <cstdlib>
 #include <random>
 
+#include <catch2/catch_test_macros.hpp>
+
 #include "aidge/data/Tensor.hpp"
+#include "aidge/backend/cpu/operator/HeavisideImpl.hpp"
 #include "aidge/graph/Node.hpp"
+#include "aidge/utils/TensorUtils.hpp"
 
 namespace Aidge
 {