diff --git a/aidge_core/aidge_export_aidge/export.py b/aidge_core/aidge_export_aidge/export.py
index aa993c4bee266b308506f46260445c7f58de1a60..51468ed846dc7a731152a1ddb3f4374847631402 100644
--- a/aidge_core/aidge_export_aidge/export.py
+++ b/aidge_core/aidge_export_aidge/export.py
@@ -93,7 +93,7 @@ def serialize_to_cpp(export_folder: str,
             node, None)
 
 
-        set_operator.add(node.type())
+        # set_operator.add(node.type())
 
         # TODO: list_configs and list_actions don't need to be passed by argument
         # Export the configuration
diff --git a/aidge_core/aidge_export_aidge/operator_export/conv.py b/aidge_core/aidge_export_aidge/operator_export/conv.py
index 8805629b7f1622f3687409c9beb8ccc4322d2a25..ea23c1551787c8579549d54a1fe7396995eb1bff 100644
--- a/aidge_core/aidge_export_aidge/operator_export/conv.py
+++ b/aidge_core/aidge_export_aidge/operator_export/conv.py
@@ -11,7 +11,7 @@ class Conv(ExportNodeCpp):
             ROOT_EXPORT / "templates/attributes/conv.jinja")
         self.forward_template = str(
             ROOT_EXPORT /"templates/graph_ctor/conv.jinja")
-        self.include_list = []
+        self.include_list = ["aidge/operator/Conv.hpp"]
         self.kernels_to_copy = []
         self.config_path = "include/attributes"
         self.config_extension = "hpp"
diff --git a/aidge_core/aidge_export_aidge/operator_export/fc.py b/aidge_core/aidge_export_aidge/operator_export/fc.py
index 6fae97d6668813727bcb81e6c175e18dc369bdd9..4f964a9942600d46740b570975a218b4c2e7aabd 100644
--- a/aidge_core/aidge_export_aidge/operator_export/fc.py
+++ b/aidge_core/aidge_export_aidge/operator_export/fc.py
@@ -12,7 +12,7 @@ class FC(ExportNodeCpp):
             ROOT_EXPORT / "templates/attributes/fc.jinja")
         self.forward_template = str(
             ROOT_EXPORT / "templates/graph_ctor/fc.jinja")
-        self.include_list = []
+        self.include_list = ["aidge/operator/FC.hpp"]
         self.kernels_to_copy = []
         self.config_path = "include/attributes"
         self.config_extension = "hpp"
diff --git a/aidge_core/aidge_export_aidge/operator_export/maxpooling.py b/aidge_core/aidge_export_aidge/operator_export/maxpooling.py
index df53de9eb6e9705064696e202c14e343beae17d5..6d9c7998fb90153bfdfd2898c1dfcfb1ad730f20 100644
--- a/aidge_core/aidge_export_aidge/operator_export/maxpooling.py
+++ b/aidge_core/aidge_export_aidge/operator_export/maxpooling.py
@@ -11,7 +11,7 @@ class MaxPooling(ExportNodeCpp):
             ROOT_EXPORT / "templates/attributes/maxpooling.jinja")
         self.forward_template = str(
             ROOT_EXPORT / "templates/graph_ctor/maxpooling.jinja")
-        self.include_list = []
+        self.include_list = ["aidge/operator/MaxPooling.hpp"]
         self.kernels_to_copy = []
         self.config_path = "include/attributes"
         self.config_extension = "hpp"
diff --git a/aidge_core/aidge_export_aidge/operator_export/producer.py b/aidge_core/aidge_export_aidge/operator_export/producer.py
index 475d3625511c1b1d9e44ebcd517620c46771718b..02f2f1f39c6797d7f92a5938d6dbe8853079a624 100644
--- a/aidge_core/aidge_export_aidge/operator_export/producer.py
+++ b/aidge_core/aidge_export_aidge/operator_export/producer.py
@@ -23,7 +23,7 @@ class Producer(ExportNodeCpp):
             ROOT_EXPORT / "templates/graph_ctor/producer.jinja")
         self.attributes["tensor_name"] = f"{child.name()}_{in_idx}"
         self.attributes["values"] = str(self.operator.get_output(0))
-        self.include_list = []
+        self.include_list = ["aidge/operator/Producer.hpp"]
         self.kernels_to_copy = []
         self.config_path = "include/attributes"
         self.config_extension = "hpp"
diff --git a/aidge_core/aidge_export_aidge/operator_export/relu.py b/aidge_core/aidge_export_aidge/operator_export/relu.py
index 3001357343fd24ddbfb2dd799efc3f72be648499..b8398e30504b534fba755e6c613d361d873e09cd 100644
--- a/aidge_core/aidge_export_aidge/operator_export/relu.py
+++ b/aidge_core/aidge_export_aidge/operator_export/relu.py
@@ -10,5 +10,5 @@ class ReLU(ExportNodeCpp):
         self.config_template = ""
         self.forward_template = str(
             ROOT_EXPORT / "templates/graph_ctor/relu.jinja")
-        self.include_list = []
+        self.include_list = ["aidge/operator/ReLU.hpp"]
         self.kernels_to_copy = []
diff --git a/aidge_core/aidge_export_aidge/operator_export/sub.py b/aidge_core/aidge_export_aidge/operator_export/sub.py
index b728e088d2516af9f1d090ae27bb526c03aecff4..01b68b70f4cfcf3b3899202269106c58cb7e54a1 100644
--- a/aidge_core/aidge_export_aidge/operator_export/sub.py
+++ b/aidge_core/aidge_export_aidge/operator_export/sub.py
@@ -10,5 +10,5 @@ class Sub(ExportNodeCpp):
         self.config_template = ""
         self.forward_template = str(
             ROOT_EXPORT / "templates/graph_ctor/sub.jinja")
-        self.include_list = []
+        self.include_list = ["aidge/operator/Sub.hpp"]
         self.kernels_to_copy = []