diff --git a/.clang-tidy b/.clang-tidy
index b493ce3ee..127fb9364 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -44,7 +44,6 @@ google-*,
 -google-default-arguments,
 misc-*,
 -misc-confusable-identifiers,
--misc-include-cleaner,
 -misc-no-recursion,
 -misc-non-private-member-variables-in-classes,
 modernize-*,
@@ -68,6 +67,7 @@ readability-*,
 
 WarningsAsErrors: '*'
 
+IgnoreHeaders: 'Eigen/.*'
 
 HeaderFilterRegex: '.*'
 
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 c275535b5..2d72c96e5 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
@@ -5,7 +5,6 @@
 #pragma once
 
 // define all components
-#include "common/common.hpp"
 #include "common/component_list.hpp"
 // component include
 #include "component/appliance.hpp"
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 06b260490..bfdc92ee5 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
@@ -13,6 +13,7 @@
 #include "../common/enum.hpp"
 
 namespace power_grid_model {
+// TODO (nitbharambe) move outside of base.hpp to component
 constexpr IntS status_to_int(bool status) { return status ? IntS{1} : IntS{0}; }
 
 class Base {
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/component/component.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/component/component.hpp
index 18236cbcd..8c1a38ffc 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/component/component.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/component/component.hpp
@@ -36,4 +36,16 @@ concept component_c = requires(T t, T const& ct, typename T::UpdateType u, typen
     { ct.inverse(u) } -> std::same_as<typename T::UpdateType>;
 };
 
+struct load_appliance_t {};
+struct gen_appliance_t {};
+
+template <typename T>
+concept appliance_type_tag = std::same_as<T, load_appliance_t> || std::same_as<T, gen_appliance_t>;
+template <appliance_type_tag T> constexpr bool is_generator_v = std::same_as<T, gen_appliance_t>;
+
+static_assert(appliance_type_tag<load_appliance_t>);
+static_assert(appliance_type_tag<gen_appliance_t>);
+static_assert(!is_generator_v<load_appliance_t>);
+static_assert(is_generator_v<gen_appliance_t>);
+
 } // 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 b00a0c043..d7351e92a 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
@@ -5,7 +5,6 @@
 #pragma once
 
 #include "appliance.hpp"
-#include "base.hpp"
 
 #include "../auxiliary/input.hpp"
 #include "../auxiliary/output.hpp"
@@ -17,18 +16,6 @@
 
 namespace power_grid_model {
 
-struct load_appliance_t {};
-struct gen_appliance_t {};
-
-template <typename T>
-concept appliance_type_tag = std::same_as<T, load_appliance_t> || std::same_as<T, gen_appliance_t>;
-template <appliance_type_tag T> constexpr bool is_generator_v = std::same_as<T, gen_appliance_t>;
-
-static_assert(appliance_type_tag<load_appliance_t>);
-static_assert(appliance_type_tag<gen_appliance_t>);
-static_assert(!is_generator_v<load_appliance_t>);
-static_assert(is_generator_v<gen_appliance_t>);
-
 class GenericLoadGen : public Appliance {
   public:
     using InputType = GenericLoadGenInput;
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 f5147bc83..c6160d4af 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
@@ -5,7 +5,6 @@
 #pragma once
 
 #include "appliance.hpp"
-#include "base.hpp"
 
 #include "../auxiliary/input.hpp"
 #include "../auxiliary/output.hpp"
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/component/transformer_tap_regulator.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/component/transformer_tap_regulator.hpp
index c16f8d0ff..624e59ace 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/component/transformer_tap_regulator.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/component/transformer_tap_regulator.hpp
@@ -4,7 +4,6 @@
 
 #pragma once
 
-#include "base.hpp"
 #include "regulator.hpp"
 
 #include "../auxiliary/input.hpp"
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/calculation_input_preparation.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/calculation_input_preparation.hpp
index f9dc0165c..44b1ba80c 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/calculation_input_preparation.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/calculation_input_preparation.hpp
@@ -7,6 +7,14 @@
 #include "state_queries.hpp"
 
 #include "../calculation_parameters.hpp"
+#include "../component/current_sensor.hpp"
+#include "../component/fault.hpp"
+#include "../component/load_gen.hpp"
+#include "../component/node.hpp"
+#include "../component/power_sensor.hpp"
+#include "../component/shunt.hpp"
+#include "../component/source.hpp"
+#include "../component/voltage_sensor.hpp"
 
 #include <concepts>
 #include <vector>
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/container_queries.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/container_queries.hpp
index ac4312108..b4230d05c 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/container_queries.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/container_queries.hpp
@@ -4,7 +4,10 @@
 
 #pragma once
 
-#include "../all_components.hpp"
+#include "../component/base.hpp"
+#include "../component/branch.hpp"
+#include "../component/branch3.hpp"
+#include "../component/regulator.hpp"
 #include "../container.hpp"
 
 namespace power_grid_model::main_core {
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 53cee3abe..397ef2c6e 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
@@ -4,8 +4,23 @@
 
 #pragma once
 
-#include "../all_components.hpp"
+#include "state.hpp"
+#include "state_queries.hpp"
+
+#include "../component/appliance.hpp"
+#include "../component/base.hpp"
+#include "../component/branch.hpp"
+#include "../component/branch3.hpp"
+#include "../component/current_sensor.hpp"
+#include "../component/fault.hpp"
+#include "../component/node.hpp"
+#include "../component/power_sensor.hpp"
+#include "../component/regulator.hpp"
+#include "../component/transformer_tap_regulator.hpp"
+#include "../component/voltage_sensor.hpp"
+
 #include "../common/iterator_facade.hpp"
+#include "../component/component.hpp"
 
 #include <unordered_set>
 
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/main_model_type.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/main_model_type.hpp
index 7aaaec2f2..26d896d6a 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/main_model_type.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/main_model_type.hpp
@@ -4,14 +4,57 @@
 
 #pragma once
 
-#include "../all_components.hpp"
+#include "../component/component.hpp"
 #include "../container.hpp"
 #include "state.hpp"
 #include "update.hpp"
 
 #include <array>
 #include <vector>
-namespace power_grid_model::main_core {
+namespace power_grid_model {
+
+class Base;
+class Node;
+class Branch;
+class Branch3;
+class Appliance;
+class GenericLoadGen;
+class GenericLoad;
+class GenericGenerator;
+class GenericPowerSensor;
+class GenericVoltageSensor;
+class GenericCurrentSensor;
+class Regulator;
+class Line;
+class AsymLine;
+class Link;
+class GenericBranch;
+class Transformer;
+class ThreeWindingTransformer;
+class Shunt;
+class Source;
+
+template <symmetry_tag loadgen_symmetry_, appliance_type_tag appliance_type_> class LoadGen;
+using SymGenerator = LoadGen<symmetric_t, gen_appliance_t>;
+using AsymGenerator = LoadGen<asymmetric_t, gen_appliance_t>;
+using SymLoad = LoadGen<symmetric_t, load_appliance_t>;
+using AsymLoad = LoadGen<asymmetric_t, load_appliance_t>;
+
+template <symmetry_tag power_sensor_symmetry_> class PowerSensor;
+using SymPowerSensor = PowerSensor<symmetric_t>;
+using AsymPowerSensor = PowerSensor<asymmetric_t>;
+
+template <symmetry_tag sym> class VoltageSensor;
+using SymVoltageSensor = VoltageSensor<symmetric_t>;
+using AsymVoltageSensor = VoltageSensor<asymmetric_t>;
+template <symmetry_tag sym> class CurrentSensor;
+using SymCurrentSensor = CurrentSensor<symmetric_t>;
+using AsymCurrentSensor = CurrentSensor<asymmetric_t>;
+
+class Fault;
+class TransformerTapRegulator;
+
+namespace main_core {
 
 namespace detail {
 
@@ -125,4 +168,5 @@ struct is_main_model_type<MainModelType<ExtraRetrievableTypes<ETs...>, Component
 
 template <typename T> inline constexpr bool is_main_model_type_v = is_main_model_type<T>::value;
 
-} // namespace power_grid_model::main_core
+} // namespace main_core
+} // namespace power_grid_model
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 330da5beb..30aa421bf 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
@@ -4,11 +4,23 @@
 
 #pragma once
 
+#include "../component/base.hpp"
+#include "../component/branch.hpp"
+#include "../component/branch3.hpp"
+#include "../component/current_sensor.hpp"
+#include "../component/fault.hpp"
+#include "../component/load_gen.hpp"
+#include "../component/node.hpp"
+#include "../component/power_sensor.hpp"
+#include "../component/shunt.hpp"
+#include "../component/source.hpp"
+#include "../component/transformer_tap_regulator.hpp"
+#include "../component/voltage_sensor.hpp"
 #include "container_queries.hpp"
 #include "state.hpp"
 #include "state_queries.hpp"
 
-#include "../all_components.hpp"
+#include "../component/component.hpp"
 
 #include <concepts>
 
@@ -115,14 +127,14 @@ constexpr void produce_output(MainModelState<ComponentContainer> const& state, C
 
 // output node
 template <std::derived_from<Node> Component, steady_state_solver_output_type SolverOutputType>
-constexpr auto output_result(Node const& node, std::vector<SolverOutputType> const& solver_output, Idx2D math_id) {
+constexpr auto output_result(Component const& node, std::vector<SolverOutputType> const& solver_output, Idx2D math_id) {
     using sym = typename SolverOutputType::sym;
 
     if (math_id.group == -1) {
-        return node.get_null_output<sym>();
+        return node.template get_null_output<sym>();
     }
-    return node.get_output<sym>(solver_output[math_id.group].u[math_id.pos],
-                                solver_output[math_id.group].bus_injection[math_id.pos]);
+    return node.template get_output<sym>(solver_output[math_id.group].u[math_id.pos],
+                                         solver_output[math_id.group].bus_injection[math_id.pos]);
 }
 template <std::derived_from<Node> Component, short_circuit_solver_output_type SolverOutputType>
 inline auto output_result(Component const& node, std::vector<SolverOutputType> const& solver_output, Idx2D math_id) {
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/state_queries.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/state_queries.hpp
index b3a5e64b7..88549be85 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/state_queries.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/main_core/state_queries.hpp
@@ -6,7 +6,11 @@
 
 #include "state.hpp"
 
-#include "../all_components.hpp"
+#include "../component/branch.hpp"
+#include "../component/branch3.hpp"
+#include "../component/node.hpp"
+#include "../component/regulator.hpp"
+#include "../component/transformer.hpp"
 
 namespace power_grid_model::main_core {
 
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 6172babf2..e2b8ac830 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
@@ -6,7 +6,17 @@
 
 #include "container_queries.hpp"
 
-#include "../all_components.hpp"
+#include "../component/branch.hpp"
+#include "../component/branch3.hpp"
+#include "../component/current_sensor.hpp"
+#include "../component/fault.hpp"
+#include "../component/load_gen.hpp"
+#include "../component/node.hpp"
+#include "../component/power_sensor.hpp"
+#include "../component/regulator.hpp"
+#include "../component/shunt.hpp"
+#include "../component/source.hpp"
+#include "../component/voltage_sensor.hpp"
 
 namespace power_grid_model::main_core {
 
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 955434315..594d754f8 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
@@ -7,10 +7,9 @@
 #include "container_queries.hpp"
 #include "core_utils.hpp"
 
-#include "../all_components.hpp"
 #include "../auxiliary/dataset.hpp"
 #include "../common/iterator_facade.hpp"
-#include "../container.hpp"
+#include "../component/component.hpp"
 
 #include <map>
 
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 b7cac93a1..d5b7d8f11 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
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include "all_components.hpp"
 #include "job_adapter.hpp"
 #include "job_dispatch.hpp"
 #include "main_model_impl.hpp"
diff --git a/power_grid_model_c/power_grid_model/include/power_grid_model/main_model_impl.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/main_model_impl.hpp
index b785c5340..51b4721cf 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/main_model_impl.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/main_model_impl.hpp
@@ -19,10 +19,10 @@
 #include "common/timer.hpp"
 
 // component include
-#include "all_components.hpp"
 #include "auxiliary/dataset.hpp"
 #include "auxiliary/input.hpp"
 #include "auxiliary/output.hpp"
+#include "component/component.hpp"
 
 // math model include
 #include "math_solver/math_solver_dispatch.hpp"
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 980af5a39..b4dbb1a3a 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
@@ -62,7 +62,6 @@ Iterative Power Flow
 #include "../common/common.hpp"
 #include "../common/exception.hpp"
 #include "../common/three_phase_tensor.hpp"
-#include "../common/timer.hpp"
 
 namespace power_grid_model::math_solver {
 
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 3dd49cfe2..d377f9189 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,7 +35,6 @@ if there are sources
 #include "../calculation_parameters.hpp"
 #include "../common/common.hpp"
 #include "../common/enum.hpp"
-#include "../common/exception.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_dispatch.hpp b/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/math_solver_dispatch.hpp
index 19cbe7d3e..5cd9f9b0c 100644
--- a/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/math_solver_dispatch.hpp
+++ b/power_grid_model_c/power_grid_model/include/power_grid_model/math_solver/math_solver_dispatch.hpp
@@ -9,9 +9,8 @@
 
 #include "../calculation_parameters.hpp"
 #include "../common/common.hpp"
-#include "../common/exception.hpp"
+#include "../common/logging.hpp"
 #include "../common/three_phase_tensor.hpp"
-#include "../common/timer.hpp"
 
 #include <memory>
 
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 a0f8790c3..297f24f18 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
@@ -153,7 +153,6 @@ J.L -= -dQ_cal_m/dV
 #include "../common/common.hpp"
 #include "../common/exception.hpp"
 #include "../common/three_phase_tensor.hpp"
-#include "../common/timer.hpp"
 
 namespace power_grid_model::math_solver {
 
diff --git a/tests/cpp_unit_tests/test_all_components.cpp b/tests/cpp_unit_tests/test_all_components.cpp
index b98913bdd..817312577 100644
--- a/tests/cpp_unit_tests/test_all_components.cpp
+++ b/tests/cpp_unit_tests/test_all_components.cpp
@@ -2,9 +2,12 @@
 //
 // SPDX-License-Identifier: MPL-2.0
 
+#include "power_grid_model/auxiliary/input.hpp"
 #include <power_grid_model/component/appliance.hpp>
+#include <power_grid_model/component/base.hpp>
 #include <power_grid_model/component/branch.hpp>
 #include <power_grid_model/component/branch3.hpp>
+#include <power_grid_model/component/component.hpp>
 #include <power_grid_model/component/fault.hpp>
 #include <power_grid_model/component/generic_branch.hpp>
 #include <power_grid_model/component/line.hpp>
@@ -22,6 +25,9 @@
 
 #include <doctest/doctest.h>
 
+#include <concepts>
+#include <type_traits>
+
 namespace power_grid_model {
 
 static_assert(component_c<Node>);
diff --git a/tests/cpp_unit_tests/test_asym_line.cpp b/tests/cpp_unit_tests/test_asym_line.cpp
index a9b0dc9f0..7acb54a9e 100644
--- a/tests/cpp_unit_tests/test_asym_line.cpp
+++ b/tests/cpp_unit_tests/test_asym_line.cpp
@@ -4,6 +4,24 @@
 
 #include <power_grid_model/component/asym_line.hpp>
 
+#include "power_grid_model/auxiliary/input.hpp"
+#include "power_grid_model/auxiliary/output.hpp"
+#include "power_grid_model/auxiliary/update.hpp"
+#include <power_grid_model/calculation_parameters.hpp>
+#include <power_grid_model/common/common.hpp>
+#include <power_grid_model/common/enum.hpp>
+#include <power_grid_model/common/exception.hpp>
+#include <power_grid_model/common/three_phase_tensor.hpp>
+// TODO (nitbharambe) Added base.hpp for status_to_int function
+#include <power_grid_model/component/base.hpp>
+#include <power_grid_model/component/branch.hpp>
+#include <power_grid_model/component/line_utils.hpp>
+
+#include <Eigen/Dense>
+
+#include <algorithm>
+#include <complex>
+
 #include <doctest/doctest.h>
 
 namespace power_grid_model {
diff --git a/tests/cpp_unit_tests/test_common.cpp b/tests/cpp_unit_tests/test_common.cpp
index 4ab94bd10..575527fd3 100644
--- a/tests/cpp_unit_tests/test_common.cpp
+++ b/tests/cpp_unit_tests/test_common.cpp
@@ -4,6 +4,9 @@
 
 #include <power_grid_model/common/common.hpp>
 
+#include <concepts>
+#include <utility>
+
 namespace power_grid_model {
 namespace {
 static_assert(symmetry_tag<symmetric_t>);
diff --git a/tests/cpp_unit_tests/test_current_sensor.cpp b/tests/cpp_unit_tests/test_current_sensor.cpp
index 78b7dd770..1e0636d50 100644
--- a/tests/cpp_unit_tests/test_current_sensor.cpp
+++ b/tests/cpp_unit_tests/test_current_sensor.cpp
@@ -4,8 +4,26 @@
 
 #include <power_grid_model/component/current_sensor.hpp>
 
+#include "power_grid_model/auxiliary/input.hpp"
+#include "power_grid_model/auxiliary/output.hpp"
+#include "power_grid_model/auxiliary/update.hpp"
+#include <power_grid_model/calculation_parameters.hpp>
+#include <power_grid_model/common/common.hpp>
+#include <power_grid_model/common/enum.hpp>
+#include <power_grid_model/common/exception.hpp>
+#include <power_grid_model/common/three_phase_tensor.hpp>
+
+#include <Eigen/Dense>
+
 #include <doctest/doctest.h>
 
+#include <cmath>
+#include <complex>
+#include <concepts>
+#include <numbers>
+#include <utility>
+#include <vector>
+
 TEST_SUITE_BEGIN("test_current_sensor");
 
 namespace power_grid_model {
diff --git a/tests/cpp_unit_tests/test_exceptions.cpp b/tests/cpp_unit_tests/test_exceptions.cpp
index bbd244df3..4f49d5af7 100644
--- a/tests/cpp_unit_tests/test_exceptions.cpp
+++ b/tests/cpp_unit_tests/test_exceptions.cpp
@@ -2,10 +2,15 @@
 //
 // SPDX-License-Identifier: MPL-2.0
 
+#include <power_grid_model/common/common.hpp>
+#include <power_grid_model/common/enum.hpp>
 #include <power_grid_model/common/exception.hpp>
 
 #include <doctest/doctest.h>
 
+#include <limits>
+#include <vector>
+
 namespace power_grid_model {
 namespace {
 enum TestCStyleEnum { // NOLINT(performance-enum-size) // NOSONAR // for testing C-style enum
diff --git a/tests/cpp_unit_tests/test_fault.cpp b/tests/cpp_unit_tests/test_fault.cpp
index b1e89c99a..2163d0ff4 100644
--- a/tests/cpp_unit_tests/test_fault.cpp
+++ b/tests/cpp_unit_tests/test_fault.cpp
@@ -4,8 +4,26 @@
 
 #include <power_grid_model/component/fault.hpp>
 
+// #include "power_grid_model/auxiliary/input.hpp"
+#include "power_grid_model/auxiliary/output.hpp"
+#include "power_grid_model/auxiliary/update.hpp"
+#include <power_grid_model/calculation_parameters.hpp>
+#include <power_grid_model/common/common.hpp>
+#include <power_grid_model/common/enum.hpp>
+#include <power_grid_model/common/exception.hpp>
+#include <power_grid_model/common/three_phase_tensor.hpp>
+// TODO (nitbharambe) Added base.hpp for status_to_int function
+#include <power_grid_model/component/base.hpp>
+#include <power_grid_model/component/component.hpp>
+
+#include <Eigen/Dense>
+
 #include <doctest/doctest.h>
 
+#include <cmath>
+#include <complex>
+#include <concepts>
+
 namespace power_grid_model {
 namespace {
 void check_nan_preserving_equality(std::floating_point auto actual, std::floating_point auto expected) {
diff --git a/tests/cpp_unit_tests/test_generic_branch.cpp b/tests/cpp_unit_tests/test_generic_branch.cpp
index 5fc237a11..9b61abc63 100644
--- a/tests/cpp_unit_tests/test_generic_branch.cpp
+++ b/tests/cpp_unit_tests/test_generic_branch.cpp
@@ -2,11 +2,19 @@
 //
 // SPDX-License-Identifier: MPL-2.0
 
+#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/enum.hpp>
+#include <power_grid_model/common/three_phase_tensor.hpp>
 #include <power_grid_model/component/generic_branch.hpp>
 #include <power_grid_model/component/transformer.hpp>
 
 #include <doctest/doctest.h>
 
+#include <cmath>
+#include <complex>
+
 namespace power_grid_model {
 
 using namespace std::complex_literals;
diff --git a/tests/cpp_unit_tests/test_grouped_index_vector.cpp b/tests/cpp_unit_tests/test_grouped_index_vector.cpp
index 13c01e3a0..197327f4e 100644
--- a/tests/cpp_unit_tests/test_grouped_index_vector.cpp
+++ b/tests/cpp_unit_tests/test_grouped_index_vector.cpp
@@ -2,10 +2,17 @@
 //
 // SPDX-License-Identifier: MPL-2.0
 
+#include <power_grid_model/common/common.hpp>
+#include <power_grid_model/common/counting_iterator.hpp>
 #include <power_grid_model/common/grouped_index_vector.hpp>
 
 #include <doctest/doctest.h>
 
+#include <algorithm>
+#include <concepts>
+#include <cstddef>
+#include <vector>
+
 namespace power_grid_model {
 
 namespace {
diff --git a/tests/cpp_unit_tests/test_line.cpp b/tests/cpp_unit_tests/test_line.cpp
index 43343adb2..89334c8f4 100644
--- a/tests/cpp_unit_tests/test_line.cpp
+++ b/tests/cpp_unit_tests/test_line.cpp
@@ -4,6 +4,21 @@
 
 #include <power_grid_model/component/line.hpp>
 
+#include "power_grid_model/auxiliary/input.hpp"
+#include "power_grid_model/auxiliary/output.hpp"
+#include "power_grid_model/auxiliary/update.hpp"
+#include <power_grid_model/calculation_parameters.hpp>
+#include <power_grid_model/common/common.hpp>
+#include <power_grid_model/common/enum.hpp>
+#include <power_grid_model/common/exception.hpp>
+#include <power_grid_model/common/three_phase_tensor.hpp>
+// TODO (nitbharambe) Added base.hpp for status_to_int function
+#include <power_grid_model/component/base.hpp>
+#include <power_grid_model/component/branch.hpp>
+
+#include <algorithm>
+#include <complex>
+
 #include <doctest/doctest.h>
 
 namespace power_grid_model {
diff --git a/tests/cpp_unit_tests/test_link.cpp b/tests/cpp_unit_tests/test_link.cpp
index e076b7a7a..cd223cb1f 100644
--- a/tests/cpp_unit_tests/test_link.cpp
+++ b/tests/cpp_unit_tests/test_link.cpp
@@ -2,10 +2,24 @@
 //
 // SPDX-License-Identifier: MPL-2.0
 
+#include "power_grid_model/auxiliary/input.hpp"
+#include "power_grid_model/auxiliary/output.hpp"
+#include "power_grid_model/auxiliary/update.hpp"
+#include <power_grid_model/calculation_parameters.hpp>
+#include <power_grid_model/common/common.hpp>
+#include <power_grid_model/common/enum.hpp>
+#include <power_grid_model/common/exception.hpp>
+#include <power_grid_model/common/three_phase_tensor.hpp>
+// TODO (nitbharambe) Added base.hpp for status_to_int function
+#include <power_grid_model/component/base.hpp>
+#include <power_grid_model/component/branch.hpp>
 #include <power_grid_model/component/link.hpp>
 
 #include <doctest/doctest.h>
 
+#include <cmath>
+#include <complex>
+
 namespace power_grid_model {
 
 using namespace std::complex_literals;
diff --git a/tests/cpp_unit_tests/test_load_gen.cpp b/tests/cpp_unit_tests/test_load_gen.cpp
index cc883894b..d11e1bac9 100644
--- a/tests/cpp_unit_tests/test_load_gen.cpp
+++ b/tests/cpp_unit_tests/test_load_gen.cpp
@@ -4,8 +4,25 @@
 
 #include <power_grid_model/component/load_gen.hpp>
 
+#include "power_grid_model/auxiliary/input.hpp"
+#include "power_grid_model/auxiliary/output.hpp"
+#include "power_grid_model/auxiliary/update.hpp"
+#include "power_grid_model/calculation_parameters.hpp"
+#include <power_grid_model/common/common.hpp>
+#include <power_grid_model/common/enum.hpp>
+#include <power_grid_model/common/three_phase_tensor.hpp>
+#include <power_grid_model/component/appliance.hpp>
+
+#include <Eigen/Dense>
+
 #include <doctest/doctest.h>
 
+#include <cmath>
+#include <complex>
+#include <concepts>
+#include <cstddef>
+#include <numbers>
+
 TYPE_TO_STRING_AS("SymGenerator", power_grid_model::SymGenerator);
 TYPE_TO_STRING_AS("AsymGenerator", power_grid_model::AsymGenerator);
 TYPE_TO_STRING_AS("SymLoad", power_grid_model::SymLoad);
diff --git a/tests/cpp_unit_tests/test_main_core_output.cpp b/tests/cpp_unit_tests/test_main_core_output.cpp
index 66549df27..803c68bac 100644
--- a/tests/cpp_unit_tests/test_main_core_output.cpp
+++ b/tests/cpp_unit_tests/test_main_core_output.cpp
@@ -2,6 +2,7 @@
 //
 // SPDX-License-Identifier: MPL-2.0
 
+#include <power_grid_model/component/transformer_tap_regulator.hpp>
 #include <power_grid_model/main_core/output.hpp>
 #include <power_grid_model/main_core/state.hpp>
 #include <power_grid_model/main_core/state_queries.hpp>
diff --git a/tests/cpp_unit_tests/test_node.cpp b/tests/cpp_unit_tests/test_node.cpp
index 92708817f..c3b0b15e7 100644
--- a/tests/cpp_unit_tests/test_node.cpp
+++ b/tests/cpp_unit_tests/test_node.cpp
@@ -4,6 +4,11 @@
 
 #include <power_grid_model/component/node.hpp>
 
+#include "power_grid_model/auxiliary/update.hpp"
+#include <power_grid_model/common/common.hpp>
+#include <power_grid_model/common/enum.hpp>
+#include <power_grid_model/component/component.hpp>
+
 #include <doctest/doctest.h>
 
 namespace power_grid_model {
diff --git a/tests/cpp_unit_tests/test_power_sensor.cpp b/tests/cpp_unit_tests/test_power_sensor.cpp
index 4cc5f189c..f256c3c8f 100644
--- a/tests/cpp_unit_tests/test_power_sensor.cpp
+++ b/tests/cpp_unit_tests/test_power_sensor.cpp
@@ -4,8 +4,20 @@
 
 #include <power_grid_model/component/power_sensor.hpp>
 
+#include "power_grid_model/auxiliary/input.hpp"
+#include "power_grid_model/auxiliary/output.hpp"
+#include "power_grid_model/auxiliary/update.hpp"
+#include <power_grid_model/calculation_parameters.hpp>
+#include <power_grid_model/common/common.hpp>
+#include <power_grid_model/common/enum.hpp>
+#include <power_grid_model/common/three_phase_tensor.hpp>
+
 #include <doctest/doctest.h>
 
+#include <cmath>
+#include <complex>
+#include <concepts>
+
 namespace power_grid_model {
 namespace {
 auto const r_nan = RealValue<asymmetric_t>{nan};
diff --git a/tests/cpp_unit_tests/test_shunt.cpp b/tests/cpp_unit_tests/test_shunt.cpp
index 3ad289902..3b36c302a 100644
--- a/tests/cpp_unit_tests/test_shunt.cpp
+++ b/tests/cpp_unit_tests/test_shunt.cpp
@@ -4,6 +4,20 @@
 
 #include <power_grid_model/component/shunt.hpp>
 
+#include "power_grid_model/auxiliary/input.hpp"
+#include "power_grid_model/auxiliary/output.hpp"
+#include "power_grid_model/auxiliary/update.hpp"
+#include <power_grid_model/calculation_parameters.hpp>
+#include <power_grid_model/common/common.hpp>
+#include <power_grid_model/common/enum.hpp>
+#include <power_grid_model/common/three_phase_tensor.hpp>
+// TODO (nitbharambe) Added base.hpp for status_to_int function
+#include <power_grid_model/component/base.hpp>
+
+#include <cmath>
+#include <complex>
+#include <concepts>
+
 #include <doctest/doctest.h>
 
 namespace power_grid_model {
diff --git a/tests/cpp_unit_tests/test_source.cpp b/tests/cpp_unit_tests/test_source.cpp
index fa813240c..070381001 100644
--- a/tests/cpp_unit_tests/test_source.cpp
+++ b/tests/cpp_unit_tests/test_source.cpp
@@ -2,8 +2,23 @@
 //
 // SPDX-License-Identifier: MPL-2.0
 
+#include <power_grid_model/calculation_parameters.hpp>
 #include <power_grid_model/component/source.hpp>
 
+#include "power_grid_model/auxiliary/input.hpp"
+#include "power_grid_model/auxiliary/output.hpp"
+#include "power_grid_model/auxiliary/update.hpp"
+#include <power_grid_model/common/common.hpp>
+#include <power_grid_model/common/enum.hpp>
+#include <power_grid_model/common/three_phase_tensor.hpp>
+// TODO (nitbharambe) Added base.hpp for status_to_int function
+#include <power_grid_model/component/base.hpp>
+
+#include <cmath>
+#include <complex>
+#include <concepts>
+#include <utility>
+
 #include <doctest/doctest.h>
 
 namespace power_grid_model {
diff --git a/tests/cpp_unit_tests/test_statistics.cpp b/tests/cpp_unit_tests/test_statistics.cpp
index b51043c0c..980baf7bf 100644
--- a/tests/cpp_unit_tests/test_statistics.cpp
+++ b/tests/cpp_unit_tests/test_statistics.cpp
@@ -2,10 +2,21 @@
 //
 // SPDX-License-Identifier: MPL-2.0
 
+#include <power_grid_model/common/common.hpp>
 #include <power_grid_model/common/statistics.hpp>
+#include <power_grid_model/common/three_phase_tensor.hpp>
 
+#include <Eigen/Dense>
 #include <doctest/doctest.h>
 
+#include <array>
+#include <cmath>
+#include <complex>
+#include <numbers>
+#include <ranges>
+#include <tuple>
+#include <vector>
+
 namespace power_grid_model {
 namespace {
 using AsymRealValue = RealValue<asymmetric_t>;
diff --git a/tests/cpp_unit_tests/test_three_phase_tensor.cpp b/tests/cpp_unit_tests/test_three_phase_tensor.cpp
index c3900cf89..dc3b3021d 100644
--- a/tests/cpp_unit_tests/test_three_phase_tensor.cpp
+++ b/tests/cpp_unit_tests/test_three_phase_tensor.cpp
@@ -3,10 +3,16 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #include <power_grid_model/auxiliary/output.hpp>
+#include <power_grid_model/common/common.hpp>
 #include <power_grid_model/common/three_phase_tensor.hpp>
 
+#include <Eigen/Dense>
 #include <doctest/doctest.h>
 
+#include <cmath>
+#include <complex>
+#include <limits>
+
 namespace power_grid_model {
 
 using namespace std::complex_literals;
diff --git a/tests/cpp_unit_tests/test_three_winding_transformer.cpp b/tests/cpp_unit_tests/test_three_winding_transformer.cpp
index 9a8ae7a72..7fb4a444f 100644
--- a/tests/cpp_unit_tests/test_three_winding_transformer.cpp
+++ b/tests/cpp_unit_tests/test_three_winding_transformer.cpp
@@ -5,8 +5,23 @@
 #include <power_grid_model/component/three_winding_transformer.hpp>
 #include <power_grid_model/component/transformer.hpp>
 
+#include "power_grid_model/auxiliary/input.hpp"
+#include "power_grid_model/auxiliary/output.hpp"
+#include "power_grid_model/auxiliary/update.hpp"
+#include <power_grid_model/calculation_parameters.hpp>
+#include <power_grid_model/common/common.hpp>
+#include <power_grid_model/common/enum.hpp>
+#include <power_grid_model/common/three_phase_tensor.hpp>
+// TODO (nitbharambe) Added base.hpp for status_to_int function
+#include <power_grid_model/component/base.hpp>
+
 #include <doctest/doctest.h>
 
+#include <array>
+#include <complex>
+#include <cstddef>
+#include <vector>
+
 namespace power_grid_model {
 
 using namespace std::complex_literals;
diff --git a/tests/cpp_unit_tests/test_transformer.cpp b/tests/cpp_unit_tests/test_transformer.cpp
index b9d65c008..cab28c5dc 100644
--- a/tests/cpp_unit_tests/test_transformer.cpp
+++ b/tests/cpp_unit_tests/test_transformer.cpp
@@ -4,6 +4,21 @@
 
 #include <power_grid_model/component/transformer.hpp>
 
+#include "power_grid_model/auxiliary/input.hpp"
+#include "power_grid_model/auxiliary/update.hpp"
+#include <power_grid_model/calculation_parameters.hpp>
+#include <power_grid_model/common/common.hpp>
+#include <power_grid_model/common/enum.hpp>
+#include <power_grid_model/common/exception.hpp>
+#include <power_grid_model/common/three_phase_tensor.hpp>
+// TODO (nitbharambe) Added base.hpp for status_to_int function
+#include <power_grid_model/component/base.hpp>
+
+#include <cmath>
+#include <complex>
+#include <cstddef>
+#include <vector>
+
 #include <doctest/doctest.h>
 
 namespace power_grid_model {
diff --git a/tests/cpp_unit_tests/test_transformer_tap_regulator.cpp b/tests/cpp_unit_tests/test_transformer_tap_regulator.cpp
index 279e6c4ce..86a6408ef 100644
--- a/tests/cpp_unit_tests/test_transformer_tap_regulator.cpp
+++ b/tests/cpp_unit_tests/test_transformer_tap_regulator.cpp
@@ -4,8 +4,20 @@
 
 #include <power_grid_model/component/transformer_tap_regulator.hpp>
 
+#include "power_grid_model/auxiliary/input.hpp"
+#include "power_grid_model/auxiliary/output.hpp"
+#include "power_grid_model/auxiliary/update.hpp"
+#include <power_grid_model/calculation_parameters.hpp>
+#include <power_grid_model/common/common.hpp>
+#include <power_grid_model/common/enum.hpp>
+#include <power_grid_model/common/three_phase_tensor.hpp>
+// TODO (nitbharambe) Added base.hpp for status_to_int function
+#include <power_grid_model/component/base.hpp>
+
 #include <doctest/doctest.h>
 
+#include <concepts>
+
 namespace power_grid_model {
 namespace {
 void check_nan_preserving_equality(std::floating_point auto actual, std::floating_point auto expected) {
diff --git a/tests/cpp_unit_tests/test_typing.cpp b/tests/cpp_unit_tests/test_typing.cpp
index 32c4bda01..7aece2e6e 100644
--- a/tests/cpp_unit_tests/test_typing.cpp
+++ b/tests/cpp_unit_tests/test_typing.cpp
@@ -8,6 +8,10 @@
 #include <doctest/doctest.h>
 
 #include <algorithm>
+#include <concepts>
+#include <cstdint>
+#include <limits>
+#include <type_traits>
 
 namespace {
 using namespace power_grid_model;
diff --git a/tests/cpp_unit_tests/test_voltage_sensor.cpp b/tests/cpp_unit_tests/test_voltage_sensor.cpp
index 814c4f735..b51f735fe 100644
--- a/tests/cpp_unit_tests/test_voltage_sensor.cpp
+++ b/tests/cpp_unit_tests/test_voltage_sensor.cpp
@@ -6,11 +6,19 @@
 #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/auxiliary/output.hpp"
+#include "power_grid_model/auxiliary/update.hpp"
+#include <power_grid_model/common/enum.hpp>
+#include <power_grid_model/component/component.hpp>
+
 #include <doctest/doctest.h>
 
+#include <cmath>
+#include <complex>
+#include <concepts>
+
 namespace power_grid_model {
 namespace {
 void check_nan_preserving_equality(std::floating_point auto actual, std::floating_point auto expected) {