diff --git a/SilKit/source/capi/CapiCan.cpp b/SilKit/source/capi/CapiCan.cpp
index 1cac3bc92..dca6d10c2 100644
--- a/SilKit/source/capi/CapiCan.cpp
+++ b/SilKit/source/capi/CapiCan.cpp
@@ -2,14 +2,11 @@
 //
 // SPDX-License-Identifier: MIT
 
-#include <map>
-#include <mutex>
-#include <cstring>
-#include <sstream>
-
-#include "silkit/capi/SilKit.h"
-#include "silkit/SilKit.hpp"
-#include "CapiImpl.hpp"
+#include "silkit/capi/Can.h"
+
+#include "capi/CapiImpl.hpp"
+
+#include "silkit/participant/IParticipant.hpp"
 #include "silkit/services/can/all.hpp"
 
 
diff --git a/SilKit/source/capi/CapiDataPubSub.cpp b/SilKit/source/capi/CapiDataPubSub.cpp
index 209c472e9..a48050fc5 100644
--- a/SilKit/source/capi/CapiDataPubSub.cpp
+++ b/SilKit/source/capi/CapiDataPubSub.cpp
@@ -2,18 +2,13 @@
 //
 // SPDX-License-Identifier: MIT
 
-#include "silkit/capi/SilKit.h"
-#include "silkit/SilKit.hpp"
-#include "silkit/services/logging/ILogger.hpp"
-#include "silkit/services/orchestration/all.hpp"
-#include "silkit/services/pubsub/all.hpp"
+#include "silkit/capi/DataPubSub.h"
 
-#include "CapiImpl.hpp"
-#include "TypeConversion.hpp"
+#include "capi/CapiImpl.hpp"
+#include "capi/TypeConversion.hpp"
 
