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 5ab74882b..0e3bd149e 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
@@ -12,7 +12,7 @@
 #include "meta_data.hpp"
 
 #include "../common/enum.hpp"
-#include "../common/power_grid_model.hpp"
+#include "../common/common.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 a605fde22..3aa6bb3d3 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
@@ -12,7 +12,7 @@
 #include "gen_getters.hpp" // NOLINT
 
 #include "../../common/enum.hpp"               // NOLINT
-#include "../../common/power_grid_model.hpp"   // NOLINT
+#include "../../common/common.hpp"   // NOLINT
 #include "../../common/three_phase_tensor.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/all_components.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/all_components.hpp
index 852344953..7d55b48e4 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
@@ -7,8 +7,8 @@
 #define POWER_GRID_MODEL_ALL_COMPONENTS_HPP
 
 // define all components
+#include "common/common.hpp"
 #include "common/component_list.hpp"
-#include "common/power_grid_model.hpp"
 // component include
 #include "component/appliance.hpp"
 #include "component/fault.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 95c76ad45..b3a450260 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
@@ -8,7 +8,7 @@
 
 // define dataset classes with void pointers
 
-#include "../common/power_grid_model.hpp"
+#include "../common/common.hpp"
 
 #include <cassert>
 #include <map>
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 1a603fffc..d4a3f8cb7 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
@@ -8,8 +8,8 @@
 
 // handle dataset and buffer related stuff
 
+#include "../common/common.hpp"
 #include "../common/exception.hpp"
-#include "../common/power_grid_model.hpp"
 #include "dataset.hpp"
 #include "meta_data.hpp"
 #include "meta_data_gen.hpp"
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 c3b154509..9290cbd6b 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
@@ -12,7 +12,7 @@
 #include "meta_data.hpp"
 
 #include "../common/enum.hpp"
-#include "../common/power_grid_model.hpp"
+#include "../common/common.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_data.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/meta_data.hpp
index f7d29be3b..b6251459a 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
@@ -6,9 +6,9 @@
 #ifndef POWER_GRID_MODEL_META_DATA_HPP
 #define POWER_GRID_MODEL_META_DATA_HPP
 
+#include "../common/common.hpp"
 #include "../common/enum.hpp"
 #include "../common/exception.hpp"
-#include "../common/power_grid_model.hpp"
 #include "../common/three_phase_tensor.hpp"
 
 #include <bit>
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 6b0345abc..352b8c633 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
@@ -16,7 +16,7 @@
 #include "update.hpp"
 
 #include "../all_components.hpp"
-#include "../common/power_grid_model.hpp"
+#include "../common/common.hpp"
 
 #include <map>
 #include <string>
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 5de116191..430880305 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
@@ -12,7 +12,7 @@
 #include "gen_getters.hpp" // NOLINT
 
 #include "../../common/enum.hpp"               // NOLINT
-#include "../../common/power_grid_model.hpp"   // NOLINT
+#include "../../common/common.hpp"   // NOLINT
 #include "../../common/three_phase_tensor.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 c503c356c..b01b7afdd 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
@@ -12,7 +12,7 @@
 #include "gen_getters.hpp" // NOLINT
 
 #include "../../common/enum.hpp"               // NOLINT
-#include "../../common/power_grid_model.hpp"   // NOLINT
+#include "../../common/common.hpp"   // NOLINT
 #include "../../common/three_phase_tensor.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 ca88759f1..7e361b835 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
@@ -12,7 +12,7 @@
 #include "gen_getters.hpp" // NOLINT
 
 #include "../../common/enum.hpp"               // NOLINT
-#include "../../common/power_grid_model.hpp"   // NOLINT
+#include "../../common/common.hpp"   // NOLINT
 #include "../../common/three_phase_tensor.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 8e42a56f9..f638cf755 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
@@ -12,7 +12,7 @@
 #include "meta_data.hpp"
 
 #include "../common/enum.hpp"
-#include "../common/power_grid_model.hpp"
+#include "../common/common.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/serialization/deserializer.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/serialization/deserializer.hpp
index aa66a674d..9bfb212d2 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
@@ -6,8 +6,8 @@
 #ifndef POWER_GRID_MODEL_AUXILIARY_SERIALIZTION_DESERIALIZER_HPP
 #define POWER_GRID_MODEL_AUXILIARY_SERIALIZTION_DESERIALIZER_HPP
 
+#include "../../common/common.hpp"
 #include "../../common/exception.hpp"
