diff --git a/redfish-core/include/event_service_manager.hpp b/redfish-core/include/event_service_manager.hpp
index ffd053f..b05a38d 100644
--- a/redfish-core/include/event_service_manager.hpp
+++ b/redfish-core/include/event_service_manager.hpp
@@ -22,10 +22,7 @@
 #include "persistent_data.hpp"
 #include "random.hpp"
 #include "registries.hpp"
-#include "registries/base_message_registry.hpp"
-#include "registries/openbmc_message_registry.hpp"
-#include "registries/privilege_registry.hpp"
-#include "registries/task_event_message_registry.hpp"
+#include "registries_selector.hpp"
 #include "server_sent_events.hpp"
 #include "str_utility.hpp"
 #include "utility.hpp"
@@ -62,27 +59,6 @@
 static constexpr const uint8_t maxNoOfSubscriptions = 20;
 static constexpr const uint8_t maxNoOfSSESubscriptions = 10;
 
-namespace registries
-{
-inline std::span<const MessageEntry>
-    getRegistryFromPrefix(const std::string& registryName)
-{
-    if (task_event::header.registryPrefix == registryName)
-    {
-        return {task_event::registry};
-    }
-    if (openbmc::header.registryPrefix == registryName)
-    {
-        return {openbmc::registry};
-    }
-    if (base::header.registryPrefix == registryName)
-    {
-        return {base::registry};
-    }
-    return {openbmc::registry};
-}
-} // namespace registries
-
 #ifndef BMCWEB_ENABLE_REDFISH_DBUS_LOG_ENTRIES
 // NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
 static std::optional<boost::asio::posix::stream_descriptor> inotifyConn;
diff --git a/redfish-core/include/registries_selector.hpp b/redfish-core/include/registries_selector.hpp
new file mode 100644
index 0000000..48b3cf7
--- /dev/null
+++ b/redfish-core/include/registries_selector.hpp
@@ -0,0 +1,28 @@
+#pragma once
+#include "registries/base_message_registry.hpp"
+#include "registries/openbmc_message_registry.hpp"
+#include "registries/task_event_message_registry.hpp"
+
+#include <span>
+#include <string_view>
+
+namespace redfish::registries
+{
+inline std::span<const MessageEntry>
+    getRegistryFromPrefix(std::string_view registryName)
+{
+    if (task_event::header.registryPrefix == registryName)
+    {
+        return {task_event::registry};
+    }
+    if (openbmc::header.registryPrefix == registryName)
+    {
+        return {openbmc::registry};
+    }
+    if (base::header.registryPrefix == registryName)
+    {
+        return {base::registry};
+    }
+    return {openbmc::registry};
+}
+} // namespace redfish::registries