-#include <map>
-#include <mutex>
-#include <cstring>
+#include "silkit/participant/IParticipant.hpp"
+#include "silkit/services/pubsub/all.hpp"
 
 
 SilKit_ReturnCode SilKitCALL SilKit_DataPublisher_Create(SilKit_DataPublisher** outPublisher,
diff --git a/SilKit/source/capi/CapiEthernet.cpp b/SilKit/source/capi/CapiEthernet.cpp
index 6ac3592bb..fab2613ad 100644
--- a/SilKit/source/capi/CapiEthernet.cpp
+++ b/SilKit/source/capi/CapiEthernet.cpp
@@ -2,14 +2,12 @@
 //
 // SPDX-License-Identifier: MIT
 
-#include "silkit/capi/SilKit.h"
-#include "silkit/SilKit.hpp"
-#include "silkit/services/logging/ILogger.hpp"
-#include "silkit/services/orchestration/all.hpp"
-#include "silkit/services/ethernet/all.hpp"
+#include "silkit/capi/Ethernet.h"
+
+#include "capi/CapiImpl.hpp"
 
-#include <cstring>
-#include "CapiImpl.hpp"
+#include "silkit/participant/IParticipant.hpp"
+#include "silkit/services/ethernet/all.hpp"
 
 
 SilKit_ReturnCode SilKitCALL SilKit_EthernetController_Create(SilKit_EthernetController** outController,
diff --git a/SilKit/source/capi/CapiFlexray.cpp b/SilKit/source/capi/CapiFlexray.cpp
index 644706fce..130b60ea5 100644
--- a/SilKit/source/capi/CapiFlexray.cpp
+++ b/SilKit/source/capi/CapiFlexray.cpp
@@ -2,15 +2,12 @@
 //
 // SPDX-License-Identifier: MIT
 
-#include <string>
-#include <cstring>
+#include "silkit/capi/Flexray.h"
 
-#include "silkit/capi/SilKit.h"
-#include "silkit/SilKit.hpp"
-#include "silkit/services/flexray/all.hpp"
+#include "capi/CapiImpl.hpp"
 
-#include "IParticipantInternal.hpp"
-#include "CapiImpl.hpp"
+#include "silkit/participant/IParticipant.hpp"
+#include "silkit/services/flexray/all.hpp"
 
 
 namespace {
diff --git a/SilKit/source/capi/CapiImpl.hpp b/SilKit/source/capi/CapiImpl.hpp
index 19dfdede0..85002c06e 100644
--- a/SilKit/source/capi/CapiImpl.hpp
+++ b/SilKit/source/capi/CapiImpl.hpp
@@ -4,11 +4,12 @@
 
 #pragma once
 
-#include "silkit/capi/Types.h"
+#include "capi/CapiExceptions.hpp"
+
 #include "silkit/capi/InterfaceIdentifiers.h"
+#include "silkit/capi/Types.h"
 #include "silkit/participant/exception.hpp"
 
-#include "CapiExceptions.hpp"
 
 #define CAPI_CATCH_EXCEPTIONS \
     catch (const SilKit::CapiBadParameterError& e) \
diff --git a/SilKit/source/capi/CapiLin.cpp b/SilKit/source/capi/CapiLin.cpp
index fe7863ae9..bd8414001 100644
--- a/SilKit/source/capi/CapiLin.cpp
+++ b/SilKit/source/capi/CapiLin.cpp
@@ -2,16 +2,14 @@
 //
 // SPDX-License-Identifier: MIT
 
+#include "silkit/capi/Lin.h"
+
+#include "capi/CapiImpl.hpp"
 #include "services/lin/LinControllerExtensionsImpl.hpp"
 
-#include "silkit/capi/SilKit.h"
-#include "silkit/SilKit.hpp"
-#include "silkit/services/lin/all.hpp"
 #include "silkit/experimental/services/lin/LinControllerExtensions.hpp"
-
-#include "CapiImpl.hpp"
-
-#include <cstring>
+#include "silkit/participant/IParticipant.hpp"
+#include "silkit/services/lin/all.hpp"
 
 
 namespace {
diff --git a/SilKit/source/capi/CapiLogger.cpp b/SilKit/source/capi/CapiLogger.cpp
index 09d2e92e9..c68e14278 100644
--- a/SilKit/source/capi/CapiLogger.cpp
+++ b/SilKit/source/capi/CapiLogger.cpp
@@ -2,13 +2,11 @@
 //
 // SPDX-License-Identifier: MIT
 
-#include "silkit/capi/SilKit.h"
-#include "silkit/SilKit.hpp"
-#include "silkit/services/logging/ILogger.hpp"
+#include "silkit/capi/Logger.h"
 
-#include "CapiImpl.hpp"
+#include "capi/CapiImpl.hpp"
 
-#include <string>
+#include "silkit/services/logging/ILogger.hpp"
 
 
 SilKit_ReturnCode SilKitCALL SilKit_Logger_Log(SilKit_Logger* self, SilKit_LoggingLevel level, const char* message)
diff --git a/SilKit/source/capi/CapiNetworkSimulator.cpp b/SilKit/source/capi/CapiNetworkSimulator.cpp
index f8b4624b0..42838d1ba 100644
--- a/SilKit/source/capi/CapiNetworkSimulator.cpp
+++ b/SilKit/source/capi/CapiNetworkSimulator.cpp
@@ -2,21 +2,16 @@
 //
 // SPDX-License-Identifier: MIT
 
-#include <iostream>
-#include <string>
-#include <algorithm>
-#include <map>
-#include <mutex>
-#include <cstring>
+#include "silkit/capi/NetworkSimulator.h"
+#include "silkit/capi/EventProducer.h"
 
-#include "silkit/capi/SilKit.h"
-#include "silkit/SilKit.hpp"
-#include "CapiImpl.hpp"
+#include "capi/CapiImpl.hpp"
+#include "participant/ParticipantExtensionsImpl.hpp"
 
+#include "silkit/detail/impl/HourglassConversions.hpp"
 #include "silkit/experimental/netsim/all.hpp"
+#include "silkit/participant/IParticipant.hpp"
 
-#include "silkit/detail/impl/HourglassConversions.hpp"
-#include "participant/ParticipantExtensionsImpl.hpp"
 
 namespace SilKit {
 namespace Experimental {
diff --git a/SilKit/source/capi/CapiOrchestration.cpp b/SilKit/source/capi/CapiOrchestration.cpp
index 303359aff..bd4f6a37c 100644
--- a/SilKit/source/capi/CapiOrchestration.cpp
+++ b/SilKit/source/capi/CapiOrchestration.cpp
@@ -2,22 +2,17 @@
 //
 // SPDX-License-Identifier: MIT
 
-#include "silkit/capi/SilKit.h"
-#include "silkit/SilKit.hpp"
-#include "silkit/services/orchestration/all.hpp"
-#include "silkit/participant/exception.hpp"
+#include "silkit/capi/Orchestration.h"
 
+#include "capi/CapiImpl.hpp"
 #include "participant/ParticipantExtensionsImpl.hpp"
-
-#include "CapiImpl.hpp"
-#include "TypeConversion.hpp"
-
 #include "services/orchestration/TimeSyncServiceExtensionsImpl.hpp"
 
-#include <memory>
+#include "silkit/experimental/services/orchestration/ISystemController.hpp"
+#include "silkit/participant/IParticipant.hpp"
+#include "silkit/services/orchestration/all.hpp"
+
 #include <map>
-#include <mutex>
-#include <cstring>
 
 
 namespace {
diff --git a/SilKit/source/capi/CapiParticipant.cpp b/SilKit/source/capi/CapiParticipant.cpp
index 326e61117..841119597 100644
--- a/SilKit/source/capi/CapiParticipant.cpp
+++ b/SilKit/source/capi/CapiParticipant.cpp
@@ -2,23 +2,15 @@
 //
 // SPDX-License-Identifier: MIT
 
-#include "ParticipantConfiguration.hpp"
-#include "ParticipantConfigurationFromXImpl.hpp"
-#include "CreateParticipantImpl.hpp"
-#include "YamlParser.hpp"
-
-#include "silkit/capi/SilKit.h"
-#include "silkit/SilKit.hpp"
-#include "silkit/services/logging/ILogger.hpp"
-#include "silkit/services/orchestration/all.hpp"
+#include "silkit/capi/Participant.h"
 
-#include "CapiImpl.hpp"
-#include "TypeConversion.hpp"
+#include "CreateParticipantImpl.hpp"
+#include "capi/CapiImpl.hpp"
+#include "config/ParticipantConfiguration.hpp"
+#include "config/ParticipantConfigurationFromXImpl.hpp"
+#include "config/YamlParser.hpp"
 
-#include <memory>
-#include <map>
-#include <mutex>
-#include <fstream>
+#include "silkit/participant/IParticipant.hpp"
 
 
 SilKit_ReturnCode SilKitCALL SilKit_Participant_Create(SilKit_Participant** outParticipant,
diff --git a/SilKit/source/capi/CapiRpc.cpp b/SilKit/source/capi/CapiRpc.cpp
index f894363c8..3a01ab9c4 100644
--- a/SilKit/source/capi/CapiRpc.cpp
+++ b/SilKit/source/capi/CapiRpc.cpp
@@ -2,21 +2,13 @@
 //
 // SPDX-License-Identifier: MIT
 
-#include "silkit/capi/SilKit.h"
-#include "silkit/SilKit.hpp"
-#include "silkit/services/logging/ILogger.hpp"
-#include "silkit/services/orchestration/all.hpp"
-#include "silkit/services/orchestration/string_utils.hpp"
-#include "silkit/services/rpc/all.hpp"
+#include "silkit/capi/Rpc.h"
 
-#include "CapiImpl.hpp"
-#include "TypeConversion.hpp"
+#include "capi/CapiImpl.hpp"
+#include "capi/TypeConversion.hpp"
 
-#include <string>
-#include <algorithm>
-#include <map>
-#include <mutex>
-#include <cstring>
+#include "silkit/participant/IParticipant.hpp"
+#include "silkit/services/rpc/all.hpp"
 
 
 namespace {
diff --git a/SilKit/source/capi/CapiVendor.cpp b/SilKit/source/capi/CapiVendor.cpp
index 264b5b3a3..9452e502d 100644
--- a/SilKit/source/capi/CapiVendor.cpp
+++ b/SilKit/source/capi/CapiVendor.cpp
@@ -2,20 +2,14 @@
 //
 // SPDX-License-Identifier: MIT
 
-#include "ParticipantConfiguration.hpp"
-#include "CreateSilKitRegistryImpl.hpp"
+#include "silkit/capi/Vendor.h"
 
-#include "silkit/capi/SilKit.h"
+#include "CreateSilKitRegistryImpl.hpp"
+#include "capi/CapiImpl.hpp"
+#include "config/ParticipantConfiguration.hpp"
 
 #include "silkit/vendor/ISilKitRegistry.hpp"
 
-#include "CapiImpl.hpp"
-#include "TypeConversion.hpp"
-
-#include <memory>
-#include <map>
-#include <mutex>
-
 
 SilKit_ReturnCode SilKitCALL SilKit_Vendor_Vector_SilKitRegistry_Create(
     SilKit_Vendor_Vector_SilKitRegistry** outSilKitRegistry, SilKit_ParticipantConfiguration* participantConfiguration)
diff --git a/SilKit/source/capi/CapiVersion.cpp b/SilKit/source/capi/CapiVersion.cpp
index d3273ecb2..89359cb4d 100644
--- a/SilKit/source/capi/CapiVersion.cpp
+++ b/SilKit/source/capi/CapiVersion.cpp
@@ -2,9 +2,10 @@
 //
 // SPDX-License-Identifier: MIT
 
-#include "silkit/capi/SilKit.h"
+#include "silkit/capi/Version.h"
+
 #include "SilKitVersionImpl.hpp"
-#include "CapiImpl.hpp"
+#include "capi/CapiImpl.hpp"
 
 
 SilKit_ReturnCode SilKitCALL SilKit_Version_Major(uint32_t* outVersionMajor)
diff --git a/SilKit/source/capi/Test_CapiCan.cpp b/SilKit/source/capi/Test_CapiCan.cpp
index e6586fa8d..7b9852494 100644
--- a/SilKit/source/capi/Test_CapiCan.cpp
+++ b/SilKit/source/capi/Test_CapiCan.cpp
@@ -2,11 +2,14 @@
 //
 // SPDX-License-Identifier: MIT
 
-#include "gtest/gtest.h"
-#include "gmock/gmock.h"
-#include "silkit/capi/SilKit.h"
+#include "core/mock/participant/MockParticipant.hpp"
+
+#include "silkit/capi/Can.h"
 #include "silkit/services/can/all.hpp"
-#include "MockParticipant.hpp"
+
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+
 
 namespace {
 using namespace SilKit::Services::Can;
diff --git a/SilKit/source/capi/Test_CapiData.cpp b/SilKit/source/capi/Test_CapiData.cpp
index 37999bdda..53c2a6c69 100644
--- a/SilKit/source/capi/Test_CapiData.cpp
+++ b/SilKit/source/capi/Test_CapiData.cpp
@@ -6,11 +6,14 @@
 #define _CRT_SECURE_NO_WARNINGS
 #endif
 
-#include "gtest/gtest.h"
-#include "gmock/gmock.h"
-#include "silkit/capi/SilKit.h"
+#include "core/mock/participant/MockParticipant.hpp"
+
+#include "silkit/capi/DataPubSub.h"
 #include "silkit/services/pubsub/all.hpp"
-#include "MockParticipant.hpp"
+
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+
 
 namespace {
 using namespace SilKit::Services::PubSub;
diff --git a/SilKit/source/capi/Test_CapiEthernet.cpp b/SilKit/source/capi/Test_CapiEthernet.cpp
index c00bcc299..e15e7c6c9 100644
--- a/SilKit/source/capi/Test_CapiEthernet.cpp
+++ b/SilKit/source/capi/Test_CapiEthernet.cpp
@@ -2,14 +2,15 @@
 //
 // SPDX-License-Identifier: MIT
 
-#include "gtest/gtest.h"
-#include "gmock/gmock.h"
-#include "silkit/capi/SilKit.h"
+#include "core/mock/participant/MockParticipant.hpp"
+#include "services/ethernet/EthDatatypeUtils.hpp"
+
+#include "silkit/capi/Ethernet.h"
 #include "silkit/services/ethernet/all.hpp"
-#include "EthDatatypeUtils.hpp"
-#include "MockParticipant.hpp"
 
-#include "fmt/format.h"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+
 
 namespace {
 using namespace SilKit::Services::Ethernet;
diff --git a/SilKit/source/capi/Test_CapiExceptions.cpp b/SilKit/source/capi/Test_CapiExceptions.cpp
index b879c0fc0..9e1eab534 100644
--- a/SilKit/source/capi/Test_CapiExceptions.cpp
+++ b/SilKit/source/capi/Test_CapiExceptions.cpp
@@ -2,12 +2,15 @@
 //
 // SPDX-License-Identifier: MIT
 
-#include "gtest/gtest.h"
-#include "gmock/gmock.h"
+#include "capi/CapiExceptions.hpp"
+#include "capi/CapiImpl.hpp"
 
-#include "CapiImpl.hpp"
 #include "silkit/detail/impl/ThrowOnError.hpp"
 
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+
+
 namespace {
 
 class Test_CapiExceptions : public testing::Test
diff --git a/SilKit/source/capi/Test_CapiFlexray.cpp b/SilKit/source/capi/Test_CapiFlexray.cpp
index 31b77272b..27380a884 100644
--- a/SilKit/source/capi/Test_CapiFlexray.cpp
+++ b/SilKit/source/capi/Test_CapiFlexray.cpp
@@ -2,12 +2,14 @@
 //
 // SPDX-License-Identifier: MIT
 
+#include "core/mock/participant/MockParticipant.hpp"
+
 #include "silkit/capi/Flexray.h"
-#include "silkit/capi/SilKit.h"
 #include "silkit/services/flexray/all.hpp"
+
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-#include "MockParticipant.hpp"
+
 
 namespace {
 using namespace SilKit::Core;
diff --git a/SilKit/source/capi/Test_CapiLin.cpp b/SilKit/source/capi/Test_CapiLin.cpp
index 15492be49..99e6b3af0 100644
--- a/SilKit/source/capi/Test_CapiLin.cpp
+++ b/SilKit/source/capi/Test_CapiLin.cpp
@@ -2,14 +2,15 @@
 //
 // SPDX-License-Identifier: MIT
 
-#include "gtest/gtest.h"
-#include "gmock/gmock.h"
+#include "core/mock/participant/MockParticipant.hpp"
+#include "services/lin/ILinControllerExtensions.hpp"
 
-#include "silkit/capi/SilKit.h"
+#include "silkit/capi/Lin.h"
 #include "silkit/services/lin/all.hpp"
 
-#include "MockParticipant.hpp"
-#include "ILinControllerExtensions.hpp"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+
 
 namespace {
 using namespace SilKit::Services::Lin;
diff --git a/SilKit/source/capi/Test_CapiNetSim.cpp b/SilKit/source/capi/Test_CapiNetSim.cpp
index f876353dd..62c2e9537 100644
--- a/SilKit/source/capi/Test_CapiNetSim.cpp
+++ b/SilKit/source/capi/Test_CapiNetSim.cpp
@@ -2,11 +2,14 @@
 //
 // SPDX-License-Identifier: MIT
 
-#include "gtest/gtest.h"
-#include "gmock/gmock.h"
-#include "silkit/capi/SilKit.h"
+#include "core/mock/participant/MockParticipant.hpp"
+
+#include "silkit/capi/NetworkSimulator.h"
 #include "silkit/experimental/netsim/all.hpp"
-#include "MockParticipant.hpp"
+
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+
 
 namespace {
 using namespace SilKit::Experimental::NetworkSimulation;
diff --git a/SilKit/source/capi/Test_CapiParticipantStateHandling.cpp b/SilKit/source/capi/Test_CapiParticipantStateHandling.cpp
index 3167eb704..d65d37065 100644
--- a/SilKit/source/capi/Test_CapiParticipantStateHandling.cpp
+++ b/SilKit/source/capi/Test_CapiParticipantStateHandling.cpp
@@ -6,12 +6,14 @@
 #define _CRT_SECURE_NO_WARNINGS
 #endif
 
-#include "gtest/gtest.h"
-#include "gmock/gmock.h"
-#include "silkit/capi/SilKit.h"
+#include "core/mock/participant/MockParticipant.hpp"
+
+#include "silkit/capi/Orchestration.h"
 #include "silkit/services/orchestration/all.hpp"
 
-#include "MockParticipant.hpp"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+
 
 namespace {
 using testing::Return;
diff --git a/SilKit/source/capi/Test_CapiRpc.cpp b/SilKit/source/capi/Test_CapiRpc.cpp
index 43796a68e..3e3918d3b 100644
--- a/SilKit/source/capi/Test_CapiRpc.cpp
+++ b/SilKit/source/capi/Test_CapiRpc.cpp
@@ -6,12 +6,15 @@
 #define _CRT_SECURE_NO_WARNINGS
 #endif
 
-#include "gtest/gtest.h"
-#include "gmock/gmock.h"
-#include "silkit/capi/SilKit.h"
+#include "core/mock/participant/MockParticipant.hpp"
+#include "services/rpc/RpcCallHandle.hpp"
+
+#include "silkit/capi/Rpc.h"
 #include "silkit/services/rpc/all.hpp"
-#include "MockParticipant.hpp"
-#include "RpcCallHandle.hpp"
+
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+
 
 namespace {
 using namespace SilKit::Services::Rpc;
diff --git a/SilKit/source/capi/Test_CapiSilKit.cpp b/SilKit/source/capi/Test_CapiSilKit.cpp
index aa177754f..89b31c47f 100644
--- a/SilKit/source/capi/Test_CapiSilKit.cpp
+++ b/SilKit/source/capi/Test_CapiSilKit.cpp
@@ -2,11 +2,13 @@
 //
 // SPDX-License-Identifier: MIT
 
-#include "gtest/gtest.h"
-#include "gmock/gmock.h"
+#include "core/mock/participant/MockParticipant.hpp"
+
 #include "silkit/capi/SilKit.h"
 
-#include "MockParticipant.hpp"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+
 
 namespace {
 
diff --git a/SilKit/source/capi/Test_CapiTimeSync.cpp b/SilKit/source/capi/Test_CapiTimeSync.cpp
index 45bd86403..adca53fea 100644
--- a/SilKit/source/capi/Test_CapiTimeSync.cpp
+++ b/SilKit/source/capi/Test_CapiTimeSync.cpp
@@ -2,12 +2,14 @@
 //
 // SPDX-License-Identifier: MIT
 
-#include "gtest/gtest.h"
-#include "gmock/gmock.h"
-#include "silkit/capi/SilKit.h"
+#include "core/mock/participant/MockParticipant.hpp"
+
+#include "silkit/capi/Orchestration.h"
 #include "silkit/services/orchestration/all.hpp"
 
-#include "MockParticipant.hpp"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+
 
 namespace {
 using namespace SilKit::Services::Orchestration;
diff --git a/SilKit/source/capi/TypeConversion.hpp b/SilKit/source/capi/TypeConversion.hpp
index dbaec0c10..8c079aa32 100644
--- a/SilKit/source/capi/TypeConversion.hpp
+++ b/SilKit/source/capi/TypeConversion.hpp
@@ -4,13 +4,15 @@
 
 #pragma once
 
+#include "silkit/capi/DataPubSub.h"
+#include "silkit/capi/Rpc.h"
 #include "silkit/capi/Types.h"
-
 #include "silkit/services/pubsub/PubSubSpec.hpp"
 #include "silkit/services/rpc/RpcSpec.hpp"
 
-#include <vector>
 #include <string>
+#include <vector>
+
 
 namespace {