From 2614c1f216b4887368cb890beb7f63a1809e0f8a Mon Sep 17 00:00:00 2001
From: Daniel Edwards <Daniel.Edwards@vector.com>
Date: Tue, 28 Apr 2026 08:19:18 +0200
Subject: [PATCH] style: use full paths for internal headers in `config/...`

Signed-off-by: Daniel Edwards <Daniel.Edwards@vector.com>
---
 SilKit/source/config/Configuration.cpp           |  2 +-
 SilKit/source/config/Configuration.hpp           | 11 +++++------
 SilKit/source/config/ConfigurationTestUtils.hpp  |  6 +++---
 .../source/config/ParticipantConfiguration.cpp   |  2 +-
 .../source/config/ParticipantConfiguration.hpp   | 16 ++++++++--------
 .../config/ParticipantConfigurationFromXImpl.cpp | 16 ++++++++--------
 .../config/ParticipantConfigurationFromXImpl.hpp |  1 +
 .../config/Test_ParticipantConfiguration.cpp     | 13 +++++++------
 SilKit/source/config/Test_Validation.cpp         |  8 +++-----
 SilKit/source/config/Test_YamlParser.cpp         |  7 +++----
 SilKit/source/config/Test_YamlValidator.cpp      |  9 ++++-----
 SilKit/source/config/Validation.cpp              |  2 +-
 SilKit/source/config/Validation.hpp              |  2 +-
 SilKit/source/config/YamlParser.cpp              |  2 +-
 SilKit/source/config/YamlParser.hpp              | 11 ++++++-----
 SilKit/source/config/YamlParserUtils.cpp         |  2 +-
 SilKit/source/config/YamlParserUtils.hpp         |  4 ++--
 SilKit/source/config/YamlReader.cpp              |  3 ++-
 SilKit/source/config/YamlReader.hpp              | 12 +++++++-----
 SilKit/source/config/YamlValidator.cpp           | 11 ++++-------
 SilKit/source/config/YamlWriter.cpp              |  2 +-
 SilKit/source/config/YamlWriter.hpp              |  7 ++++---
 22 files changed, 74 insertions(+), 75 deletions(-)

diff --git a/SilKit/source/config/Configuration.cpp b/SilKit/source/config/Configuration.cpp
index 5f3017193..4679069fb 100644
--- 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
index dc8f42c10..e31be8f0b 100644
--- 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
index e3a614b61..20ca4acc4 100644
--- 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
index 583b9c050..33d6a4a90 100755
--- 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
index e1322cb46..addebcc4a 100644
--- 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
index d2e3f7c20..01a31a0d0 100644
--- 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
index 57a14d81a..3adacbb89 100644
--- 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
index 6b3c4cbec..0b94475f6 100644
--- 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
index 5869aadab..0b891876c 100644
--- 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
index bb9090231..a5237273b 100644
--- 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
index 63d50ee89..a1885fc83 100644
--- 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
index f8c0ef40a..4e49a889a 100644
--- 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
index c7ab5433d..754766948 100644
--- 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
index ef4ce1930..163be50e1 100644
--- 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
index 8c30d756d..320a7cc98 100644
--- 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
index c15910f64..60a462622 100644
--- 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
index 9adba1d4f..a0f46c9f1 100644
--- 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
index 6a796eb39..6a8bceaae 100644
--- 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
index 9e5da9b23..73919da72 100644
--- 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
index d22b36136..04d6c08b3 100644
--- 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
index 1bcadc815..e7db490bc 100644
--- 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
index 067fc0085..4286f6793 100644
--- 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>