-#include "../../common/power_grid_model.hpp"
 #include "../dataset_handler.hpp"
 #include "../meta_data.hpp"
 #include "../meta_data_gen.hpp"
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 589f7f5f4..fb16e8301 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
@@ -6,8 +6,8 @@
 #ifndef POWER_GRID_MODEL_AUXILIARY_SERIALIZTION_SERIALIZER_HPP
 #define POWER_GRID_MODEL_AUXILIARY_SERIALIZTION_SERIALIZER_HPP
 
+#include "../../common/common.hpp"
 #include "../../common/exception.hpp"
-#include "../../common/power_grid_model.hpp"
 #include "../dataset_handler.hpp"
 #include "../meta_data.hpp"
 #include "../meta_data_gen.hpp"
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 60f5f3984..1519ce710 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
@@ -12,7 +12,7 @@
 #include "meta_data.hpp"
 
 #include "../common/enum.hpp"
-#include "../common/power_grid_model.hpp"
+#include "../common/common.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/calculation_parameters.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/calculation_parameters.hpp
index 2111cea38..819d83506 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
@@ -6,9 +6,9 @@
 #ifndef POWER_GRID_MODEL_CALCULATION_PARAMETERS_HPP
 #define POWER_GRID_MODEL_CALCULATION_PARAMETERS_HPP
 
+#include "common/common.hpp"
 #include "common/enum.hpp"
 #include "common/grouped_index_vector.hpp"
-#include "common/power_grid_model.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/common/power_grid_model.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/common/common.hpp
similarity index 95%
rename from power_grid_model_c/power_grid_model/include/power_grid_model/common/power_grid_model.hpp
rename to power_grid_model_c/power_grid_model/include/power_grid_model/common/common.hpp
index d0c794674..c76d6c9a3 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/common/power_grid_model.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/common/common.hpp
@@ -3,8 +3,8 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #pragma once
-#ifndef POWER_GRID_MODEL_COMMON_POWER_GRID_MODEL_HPP
-#define POWER_GRID_MODEL_COMMON_POWER_GRID_MODEL_HPP
+#ifndef POWER_GRID_MODEL_COMMON_COMMON_HPP
+#define POWER_GRID_MODEL_COMMON_COMMON_HPP
 
 #include <complex>
 #include <cstddef>
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
index 74621ccec..5a3c91045 100644
--- 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
@@ -6,7 +6,7 @@
 #ifndef POWER_GRID_MODEL_COMMON_COUNTING_ITERATOR_HPP
 #define POWER_GRID_MODEL_COMMON_COUNTING_ITERATOR_HPP
 
-#include "power_grid_model.hpp"
+#include "common.hpp"
 
 #include <boost/iterator/counting_iterator.hpp>
 
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/common/enum.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/common/enum.hpp
index f7e88197d..64b370464 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/common/enum.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/common/enum.hpp
@@ -6,7 +6,7 @@
 #ifndef POWER_GRID_MODEL_COMMON_ENUM_HPP
 #define POWER_GRID_MODEL_COMMON_ENUM_HPP
 
