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 feaf33bda5..4fe62f85c3 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
@@ -6,14 +6,12 @@
 
 // clang-format off
 #pragma once
-#ifndef POWER_GRID_MODEL_AUXILIARY_{{ include_guard }}_HPP
-#define POWER_GRID_MODEL_AUXILIARY_{{ include_guard }}_HPP
 
 #include "meta_data.hpp"
 
-#include "../enum.hpp"
-#include "../power_grid_model.hpp"
-#include "../three_phase_tensor.hpp"
+#include "../common/common.hpp"
+#include "../common/enum.hpp"
+#include "../common/three_phase_tensor.hpp"
 
 namespace power_grid_model {
 
@@ -41,5 +39,4 @@ using Asym{{ attribute_class.name }} = {{ attribute_class.name }}<false>;
 
 } // namespace power_grid_model
 
-#endif
 // clang-format on
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 77fd997b37..637d71b15a 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
@@ -6,15 +6,14 @@
 
 // clang-format off
 #pragma once
-#ifndef POWER_GRID_MODEL_AUXILIARY_META_GEN_{{ include_guard }}_HPP
-#define POWER_GRID_MODEL_AUXILIARY_META_GEN_{{ include_guard }}_HPP
 
 #include "gen_getters.hpp" // NOLINT
 
-#include "../../enum.hpp"               // NOLINT
-#include "../../power_grid_model.hpp"   // NOLINT
-#include "../../three_phase_tensor.hpp" // NOLINT
-#include "../meta_data.hpp"             // NOLINT
+#include "../../common/common.hpp"             // NOLINT
+#include "../../common/enum.hpp"               // NOLINT
+#include "../../common/three_phase_tensor.hpp" // NOLINT
+#include "../meta_data.hpp"                    // NOLINT
+
 #include "../{{ name }}.hpp" // NOLINT
 
 
@@ -66,5 +65,4 @@ struct get_component_nan<{{ attribute_class.name }}> {
 
 } // namespace power_grid_model::meta_data
 
-#endif
 // clang-format on
diff --git a/code_generation/templates/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/static_asserts/attribute_classes.hpp.jinja b/code_generation/templates/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/static_asserts/attribute_classes.hpp.jinja
index badb730f62..b7c9d55bd1 100644
--- a/code_generation/templates/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/static_asserts/attribute_classes.hpp.jinja
+++ b/code_generation/templates/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/static_asserts/attribute_classes.hpp.jinja
@@ -6,8 +6,6 @@
 
 // clang-format off
 #pragma once
-#ifndef POWER_GRID_MODEL_AUXILIARY_STATIC_ASSERTS_{{ include_guard }}_HPP
-#define POWER_GRID_MODEL_AUXILIARY_STATIC_ASSERTS_{{ include_guard }}_HPP
 
 #include "../{{ name }}.hpp" // NOLINT
 
@@ -35,5 +33,4 @@ static_assert(offsetof({{ specification }}, {{ attribute.names }}) == offsetof({
 
 } // namespace power_grid_model::test
 
-#endif
 // clang-format on
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/all_components.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/all_components.hpp
index 73b16b64bd..82c8d7260e 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/all_components.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/all_components.hpp
@@ -3,11 +3,10 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #pragma once
-#ifndef POWER_GRID_MODEL_ALL_COMPONENTS_HPP
-#define POWER_GRID_MODEL_ALL_COMPONENTS_HPP
 
 // define all components
-#include "power_grid_model.hpp"
+#include "common/common.hpp"
+#include "common/component_list.hpp"
 // component include
 #include "component/appliance.hpp"
 #include "component/fault.hpp"
@@ -30,5 +29,3 @@ using AllComponents =
                   SymLoad, AsymLoad, SymPowerSensor, AsymPowerSensor, SymVoltageSensor, AsymVoltageSensor, Fault>;
 
 } // namespace power_grid_model
-
-#endif // POWER_GRID_MODEL_ALL_COMPONENTS_HPP
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/dataset.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/dataset.hpp
index b08300f730..98aa2d40f0 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/dataset.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/dataset.hpp
@@ -3,12 +3,13 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #pragma once
-#ifndef POWER_GRID_MODEL_AUXILIARY_DATASET_HPP
-#define POWER_GRID_MODEL_AUXILIARY_DATASET_HPP
 
 // define dataset classes with void pointers
 
-#include "../power_grid_model.hpp"
+#include "../common/common.hpp"
+
+#include <cassert>
+#include <map>
 
 namespace power_grid_model {
 
@@ -104,5 +105,3 @@ using Dataset = std::map<std::string, MutableDataPointer>;
 using ConstDataset = std::map<std::string, ConstDataPointer>;
 
 } // namespace power_grid_model
-
-#endif
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/dataset_handler.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/dataset_handler.hpp
index e9e9a89fa7..0169fc0154 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/dataset_handler.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/dataset_handler.hpp
@@ -3,13 +3,11 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #pragma once
-#ifndef POWER_GRID_MODEL_AUXILIARY_DATASET_HANDLER_HPP
-#define POWER_GRID_MODEL_AUXILIARY_DATASET_HANDLER_HPP
 
 // handle dataset and buffer related stuff
 
-#include "../exception.hpp"
-#include "../power_grid_model.hpp"
+#include "../common/common.hpp"
+#include "../common/exception.hpp"
 #include "dataset.hpp"
 #include "meta_data.hpp"
 #include "meta_data_gen.hpp"
@@ -202,5 +200,3 @@ using MutableDatasetHandler = DatasetHandler<true, false>;
 using WritableDatasetHandler = DatasetHandler<true, true>;
 
 } // namespace power_grid_model::meta_data
-
-#endif
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 a93121b033..c93a53e948 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
@@ -6,14 +6,12 @@
 
 // clang-format off
 #pragma once
-#ifndef POWER_GRID_MODEL_AUXILIARY_INPUT_HPP
-#define POWER_GRID_MODEL_AUXILIARY_INPUT_HPP
 
 #include "meta_data.hpp"
 
-#include "../enum.hpp"
-#include "../power_grid_model.hpp"
-#include "../three_phase_tensor.hpp"
+#include "../common/common.hpp"
+#include "../common/enum.hpp"
+#include "../common/three_phase_tensor.hpp"
 
 namespace power_grid_model {
 
@@ -392,5 +390,4 @@ struct FaultInput {
 
 } // namespace power_grid_model
 
-#endif
 // clang-format on
\ No newline at end of file
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_data.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_data.hpp
index c10db79a23..d3047e3e74 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_data.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_data.hpp
@@ -3,13 +3,11 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #pragma once
-#ifndef POWER_GRID_MODEL_META_DATA_HPP
-#define POWER_GRID_MODEL_META_DATA_HPP
 
-#include "../enum.hpp"
-#include "../exception.hpp"
-#include "../power_grid_model.hpp"
-#include "../three_phase_tensor.hpp"
+#include "../common/common.hpp"
+#include "../common/enum.hpp"
+#include "../common/exception.hpp"
+#include "../common/three_phase_tensor.hpp"
 
 #include <bit>
 #include <span>
@@ -191,5 +189,3 @@ struct MetaData {
 constexpr bool is_little_endian() { return std::endian::native == std::endian::little; }
 
 } // namespace power_grid_model::meta_data
-
-#endif
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_data_gen.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_data_gen.hpp
index 047517a00f..e25a0f23c6 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_data_gen.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_data_gen.hpp
@@ -3,8 +3,6 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #pragma once
-#ifndef POWER_GRID_MODEL_META_DATA_GEN_HPP
-#define POWER_GRID_MODEL_META_DATA_GEN_HPP
 
 #include "input.hpp"
 #include "meta_data.hpp"
@@ -16,7 +14,7 @@
 #include "update.hpp"
 
 #include "../all_components.hpp"
-#include "../power_grid_model.hpp"
+#include "../common/common.hpp"
 
 #include <map>
 #include <string>
@@ -58,5 +56,3 @@ constexpr MetaData meta_data = get_meta_data<AllComponents, // all components li
 constexpr MetaData meta_data = meta_data_gen::meta_data;
 
 } // namespace power_grid_model::meta_data
-
-#endif
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/gen_getters.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/gen_getters.hpp
index ac5d1bae51..6e002fd4ee 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/gen_getters.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_gen/gen_getters.hpp
@@ -3,9 +3,9 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #pragma once
-#ifndef POWER_GRID_MODEL_AUXILIARY_META_GEN_GEN_GETTERS_HPP
-#define POWER_GRID_MODEL_AUXILIARY_META_GEN_GEN_GETTERS_HPP
 
+#include "../../common/component_list.hpp"
+#include "../../common/counting_iterator.hpp"
 #include "../meta_data.hpp"
 
 namespace power_grid_model::meta_data::meta_data_gen {
@@ -96,5 +96,3 @@ struct get_meta_data<comp_list, dataset_mark<dataset_name_getter, struct_getter>
 };
 
 } // namespace power_grid_model::meta_data::meta_data_gen
-
-#endif
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 2631f54d27..94af9e4e21 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
@@ -6,15 +6,14 @@
 
 // clang-format off
 #pragma once
-#ifndef POWER_GRID_MODEL_AUXILIARY_META_GEN_INPUT_HPP
-#define POWER_GRID_MODEL_AUXILIARY_META_GEN_INPUT_HPP
 
 #include "gen_getters.hpp" // NOLINT
 
-#include "../../enum.hpp"               // NOLINT
-#include "../../power_grid_model.hpp"   // NOLINT
-#include "../../three_phase_tensor.hpp" // NOLINT
-#include "../meta_data.hpp"             // NOLINT
+#include "../../common/common.hpp"             // NOLINT
+#include "../../common/enum.hpp"               // NOLINT
+#include "../../common/three_phase_tensor.hpp" // NOLINT
+#include "../meta_data.hpp"                    // NOLINT
+
 #include "../input.hpp" // NOLINT
 
 
@@ -712,5 +711,4 @@ struct get_component_nan<FaultInput> {
 
 } // namespace power_grid_model::meta_data
 
-#endif
 // clang-format on
