From 4559a219350e0047696d761723f125739080ecbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marius=20B=C3=B6rschig?= <Marius.Boerschig@vector.com>
Date: Fri, 26 Jun 2026 16:33:54 +0200
Subject: [PATCH] style: fix includes Utilities
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Marius Börschig <Marius.Boerschig@vector.com>
---
 .../SilKitMonitor/PassiveSystemMonitor.cpp     |  4 ++--
 Utilities/SilKitRegistry/Registry.cpp          | 18 +++++++++---------
 Utilities/SilKitRegistry/Registry.hpp          |  2 +-
 .../config/RegistryConfiguration.cpp           |  4 ++--
 .../config/RegistryConfiguration.hpp           |  4 ++--
 .../config/Test_RegistryConfiguration.cpp      |  2 +-
 .../SystemController.cpp                       |  4 ++--
 7 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/Utilities/SilKitMonitor/PassiveSystemMonitor.cpp b/Utilities/SilKitMonitor/PassiveSystemMonitor.cpp
index 975d4aacb..45874d99a 100644
--- a/Utilities/SilKitMonitor/PassiveSystemMonitor.cpp
+++ b/Utilities/SilKitMonitor/PassiveSystemMonitor.cpp
@@ -19,8 +19,8 @@
 #include "silkit/services/orchestration/string_utils.hpp"
 #include "silkit/services/logging/ILogger.hpp"
 
-#include "CommandlineParser.hpp"
-#include "SignalHandler.hpp"
+#include "util/CommandlineParser.hpp"
+#include "util/SignalHandler.hpp"
 
 using namespace SilKit;
 using namespace SilKit::Util;
diff --git a/Utilities/SilKitRegistry/Registry.cpp b/Utilities/SilKitRegistry/Registry.cpp
index db7ef9fb5..114ffed73 100644
--- a/Utilities/SilKitRegistry/Registry.cpp
+++ b/Utilities/SilKitRegistry/Registry.cpp
@@ -17,22 +17,22 @@
 #include "silkit/SilKitVersion.hpp"
 #include "silkit/SilKit.hpp"
 
-#include "SignalHandler.hpp"
+#include "util/SignalHandler.hpp"
 #include "WindowsServiceMain.hpp"
 #include "RegistryConfiguration.hpp"
-#include "StringHelpers.hpp"
+#include "util/StringHelpers.hpp"
 
-#include "CommandlineParser.hpp"
-#include "ParticipantConfiguration.hpp"
-#include "FileHelpers.hpp"
-#include "YamlParser.hpp"
-#include "ParticipantConfigurationFromXImpl.hpp"
+#include "util/CommandlineParser.hpp"
+#include "config/ParticipantConfiguration.hpp"
+#include "util/FileHelpers.hpp"
+#include "config/YamlParser.hpp"
+#include "config/ParticipantConfigurationFromXImpl.hpp"
 #include "CreateSilKitRegistryImpl.hpp"
 #include "CreateSilKitRegistryWithDashboard.hpp"
 
 // Dashboard
-#include "ValidateAndSanitizeConfig.hpp"
-#include "CreateDashboardInstance.hpp"
+#include "core/participant/ValidateAndSanitizeConfig.hpp"
+#include "dashboard/CreateDashboardInstance.hpp"
 
 using namespace SilKit::Core;
 using namespace SilKit::Util;
diff --git a/Utilities/SilKitRegistry/Registry.hpp b/Utilities/SilKitRegistry/Registry.hpp
index 9185354de..32fe075ce 100644
--- a/Utilities/SilKitRegistry/Registry.hpp
+++ b/Utilities/SilKitRegistry/Registry.hpp
@@ -5,7 +5,7 @@
 #pragma once
 
 #include "silkit/vendor/ISilKitRegistry.hpp"
-#include "IDashboardInstance.hpp"
+#include "dashboard/IDashboardInstance.hpp"
 
 #include <memory>
 
diff --git a/Utilities/SilKitRegistry/config/RegistryConfiguration.cpp b/Utilities/SilKitRegistry/config/RegistryConfiguration.cpp
index d8261062f..dbfb00eb9 100644
--- a/Utilities/SilKitRegistry/config/RegistryConfiguration.cpp
+++ b/Utilities/SilKitRegistry/config/RegistryConfiguration.cpp
@@ -2,11 +2,11 @@
 //
 // SPDX-License-Identifier: MIT
 
-#include "ParticipantConfiguration.hpp"
+#include "config/ParticipantConfiguration.hpp"
 #include "RegistryConfiguration.hpp"
 
 // Internal SIL Kit Headers
-#include "YamlParser.hpp"
+#include "config/YamlParser.hpp"
 #include "fmt/format.h"
 
 namespace SilKitRegistry {
diff --git a/Utilities/SilKitRegistry/config/RegistryConfiguration.hpp b/Utilities/SilKitRegistry/config/RegistryConfiguration.hpp
index 943e1423e..de09fb294 100644
--- a/Utilities/SilKitRegistry/config/RegistryConfiguration.hpp
+++ b/Utilities/SilKitRegistry/config/RegistryConfiguration.hpp
@@ -7,8 +7,8 @@
 #include <string>
 
 // Internal SIL Kit Headers
-#include "Configuration.hpp"
-#include "ParticipantConfiguration.hpp"
+#include "config/Configuration.hpp"
+#include "config/ParticipantConfiguration.hpp"
 
 
 namespace SilKitRegistry {
diff --git a/Utilities/SilKitRegistry/config/Test_RegistryConfiguration.cpp b/Utilities/SilKitRegistry/config/Test_RegistryConfiguration.cpp
index cb2f99091..346bf7d03 100644
--- a/Utilities/SilKitRegistry/config/Test_RegistryConfiguration.cpp
+++ b/Utilities/SilKitRegistry/config/Test_RegistryConfiguration.cpp
@@ -7,7 +7,7 @@
 
 #include "RegistryConfiguration.hpp"
 
-#include "FileHelpers.hpp"
+#include "util/FileHelpers.hpp"
 
 namespace {
 
diff --git a/Utilities/SilKitSystemController/SystemController.cpp b/Utilities/SilKitSystemController/SystemController.cpp
index 8320dc958..037abbaa5 100644
--- a/Utilities/SilKitSystemController/SystemController.cpp
+++ b/Utilities/SilKitSystemController/SystemController.cpp
@@ -21,8 +21,8 @@
 #include "silkit/services/orchestration/string_utils.hpp"
 #include "silkit/experimental/participant/ParticipantExtensions.hpp"
 
-#include "CommandlineParser.hpp"
-#include "SignalHandler.hpp"
+#include "util/CommandlineParser.hpp"
+#include "util/SignalHandler.hpp"
 
 using namespace SilKit;
 using namespace SilKit::Util;