-#include "power_grid_model.hpp"
+#include "common.hpp"
 
 namespace power_grid_model {
 
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/common/exception.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/common/exception.hpp
index f828e1a95..707ec0e03 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/common/exception.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/common/exception.hpp
@@ -6,8 +6,8 @@
 #ifndef POWER_GRID_MODEL_COMMON_EXCEPTION_HPP
 #define POWER_GRID_MODEL_COMMON_EXCEPTION_HPP
 
+#include "common.hpp"
 #include "enum.hpp"
-#include "power_grid_model.hpp"
 
 #include <exception>
 #include <string>
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/common/grouped_index_vector.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/common/grouped_index_vector.hpp
index f7d9ddf4e..90623fb10 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/common/grouped_index_vector.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/common/grouped_index_vector.hpp
@@ -6,8 +6,8 @@
 #ifndef POWER_GRID_MODEL_COMMON_GROUPED_INDEX_VECTOR_HPP
 #define POWER_GRID_MODEL_COMMON_GROUPED_INDEX_VECTOR_HPP
 
+#include "common.hpp"
 #include "counting_iterator.hpp"
-#include "power_grid_model.hpp"
 #include "typing.hpp"
 
 #include <boost/iterator/iterator_facade.hpp>
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/common/three_phase_tensor.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/common/three_phase_tensor.hpp
index 6dd4013be..326ff5c24 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/common/three_phase_tensor.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/common/three_phase_tensor.hpp
@@ -6,7 +6,7 @@
 #ifndef POWER_GRID_MODEL_COMMON_THREE_PHASE_TENSOR_HPP
 #define POWER_GRID_MODEL_COMMON_THREE_PHASE_TENSOR_HPP
 
-#include "power_grid_model.hpp"
+#include "common.hpp"
 
 // eigen properties
 #include <Eigen/Dense>
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/common/timer.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/common/timer.hpp
index 92f8eeae3..6bdb8c03f 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/common/timer.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/common/timer.hpp
@@ -7,7 +7,7 @@
 #define POWER_GRID_MODEL_COMMON_TIMER_HPP
 
 #include "calculation_info.hpp"
-#include "power_grid_model.hpp"
+#include "common.hpp"
 
 #include <chrono>
 #include <iomanip>
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 ecc40d516..27aec6aa7 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
@@ -12,7 +12,7 @@
 #include "../auxiliary/output.hpp"
 #include "../auxiliary/update.hpp"
 #include "../calculation_parameters.hpp"
-#include "../common/power_grid_model.hpp"
+#include "../common/common.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/component/base.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/component/base.hpp
index 3e7db1bd8..e65e414f8 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
@@ -9,8 +9,8 @@
 #include "../auxiliary/input.hpp"
 #include "../auxiliary/output.hpp"
 #include "../auxiliary/update.hpp"
+#include "../common/common.hpp"
 #include "../common/enum.hpp"
-#include "../common/power_grid_model.hpp"
 
 namespace power_grid_model {
 
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 ba332c79b..793d93fa7 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
@@ -12,8 +12,8 @@
 #include "../auxiliary/output.hpp"
 #include "../auxiliary/update.hpp"
 #include "../calculation_parameters.hpp"
+#include "../common/common.hpp"
 #include "../common/exception.hpp"
-#include "../common/power_grid_model.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/component/line.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/component/line.hpp
index 6e8523b4b..848a7b7a0 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
@@ -12,8 +12,8 @@
 #include "../auxiliary/output.hpp"
 #include "../auxiliary/update.hpp"
 #include "../calculation_parameters.hpp"
+#include "../common/common.hpp"
 #include "../common/exception.hpp"
-#include "../common/power_grid_model.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/component/link.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/component/link.hpp
index 7074b0139..1e0520a31 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
@@ -12,8 +12,8 @@
 #include "../auxiliary/output.hpp"
 #include "../auxiliary/update.hpp"
 #include "../calculation_parameters.hpp"
+#include "../common/common.hpp"
 #include "../common/exception.hpp"
-#include "../common/power_grid_model.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/component/load_gen.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/component/load_gen.hpp
index 33d78fa0d..b36156e96 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
@@ -13,8 +13,8 @@
 #include "../auxiliary/output.hpp"
 #include "../auxiliary/update.hpp"
 #include "../calculation_parameters.hpp"
+#include "../common/common.hpp"
 #include "../common/exception.hpp"
-#include "../common/power_grid_model.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/component/node.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/component/node.hpp
index 22158d2e7..7d780aaec 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
@@ -12,7 +12,7 @@
 #include "../auxiliary/output.hpp"
 #include "../auxiliary/update.hpp"
 #include "../calculation_parameters.hpp"
-#include "../common/power_grid_model.hpp"
+#include "../common/common.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/component/power_sensor.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/component/power_sensor.hpp
index bd9b37971..3d091e442 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
@@ -9,9 +9,9 @@
 #include "sensor.hpp"
 
 #include "../calculation_parameters.hpp"
+#include "../common/common.hpp"
 #include "../common/enum.hpp"
 #include "../common/exception.hpp"
-#include "../common/power_grid_model.hpp"
 
 namespace power_grid_model {
 
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 352c20d58..3bb63c2c6 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
@@ -12,8 +12,8 @@
 #include "../auxiliary/output.hpp"
 #include "../auxiliary/update.hpp"
 #include "../calculation_parameters.hpp"
+#include "../common/common.hpp"
 #include "../common/exception.hpp"
-#include "../common/power_grid_model.hpp"
 
 namespace power_grid_model {
 
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 12878f24c..4852ec5f4 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
@@ -13,7 +13,7 @@
 #include "../auxiliary/output.hpp"
 #include "../auxiliary/update.hpp"
 #include "../calculation_parameters.hpp"
-#include "../common/power_grid_model.hpp"
+#include "../common/common.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/component/source.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/component/source.hpp
index 089bd2b05..0baf938ab 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
@@ -13,7 +13,7 @@
 #include "../auxiliary/output.hpp"
 #include "../auxiliary/update.hpp"
 #include "../calculation_parameters.hpp"
-#include "../common/power_grid_model.hpp"
+#include "../common/common.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/component/transformer.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/component/transformer.hpp
index 8d4d21fcb..d4bc11f27 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
@@ -13,8 +13,8 @@
 #include "../auxiliary/output.hpp"
 #include "../auxiliary/update.hpp"
 #include "../calculation_parameters.hpp"
+#include "../common/common.hpp"
 #include "../common/exception.hpp"
-#include "../common/power_grid_model.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/component/voltage_sensor.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/component/voltage_sensor.hpp
index d706f45bf..75f678c6f 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
@@ -9,8 +9,8 @@
 #include "sensor.hpp"
 
 #include "../calculation_parameters.hpp"
+#include "../common/common.hpp"
 #include "../common/exception.hpp"
-#include "../common/power_grid_model.hpp"
 #include "../common/three_phase_tensor.hpp"
 
 #include <limits>
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 1010d2001..47bd148b4 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
@@ -8,8 +8,8 @@
 
 // container for multiple components
 
+#include "common/common.hpp"
 #include "common/exception.hpp"
-#include "common/power_grid_model.hpp"
 
 #include <boost/iterator/iterator_facade.hpp>
 #include <boost/range.hpp>
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 b71bd5265..4db200d4d 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
@@ -6,8 +6,8 @@
 #ifndef POWER_GRID_MODEL_INDEX_MAPPING_HPP
 #define POWER_GRID_MODEL_INDEX_MAPPING_HPP
 
+#include "common/common.hpp"
 #include "common/grouped_index_vector.hpp"
-#include "common/power_grid_model.hpp"
 
 #include <numeric>
 #include <ranges>
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 1789a5e00..9841b53a9 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
@@ -6,7 +6,7 @@
 #ifndef POWER_GRID_MODEL_MAIN_CORE_CALCULATION_INFO_HPP
 #define POWER_GRID_MODEL_MAIN_CORE_CALCULATION_INFO_HPP
 
-#include "../common/power_grid_model.hpp"
+#include "../common/common.hpp"
 
 namespace power_grid_model::main_core {
 
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 c361f52d7..570b8676c 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
@@ -15,8 +15,8 @@
 #include "topology.hpp"
 
 // common
+#include "common/common.hpp"
 #include "common/exception.hpp"
-#include "common/power_grid_model.hpp"
 #include "common/timer.hpp"
 
 // component include
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 6c8f8bfcd..0bd678d61 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
@@ -9,7 +9,7 @@
 // define block matrix entry for several calculations
 // the name of block matrix getter can be overwritten by sub matrix
 
-#include "../common/power_grid_model.hpp"
+#include "../common/common.hpp"
 #include "../common/three_phase_tensor.hpp"
 
 namespace power_grid_model::math_solver {
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 132c77684..7f4b6fd0b 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
@@ -61,8 +61,8 @@ Iterative Power Flow
 #include "y_bus.hpp"
 
 #include "../calculation_parameters.hpp"
+#include "../common/common.hpp"
 #include "../common/exception.hpp"
-#include "../common/power_grid_model.hpp"
 #include "../common/three_phase_tensor.hpp"
 #include "../common/timer.hpp"
 
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 efa0e3c5b..5c485f66c 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
@@ -15,8 +15,8 @@
 #include "y_bus.hpp"
 
 #include "../calculation_parameters.hpp"
+#include "../common/common.hpp"
 #include "../common/exception.hpp"
-#include "../common/power_grid_model.hpp"
 #include "../common/three_phase_tensor.hpp"
 #include "../common/timer.hpp"
 
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 18f6e6262..1bbd43306 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
@@ -15,8 +15,8 @@
 #include "y_bus.hpp"
 
 #include "../calculation_parameters.hpp"
+#include "../common/common.hpp"
 #include "../common/exception.hpp"
-#include "../common/power_grid_model.hpp"
 #include "../common/three_phase_tensor.hpp"
 #include "../common/timer.hpp"
 
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 f649691a7..b7cd92b18 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
@@ -35,8 +35,8 @@ if there are sources
 #include "y_bus.hpp"
 
 #include "../calculation_parameters.hpp"
+#include "../common/common.hpp"
 #include "../common/exception.hpp"
-#include "../common/power_grid_model.hpp"
 #include "../common/three_phase_tensor.hpp"
 #include "../common/timer.hpp"
 
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 5b30d526a..3071eca7a 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
@@ -15,8 +15,8 @@
 #include "y_bus.hpp"
 
 #include "../calculation_parameters.hpp"
+#include "../common/common.hpp"
 #include "../common/exception.hpp"
-#include "../common/power_grid_model.hpp"
 #include "../common/three_phase_tensor.hpp"
 #include "../common/timer.hpp"
 
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 d29a6ec9d..8ef5734da 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
@@ -152,8 +152,8 @@ J.L -= -dQ_cal_m/dV
 #include "y_bus.hpp"
 
 #include "../calculation_parameters.hpp"
+#include "../common/common.hpp"
 #include "../common/exception.hpp"
-#include "../common/power_grid_model.hpp"
 #include "../common/three_phase_tensor.hpp"
 #include "../common/timer.hpp"
 
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 36544fa6e..22315b0f9 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
@@ -6,8 +6,8 @@
 #ifndef POWER_GRID_MODEL_MATH_SOLVER_SPARSE_LU_SOLVER_HPP
 #define POWER_GRID_MODEL_MATH_SOLVER_SPARSE_LU_SOLVER_HPP
 
+#include "../common/common.hpp"
 #include "../common/exception.hpp"
-#include "../common/power_grid_model.hpp"
 #include "../common/three_phase_tensor.hpp"
 #include "../common/typing.hpp"
 
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 e3d7e99a4..35b4889da 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
@@ -7,7 +7,7 @@
 #define POWER_GRID_MODEL_MATH_SOLVER_Y_BUS_HPP
 
 #include "../calculation_parameters.hpp"
-#include "../common/power_grid_model.hpp"
+#include "../common/common.hpp"
 #include "../common/three_phase_tensor.hpp"
 
 #include <algorithm>
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 c9682fd56..f1eeaa5a6 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
@@ -7,9 +7,9 @@
 #define POWER_GRID_MODEL_TOPOLOGY_HPP
 
 #include "calculation_parameters.hpp"
+#include "common/common.hpp"
 #include "common/enum.hpp"
 #include "common/exception.hpp"
-#include "common/power_grid_model.hpp"
 #include "index_mapping.hpp"
 
 #include <boost/graph/adjacency_list.hpp>
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 e9e17b7ea..3882ed2ec 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
@@ -15,7 +15,7 @@
 #include "power_grid_model_c/handle.h"
 
 #include <power_grid_model/batch_parameter.hpp>
-#include <power_grid_model/common/power_grid_model.hpp>
+#include <power_grid_model/common/common.hpp>
 
 #include <string_view>
 
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 7968eea94..127db855a 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,7 +12,7 @@
 
 #include <power_grid_model/auxiliary/dataset_handler.hpp>
 #include <power_grid_model/auxiliary/meta_data_gen.hpp>
-#include <power_grid_model/common/power_grid_model.hpp>
+#include <power_grid_model/common/common.hpp>
 #include <power_grid_model/main_model.hpp>
 
 namespace {
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 9b03d5793..761ec3d99 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
@@ -14,7 +14,7 @@
 
 #include "power_grid_model_c/options.h"
 
-#include <power_grid_model/common/power_grid_model.hpp>
+#include <power_grid_model/common/common.hpp>
 
 // options
 struct PGM_Options {
diff --git a/tests/cpp_unit_tests/test_typing.cpp b/tests/cpp_unit_tests/test_typing.cpp
index 18be8095b..32c4bda01 100644
--- a/tests/cpp_unit_tests/test_typing.cpp
+++ b/tests/cpp_unit_tests/test_typing.cpp
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: MPL-2.0
 
-#include <power_grid_model/common/power_grid_model.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 c724247d8..1dc2f95fb 100644
--- a/tests/cpp_unit_tests/test_voltage_sensor.cpp
+++ b/tests/cpp_unit_tests/test_voltage_sensor.cpp
@@ -4,7 +4,7 @@
 
 #include <power_grid_model/auxiliary/input.hpp>
 #include <power_grid_model/calculation_parameters.hpp>
-#include <power_grid_model/common/power_grid_model.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>