\ No newline at end of file
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 912834d687..113345e797 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
@@ -6,15 +6,14 @@
 
 // clang-format off
 #pragma once
-#ifndef POWER_GRID_MODEL_AUXILIARY_META_GEN_OUTPUT_HPP
-#define POWER_GRID_MODEL_AUXILIARY_META_GEN_OUTPUT_HPP
 
 #include "gen_getters.hpp" // NOLINT
 
-#include "../../enum.hpp"               // NOLINT
-#include "../../power_grid_model.hpp"   // NOLINT
-#include "../../three_phase_tensor.hpp" // NOLINT
-#include "../meta_data.hpp"             // NOLINT
+#include "../../common/common.hpp"             // NOLINT
+#include "../../common/enum.hpp"               // NOLINT
+#include "../../common/three_phase_tensor.hpp" // NOLINT
+#include "../meta_data.hpp"                    // NOLINT
+
 #include "../output.hpp" // NOLINT
 
 
@@ -444,5 +443,4 @@ struct get_component_nan<SensorShortCircuitOutput> {
 
 } // namespace power_grid_model::meta_data
 
-#endif
 // clang-format on
\ No newline at end of file
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 ad27f9a868..b46fd1e6d6 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
@@ -6,15 +6,14 @@
 
 // clang-format off
 #pragma once
-#ifndef POWER_GRID_MODEL_AUXILIARY_META_GEN_UPDATE_HPP
-#define POWER_GRID_MODEL_AUXILIARY_META_GEN_UPDATE_HPP
 
 #include "gen_getters.hpp" // NOLINT
 
-#include "../../enum.hpp"               // NOLINT
-#include "../../power_grid_model.hpp"   // NOLINT
-#include "../../three_phase_tensor.hpp" // NOLINT
-#include "../meta_data.hpp"             // NOLINT
+#include "../../common/common.hpp"             // NOLINT
+#include "../../common/enum.hpp"               // NOLINT
+#include "../../common/three_phase_tensor.hpp" // NOLINT
+#include "../meta_data.hpp"                    // NOLINT
+
 #include "../update.hpp" // NOLINT
 
 
@@ -346,5 +345,4 @@ struct get_component_nan<FaultUpdate> {
 
 } // namespace power_grid_model::meta_data
 
-#endif
 // clang-format on
\ No newline at end of file
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 a162aeb372..5157b40842 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
@@ -6,14 +6,12 @@
 
 // clang-format off
 #pragma once
-#ifndef POWER_GRID_MODEL_AUXILIARY_OUTPUT_HPP
-#define POWER_GRID_MODEL_AUXILIARY_OUTPUT_HPP
 
 #include "meta_data.hpp"
 
-#include "../enum.hpp"
-#include "../power_grid_model.hpp"
-#include "../three_phase_tensor.hpp"
+#include "../common/common.hpp"
+#include "../common/enum.hpp"
+#include "../common/three_phase_tensor.hpp"
 
 namespace power_grid_model {
 
@@ -220,5 +218,4 @@ struct SensorShortCircuitOutput {
 
 } // namespace power_grid_model
 
-#endif
 // clang-format on
\ No newline at end of file
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/serialization/deserializer.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/serialization/deserializer.hpp
index 6bd74f2446..34c94ceae0 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/serialization/deserializer.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/serialization/deserializer.hpp
@@ -3,11 +3,9 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #pragma once
-#ifndef POWER_GRID_MODEL_AUXILIARY_SERIALIZTION_DESERIALIZER_HPP
-#define POWER_GRID_MODEL_AUXILIARY_SERIALIZTION_DESERIALIZER_HPP
 
-#include "../../exception.hpp"
-#include "../../power_grid_model.hpp"
+#include "../../common/common.hpp"
+#include "../../common/exception.hpp"
 #include "../dataset_handler.hpp"
 #include "../meta_data.hpp"
 #include "../meta_data_gen.hpp"
@@ -844,5 +842,3 @@ class Deserializer {
 };
 
 } // namespace power_grid_model::meta_data
-
-#endif
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/serialization/serializer.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/serialization/serializer.hpp
index 5cd843a3b8..ec71f75178 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/serialization/serializer.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/serialization/serializer.hpp
@@ -3,11 +3,9 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #pragma once
-#ifndef POWER_GRID_MODEL_AUXILIARY_SERIALIZTION_SERIALIZER_HPP
-#define POWER_GRID_MODEL_AUXILIARY_SERIALIZTION_SERIALIZER_HPP
 
-#include "../../exception.hpp"
-#include "../../power_grid_model.hpp"
+#include "../../common/common.hpp"
+#include "../../common/exception.hpp"
 #include "../dataset_handler.hpp"
 #include "../meta_data.hpp"
 #include "../meta_data_gen.hpp"
@@ -510,5 +508,3 @@ class Serializer {
 };
 
 } // namespace power_grid_model::meta_data
-
-#endif
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/static_asserts/input.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/static_asserts/input.hpp
index 32373806c5..dd29f1f0ac 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/static_asserts/input.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/static_asserts/input.hpp
@@ -6,8 +6,6 @@
 
 // clang-format off
 #pragma once
-#ifndef POWER_GRID_MODEL_AUXILIARY_STATIC_ASSERTS_INPUT_HPP
-#define POWER_GRID_MODEL_AUXILIARY_STATIC_ASSERTS_INPUT_HPP
 
 #include "../input.hpp" // NOLINT
 
@@ -482,5 +480,4 @@ static_assert(offsetof(FaultInput, id) == offsetof(BaseInput, id));
 
 } // namespace power_grid_model::test
 
-#endif
 // clang-format on
\ No newline at end of file
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/static_asserts/output.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/static_asserts/output.hpp
index 9f660c71c5..e814f56a78 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/static_asserts/output.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/static_asserts/output.hpp
@@ -6,8 +6,6 @@
 
 // clang-format off
 #pragma once
-#ifndef POWER_GRID_MODEL_AUXILIARY_STATIC_ASSERTS_OUTPUT_HPP
-#define POWER_GRID_MODEL_AUXILIARY_STATIC_ASSERTS_OUTPUT_HPP
 
 #include "../output.hpp" // NOLINT
 
@@ -283,5 +281,4 @@ static_assert(offsetof(SensorShortCircuitOutput, energized) == offsetof(BaseOutp
 
 } // namespace power_grid_model::test
 
-#endif
 // clang-format on
\ No newline at end of file
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/static_asserts/update.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/static_asserts/update.hpp
index 4897290915..243724cc68 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/static_asserts/update.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/static_asserts/update.hpp
@@ -6,8 +6,6 @@
 
 // clang-format off
 #pragma once
-#ifndef POWER_GRID_MODEL_AUXILIARY_STATIC_ASSERTS_UPDATE_HPP
-#define POWER_GRID_MODEL_AUXILIARY_STATIC_ASSERTS_UPDATE_HPP
 
 #include "../update.hpp" // NOLINT
 
@@ -207,5 +205,4 @@ static_assert(offsetof(FaultUpdate, id) == offsetof(BaseUpdate, id));
 
 } // namespace power_grid_model::test
 
-#endif
 // clang-format on
\ No newline at end of file
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 79c240cdd3..f97d6fafa7 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
@@ -6,14 +6,12 @@
 
 // clang-format off
 #pragma once
-#ifndef POWER_GRID_MODEL_AUXILIARY_UPDATE_HPP
-#define POWER_GRID_MODEL_AUXILIARY_UPDATE_HPP
 
 #include "meta_data.hpp"
 
