diff --git a/score/json/json_serializer.h b/score/json/json_serializer.h
index c34348f6..ddcf6c8f 100644
--- a/score/json/json_serializer.h
+++ b/score/json/json_serializer.h
@@ -17,8 +17,8 @@
 
 #include "score/result/result.h"
 
-#include <static_reflection_with_serialization/visitor/visit.h>
-#include <static_reflection_with_serialization/visitor/visit_as_struct.h>
+#include <visitor/visit.h>
+#include <visitor/visit_as_struct.h>
 
 #include <cstdint>
 #include <optional>
diff --git a/score/json/json_serializer_test.cpp b/score/json/json_serializer_test.cpp
index 7d98bb15..8d051141 100644
--- a/score/json/json_serializer_test.cpp
+++ b/score/json/json_serializer_test.cpp
@@ -12,8 +12,8 @@
  ********************************************************************************/
 #include "score/json/json_serializer.h"
 
-#include <static_reflection_with_serialization/visitor/visit.h>
-#include <static_reflection_with_serialization/visitor/visit_as_struct.h>
+#include <visitor/visit.h>
+#include <visitor/visit_as_struct.h>
 
 #include <gmock/gmock-matchers.h>
 #include <gtest/gtest.h>
diff --git a/score/mw/log/detail/file_logging/dlt_message_builder.cpp b/score/mw/log/detail/file_logging/dlt_message_builder.cpp
index 67c7ad9f..c650bfd7 100644
--- a/score/mw/log/detail/file_logging/dlt_message_builder.cpp
+++ b/score/mw/log/detail/file_logging/dlt_message_builder.cpp
@@ -17,9 +17,9 @@
 #include "score/mw/log/detail/file_logging/svp_time.h"
 #include "score/mw/log/log_level.h"
 
-#include "static_reflection_with_serialization/serialization/for_logging.h"
-#include "static_reflection_with_serialization/visitor/visit.h"
-#include "static_reflection_with_serialization/visitor/visit_as_struct.h"
+#include "serialization/for_logging.h"
+#include "visitor/visit.h"
+#include "visitor/visit_as_struct.h"
 
 #include <arpa/inet.h>
 #include <chrono>
diff --git a/score/mw/log/detail/log_entry.h b/score/mw/log/detail/log_entry.h
index 0110d5f6..19da554d 100644
--- a/score/mw/log/detail/log_entry.h
+++ b/score/mw/log/detail/log_entry.h
@@ -15,7 +15,7 @@
 
 #include "score/mw/log/detail/logging_identifier.h"
 #include "score/mw/log/log_level.h"
-#include "static_reflection_with_serialization/visitor/visit_as_struct.h"
+#include "visitor/visit_as_struct.h"
 
 #include <vector>
 
diff --git a/score/mw/log/detail/log_entry_deserialize.h b/score/mw/log/detail/log_entry_deserialize.h
index 3443746e..b632d8ba 100644
--- a/score/mw/log/detail/log_entry_deserialize.h
+++ b/score/mw/log/detail/log_entry_deserialize.h
@@ -15,7 +15,7 @@
 
 #include "score/mw/log/detail/logging_identifier.h"
 #include "score/mw/log/log_level.h"
-#include "static_reflection_with_serialization/visitor/visit_as_struct.h"
+#include "visitor/visit_as_struct.h"
 
 #include <score/span.hpp>
 
diff --git a/score/mw/log/detail/logging_identifier.h b/score/mw/log/detail/logging_identifier.h
index e04a31a9..ec02bac4 100644
--- a/score/mw/log/detail/logging_identifier.h
+++ b/score/mw/log/detail/logging_identifier.h
@@ -15,7 +15,7 @@
 
 #include <string_view>
 
-#include "static_reflection_with_serialization/visitor/visit_as_struct.h"
+#include "visitor/visit_as_struct.h"
 
 #include <array>
 #include <functional>
diff --git a/score/static_reflection_with_serialization/serialization/BUILD b/score/static_reflection_with_serialization/serialization/BUILD
index 5401c1ea..47d4a6a5 100644
--- a/score/static_reflection_with_serialization/serialization/BUILD
+++ b/score/static_reflection_with_serialization/serialization/BUILD
@@ -26,7 +26,6 @@ cc_library(
         "include/serialization/visit_type_traits.h",
     ],
     features = _compiler_warning_features,
