diff --git a/code_generation/templates/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/attribute_classes.hpp.jinja b/code_generation/templates/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/attribute_classes.hpp.jinja
index 0e3bd149e..30068bc11 100644
--- a/code_generation/templates/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/attribute_classes.hpp.jinja
+++ b/code_generation/templates/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/attribute_classes.hpp.jinja
@@ -11,8 +11,8 @@
 
 #include "meta_data.hpp"
 
-#include "../common/enum.hpp"
 #include "../common/common.hpp"
+#include "../common/enum.hpp"
 #include "../common/three_phase_tensor.hpp"
 
 namespace power_grid_model {
diff --git a/code_generation/templates/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/attribute_classes.hpp.jinja b/code_generation/templates/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/attribute_classes.hpp.jinja
index 3aa6bb3d3..4234bd04a 100644
--- a/code_generation/templates/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/attribute_classes.hpp.jinja
+++ b/code_generation/templates/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/attribute_classes.hpp.jinja
@@ -11,10 +11,11 @@
 
 #include "gen_getters.hpp" // NOLINT
 
+#include "../../common/common.hpp"             // NOLINT
 #include "../../common/enum.hpp"               // NOLINT
-#include "../../common/common.hpp"   // NOLINT
 #include "../../common/three_phase_tensor.hpp" // NOLINT
-#include "../meta_data.hpp"             // NOLINT
+#include "../meta_data.hpp"                    // NOLINT
+
 #include "../{{ name }}.hpp" // NOLINT
 
 
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/input.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/input.hpp
index 9290cbd6b..d4c4e6dd2 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/input.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/input.hpp
@@ -11,8 +11,8 @@
 
 #include "meta_data.hpp"
 
-#include "../common/enum.hpp"
 #include "../common/common.hpp"
+#include "../common/enum.hpp"
 #include "../common/three_phase_tensor.hpp"
 
 namespace power_grid_model {
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/input.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/input.hpp
index 430880305..d6cab1b5c 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/input.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/input.hpp
@@ -11,10 +11,11 @@
 
 #include "gen_getters.hpp" // NOLINT
 
+#include "../../common/common.hpp"             // NOLINT
 #include "../../common/enum.hpp"               // NOLINT
-#include "../../common/common.hpp"   // NOLINT
 #include "../../common/three_phase_tensor.hpp" // NOLINT
-#include "../meta_data.hpp"             // NOLINT
+#include "../meta_data.hpp"                    // NOLINT
+
 #include "../input.hpp" // NOLINT
 
 
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/output.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/output.hpp
index b01b7afdd..11d58c035 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/output.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/output.hpp
@@ -11,10 +11,11 @@
 
 #include "gen_getters.hpp" // NOLINT
 
+#include "../../common/common.hpp"             // NOLINT
 #include "../../common/enum.hpp"               // NOLINT
-#include "../../common/common.hpp"   // NOLINT
 #include "../../common/three_phase_tensor.hpp" // NOLINT
-#include "../meta_data.hpp"             // NOLINT
+#include "../meta_data.hpp"                    // NOLINT
+
 #include "../output.hpp" // NOLINT
 
 
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/update.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/update.hpp
index 7e361b835..45f4c79eb 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/update.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/update.hpp
@@ -11,10 +11,11 @@
 
 #include "gen_getters.hpp" // NOLINT
 
+#include "../../common/common.hpp"             // NOLINT
 #include "../../common/enum.hpp"               // NOLINT
-#include "../../common/common.hpp"   // NOLINT
 #include "../../common/three_phase_tensor.hpp" // NOLINT
-#include "../meta_data.hpp"             // NOLINT
+#include "../meta_data.hpp"                    // NOLINT
+
 #include "../update.hpp" // NOLINT
 
 
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/output.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/output.hpp
index f638cf755..0cff82ea4 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/output.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/output.hpp
@@ -11,8 +11,8 @@
 
 #include "meta_data.hpp"
 
-#include "../common/enum.hpp"
 #include "../common/common.hpp"
+#include "../common/enum.hpp"
 #include "../common/three_phase_tensor.hpp"
 
 namespace power_grid_model {
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/update.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/update.hpp
index 1519ce710..4ecf57393 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/update.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/update.hpp
@@ -11,8 +11,8 @@
 
 #include "meta_data.hpp"
 
-#include "../common/enum.hpp"
 #include "../common/common.hpp"
+#include "../common/enum.hpp"
 #include "../common/three_phase_tensor.hpp"
 
 namespace power_grid_model {