-#include "../enum.hpp"
-#include "../power_grid_model.hpp"
-#include "../three_phase_tensor.hpp"
+#include "../common/common.hpp"
+#include "../common/enum.hpp"
+#include "../common/three_phase_tensor.hpp"
 
 namespace power_grid_model {
 
@@ -183,5 +181,4 @@ struct FaultUpdate {
 
 } // namespace power_grid_model
 
-#endif
 // clang-format on
\ No newline at end of file
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/batch_parameter.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/batch_parameter.hpp
new file mode 100644
index 0000000000..e909bdc5fc
--- /dev/null
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/batch_parameter.hpp
@@ -0,0 +1,12 @@
+// SPDX-FileCopyrightText: Contributors to the Power Grid Model project <powergridmodel@lfenergy.org>
+//
+// SPDX-License-Identifier: MPL-2.0
+
+#pragma once
+
+namespace power_grid_model {
+
+// batch parameter
+struct BatchParameter {};
+
+} // namespace power_grid_model
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/calculation_parameters.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/calculation_parameters.hpp
index a041e00e4d..f30a67afd4 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/calculation_parameters.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/calculation_parameters.hpp
@@ -3,13 +3,11 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #pragma once
-#ifndef POWER_GRID_MODEL_CALCULATION_PARAMETERS_HPP
-#define POWER_GRID_MODEL_CALCULATION_PARAMETERS_HPP
 
-#include "enum.hpp"
-#include "grouped_index_vector.hpp"
-#include "power_grid_model.hpp"
-#include "three_phase_tensor.hpp"
+#include "common/common.hpp"
+#include "common/enum.hpp"
+#include "common/grouped_index_vector.hpp"
+#include "common/three_phase_tensor.hpp"
 
 namespace power_grid_model {
 
@@ -367,5 +365,3 @@ struct UpdateChange {
 };
 
 } // namespace power_grid_model
-
-#endif
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/common/calculation_info.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/common/calculation_info.hpp
new file mode 100644
index 0000000000..04a81a6ef6
--- /dev/null
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/common/calculation_info.hpp
@@ -0,0 +1,30 @@
+// SPDX-FileCopyrightText: Contributors to the Power Grid Model project <powergridmodel@lfenergy.org>
+//
+// SPDX-License-Identifier: MPL-2.0
+
+#pragma once
+
+#include <cstddef>
+#include <functional>
+#include <map>
+#include <string>
+
+#ifdef POWER_GRID_MODEL_CPP_BENCHMARK
+#include <new>
+#endif
+
+namespace power_grid_model {
+
+// calculation info
+#ifdef POWER_GRID_MODEL_CPP_BENCHMARK
+#if defined(__cpp_lib_hardware_interference_size)
+constexpr size_t cache_line_size = std::hardware_destructive_interference_size;
+#else
+constexpr size_t cache_line_size = 64;
+#endif
+class alignas(cache_line_size) CalculationInfo : public std::map<std::string, double, std::less<>> {};
+#else
+using CalculationInfo = std::map<std::string, double, std::less<>>;
+#endif
+
+} // namespace power_grid_model
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/power_grid_model.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/common/common.hpp
similarity index 65%
rename from power_grid_model_c/power_grid_model/include/power_grid_model/power_grid_model.hpp
rename to power_grid_model_c/power_grid_model/include/power_grid_model/common/common.hpp
index 1befffbefa..a1dc6399d7 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/power_grid_model.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/common/common.hpp
@@ -3,35 +3,14 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #pragma once
-#ifndef POWER_GRID_MODEL_POWER_GRID_MODEL_HPP
-#define POWER_GRID_MODEL_POWER_GRID_MODEL_HPP
 
-// main header for the model
-#include <boost/iterator/counting_iterator.hpp>
-
-#include <algorithm>
-#include <array>
-#include <cassert>
-#include <chrono>
-#include <cmath>
 #include <complex>
-#include <concepts>
 #include <cstddef>
-#include <functional>
+#include <cstdint>
 #include <limits>
-#include <map>
-#include <memory>
 #include <numbers>
-#include <numeric>
-#include <string>
-#include <tuple>
 #include <type_traits>
-#include <utility>
-#include <variant>
 #include <vector>
-#ifdef POWER_GRID_MODEL_CPP_BENCHMARK
-#include <new>
-#endif
 
 namespace power_grid_model {
 
@@ -43,9 +22,6 @@ using IdxVector = std::vector<Idx>;
 
 using IntS = int8_t;
 
-// couting iterator
-using IdxCount = boost::counting_iterator<Idx>;
-
 // struct of indexing to sub modules
 struct Idx2D {
     Idx group; // sequence number of outer module/groups
@@ -87,32 +63,9 @@ constexpr double default_source_sk = 1e10; // 10 GVA 10^10
 constexpr double default_source_rx_ratio = 0.1;
 constexpr double default_source_z01_ratio = 1.0;
 
-// calculation info
-#ifdef POWER_GRID_MODEL_CPP_BENCHMARK
-#if defined(__cpp_lib_hardware_interference_size)
-constexpr size_t cache_line_size = std::hardware_destructive_interference_size;
-#else
-constexpr size_t cache_line_size = 64;
-#endif
-class alignas(cache_line_size) CalculationInfo : public std::map<std::string, double, std::less<>> {};
-#else
-using CalculationInfo = std::map<std::string, double, std::less<>>;
-#endif
-
-using Clock = std::chrono::high_resolution_clock;
-using Duration = std::chrono::duration<double>;
-
 // some usual vector
 using DoubleVector = std::vector<double>;
 using ComplexVector = std::vector<std::complex<double>>;
 using IntSVector = std::vector<IntS>;
 
-// component list
-template <class... T> struct ComponentList {};
-
-// batch parameter
-struct BatchParameter {};
-
 } // namespace power_grid_model
-
-#endif
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/common/component_list.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/common/component_list.hpp
new file mode 100644
index 0000000000..7dae677e0d
--- /dev/null
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/common/component_list.hpp
@@ -0,0 +1,12 @@
+// SPDX-FileCopyrightText: Contributors to the Power Grid Model project <powergridmodel@lfenergy.org>
+//
+// SPDX-License-Identifier: MPL-2.0
+
+#pragma once
+
+namespace power_grid_model {
+
+// component list
+template <class... T> struct ComponentList {};
+
+} // namespace power_grid_model
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/common/counting_iterator.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/common/counting_iterator.hpp
new file mode 100644
index 0000000000..ce6b5df7ca
--- /dev/null
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/common/counting_iterator.hpp
@@ -0,0 +1,16 @@
+// SPDX-FileCopyrightText: Contributors to the Power Grid Model project <powergridmodel@lfenergy.org>
+//
+// SPDX-License-Identifier: MPL-2.0
+
+#pragma once
+
+#include "common.hpp"
+
+#include <boost/iterator/counting_iterator.hpp>
+
+namespace power_grid_model {
+
+// couting iterator
+using IdxCount = boost::counting_iterator<Idx>;
+
+} // namespace power_grid_model
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/enum.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/common/enum.hpp
similarity index 95%
rename from power_grid_model_c/power_grid_model/include/power_grid_model/enum.hpp
rename to power_grid_model_c/power_grid_model/include/power_grid_model/common/enum.hpp
index b4b24a7c00..a54194664d 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/enum.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/common/enum.hpp
@@ -3,10 +3,8 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #pragma once
-#ifndef POWER_GRID_MODEL_ENUM_HPP
-#define POWER_GRID_MODEL_ENUM_HPP
 
-#include "power_grid_model.hpp"
+#include "common.hpp"
 
 namespace power_grid_model {
 
@@ -101,5 +99,3 @@ enum class CType : IntS { c_int32 = 0, c_int8 = 1, c_double = 2, c_double3 = 3 }
 enum class SerializationFormat : IntS { json = 0, msgpack = 1 };
 
 } // namespace power_grid_model
-
-#endif
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/exception.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/common/exception.hpp
similarity index 97%
rename from power_grid_model_c/power_grid_model/include/power_grid_model/exception.hpp
rename to power_grid_model_c/power_grid_model/include/power_grid_model/common/exception.hpp
index b6d15de103..7b650cca52 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/exception.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/common/exception.hpp
@@ -3,15 +3,12 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #pragma once
-#ifndef POWER_GRID_MODEL_EXCEPTION_HPP
-#define POWER_GRID_MODEL_EXCEPTION_HPP
 
+#include "common.hpp"
 #include "enum.hpp"
-#include "power_grid_model.hpp"
 
 #include <exception>
 #include <string>
-#include <utility>
 
 namespace power_grid_model {
 
@@ -181,5 +178,3 @@ class DatasetError : public PowerGridError {
 };
 
 } // namespace power_grid_model
-
-#endif
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/grouped_index_vector.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/common/grouped_index_vector.hpp
similarity index 98%
rename from power_grid_model_c/power_grid_model/include/power_grid_model/grouped_index_vector.hpp
rename to power_grid_model_c/power_grid_model/include/power_grid_model/common/grouped_index_vector.hpp
index e50e671344..194b3145d6 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/grouped_index_vector.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/common/grouped_index_vector.hpp
@@ -3,10 +3,9 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #pragma once
-#ifndef POWER_GRID_MODEL_SPARSE_IDX_VECTOR_HPP
-#define POWER_GRID_MODEL_SPARSE_IDX_VECTOR_HPP
 
-#include "power_grid_model.hpp"
+#include "common.hpp"
+#include "counting_iterator.hpp"
 #include "typing.hpp"
 
 #include <boost/iterator/iterator_facade.hpp>
@@ -281,5 +280,3 @@ inline auto enumerated_zip_sequence(grouped_idx_vector_type auto const& first,
 }
 
 } // namespace power_grid_model
-
-#endif
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/three_phase_tensor.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/common/three_phase_tensor.hpp
similarity index 98%
rename from power_grid_model_c/power_grid_model/include/power_grid_model/three_phase_tensor.hpp
rename to power_grid_model_c/power_grid_model/include/power_grid_model/common/three_phase_tensor.hpp
index 0d629e5c4c..47b7fab3a6 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/three_phase_tensor.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/common/three_phase_tensor.hpp
@@ -3,18 +3,14 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #pragma once
-#ifndef POWER_GRID_MODEL_THREE_PHASE_TENSOR_HPP
-#define POWER_GRID_MODEL_THREE_PHASE_TENSOR_HPP
 
-#include "power_grid_model.hpp"
+#include "common.hpp"
 
 // eigen properties
 #include <Eigen/Dense>
 
 #include <cmath>
 #include <complex>
-#include <tuple>
-#include <utility>
 
 namespace power_grid_model {
 
@@ -385,5 +381,3 @@ template <bool sym> using RealTensorVector = std::vector<RealTensor<sym>>;
 template <bool sym> using ComplexTensorVector = std::vector<ComplexTensor<sym>>;
 
 } // namespace power_grid_model
-
-#endif
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/timer.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/common/timer.hpp
similarity index 91%
rename from power_grid_model_c/power_grid_model/include/power_grid_model/timer.hpp
rename to power_grid_model_c/power_grid_model/include/power_grid_model/common/timer.hpp
index fc3a353cf2..812e2ffa42 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/timer.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/common/timer.hpp
@@ -3,16 +3,19 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #pragma once
-#ifndef POWER_GRID_MODEL_TIMER_HPP
-#define POWER_GRID_MODEL_TIMER_HPP
 
-#include "power_grid_model.hpp"
+#include "calculation_info.hpp"
+#include "common.hpp"
 
+#include <chrono>
 #include <iomanip>
 #include <sstream>
 
 namespace power_grid_model {
 
+using Clock = std::chrono::high_resolution_clock;
+using Duration = std::chrono::duration<double>;
+
 class Timer {
   private:
     CalculationInfo* info_;
@@ -78,5 +81,3 @@ class Timer {
 };
 
 } // namespace power_grid_model
-
-#endif // POWER_GRID_MODEL_TIMER_HPP
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/typing.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/common/typing.hpp
similarity index 86%
rename from power_grid_model_c/power_grid_model/include/power_grid_model/typing.hpp
rename to power_grid_model_c/power_grid_model/include/power_grid_model/common/typing.hpp
index 629f527be7..e6328bb608 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/typing.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/common/typing.hpp
@@ -3,10 +3,10 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #pragma once
-#ifndef POWER_GRID_MODEL_TYPING_HPP
-#define POWER_GRID_MODEL_TYPING_HPP
 
+#include <cassert>
 #include <concepts>
+#include <utility>
 
 namespace power_grid_model {
 template <std::integral T, std::integral U>
@@ -19,5 +19,3 @@ constexpr auto narrow_cast(U value) {
     return static_cast<T>(value);
 }
 } // namespace power_grid_model
-
-#endif
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/component/appliance.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/component/appliance.hpp
index 8627b5f6cd..4a8b257730 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/component/appliance.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/component/appliance.hpp
@@ -3,8 +3,6 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #pragma once
-#ifndef POWER_GRID_MODEL_COMPONENT_APPLIANCE_HPP
-#define POWER_GRID_MODEL_COMPONENT_APPLIANCE_HPP
 
 #include "base.hpp"
 
@@ -12,8 +10,8 @@
 #include "../auxiliary/output.hpp"
 #include "../auxiliary/update.hpp"
 #include "../calculation_parameters.hpp"
-#include "../power_grid_model.hpp"
-#include "../three_phase_tensor.hpp"
+#include "../common/common.hpp"
+#include "../common/three_phase_tensor.hpp"
 
 namespace power_grid_model {
 
@@ -122,5 +120,3 @@ class Appliance : public Base {
 };
 
 } // namespace power_grid_model
-
-#endif
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/component/base.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/component/base.hpp
index 76169fa11f..ab0bfe1950 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/component/base.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/component/base.hpp
@@ -3,14 +3,12 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #pragma once
-#ifndef POWER_GRID_MODEL_COMPONENT_BASE_HPP
-#define POWER_GRID_MODEL_COMPONENT_BASE_HPP
 
 #include "../auxiliary/input.hpp"
 #include "../auxiliary/output.hpp"
 #include "../auxiliary/update.hpp"
-#include "../enum.hpp"
-#include "../power_grid_model.hpp"
+#include "../common/common.hpp"
+#include "../common/enum.hpp"
 
 namespace power_grid_model {
 
@@ -42,5 +40,3 @@ class Base {
 };
 
 } // namespace power_grid_model
-
-#endif
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/component/branch.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/component/branch.hpp
index 5beebaca1e..9617959c9b 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/component/branch.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/component/branch.hpp
@@ -3,8 +3,6 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #pragma once
-#ifndef POWER_GRID_MODEL_COMPONENT_BRANCH_HPP
-#define POWER_GRID_MODEL_COMPONENT_BRANCH_HPP
 
 #include "base.hpp"
 
@@ -12,9 +10,9 @@
 #include "../auxiliary/output.hpp"
 #include "../auxiliary/update.hpp"
 #include "../calculation_parameters.hpp"
-#include "../exception.hpp"
-#include "../power_grid_model.hpp"
-#include "../three_phase_tensor.hpp"
+#include "../common/common.hpp"
+#include "../common/exception.hpp"
+#include "../common/three_phase_tensor.hpp"
 
 namespace power_grid_model {
 
@@ -228,5 +226,3 @@ class Branch : public Base {
 };
 
 } // namespace power_grid_model
-
-#endif
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/component/branch3.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/component/branch3.hpp
index e18114b01b..5525867b9d 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/component/branch3.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/component/branch3.hpp
@@ -3,8 +3,6 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #pragma once
-#ifndef POWER_GRID_MODEL_COMPONENT_BRANCH3_HPP
-#define POWER_GRID_MODEL_COMPONENT_BRANCH3_HPP
 
 #include "base.hpp"
 
@@ -12,7 +10,7 @@
 #include "../auxiliary/output.hpp"
 #include "../auxiliary/update.hpp"
 #include "../calculation_parameters.hpp"
-#include "../exception.hpp"
+#include "../common/exception.hpp"
 
 namespace power_grid_model {
 
@@ -190,5 +188,3 @@ class Branch3 : public Base {
 };
 
 } // namespace power_grid_model
-
-#endif
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/component/fault.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/component/fault.hpp
index e09c6c6485..56880cb343 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/component/fault.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/component/fault.hpp
@@ -3,8 +3,6 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #pragma once
-#ifndef POWER_GRID_MODEL_COMPONENT_SHORT_CIRCUIT_HPP
-#define POWER_GRID_MODEL_COMPONENT_SHORT_CIRCUIT_HPP
 
 #include "base.hpp"
 
@@ -12,8 +10,8 @@
 #include "../auxiliary/output.hpp"
 #include "../auxiliary/update.hpp"
 #include "../calculation_parameters.hpp"
-#include "../enum.hpp"
-#include "../exception.hpp"
+#include "../common/enum.hpp"
+#include "../common/exception.hpp"
 
 namespace power_grid_model {
 
@@ -219,5 +217,3 @@ class Fault final : public Base {
 };
 
 } // namespace power_grid_model
-
-#endif
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/component/line.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/component/line.hpp
index e151e3caf1..9ab2e03ad3 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/component/line.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/component/line.hpp
@@ -3,8 +3,6 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #pragma once
-#ifndef POWER_GRID_MODEL_COMPONENT_LINE_HPP
-#define POWER_GRID_MODEL_COMPONENT_LINE_HPP
 
 #include "branch.hpp"
 
@@ -12,9 +10,9 @@
 #include "../auxiliary/output.hpp"
 #include "../auxiliary/update.hpp"
 #include "../calculation_parameters.hpp"
-#include "../exception.hpp"
-#include "../power_grid_model.hpp"
-#include "../three_phase_tensor.hpp"
+#include "../common/common.hpp"
+#include "../common/exception.hpp"
+#include "../common/three_phase_tensor.hpp"
 
 namespace power_grid_model {
 
@@ -58,5 +56,3 @@ class Line final : public Branch {
 };
 
 } // namespace power_grid_model
-
-#endif
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/component/link.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/component/link.hpp
index 833d3caeed..a04c76da5b 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/component/link.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/component/link.hpp
@@ -3,8 +3,6 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #pragma once
-#ifndef POWER_GRID_MODEL_COMPONENT_LINK_HPP
-#define POWER_GRID_MODEL_COMPONENT_LINK_HPP
 
 #include "branch.hpp"
 
@@ -12,9 +10,9 @@
 #include "../auxiliary/output.hpp"
 #include "../auxiliary/update.hpp"
 #include "../calculation_parameters.hpp"
-#include "../exception.hpp"
-#include "../power_grid_model.hpp"
-#include "../three_phase_tensor.hpp"
+#include "../common/common.hpp"
+#include "../common/exception.hpp"
+#include "../common/three_phase_tensor.hpp"
 
 namespace power_grid_model {
 
@@ -41,5 +39,3 @@ class Link final : public Branch {
     BranchCalcParam<false> asym_calc_param() const override { return calc_param_y_asym(y_link, 0.0, y_link, 0.0, 1.0); }
 };
 } // namespace power_grid_model
-
-#endif
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/component/load_gen.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/component/load_gen.hpp
index 4e37268363..9c0a42bf52 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/component/load_gen.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/component/load_gen.hpp
@@ -3,8 +3,6 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #pragma once
-#ifndef POWER_GRID_MODEL_COMPONENT_LOAD_GEN_HPP
-#define POWER_GRID_MODEL_COMPONENT_LOAD_GEN_HPP
 
 #include "appliance.hpp"
 #include "base.hpp"
@@ -13,9 +11,9 @@
 #include "../auxiliary/output.hpp"
 #include "../auxiliary/update.hpp"
 #include "../calculation_parameters.hpp"
-#include "../exception.hpp"
-#include "../power_grid_model.hpp"
-#include "../three_phase_tensor.hpp"
+#include "../common/common.hpp"
+#include "../common/exception.hpp"
+#include "../common/three_phase_tensor.hpp"
 
 namespace power_grid_model {
 
@@ -171,5 +169,3 @@ using SymLoad = LoadGen<true, false>;
 using AsymLoad = LoadGen<false, false>;
 
 } // namespace power_grid_model
-
-#endif
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/component/node.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/component/node.hpp
index 494445954f..e2210cdb28 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/component/node.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/component/node.hpp
@@ -3,8 +3,6 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #pragma once
-#ifndef POWER_GRID_MODEL_COMPONENT_NODE_HPP
-#define POWER_GRID_MODEL_COMPONENT_NODE_HPP
 
 #include "base.hpp"
 
@@ -12,8 +10,8 @@
 #include "../auxiliary/output.hpp"
 #include "../auxiliary/update.hpp"
 #include "../calculation_parameters.hpp"
-#include "../power_grid_model.hpp"
-#include "../three_phase_tensor.hpp"
+#include "../common/common.hpp"
+#include "../common/three_phase_tensor.hpp"
 
 namespace power_grid_model {
 
@@ -78,5 +76,3 @@ class Node final : public Base {
 };
 
 } // namespace power_grid_model
-
-#endif
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/component/power_sensor.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/component/power_sensor.hpp
index 13e7d14630..d80fe728e9 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/component/power_sensor.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/component/power_sensor.hpp
@@ -3,15 +3,13 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #pragma once
-#ifndef POWER_GRID_MODEL_COMPONENT_POWER_SENSOR_HPP
-#define POWER_GRID_MODEL_COMPONENT_POWER_SENSOR_HPP
 
 #include "sensor.hpp"
 
 #include "../calculation_parameters.hpp"
-#include "../enum.hpp"
-#include "../exception.hpp"
-#include "../power_grid_model.hpp"
+#include "../common/common.hpp"
+#include "../common/enum.hpp"
+#include "../common/exception.hpp"
 
 namespace power_grid_model {
 
@@ -181,5 +179,3 @@ using SymPowerSensor = PowerSensor<true>;
 using AsymPowerSensor = PowerSensor<false>;
 
 } // namespace power_grid_model
-
-#endif
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/component/sensor.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/component/sensor.hpp
index 46da4c286d..5425d5eb4d 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/component/sensor.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/component/sensor.hpp
@@ -3,8 +3,6 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #pragma once
-#ifndef POWER_GRID_MODEL_COMPONENT_SENSOR_HPP
-#define POWER_GRID_MODEL_COMPONENT_SENSOR_HPP
 
 #include "base.hpp"
 
@@ -12,8 +10,8 @@
 #include "../auxiliary/output.hpp"
 #include "../auxiliary/update.hpp"
 #include "../calculation_parameters.hpp"
-#include "../exception.hpp"
-#include "../power_grid_model.hpp"
+#include "../common/common.hpp"
+#include "../common/exception.hpp"
 
 namespace power_grid_model {
 
@@ -46,5 +44,3 @@ class Sensor : public Base {
 };
 
 } // namespace power_grid_model
-
-#endif
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/component/shunt.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/component/shunt.hpp
index b4e432faff..83902d13e3 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/component/shunt.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/component/shunt.hpp
@@ -3,8 +3,6 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #pragma once
-#ifndef POWER_GRID_MODEL_COMPONENT_SHUNT_HPP
-#define POWER_GRID_MODEL_COMPONENT_SHUNT_HPP
 
 #include "appliance.hpp"
 #include "base.hpp"
@@ -13,8 +11,8 @@
 #include "../auxiliary/output.hpp"
 #include "../auxiliary/update.hpp"
 #include "../calculation_parameters.hpp"
-#include "../power_grid_model.hpp"
-#include "../three_phase_tensor.hpp"
+#include "../common/common.hpp"
+#include "../common/three_phase_tensor.hpp"
 
 namespace power_grid_model {
 
@@ -118,5 +116,3 @@ class Shunt : public Appliance {
 };
 
 } // namespace power_grid_model
-
-#endif
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/component/source.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/component/source.hpp
index 1dccf285e6..e2ecd716fc 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/component/source.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/component/source.hpp
@@ -3,8 +3,6 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #pragma once
-#ifndef POWER_GRID_MODEL_COMPONENT_SOURCE_HPP
-#define POWER_GRID_MODEL_COMPONENT_SOURCE_HPP
 
 #include "appliance.hpp"
 #include "base.hpp"
@@ -13,8 +11,8 @@
 #include "../auxiliary/output.hpp"
 #include "../auxiliary/update.hpp"
 #include "../calculation_parameters.hpp"
-#include "../power_grid_model.hpp"
-#include "../three_phase_tensor.hpp"
+#include "../common/common.hpp"
+#include "../common/three_phase_tensor.hpp"
 
 namespace power_grid_model {
 
@@ -138,5 +136,3 @@ class Source : public Appliance {
 };
 
 } // namespace power_grid_model
-
-#endif
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/component/three_winding_transformer.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/component/three_winding_transformer.hpp
index aec1eca7f4..2ecc71eb75 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/component/three_winding_transformer.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/component/three_winding_transformer.hpp
@@ -3,8 +3,6 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #pragma once
-#ifndef POWER_GRID_MODEL_COMPONENT_THREE_WINDING_TRANSFORMER_HPP
-#define POWER_GRID_MODEL_COMPONENT_THREE_WINDING_TRANSFORMER_HPP
 
 #include "branch3.hpp"
 #include "transformer.hpp"
@@ -405,5 +403,3 @@ class ThreeWindingTransformer : public Branch3 {
 };
 
 } // namespace power_grid_model
-
-#endif
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/component/transformer.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/component/transformer.hpp
index a24f75cfa4..fe938225bc 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/component/transformer.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/component/transformer.hpp
@@ -3,8 +3,6 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #pragma once
-#ifndef POWER_GRID_MODEL_COMPONENT_TRANSFORMER_HPP
-#define POWER_GRID_MODEL_COMPONENT_TRANSFORMER_HPP
 
 #include "branch.hpp"
 #include "transformer_utils.hpp"
@@ -13,9 +11,9 @@
 #include "../auxiliary/output.hpp"
 #include "../auxiliary/update.hpp"
 #include "../calculation_parameters.hpp"
-#include "../exception.hpp"
-#include "../power_grid_model.hpp"
-#include "../three_phase_tensor.hpp"
+#include "../common/common.hpp"
+#include "../common/exception.hpp"
+#include "../common/three_phase_tensor.hpp"
 
 namespace power_grid_model {
 
@@ -263,5 +261,3 @@ class Transformer : public Branch {
 };
 
 } // namespace power_grid_model
-
-#endif
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/component/transformer_utils.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/component/transformer_utils.hpp
index 112fe644e2..5867fecd44 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/component/transformer_utils.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/component/transformer_utils.hpp
@@ -3,10 +3,8 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #pragma once
-#ifndef POWER_GRID_MODEL_COMPONENT_TRANSFORMER_UTILS_HPP
-#define POWER_GRID_MODEL_COMPONENT_TRANSFORMER_UTILS_HPP
 
-#include "../enum.hpp"
+#include "../common/enum.hpp"
 
 namespace power_grid_model {
 
@@ -45,5 +43,3 @@ constexpr bool is_valid_clock(IntS clock, WindingType winding_from, WindingType
 // add tap
 
 } // namespace power_grid_model
-
-#endif
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/component/voltage_sensor.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/component/voltage_sensor.hpp
index 99ab90d666..d5bd70613a 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/component/voltage_sensor.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/component/voltage_sensor.hpp
@@ -3,15 +3,13 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #pragma once
-#ifndef POWER_GRID_MODEL_COMPONENT_VOLTAGE_SENSOR_HPP
-#define POWER_GRID_MODEL_COMPONENT_VOLTAGE_SENSOR_HPP
 
 #include "sensor.hpp"
 
 #include "../calculation_parameters.hpp"
-#include "../exception.hpp"
-#include "../power_grid_model.hpp"
-#include "../three_phase_tensor.hpp"
+#include "../common/common.hpp"
+#include "../common/exception.hpp"
+#include "../common/three_phase_tensor.hpp"
 
 #include <limits>
 
@@ -172,5 +170,3 @@ using SymVoltageSensor = VoltageSensor<true>;
 using AsymVoltageSensor = VoltageSensor<false>;
 
 } // namespace power_grid_model
-
-#endif
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/container.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/container.hpp
index 63d5dca2f1..b210726d6f 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/container.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/container.hpp
@@ -3,19 +3,19 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #pragma once
-#ifndef POWER_GRID_MODEL_CONTAINER_HPP
-#define POWER_GRID_MODEL_CONTAINER_HPP
 
 // container for multiple components
 
-#include "exception.hpp"
-#include "power_grid_model.hpp"
+#include "common/common.hpp"
+#include "common/exception.hpp"
 
 #include <boost/iterator/iterator_facade.hpp>
 #include <boost/range.hpp>
 
+#include <array>
 #include <functional>
 #include <memory>
+#include <numeric>
 #include <unordered_map>
 
 namespace power_grid_model {
@@ -327,5 +327,3 @@ template <class... T> using ExtraRetrievableTypes = container_impl::ExtraRetriev
 template <class... T> using Container = typename container_impl::container_trait<T...>::type;
 
 } // namespace power_grid_model
-
-#endif
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/index_mapping.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/index_mapping.hpp
index f2f06f9f83..15a895164a 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/index_mapping.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/index_mapping.hpp
@@ -3,12 +3,11 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #pragma once
-#ifndef POWER_GRID_MODEL_INDEX_MAPPING_HPP
-#define POWER_GRID_MODEL_INDEX_MAPPING_HPP
 
-#include "grouped_index_vector.hpp"
-#include "power_grid_model.hpp"
+#include "common/common.hpp"
+#include "common/grouped_index_vector.hpp"
 
+#include <numeric>
 #include <ranges>
 
 namespace power_grid_model {
@@ -51,7 +50,7 @@ struct SparseIndexMapping {
 ///     A 0			coupled to B 3
 ///     nothing		coupled to B 4
 ///     A 1			coupled	to B 5
-///     nothing	coupled to B 6
+///     nothing	    coupled to B 6
 inline SparseIndexMapping build_sparse_mapping(IdxVector const& idx_B_in_A, Idx const n_B) {
     using SparseEntry = std::pair<Idx, Idx>;
 
@@ -138,5 +137,3 @@ inline DenseIndexMapping build_dense_mapping(IdxVector const& idx_B_in_A, Idx co
 }
 
 } // namespace power_grid_model
-
-#endif
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/calculation_info.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/calculation_info.hpp
index e7cde07e34..cc5f1879aa 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/calculation_info.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/calculation_info.hpp
@@ -3,10 +3,8 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #pragma once
-#ifndef POWER_GRID_MODEL_MAIN_CORE_CALCULATION_INFO_HPP
-#define POWER_GRID_MODEL_MAIN_CORE_CALCULATION_INFO_HPP
 
-#include "../power_grid_model.hpp"
+#include "../common/common.hpp"
 
 namespace power_grid_model::main_core {
 
@@ -28,5 +26,3 @@ inline CalculationInfo merge_calculation_info(std::vector<CalculationInfo> const
 }
 
 } // namespace power_grid_model::main_core
-
-#endif
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/input.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/input.hpp
index 9476263178..f7e5998692 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/input.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/input.hpp
@@ -3,8 +3,6 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #pragma once
-#ifndef POWER_GRID_MODEL_MAIN_CORE_INPUT_HPP
-#define POWER_GRID_MODEL_MAIN_CORE_INPUT_HPP
 
 #include "state.hpp"
 
@@ -98,5 +96,3 @@ inline void add_component(MainModelState<ComponentContainer>& state, ForwardIter
 }
 
 } // namespace power_grid_model::main_core
-
-#endif
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/math_state.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/math_state.hpp
index 9eece17ebb..9507ae5901 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/math_state.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/math_state.hpp
@@ -3,8 +3,6 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #pragma once
-#ifndef POWER_GRID_MODEL_MAIN_CORE_MATH_STATE_HPP
-#define POWER_GRID_MODEL_MAIN_CORE_MATH_STATE_HPP
 
 #include "../math_solver/y_bus.hpp"
 
@@ -25,5 +23,3 @@ inline void clear(MathState& math_state) {
 }
 
 } // namespace power_grid_model::main_core
-
-#endif
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/output.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/output.hpp
index 276b86c729..bc9d02be2b 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/output.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/output.hpp
@@ -3,8 +3,6 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #pragma once
-#ifndef POWER_GRID_MODEL_MAIN_CORE_OUTPUT_HPP
-#define POWER_GRID_MODEL_MAIN_CORE_OUTPUT_HPP
 
 #include "state.hpp"
 
@@ -418,5 +416,3 @@ constexpr ResIt output_result(MainModelState<ComponentContainer> const& state,
 }
 
 } // namespace power_grid_model::main_core
