diff --git a/include/aidge/hook/execTime.hpp b/include/aidge/hook/ExecTime.hpp
similarity index 100%
rename from include/aidge/hook/execTime.hpp
rename to include/aidge/hook/ExecTime.hpp
diff --git a/include/aidge/hook/hook.hpp b/include/aidge/hook/Hook.hpp
similarity index 100%
rename from include/aidge/hook/hook.hpp
rename to include/aidge/hook/Hook.hpp
diff --git a/include/aidge/hook/outputRange.hpp b/include/aidge/hook/OutputRange.hpp
similarity index 100%
rename from include/aidge/hook/outputRange.hpp
rename to include/aidge/hook/OutputRange.hpp
diff --git a/include/aidge/operator/Operator.hpp b/include/aidge/operator/Operator.hpp
index 3ac651cfd6f700a129e36fb461f948f50137cfd6..5b0c199e75f0cedd4a0d36f6d2c87d89833e0dd5 100644
--- a/include/aidge/operator/Operator.hpp
+++ b/include/aidge/operator/Operator.hpp
@@ -20,7 +20,7 @@
 #include "aidge/data/Data.hpp"
 #include "aidge/data/Tensor.hpp"
 #include "aidge/utils/Types.h"
-#include "aidge/hook/hook.hpp"
+#include "aidge/hook/Hook.hpp"
 
 namespace Aidge {
 
diff --git a/include/aidge/utils/Attributes.hpp b/include/aidge/utils/Attributes.hpp
index 76875f15ff4229522e6208b0edb23ec519ff59ce..d3444000191022b575adaf1430319479daa5d4fc 100644
--- a/include/aidge/utils/Attributes.hpp
+++ b/include/aidge/utils/Attributes.hpp
@@ -18,6 +18,7 @@
 #endif
 #include <vector>
 #include <string>
+#include <set>
 
 #ifdef PYBIND
 namespace py = pybind11;
diff --git a/include/aidge/utils/Utils.hpp b/include/aidge/utils/Utils.hpp
index 7c0c03c82ff252b6175d3c9bbe5395bb05127c9f..71817dcfc9713ad36a74175affd21b03cb6ed181 100644
--- a/include/aidge/utils/Utils.hpp
+++ b/include/aidge/utils/Utils.hpp
@@ -14,6 +14,7 @@
 #define AIDGE_UTILS_H_
 
 #include <cstdio>
+#include <memory>
 
 #ifdef NO_EXCEPTIONS
 #define AIDGE_THROW_OR_ABORT(ex, ...) \