-    include_prefix = "static_reflection_with_serialization",
     strip_include_prefix = "include",
     tags = ["FFI"],
     visibility = [
diff --git a/score/static_reflection_with_serialization/serialization/include/serialization/skip_deserialize.h b/score/static_reflection_with_serialization/serialization/include/serialization/skip_deserialize.h
index c3e3d9c3..eee274ef 100644
--- a/score/static_reflection_with_serialization/serialization/include/serialization/skip_deserialize.h
+++ b/score/static_reflection_with_serialization/serialization/include/serialization/skip_deserialize.h
@@ -13,7 +13,7 @@
 #ifndef SCORE_COMMON_SERIALIZATION_INCLUDE_SERIALIZATION_SKIP_DESERIALIZE_H
 #define SCORE_COMMON_SERIALIZATION_INCLUDE_SERIALIZATION_SKIP_DESERIALIZE_H
 
-#include "static_reflection_with_serialization/serialization/for_logging.h"
+#include "serialization/for_logging.h"
 
 namespace score
 {
diff --git a/score/static_reflection_with_serialization/serialization/include/serialization/visit_serialize.h b/score/static_reflection_with_serialization/serialization/include/serialization/visit_serialize.h
index b01e4883..6504e28e 100644
--- a/score/static_reflection_with_serialization/serialization/include/serialization/visit_serialize.h
+++ b/score/static_reflection_with_serialization/serialization/include/serialization/visit_serialize.h
@@ -13,10 +13,10 @@
 #ifndef SCORE_COMMON_SERIALIZATION_INCLUDE_SERIALIZATION_VISIT_SERIALIZE_H
 #define SCORE_COMMON_SERIALIZATION_INCLUDE_SERIALIZATION_VISIT_SERIALIZE_H
 
-#include "static_reflection_with_serialization/serialization/visit_size.h"
-#include "static_reflection_with_serialization/serialization/visit_type_traits.h"
-#include "static_reflection_with_serialization/visitor/visit.h"
-#include "static_reflection_with_serialization/visitor/visit_as_struct.h"
+#include "serialization/visit_size.h"
+#include "serialization/visit_type_traits.h"
+#include "visitor/visit.h"
+#include "visitor/visit_as_struct.h"
 
 #include "score/assert.hpp"
 #include "score/optional.hpp"
diff --git a/score/static_reflection_with_serialization/serialization/include/serialization/visit_size.h b/score/static_reflection_with_serialization/serialization/include/serialization/visit_size.h
index 5b67f87f..1b662395 100644
--- a/score/static_reflection_with_serialization/serialization/include/serialization/visit_size.h
+++ b/score/static_reflection_with_serialization/serialization/include/serialization/visit_size.h
@@ -13,9 +13,9 @@
 #ifndef SCORE_COMMON_SERIALIZATION_INCLUDE_SERIALIZATION_VISIT_SIZE_H
 #define SCORE_COMMON_SERIALIZATION_INCLUDE_SERIALIZATION_VISIT_SIZE_H
 
-#include "static_reflection_with_serialization/serialization/visit_type_traits.h"
-#include "static_reflection_with_serialization/visitor/visit.h"
-#include "static_reflection_with_serialization/visitor/visit_as_struct.h"
+#include "serialization/visit_type_traits.h"
+#include "visitor/visit.h"
+#include "visitor/visit_as_struct.h"
 
 #include "score/assert.hpp"
 #include <cstdint>
diff --git a/score/static_reflection_with_serialization/serialization/test/ut/test_serializer_visitor.cpp b/score/static_reflection_with_serialization/serialization/test/ut/test_serializer_visitor.cpp
index 2a0c8cf1..fb13eb77 100644
--- a/score/static_reflection_with_serialization/serialization/test/ut/test_serializer_visitor.cpp
+++ b/score/static_reflection_with_serialization/serialization/test/ut/test_serializer_visitor.cpp
@@ -10,8 +10,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  ********************************************************************************/
-#include "static_reflection_with_serialization/serialization/for_logging.h"
-#include "static_reflection_with_serialization/serialization/visit_serialize.h"
+#include "serialization/for_logging.h"
+#include "serialization/visit_serialize.h"
 #include "visitor_test_types.h"
 
 #include <array>
diff --git a/score/static_reflection_with_serialization/serialization/test/ut/test_size_visitor.cpp b/score/static_reflection_with_serialization/serialization/test/ut/test_size_visitor.cpp
index a84759a3..ca2d7e14 100644
--- a/score/static_reflection_with_serialization/serialization/test/ut/test_size_visitor.cpp
+++ b/score/static_reflection_with_serialization/serialization/test/ut/test_size_visitor.cpp
@@ -10,9 +10,9 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  ********************************************************************************/
-#include "static_reflection_with_serialization/serialization/visit_serialize.h"
-#include "static_reflection_with_serialization/serialization/visit_size.h"
-#include "static_reflection_with_serialization/serialization/visit_type_traits.h"
+#include "serialization/visit_serialize.h"
+#include "serialization/visit_size.h"
+#include "serialization/visit_type_traits.h"
 #include "visitor_test_types.h"
 
 #include <gtest/gtest.h>
diff --git a/score/static_reflection_with_serialization/serialization/test/ut/test_skip_deserialize.cpp b/score/static_reflection_with_serialization/serialization/test/ut/test_skip_deserialize.cpp
index 2a9ae609..643feb3d 100644
--- a/score/static_reflection_with_serialization/serialization/test/ut/test_skip_deserialize.cpp
+++ b/score/static_reflection_with_serialization/serialization/test/ut/test_skip_deserialize.cpp
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  ********************************************************************************/
-#include "static_reflection_with_serialization/serialization/skip_deserialize.h"
+#include "serialization/skip_deserialize.h"
 
 #include <type_traits>
 
diff --git a/score/static_reflection_with_serialization/serialization/test/ut/test_visitor_type_traits.cpp b/score/static_reflection_with_serialization/serialization/test/ut/test_visitor_type_traits.cpp
index f06decbb..bb829d33 100644
--- a/score/static_reflection_with_serialization/serialization/test/ut/test_visitor_type_traits.cpp
+++ b/score/static_reflection_with_serialization/serialization/test/ut/test_visitor_type_traits.cpp
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  ********************************************************************************/
-#include "static_reflection_with_serialization/serialization/visit_type_traits.h"
+#include "serialization/visit_type_traits.h"
 #include "visitor_test_types.h"
 
 #include <gtest/gtest.h>
diff --git a/score/static_reflection_with_serialization/visitor/BUILD b/score/static_reflection_with_serialization/visitor/BUILD
index 2a9460fd..8f5204ff 100644
--- a/score/static_reflection_with_serialization/visitor/BUILD
+++ b/score/static_reflection_with_serialization/visitor/BUILD
@@ -23,7 +23,6 @@ cc_library(
         "include/visitor/visit_as_struct.h",
     ],
     features = _compiler_warning_features,
-    include_prefix = "static_reflection_with_serialization",
     strip_include_prefix = "include",
     tags = ["FFI"],
     visibility = [
diff --git a/score/static_reflection_with_serialization/visitor/examples/ostream/include/visitor/visit_ostream.h b/score/static_reflection_with_serialization/visitor/examples/ostream/include/visitor/visit_ostream.h
index 34a5a2c9..069f1ba3 100644
--- a/score/static_reflection_with_serialization/visitor/examples/ostream/include/visitor/visit_ostream.h
+++ b/score/static_reflection_with_serialization/visitor/examples/ostream/include/visitor/visit_ostream.h
@@ -13,8 +13,8 @@
 #ifndef SCORE_COMMON_VISITOR_EXAMPLES_OSTREAM_INCLUDE_VISITOR_VISIT_OSTREAM_H
 #define SCORE_COMMON_VISITOR_EXAMPLES_OSTREAM_INCLUDE_VISITOR_VISIT_OSTREAM_H
 
-#include "static_reflection_with_serialization/visitor/visit.h"
-#include "static_reflection_with_serialization/visitor/visit_as_struct.h"
+#include "visitor/visit.h"
+#include "visitor/visit_as_struct.h"
 
 #include <ostream>
 #include <tuple>
diff --git a/score/static_reflection_with_serialization/visitor/examples/ostream/test/ut/test_ostream_visitor.cpp b/score/static_reflection_with_serialization/visitor/examples/ostream/test/ut/test_ostream_visitor.cpp
index 8a2693b4..657c2d18 100644
--- a/score/static_reflection_with_serialization/visitor/examples/ostream/test/ut/test_ostream_visitor.cpp
+++ b/score/static_reflection_with_serialization/visitor/examples/ostream/test/ut/test_ostream_visitor.cpp
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  ********************************************************************************/
-#include "static_reflection_with_serialization/visitor/visit_ostream.h"
+#include "visitor/visit_ostream.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
diff --git a/score/static_reflection_with_serialization/visitor/test/ut/test_detail.cpp b/score/static_reflection_with_serialization/visitor/test/ut/test_detail.cpp
index b2366cb8..50593f55 100644
--- a/score/static_reflection_with_serialization/visitor/test/ut/test_detail.cpp
+++ b/score/static_reflection_with_serialization/visitor/test/ut/test_detail.cpp
@@ -10,8 +10,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  ********************************************************************************/
-#include "static_reflection_with_serialization/visitor/visit.h"
-#include "static_reflection_with_serialization/visitor/visit_as_struct.h"
+#include "visitor/visit.h"
+#include "visitor/visit_as_struct.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
diff --git a/score/static_reflection_with_serialization/visitor/test/ut/test_struct_visitor.cpp b/score/static_reflection_with_serialization/visitor/test/ut/test_struct_visitor.cpp
index 0ae3d01c..6a22d724 100644
--- a/score/static_reflection_with_serialization/visitor/test/ut/test_struct_visitor.cpp
+++ b/score/static_reflection_with_serialization/visitor/test/ut/test_struct_visitor.cpp
@@ -10,8 +10,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  ********************************************************************************/
-#include "static_reflection_with_serialization/visitor/visit.h"
-#include "static_reflection_with_serialization/visitor/visit_as_struct.h"
+#include "visitor/visit.h"
+#include "visitor/visit_as_struct.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
diff --git a/score/static_reflection_with_serialization/visitor/test/ut/test_visitor.cpp b/score/static_reflection_with_serialization/visitor/test/ut/test_visitor.cpp
index d5c0fc9e..96cb452a 100644
--- a/score/static_reflection_with_serialization/visitor/test/ut/test_visitor.cpp
+++ b/score/static_reflection_with_serialization/visitor/test/ut/test_visitor.cpp
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  ********************************************************************************/
-#include "static_reflection_with_serialization/visitor/visit.h"
+#include "visitor/visit.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"