-
-#endif
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/state.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/state.hpp
index a75e661fbf..2a436da4df 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/state.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/state.hpp
@@ -3,8 +3,6 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #pragma once
-#ifndef POWER_GRID_MODEL_MAIN_CORE_STATE_HPP
-#define POWER_GRID_MODEL_MAIN_CORE_STATE_HPP
 
 #include "../calculation_parameters.hpp"
 #include "../container.hpp"
@@ -46,5 +44,3 @@ concept model_component_state =
     std::same_as<StateType<ContainerType>, MainModelState<ContainerType>>;
 
 } // namespace power_grid_model::main_core
-
-#endif
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/topology.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/topology.hpp
index 21adc697cb..db06dd0286 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/topology.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/topology.hpp
@@ -3,8 +3,6 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #pragma once
-#ifndef POWER_GRID_MODEL_MAIN_CORE_TOPOLOGY_HPP
-#define POWER_GRID_MODEL_MAIN_CORE_TOPOLOGY_HPP
 
 #include "state.hpp"
 
@@ -140,5 +138,3 @@ constexpr void register_topology_components(MainModelState<ComponentContainer> c
 }
 
 } // namespace power_grid_model::main_core
-
-#endif
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/update.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/update.hpp
index 85792bfac4..48166e2aa2 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/update.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/update.hpp
@@ -3,8 +3,6 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #pragma once
-#ifndef POWER_GRID_MODEL_MAIN_CORE_UPDATE_HPP
-#define POWER_GRID_MODEL_MAIN_CORE_UPDATE_HPP
 
 #include "state.hpp"
 
