diff --git a/rocclr/utils/flags.cpp b/rocclr/utils/flags.cpp
index 96df2ed509..f68bc2a76c 100644
--- a/rocclr/utils/flags.cpp
+++ b/rocclr/utils/flags.cpp
@@ -205,7 +205,7 @@ Flag Flag::flags_[] = {
 }  // namespace amd
 
 #ifndef _WIN32
-namespace {
+namespace amd::flags {
 #endif
 #define DEFINE_RELEASE_FLAG_VALUE(type, name, value, help) type name = value;
 #define DEFINE_DEBUG_FLAG_VALUE(type, name, value, help) DEBUG_ONLY(type name = value);
@@ -216,4 +216,4 @@ RUNTIME_FLAGS(DEFINE_DEBUG_FLAG_VALUE, DEFINE_RELEASE_FLAG_VALUE, DEFINE_DEBUG_F
 #undef DEFINE_RELEASE_FLAG_VALUE
 #ifndef _WIN32
 }
-#endif
+#endif /*!_WIN32*/
diff --git a/rocclr/utils/flags.hpp b/rocclr/utils/flags.hpp
index 273a3dd911..c48eeb1523 100644
--- a/rocclr/utils/flags.hpp
+++ b/rocclr/utils/flags.hpp
@@ -333,7 +333,7 @@ struct Flag {
 #else
 # define EXPORT_FLAG extern "C"
 #endif
-namespace {
+namespace amd::flags {
 #endif // !_WIN32
 
 #define DECLARE_RELEASE_FLAG(type, name, value, help) EXPORT_FLAG type name;
@@ -349,5 +349,6 @@ RUNTIME_FLAGS(DECLARE_DEBUG_FLAG, DECLARE_RELEASE_FLAG, DECLARE_DEBUG_FLAG);
 #undef DECLARE_RELEASE_FLAG
 #ifndef _WIN32
 }
+using namespace amd::flags;
 #endif // !_WIN32
 #endif /*FLAGS_HPP_*/