diff --git a/aidge_core/export_utils/templates/forward_header.jinja b/aidge_core/export_utils/templates/forward_header.jinja
index 1e14cdea67f0e9da930c0907fa1d82624a8579e4..86333e6c901cfcadb752d7379a7717e5fc84c8c7 100644
--- a/aidge_core/export_utils/templates/forward_header.jinja
+++ b/aidge_core/export_utils/templates/forward_header.jinja
@@ -7,7 +7,7 @@
 {%- endfor %}
 
 {% for func in functions %}
-{{ func }}
+{{ func }};
 {% endfor %}
 
 #endif /* DNN_HPP */
diff --git a/aidge_core/export_utils/templates/main.jinja b/aidge_core/export_utils/templates/main.jinja
index 06945222fcfc5a3d11852d66e2706bf1881eeb79..40ca12e0addcb2df4e4f4dec20ff06456e573a62 100644
--- a/aidge_core/export_utils/templates/main.jinja
+++ b/aidge_core/export_utils/templates/main.jinja
@@ -1,7 +1,11 @@
 
 #include <iostream>
 #include "forward.hpp"
-#include "inputs.h"
+{% for name in inputs_name %}
+#include "{{ name }}.h"
+{% endfor %}
+
+
 
 int main()
 {