@@ -144,5 +142,3 @@ inline void update_y_bus(MathState& math_state, std::vector<MathModelParam<sym>>
 }
 
 } // namespace power_grid_model::main_core
-
-#endif
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/main_model.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/main_model.hpp
index 095fe0aacc..6878e4c07a 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/main_model.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/main_model.hpp
@@ -3,19 +3,20 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #pragma once
-#ifndef POWER_GRID_MODEL_MAIN_MODEL_HPP
-#define POWER_GRID_MODEL_MAIN_MODEL_HPP
 
 // main model class
 
 // main include
+#include "batch_parameter.hpp"
 #include "calculation_parameters.hpp"
 #include "container.hpp"
-#include "exception.hpp"
-#include "power_grid_model.hpp"
-#include "timer.hpp"
 #include "topology.hpp"
 
+// common
+#include "common/common.hpp"
+#include "common/exception.hpp"
+#include "common/timer.hpp"
+
 // component include
 #include "all_components.hpp"
 #include "auxiliary/dataset.hpp"
@@ -1303,5 +1304,3 @@ using MainModel =
                   AllComponents>;
 
 } // namespace power_grid_model
-
-#endif
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/block_matrix.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/block_matrix.hpp
index 44ad89168e..386f74fc40 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/block_matrix.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/block_matrix.hpp
@@ -3,14 +3,12 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #pragma once
-#ifndef POWER_GRID_MODEL_MATH_SOLVER_BLOCK_MATRIX_HPP
-#define POWER_GRID_MODEL_MATH_SOLVER_BLOCK_MATRIX_HPP
 
 // define block matrix entry for several calculations
 // the name of block matrix getter can be overwritten by sub matrix
 
