diff --git a/score/datarouter/BUILD b/score/datarouter/BUILD
index 2b3e408d..8a986a39 100644
--- a/score/datarouter/BUILD
+++ b/score/datarouter/BUILD
@@ -72,7 +72,7 @@ cc_library(
     features = COMPILER_WARNING_FEATURES,
     strip_include_prefix = "include",
     visibility = [
-        "//platform/aas/pas/datarouterconf:__subpackages__",
+        "//platform/aas/log_and_trace/datarouterconf:__subpackages__",
         "@score_logging//score/datarouter:__subpackages__",
     ],
     deps = [
@@ -290,7 +290,7 @@ cc_library(
     features = COMPILER_WARNING_FEATURES,
     strip_include_prefix = "include/daemon",
     visibility = [
-        "//platform/aas/pas/datarouterconf:__subpackages__",
+        "//platform/aas/log_and_trace/datarouterconf:__subpackages__",
     ],
 )
 
@@ -350,7 +350,7 @@ cc_library(
         "include/daemon/configurator_commands.h",
     ],
     visibility = [
-        "//platform/aas/pas/datarouterconf:__subpackages__",
+        "//platform/aas/log_and_trace/datarouterconf:__subpackages__",
         "@score_logging//score/datarouter:__subpackages__",
     ],
 )
diff --git a/score/datarouter/build_configuration_flags/BUILD b/score/datarouter/build_configuration_flags/BUILD
index 5d51914d..ef556c25 100644
--- a/score/datarouter/build_configuration_flags/BUILD
+++ b/score/datarouter/build_configuration_flags/BUILD
@@ -24,7 +24,7 @@ config_setting(
         ":persistent_logging": "True",
     },
     visibility = [
-        "//platform/aas/pas/datarouterconf:__subpackages__",
+        "//platform/aas/log_and_trace/datarouterconf:__subpackages__",
         "@score_logging//score/datarouter:__subpackages__",
     ],
 )
diff --git a/score/datarouter/dlt_filetransfer_trigger_lib/BUILD b/score/datarouter/dlt_filetransfer_trigger_lib/BUILD
index 20077d18..a654d5c2 100644
--- a/score/datarouter/dlt_filetransfer_trigger_lib/BUILD
+++ b/score/datarouter/dlt_filetransfer_trigger_lib/BUILD
@@ -27,8 +27,8 @@ cc_library(
     ],
     features = COMPILER_WARNING_FEATURES,
     visibility = [
+        "//platform/aas/log_and_trace/datarouterconf/src/services:__pkg__",
         "//platform/aas/pas/crash_handler:__pkg__",
-        "//platform/aas/pas/datarouterconf/src/services:__pkg__",
         "//platform/aas/test/pas:__subpackages__",
         "//score/datarouter/test:__subpackages__",
         "//score/test/component:__subpackages__",
@@ -49,8 +49,8 @@ cc_library(
     ],
     features = COMPILER_WARNING_FEATURES,
     visibility = [
+        "//platform/aas/log_and_trace/datarouterconf/src/filetransfer:__subpackages__",
         "//platform/aas/pas/crash_handler:__subpackages__",
-        "//platform/aas/pas/datarouterconf/src/filetransfer:__subpackages__",
         "//score/mw/log/legacy_non_verbose_api:__pkg__",
         "@score_logging//score/datarouter:__subpackages__",
     ],
diff --git a/score/datarouter/include/daemon/socketserver.h b/score/datarouter/include/daemon/socketserver.h
index dd21ad9c..cebc079c 100644
--- a/score/datarouter/include/daemon/socketserver.h
+++ b/score/datarouter/include/daemon/socketserver.h
@@ -17,6 +17,7 @@
 #include "daemon/dlt_log_server.h"
 #include "daemon/message_passing_server.h"
 #include "logparser/i_log_parser_factory.h"
+#include "score/os/pthread.h"
 #include "score/mw/log/configuration/nvconfig.h"
 #include "score/mw/log/logging.h"
 #include "score/datarouter/datarouter/data_router.h"
@@ -44,14 +45,6 @@ class ConnectMessageFromClient;
 }  // namespace mw
 }  // namespace score
 
-namespace score
-{
-namespace os
-{
-class Pthread;
-}  // namespace os
-}  // namespace score
-
 #include "score/message_passing/client_factory.h"
 #include "score/message_passing/server_factory.h"
 
diff --git a/score/datarouter/test/ut/etc/BUILD b/score/datarouter/test/ut/etc/BUILD
index 098ef88e..9fe118dc 100644
--- a/score/datarouter/test/ut/etc/BUILD
+++ b/score/datarouter/test/ut/etc/BUILD
@@ -23,7 +23,7 @@ filegroup(
         "datarouter/persistent-logging_test_6.json",
     ],
     visibility = [
-        "//platform/aas/pas/datarouterconf:__subpackages__",
+        "//platform/aas/log_and_trace/datarouterconf:__subpackages__",
         "@score_logging//score/datarouter:__subpackages__",
     ],
 )
diff --git a/score/mw/common_features.bzl b/score/mw/common_features.bzl
index c46c86fb..3c5175a4 100644
--- a/score/mw/common_features.bzl
+++ b/score/mw/common_features.bzl
@@ -14,5 +14,4 @@ COMPILER_WARNING_FEATURES = [
     "treat_warnings_as_errors",
     "additional_warnings",
     "strict_warnings",
-    "strict_warnings_no_error",
 ]