vectorgrp · VDanielEdwards · Apr 28, 2026
diff --git a/SilKit/source/config/Configuration.cpp b/SilKit/source/config/Configuration.cpp
@@ -2,4 +2,4 @@
 //
 // SPDX-License-Identifier: MIT
 
-#include "Configuration.hpp"
+#include "config/Configuration.hpp"
diff --git a/SilKit/source/config/Configuration.hpp b/SilKit/source/config/Configuration.hpp
@@ -4,6 +4,11 @@
 
 #pragma once
 
+#include "util/StringHelpers.hpp"
+
+#include "silkit/participant/exception.hpp"
+#include "silkit/services/logging/LoggingDatatypes.hpp"
+
 #include <algorithm>
 #include <iostream>
 #include <optional>
@@ -14,12 +19,6 @@
 #include <vector>
 #include <cctype>
 
-#include "silkit/participant/exception.hpp"
-#include "silkit/SilKitMacros.hpp"
-#include "silkit/services/logging/LoggingDatatypes.hpp"
-
-#include "StringHelpers.hpp"
-
 namespace SilKit {
 namespace Config {
 

diff --git a/SilKit/source/config/ConfigurationTestUtils.hpp b/SilKit/source/config/ConfigurationTestUtils.hpp
@@ -4,13 +4,13 @@
 
 #pragma once
 
-#include <memory>
-#include <sstream>
+#include "config/ParticipantConfiguration.hpp"
 
 #include "silkit/services/logging/LoggingDatatypes.hpp"
 #include "silkit/services/logging/string_utils.hpp"
 
-#include "ParticipantConfiguration.hpp"
+#include <memory>
+#include <sstream>
 
 namespace SilKit {
 namespace Config {

diff --git a/SilKit/source/config/ParticipantConfiguration.cpp b/SilKit/source/config/ParticipantConfiguration.cpp
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: MIT
 
-#include "ParticipantConfiguration.hpp"
+#include "config/ParticipantConfiguration.hpp"
 
 #include <string>
 #include <type_traits>

diff --git a/SilKit/source/config/ParticipantConfiguration.hpp b/SilKit/source/config/ParticipantConfiguration.hpp
@@ -4,13 +4,7 @@
 
 #pragma once
 
-#include <array>
-#include <chrono>
-#include <iostream>
-#include <optional>
-#include <ostream>
-#include <string>
-#include <vector>
+#include "config/Configuration.hpp"
 
 #include "silkit/config/IParticipantConfiguration.hpp"
 #include "silkit/services/flexray/FlexrayDatatypes.hpp"
@@ -19,7 +13,13 @@
 #include "silkit/services/rpc/RpcDatatypes.hpp"
 #include "silkit/services/datatypes.hpp"
 
-#include "Configuration.hpp"
+#include <array>
+#include <chrono>
+#include <iostream>
+#include <optional>
+#include <ostream>
+#include <string>
+#include <vector>
 
 namespace SilKit {
 namespace Config {

diff --git a/SilKit/source/config/ParticipantConfigurationFromXImpl.cpp b/SilKit/source/config/ParticipantConfigurationFromXImpl.cpp
@@ -2,7 +2,14 @@
 //
 // SPDX-License-Identifier: MIT
 
-#include "ParticipantConfiguration.hpp"
+#include "config/ParticipantConfigurationFromXImpl.hpp"
+
+#include "config/ParticipantConfiguration.hpp"
+#include "config/YamlParser.hpp"
+#include "config/YamlValidator.hpp"
+#include "util/FileHelpers.hpp"
+
+#include "silkit/services/logging/string_utils.hpp"
 
 #include <filesystem>
 #include <fstream>
@@ -13,13 +20,6 @@
 #include <utility>
 #include <vector>
 
-#include "FileHelpers.hpp"
-#include "ParticipantConfigurationFromXImpl.hpp"
-#include "silkit/services/logging/string_utils.hpp"
-
-#include "YamlParser.hpp"
-#include "YamlValidator.hpp"
-
 #include "fmt/format.h"
 
 namespace SilKit {

diff --git a/SilKit/source/config/ParticipantConfigurationFromXImpl.hpp b/SilKit/source/config/ParticipantConfigurationFromXImpl.hpp
@@ -9,6 +9,7 @@
 //             nor public), as it is used to implement the 'legacy' ABI functions.
 // ================================================================================
 
+#include <memory>
 #include <string>
 
 namespace SilKit {

diff --git a/SilKit/source/config/Test_ParticipantConfiguration.cpp b/SilKit/source/config/Test_ParticipantConfiguration.cpp
@@ -2,18 +2,19 @@
 //
 // SPDX-License-Identifier: MIT
 
+#include "core/mock/nullconnection/NullConnectionParticipant.hpp"
+#include "config/ParticipantConfiguration.hpp"
+#include "config/ParticipantConfigurationFromXImpl.hpp"
+#include "util/functional.hpp"
+
+#include "silkit/services/all.hpp"
+
 #include <chrono>
 #include <cstdlib>
 #include <thread>
 #include <future>
 #include <memory>
 
-#include "NullConnectionParticipant.hpp"
-#include "ParticipantConfiguration.hpp"
-#include "ParticipantConfigurationFromXImpl.hpp"
-#include "silkit/services/all.hpp"
-#include "functional.hpp"
-
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 

diff --git a/SilKit/source/config/Test_Validation.cpp b/SilKit/source/config/Test_Validation.cpp
@@ -2,7 +2,9 @@
 //
 // SPDX-License-Identifier: MIT
 
-#include "Validation.hpp"
+#include "config/Validation.hpp"
+
+#include "util/functional.hpp"
 
 #include <chrono>
 #include <functional>
@@ -11,10 +13,6 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-#include "functional.hpp"
-
-#include "Validation.hpp"
-
 namespace {
 
 using namespace std::chrono_literals;

diff --git a/SilKit/source/config/Test_YamlParser.cpp b/SilKit/source/config/Test_YamlParser.cpp
@@ -2,15 +2,14 @@
 //
 // SPDX-License-Identifier: MIT
 
-#include "YamlParser.hpp"
+#include "config/YamlParser.hpp"
+#include "config/ParticipantConfiguration.hpp"
 
-#include "ParticipantConfiguration.hpp"
+#include <chrono>
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-#include <chrono>
-
 namespace {
 
 class Test_YamlParser : public testing::Test

diff --git a/SilKit/source/config/Test_YamlValidator.cpp b/SilKit/source/config/Test_YamlValidator.cpp
@@ -2,16 +2,15 @@
 //
 // SPDX-License-Identifier: MIT
 
-#include "YamlParser.hpp"
-#include "YamlValidator.hpp"
+#include "config/YamlParser.hpp"
+#include "config/YamlValidator.hpp"
+#include "config/ParticipantConfiguration.hpp"
 
-#include "ParticipantConfiguration.hpp"
+#include <fstream>
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-#include <fstream>
-
 namespace {
 
 class Test_YamlValidator : public testing::Test

diff --git a/SilKit/source/config/Validation.cpp b/SilKit/source/config/Validation.cpp
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: MIT
 
-#include "Validation.hpp"
+#include "config/Validation.hpp"
 
 #include <iostream>
 #include <sstream>

diff --git a/SilKit/source/config/Validation.hpp b/SilKit/source/config/Validation.hpp
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "ParticipantConfiguration.hpp"
+#include "config/ParticipantConfiguration.hpp"
 
 namespace SilKit {
 namespace Config {

diff --git a/SilKit/source/config/YamlParser.cpp b/SilKit/source/config/YamlParser.cpp
@@ -2,4 +2,4 @@
 //
 // SPDX-License-Identifier: MIT
 
-#include "YamlParser.hpp"
+#include "config/YamlParser.hpp"
diff --git a/SilKit/source/config/YamlParser.hpp b/SilKit/source/config/YamlParser.hpp
@@ -1,13 +1,14 @@
-#pragma once
 // SPDX-FileCopyrightText: 2025 Vector Informatik GmbH
 //
 // SPDX-License-Identifier: MIT
 
-#include <string>
+#pragma once
 
-#include "YamlReader.hpp"
-#include "YamlWriter.hpp"
-#include "YamlParserUtils.hpp"
+#include "config/YamlReader.hpp"
+#include "config/YamlWriter.hpp"
+#include "config/YamlParserUtils.hpp"
+
+#include <string>
 
 #include "rapidyaml.hpp"
 

diff --git a/SilKit/source/config/YamlParserUtils.cpp b/SilKit/source/config/YamlParserUtils.cpp
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: MIT
 
-#include "YamlParserUtils.hpp"
+#include "config/YamlParserUtils.hpp"
 
 #include "silkit/participant/exception.hpp"
 

diff --git a/SilKit/source/config/YamlParserUtils.hpp b/SilKit/source/config/YamlParserUtils.hpp
@@ -4,12 +4,12 @@
 
 #pragma once
 
+#include "silkit/participant/exception.hpp"
+
 #include <map>
 #include <string>
 #include <vector>
 
-#include "silkit/participant/exception.hpp"
-
 #include "rapidyaml.hpp"
 
 namespace VSilKit {

diff --git a/SilKit/source/config/YamlReader.cpp b/SilKit/source/config/YamlReader.cpp
@@ -1,7 +1,8 @@
 // SPDX-FileCopyrightText: 2025 Vector Informatik GmbH
 //
 // SPDX-License-Identifier: MIT
-#include "YamlReader.hpp"
+
+#include "config/YamlReader.hpp"
 
 namespace VSilKit {
 

diff --git a/SilKit/source/config/YamlReader.hpp b/SilKit/source/config/YamlReader.hpp
@@ -1,9 +1,14 @@
-#pragma once
-
 // SPDX-FileCopyrightText: 2025 Vector Informatik GmbH
 //
 // SPDX-License-Identifier: MIT
 
+#pragma once
+
+#include "silkit/participant/exception.hpp"
+
+#include "config/ParticipantConfiguration.hpp"
+#include "config/YamlParserUtils.hpp"
+
 #include <string>
 #include <memory>
 #include <optional>
@@ -13,9 +18,6 @@
 
 #include "rapidyaml.hpp"
 
-#include "ParticipantConfiguration.hpp"
-#include "YamlParserUtils.hpp"
-
 namespace VSilKit {
 
 template <typename Impl>

diff --git a/SilKit/source/config/YamlValidator.cpp b/SilKit/source/config/YamlValidator.cpp
@@ -2,7 +2,10 @@
 //
 // SPDX-License-Identifier: MIT
 
-#include "YamlValidator.hpp"
+#include "config/YamlValidator.hpp"
+
+#include "config/Configuration.hpp"
+#include "config/YamlParser.hpp"
 
 #include <stdexcept>
 #include <set>
@@ -11,14 +14,8 @@
 #include <vector>
 #include <sstream>
 
-
-#include "Configuration.hpp"
 #include "rapidyaml.hpp"
 
-//#include "YamlConversion.hpp"
-//#include "SilKitYamlHelper.hpp" // ParserContext
-#include "YamlParser.hpp" // ParserContext
-
 namespace {
 
 inline auto to_string(ryml::csubstr stringView) -> std::string

diff --git a/SilKit/source/config/YamlWriter.cpp b/SilKit/source/config/YamlWriter.cpp
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: MIT
 
-#include "YamlWriter.hpp"
+#include "config/YamlWriter.hpp"
 
 namespace VSilKit {
 

diff --git a/SilKit/source/config/YamlWriter.hpp b/SilKit/source/config/YamlWriter.hpp
@@ -1,8 +1,11 @@
-#pragma once
 // SPDX-FileCopyrightText: 2025 Vector Informatik GmbH
 //
 // SPDX-License-Identifier: MIT
 
+#pragma once
+
+#include "config/ParticipantConfiguration.hpp"
+
 #include <string>
 #include <memory>
 #include <sstream>
@@ -12,8 +15,6 @@
 
 #include "rapidyaml.hpp"
 
-#include "ParticipantConfiguration.hpp"
-
 namespace VSilKit {
 
 template <typename Impl>