-#include "../power_grid_model.hpp"
-#include "../three_phase_tensor.hpp"
+#include "../common/common.hpp"
+#include "../common/three_phase_tensor.hpp"
 
 namespace power_grid_model::math_solver {
 
@@ -91,5 +89,3 @@ class Block : public block_trait<T, sym, is_tensor, n_sub_block>::ArrayType {
 };
 
 } // namespace power_grid_model::math_solver
-
-#endif
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/common_solver_functions.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/common_solver_functions.hpp
index 3047e7fa15..5f29e60d1e 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/common_solver_functions.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/common_solver_functions.hpp
@@ -3,14 +3,12 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #pragma once
-#ifndef POWER_GRID_MODEL_COMMON_SOLVER_FUNCTIONS_HPP
-#define POWER_GRID_MODEL_COMMON_SOLVER_FUNCTIONS_HPP
 
 #include "measured_values.hpp"
 #include "y_bus.hpp"
 
 #include "../calculation_parameters.hpp"
-#include "../exception.hpp"
+#include "../common/exception.hpp"
 
 namespace power_grid_model::math_solver::detail {
 
@@ -110,5 +108,3 @@ inline void calculate_se_result(YBus<sym> const& y_bus, MeasuredValues<sym> cons
 }
 
 } // namespace power_grid_model::math_solver::detail
-
-#endif
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/iterative_current_pf_solver.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/iterative_current_pf_solver.hpp
index 32f29159f7..bfcf8939db 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/iterative_current_pf_solver.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/iterative_current_pf_solver.hpp
@@ -4,8 +4,6 @@
 
 // Check if the name means anything
 #pragma once
-#ifndef POWER_GRID_MODEL_MATH_SOLVER_ITERATIVE_CURRENT_PF_SOLVER_HPP
-#define POWER_GRID_MODEL_MATH_SOLVER_ITERATIVE_CURRENT_PF_SOLVER_HPP
 
 /*
 Iterative Power Flow
@@ -61,10 +59,10 @@ Iterative Power Flow
 #include "y_bus.hpp"
 
 #include "../calculation_parameters.hpp"
-#include "../exception.hpp"
-#include "../power_grid_model.hpp"
-#include "../three_phase_tensor.hpp"
-#include "../timer.hpp"
+#include "../common/common.hpp"
+#include "../common/exception.hpp"
+#include "../common/three_phase_tensor.hpp"
+#include "../common/timer.hpp"
 
 namespace power_grid_model::math_solver {
 
@@ -198,5 +196,3 @@ template class IterativeCurrentPFSolver<false>;
 using iterative_current_pf::IterativeCurrentPFSolver;
 
 } // namespace power_grid_model::math_solver
-
-#endif
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/iterative_linear_se_solver.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/iterative_linear_se_solver.hpp
index 6e95525cbe..406aa1dcad 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/iterative_linear_se_solver.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/iterative_linear_se_solver.hpp
@@ -3,8 +3,6 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #pragma once
-#ifndef POWER_GRID_MODEL_MATH_SOLVER_ITERATIVE_LINEAR_SE_SOLVER_HPP
-#define POWER_GRID_MODEL_MATH_SOLVER_ITERATIVE_LINEAR_SE_SOLVER_HPP
 
 // iterative linear state estimation solver
 
@@ -15,10 +13,10 @@
 #include "y_bus.hpp"
 
 #include "../calculation_parameters.hpp"
-#include "../exception.hpp"
-#include "../power_grid_model.hpp"
-#include "../three_phase_tensor.hpp"
-#include "../timer.hpp"
+#include "../common/common.hpp"
+#include "../common/exception.hpp"
+#include "../common/three_phase_tensor.hpp"
+#include "../common/timer.hpp"
 
 namespace power_grid_model::math_solver {
 
@@ -357,5 +355,3 @@ template class IterativeLinearSESolver<false>;
 using iterative_linear_se::IterativeLinearSESolver;
 
 } // namespace power_grid_model::math_solver
-
-#endif
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/iterative_pf_solver.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/iterative_pf_solver.hpp
index 4b96e7c5da..a42fa62c10 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/iterative_pf_solver.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/iterative_pf_solver.hpp
@@ -3,8 +3,6 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #pragma once
-#ifndef POWER_GRID_MODEL_MATH_SOLVER_ITERATIVE_PF_SOLVER_HPP
-#define POWER_GRID_MODEL_MATH_SOLVER_ITERATIVE_PF_SOLVER_HPP
 
 /*
  * Class to house common functions of newton raphson and iterative current method
@@ -15,10 +13,10 @@
 #include "y_bus.hpp"
 
 #include "../calculation_parameters.hpp"
-#include "../exception.hpp"
-#include "../power_grid_model.hpp"
-#include "../three_phase_tensor.hpp"
-#include "../timer.hpp"
+#include "../common/common.hpp"
+#include "../common/exception.hpp"
+#include "../common/three_phase_tensor.hpp"
+#include "../common/timer.hpp"
 
 namespace power_grid_model::math_solver {
 
@@ -121,5 +119,3 @@ template <bool sym, typename DerivedSolver> class IterativePFSolver {
 };
 
 } // namespace power_grid_model::math_solver
-
-#endif
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/linear_pf_solver.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/linear_pf_solver.hpp
index f75a38920b..ebaa171c5e 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/linear_pf_solver.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/linear_pf_solver.hpp
@@ -3,8 +3,6 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #pragma once
-#ifndef POWER_GRID_MODEL_MATH_SOLVER_LINEAR_PF_SOLVER_HPP
-#define POWER_GRID_MODEL_MATH_SOLVER_LINEAR_PF_SOLVER_HPP
 
 /*
 Linear PF solver for constant impedance
@@ -35,10 +33,10 @@ if there are sources
 #include "y_bus.hpp"
 
 #include "../calculation_parameters.hpp"
-#include "../exception.hpp"
-#include "../power_grid_model.hpp"
-#include "../three_phase_tensor.hpp"
-#include "../timer.hpp"
+#include "../common/common.hpp"
+#include "../common/exception.hpp"
+#include "../common/three_phase_tensor.hpp"
+#include "../common/timer.hpp"
 
 namespace power_grid_model::math_solver {
 
@@ -127,5 +125,3 @@ template class LinearPFSolver<false>;
 using linear_pf::LinearPFSolver;
 
 } // namespace power_grid_model::math_solver
-
-#endif
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/math_solver.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/math_solver.hpp
index 4ce7aac706..31fe007900 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/math_solver.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/math_solver.hpp
@@ -3,8 +3,6 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #pragma once
-#ifndef POWER_GRID_MODEL_MATH_SOLVER_MATH_SOLVER_HPP
-#define POWER_GRID_MODEL_MATH_SOLVER_MATH_SOLVER_HPP
 
 #include "iterative_current_pf_solver.hpp"
 #include "iterative_linear_se_solver.hpp"
@@ -15,10 +13,10 @@
 #include "y_bus.hpp"
 
 #include "../calculation_parameters.hpp"
-#include "../exception.hpp"
-#include "../power_grid_model.hpp"
-#include "../three_phase_tensor.hpp"
-#include "../timer.hpp"
+#include "../common/common.hpp"
+#include "../common/exception.hpp"
+#include "../common/three_phase_tensor.hpp"
+#include "../common/timer.hpp"
 
 #include <optional>
 
@@ -184,5 +182,3 @@ template class MathSolver<false>;
 using math_solver::MathSolver;
 
 } // namespace power_grid_model
-
-#endif
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/measured_values.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/measured_values.hpp
index af2525da5b..feb80eab26 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/measured_values.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/measured_values.hpp
@@ -3,15 +3,15 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #pragma once
-#ifndef POWER_GRID_MODEL_MATH_SOLVER_MEASURED_VALUES_HPP
-#define POWER_GRID_MODEL_MATH_SOLVER_MEASURED_VALUES_HPP
 
 /*
 Collect all measured Values
 */
 
 #include "../calculation_parameters.hpp"
-#include "../three_phase_tensor.hpp"
+#include "../common/three_phase_tensor.hpp"
+
+#include <memory>
 
 namespace power_grid_model::math_solver {
 
@@ -607,5 +607,3 @@ template <bool sym> class MeasuredValues {
 template class MeasuredValues<true>;
 template class MeasuredValues<false>;
 } // namespace power_grid_model::math_solver
-
-#endif
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/newton_raphson_pf_solver.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/newton_raphson_pf_solver.hpp
index 48201b2b56..3ff15d3162 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/newton_raphson_pf_solver.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/newton_raphson_pf_solver.hpp
@@ -3,8 +3,6 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #pragma once
-#ifndef POWER_GRID_MODEL_MATH_SOLVER_NEWTON_RAPHSON_PF_SOLVER_HPP
-#define POWER_GRID_MODEL_MATH_SOLVER_NEWTON_RAPHSON_PF_SOLVER_HPP
 
 /*
 Newton Raphson Power Flow
@@ -152,10 +150,10 @@ J.L -= -dQ_cal_m/dV
 #include "y_bus.hpp"
 
 #include "../calculation_parameters.hpp"
-#include "../exception.hpp"
-#include "../power_grid_model.hpp"
-#include "../three_phase_tensor.hpp"
-#include "../timer.hpp"
+#include "../common/common.hpp"
+#include "../common/exception.hpp"
+#include "../common/three_phase_tensor.hpp"
+#include "../common/timer.hpp"
 
 namespace power_grid_model::math_solver {
 
@@ -440,5 +438,3 @@ template class NewtonRaphsonPFSolver<false>;
 using newton_raphson_pf::NewtonRaphsonPFSolver;
 
 } // namespace power_grid_model::math_solver
-
-#endif
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/newton_raphson_se_solver.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/newton_raphson_se_solver.hpp
index 6867402dc0..6740f97b3c 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/newton_raphson_se_solver.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/newton_raphson_se_solver.hpp
@@ -3,8 +3,6 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #pragma once
-#ifndef POWER_GRID_MODEL_MATH_SOLVER_NEWTON_RAPHSON_SE_SOLVER_HPP
-#define POWER_GRID_MODEL_MATH_SOLVER_NEWTON_RAPHSON_SE_SOLVER_HPP
 
 // Newton Raphson state estimation solver
 
@@ -14,7 +12,8 @@
 #include "y_bus.hpp"
 
 #include "../calculation_parameters.hpp"
-#include "../three_phase_tensor.hpp"
+#include "../common/three_phase_tensor.hpp"
+#include "../common/timer.hpp"
 
 namespace power_grid_model::math_solver {
 
@@ -699,5 +698,3 @@ template class NewtonRaphsonSESolver<false>;
 using newton_raphson_se::NewtonRaphsonSESolver;
 
 } // namespace power_grid_model::math_solver
-
-#endif
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/short_circuit_solver.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/short_circuit_solver.hpp
index 361729cd57..df3848029e 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/short_circuit_solver.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/short_circuit_solver.hpp
@@ -3,16 +3,14 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #pragma once
-#ifndef POWER_GRID_MODEL_MATH_SOLVER_SHORT_CIRCUIT_SOLVER_HPP
-#define POWER_GRID_MODEL_MATH_SOLVER_SHORT_CIRCUIT_SOLVER_HPP
 
 #include "common_solver_functions.hpp"
 #include "sparse_lu_solver.hpp"
 #include "y_bus.hpp"
 
 #include "../calculation_parameters.hpp"
-#include "../enum.hpp"
-#include "../exception.hpp"
+#include "../common/enum.hpp"
+#include "../common/exception.hpp"
 
 namespace power_grid_model::math_solver {
 
@@ -446,5 +444,3 @@ template class ShortCircuitSolver<false>;
 using short_circuit::ShortCircuitSolver;
 
 } // namespace power_grid_model::math_solver
-
-#endif
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/sparse_lu_solver.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/sparse_lu_solver.hpp
index df3cb72ca0..9413aef6b9 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/sparse_lu_solver.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/sparse_lu_solver.hpp
@@ -3,13 +3,11 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #pragma once
-#ifndef POWER_GRID_MODEL_MATH_SOLVER_SPARSE_LU_SOLVER_HPP
-#define POWER_GRID_MODEL_MATH_SOLVER_SPARSE_LU_SOLVER_HPP
 
-#include "../exception.hpp"
-#include "../power_grid_model.hpp"
-#include "../three_phase_tensor.hpp"
-#include "../typing.hpp"
+#include "../common/common.hpp"
+#include "../common/exception.hpp"
+#include "../common/three_phase_tensor.hpp"
+#include "../common/typing.hpp"
 
 #include <memory>
 
@@ -333,5 +331,3 @@ template <class Tensor, class RHSVector, class XVector> class SparseLUSolver {
 };
 
 } // namespace power_grid_model::math_solver
-
-#endif
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/y_bus.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/y_bus.hpp
index e3ce351836..d72627dfd5 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/y_bus.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/y_bus.hpp
@@ -3,14 +3,14 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #pragma once
-#ifndef POWER_GRID_MODEL_MATH_SOLVER_Y_BUS_HPP
-#define POWER_GRID_MODEL_MATH_SOLVER_Y_BUS_HPP
 
 #include "../calculation_parameters.hpp"
-#include "../power_grid_model.hpp"
-#include "../three_phase_tensor.hpp"
+#include "../common/common.hpp"
+#include "../common/three_phase_tensor.hpp"
 
 #include <algorithm>
+#include <memory>
+#include <numeric>
 #include <ranges>
 
 namespace power_grid_model {
@@ -550,5 +550,3 @@ template class YBus<false>;
 using math_solver::YBus;
 
 } // namespace power_grid_model
-
-#endif
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/topology.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/topology.hpp
index 93d30fcaf6..6bcb7ea5a2 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/topology.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/topology.hpp
@@ -3,14 +3,12 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #pragma once
-#ifndef POWER_GRID_MODEL_TOPOLOGY_HPP
-#define POWER_GRID_MODEL_TOPOLOGY_HPP
 
 #include "calculation_parameters.hpp"
-#include "enum.hpp"
-#include "exception.hpp"
+#include "common/common.hpp"
+#include "common/enum.hpp"
+#include "common/exception.hpp"
 #include "index_mapping.hpp"
-#include "power_grid_model.hpp"
 
 #include <boost/graph/adjacency_list.hpp>
 #include <boost/graph/compressed_sparse_row_graph.hpp>
@@ -692,5 +690,3 @@ class Topology {
 }; // namespace power_grid_model
 
 } // namespace power_grid_model
-
-#endif
diff --git a/power_grid_model_c/power_grid_model_c/src/forward_declarations.hpp b/power_grid_model_c/power_grid_model_c/src/forward_declarations.hpp
index 5752be0413..546c3cb868 100644
--- a/power_grid_model_c/power_grid_model_c/src/forward_declarations.hpp
+++ b/power_grid_model_c/power_grid_model_c/src/forward_declarations.hpp
@@ -3,8 +3,6 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #pragma once
-#ifndef POWER_GRID_MODEL_C_FORWARD_DECLARATION_HPP
-#define POWER_GRID_MODEL_C_FORWARD_DECLARATION_HPP
 
 #ifndef PGM_DLL_EXPORTS
 #define PGM_DLL_EXPORTS
@@ -37,5 +35,3 @@ using PGM_ConstDataset = power_grid_model::meta_data::DatasetHandler<false, fals
 using PGM_MutableDataset = power_grid_model::meta_data::DatasetHandler<true, false>;
 using PGM_WritableDataset = power_grid_model::meta_data::DatasetHandler<true, true>;
 using PGM_DatasetInfo = power_grid_model::meta_data::DatasetInfo;
-
-#endif
diff --git a/power_grid_model_c/power_grid_model_c/src/handle.cpp b/power_grid_model_c/power_grid_model_c/src/handle.cpp
index fc7257bb4c..b2a59523e1 100644
--- a/power_grid_model_c/power_grid_model_c/src/handle.cpp
+++ b/power_grid_model_c/power_grid_model_c/src/handle.cpp
@@ -9,6 +9,8 @@
 
 #include "handle.hpp"
 
+#include <algorithm>
+
 namespace {
 using namespace power_grid_model;
 } // namespace
diff --git a/power_grid_model_c/power_grid_model_c/src/handle.hpp b/power_grid_model_c/power_grid_model_c/src/handle.hpp
index d9baa62a73..f630f9128b 100644
--- a/power_grid_model_c/power_grid_model_c/src/handle.hpp
+++ b/power_grid_model_c/power_grid_model_c/src/handle.hpp
@@ -3,8 +3,6 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #pragma once
-#ifndef POWER_GRID_MODEL_C_HANDLE_HPP
-#define POWER_GRID_MODEL_C_HANDLE_HPP
 
 #ifndef PGM_DLL_EXPORTS
 #define PGM_DLL_EXPORTS
@@ -14,7 +12,8 @@
 
 #include "power_grid_model_c/handle.h"
 
-#include <power_grid_model/power_grid_model.hpp>
+#include <power_grid_model/batch_parameter.hpp>
+#include <power_grid_model/common/common.hpp>
 
 #include <string_view>
 
@@ -44,5 +43,3 @@ auto call_with_catch(PGM_Handle* handle, Functor func, PGM_Idx error_code, std::
         return static_cast<ReturnValueType>(empty);
     }
 }
-
-#endif
diff --git a/power_grid_model_c/power_grid_model_c/src/model.cpp b/power_grid_model_c/power_grid_model_c/src/model.cpp
index b264734a8f..127db855a9 100644
--- a/power_grid_model_c/power_grid_model_c/src/model.cpp
+++ b/power_grid_model_c/power_grid_model_c/src/model.cpp
@@ -12,8 +12,8 @@
 
 #include <power_grid_model/auxiliary/dataset_handler.hpp>
 #include <power_grid_model/auxiliary/meta_data_gen.hpp>
+#include <power_grid_model/common/common.hpp>
 #include <power_grid_model/main_model.hpp>
-#include <power_grid_model/power_grid_model.hpp>
 
 namespace {
 using namespace power_grid_model;
diff --git a/power_grid_model_c/power_grid_model_c/src/options.hpp b/power_grid_model_c/power_grid_model_c/src/options.hpp
index 5154444a0a..5470269571 100644
--- a/power_grid_model_c/power_grid_model_c/src/options.hpp
+++ b/power_grid_model_c/power_grid_model_c/src/options.hpp
@@ -3,8 +3,6 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #pragma once
-#ifndef POWER_GRID_MODEL_C_OPTIONS_HPP
-#define POWER_GRID_MODEL_C_OPTIONS_HPP
 
 #ifndef PGM_DLL_EXPORTS
 #define PGM_DLL_EXPORTS
@@ -14,7 +12,7 @@
 
 #include "power_grid_model_c/options.h"
 
-#include <power_grid_model/power_grid_model.hpp>
+#include <power_grid_model/common/common.hpp>
 
 // options
 struct PGM_Options {
@@ -28,5 +26,3 @@ struct PGM_Options {
     Idx short_circuit_voltage_scaling{PGM_short_circuit_voltage_scaling_maximum};
     Idx experimental_features{PGM_experimental_features_disabled};
 };
-
-#endif
diff --git a/tests/benchmark_cpp/benchmark.cpp b/tests/benchmark_cpp/benchmark.cpp
index 7ae61ea605..d2b2f99b5e 100644
--- a/tests/benchmark_cpp/benchmark.cpp
+++ b/tests/benchmark_cpp/benchmark.cpp
@@ -4,8 +4,8 @@
 
 #include "fictional_grid_generator.hpp"
 
+#include <power_grid_model/common/timer.hpp>
 #include <power_grid_model/main_model.hpp>
-#include <power_grid_model/timer.hpp>
 
 #include <iostream>
 #include <random>
diff --git a/tests/c_api_tests/c_api_cpp_handle.hpp b/tests/c_api_tests/c_api_cpp_handle.hpp
index 777591815d..13050409f4 100644
--- a/tests/c_api_tests/c_api_cpp_handle.hpp
+++ b/tests/c_api_tests/c_api_cpp_handle.hpp
@@ -3,8 +3,6 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #pragma once
-#ifndef POWER_GRID_MODEL_C_API_CPP_HANDLE_HPP
-#define POWER_GRID_MODEL_C_API_CPP_HANDLE_HPP
 
 #include "power_grid_model_c.h"
 
@@ -28,5 +26,3 @@ using ConstDatasetPtr = std::unique_ptr<PGM_ConstDataset, DeleterFunctor<&PGM_de
 using MutableDatasetPtr = std::unique_ptr<PGM_MutableDataset, DeleterFunctor<&PGM_destroy_dataset_mutable>>;
 
 } // namespace power_grid_model
-
-#endif // POWER_GRID_MODEL_C_API_CPP_HANDLE_HPP
diff --git a/tests/cpp_unit_tests/test_grouped_index_vector.cpp b/tests/cpp_unit_tests/test_grouped_index_vector.cpp
index 60fd0e20e5..9e71a111c5 100644
--- a/tests/cpp_unit_tests/test_grouped_index_vector.cpp
+++ b/tests/cpp_unit_tests/test_grouped_index_vector.cpp
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #include <doctest/doctest.h>
-#include <power_grid_model/grouped_index_vector.hpp>
+#include <power_grid_model/common/grouped_index_vector.hpp>
 
 namespace power_grid_model {
 
diff --git a/tests/cpp_unit_tests/test_math_solver.cpp b/tests/cpp_unit_tests/test_math_solver.cpp
index 2e9b293111..7b222e9a97 100644
--- a/tests/cpp_unit_tests/test_math_solver.cpp
+++ b/tests/cpp_unit_tests/test_math_solver.cpp
@@ -4,10 +4,10 @@
 
 // In this unit test the powerflow, state estimation and short circuit solvers are tested
 
-#include <power_grid_model/exception.hpp>
+#include <power_grid_model/common/exception.hpp>
+#include <power_grid_model/common/three_phase_tensor.hpp>
 #include <power_grid_model/math_solver/math_solver.hpp>
 #include <power_grid_model/math_solver/newton_raphson_pf_solver.hpp>
-#include <power_grid_model/three_phase_tensor.hpp>
 
 #include <doctest/doctest.h>
 
diff --git a/tests/cpp_unit_tests/test_meta_data_generation.cpp b/tests/cpp_unit_tests/test_meta_data_generation.cpp
index deb93058ba..df01a48547 100644
--- a/tests/cpp_unit_tests/test_meta_data_generation.cpp
+++ b/tests/cpp_unit_tests/test_meta_data_generation.cpp
@@ -4,7 +4,7 @@
 
 #include <power_grid_model/auxiliary/meta_data.hpp>
 #include <power_grid_model/auxiliary/meta_data_gen.hpp>
-#include <power_grid_model/three_phase_tensor.hpp>
+#include <power_grid_model/common/three_phase_tensor.hpp>
 
 #include <doctest/doctest.h>
 
diff --git a/tests/cpp_unit_tests/test_sparse_lu_solver.cpp b/tests/cpp_unit_tests/test_sparse_lu_solver.cpp
index 932895111e..af9542f8f5 100644
--- a/tests/cpp_unit_tests/test_sparse_lu_solver.cpp
+++ b/tests/cpp_unit_tests/test_sparse_lu_solver.cpp
@@ -2,8 +2,8 @@
 //
 // SPDX-License-Identifier: MPL-2.0
 
+#include <power_grid_model/common/three_phase_tensor.hpp>
 #include <power_grid_model/math_solver/sparse_lu_solver.hpp>
-#include <power_grid_model/three_phase_tensor.hpp>
 
 #include <doctest/doctest.h>
 
diff --git a/tests/cpp_unit_tests/test_three_phase_tensor.cpp b/tests/cpp_unit_tests/test_three_phase_tensor.cpp
index 7a29c10089..39ef33f16c 100644
--- a/tests/cpp_unit_tests/test_three_phase_tensor.cpp
+++ b/tests/cpp_unit_tests/test_three_phase_tensor.cpp
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #include <power_grid_model/auxiliary/output.hpp>
-#include <power_grid_model/three_phase_tensor.hpp>
+#include <power_grid_model/common/three_phase_tensor.hpp>
 
 #include <doctest/doctest.h>
 
diff --git a/tests/cpp_unit_tests/test_typing.cpp b/tests/cpp_unit_tests/test_typing.cpp
index 0a2f624da1..32c4bda012 100644
--- a/tests/cpp_unit_tests/test_typing.cpp
+++ b/tests/cpp_unit_tests/test_typing.cpp
@@ -2,8 +2,8 @@
 //
 // SPDX-License-Identifier: MPL-2.0
 
-#include <power_grid_model/power_grid_model.hpp>
-#include <power_grid_model/typing.hpp>
+#include <power_grid_model/common/common.hpp>
+#include <power_grid_model/common/typing.hpp>
 
 #include <doctest/doctest.h>
 
diff --git a/tests/cpp_unit_tests/test_voltage_sensor.cpp b/tests/cpp_unit_tests/test_voltage_sensor.cpp
index fcc59d8a0e..1dc2f95fbb 100644
--- a/tests/cpp_unit_tests/test_voltage_sensor.cpp
+++ b/tests/cpp_unit_tests/test_voltage_sensor.cpp
@@ -4,10 +4,10 @@
 
 #include <power_grid_model/auxiliary/input.hpp>
 #include <power_grid_model/calculation_parameters.hpp>
+#include <power_grid_model/common/common.hpp>
+#include <power_grid_model/common/three_phase_tensor.hpp>
 #include <power_grid_model/component/sensor.hpp>
 #include <power_grid_model/component/voltage_sensor.hpp>
-#include <power_grid_model/power_grid_model.hpp>
-#include <power_grid_model/three_phase_tensor.hpp>
 
 #include <doctest/doctest.h>
 
diff --git a/tests/cpp_unit_tests/test_y_bus.cpp b/tests/cpp_unit_tests/test_y_bus.cpp
index 06efe4373b..eb3cdfdb69 100644
--- a/tests/cpp_unit_tests/test_y_bus.cpp
+++ b/tests/cpp_unit_tests/test_y_bus.cpp
@@ -2,8 +2,8 @@
 //
 // SPDX-License-Identifier: MPL-2.0
 
+#include <power_grid_model/common/three_phase_tensor.hpp>
 #include <power_grid_model/math_solver/y_bus.hpp>
-#include <power_grid_model/three_phase_tensor.hpp>
 
 #include <doctest/doctest.h>