diff --git a/clang/lib/Sema/SemaSYCL.cpp b/clang/lib/Sema/SemaSYCL.cpp
index fc9792d55c2d8..ae27b08b2bf68 100644
--- a/clang/lib/Sema/SemaSYCL.cpp
+++ b/clang/lib/Sema/SemaSYCL.cpp
@@ -5184,7 +5184,7 @@ void SYCLIntegrationHeader::emit(raw_ostream &O) {
   O << "\n";
 
   O << "namespace sycl {\n";
-  O << "__SYCL_INLINE_VER_NAMESPACE(_V1) {\n";
+  O << "inline namespace _V1 {\n";
   O << "namespace detail {\n";
 
   // Generate declaration of variable of type __sycl_device_global_registration
@@ -5347,7 +5347,7 @@ void SYCLIntegrationHeader::emit(raw_ostream &O) {
   }
   O << "\n";
   O << "} // namespace detail\n";
-  O << "} // __SYCL_INLINE_VER_NAMESPACE(_V1)\n";
+  O << "} // namespace _V1\n";
   O << "} // namespace sycl\n";
   O << "\n";
 }
@@ -5659,7 +5659,7 @@ bool SYCLIntegrationFooter::emit(raw_ostream &OS) {
     } else {
       EmittedFirstSpecConstant = true;
       OS << "namespace sycl {\n";
-      OS << "__SYCL_INLINE_VER_NAMESPACE(_V1) {\n";
+      OS << "inline namespace _V1 {\n";
       OS << "namespace detail {\n";
       OS << "template<>\n";
       OS << "inline const char *get_spec_constant_symbolic_ID_impl<";
@@ -5677,7 +5677,7 @@ bool SYCLIntegrationFooter::emit(raw_ostream &OS) {
       OS << "\";\n";
       OS << "}\n";
       OS << "} // namespace detail\n";
-      OS << "} // __SYCL_INLINE_VER_NAMESPACE(_V1)\n";
+      OS << "} // namespace _V1\n";
       OS << "} // namespace sycl\n";
     }
   }
diff --git a/clang/test/CodeGenSYCL/Inputs/sycl.hpp b/clang/test/CodeGenSYCL/Inputs/sycl.hpp
index ff9f4ed3ba665..0bcdcb2d3cc15 100644
--- a/clang/test/CodeGenSYCL/Inputs/sycl.hpp
+++ b/clang/test/CodeGenSYCL/Inputs/sycl.hpp
@@ -670,5 +670,5 @@ class image {
   }
 };
 
-} // inline namespace _V1
+} // namespace _V1
 } // namespace sycl
diff --git a/clang/test/CodeGenSYCL/accessor-readonly-invalid-lib.cpp b/clang/test/CodeGenSYCL/accessor-readonly-invalid-lib.cpp
index 7ca8bbb86a205..8f64032066fc3 100644
--- a/clang/test/CodeGenSYCL/accessor-readonly-invalid-lib.cpp
+++ b/clang/test/CodeGenSYCL/accessor-readonly-invalid-lib.cpp
@@ -71,7 +71,7 @@ class __attribute__((sycl_special_class)) [[__sycl_detail__::sycl_type(accessor)
               range<dimensions> MemRange, id<dimensions> Offset) {}
 };
 
-} // inline namespace _V1
+} // namespace _V1
 } // namespace sycl
 
 template <typename name, typename Func>
diff --git a/clang/test/CodeGenSYCL/anonymous_integration_footer.cpp b/clang/test/CodeGenSYCL/anonymous_integration_footer.cpp
index 301f028bfc7e7..fe88c07beecaa 100644
--- a/clang/test/CodeGenSYCL/anonymous_integration_footer.cpp
+++ b/clang/test/CodeGenSYCL/anonymous_integration_footer.cpp
@@ -16,48 +16,48 @@ int main() {
 struct S1 {
   static constexpr sycl::specialization_id a{1};
   // CHECK: namespace sycl {
-  // CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) {
+  // CHECK-NEXT: inline namespace _V1 {
   // CHECK-NEXT: namespace detail {
   // CHECK-NEXT: template<>
   // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::S1::a>() {
   // CHECK-NEXT: return "_ZN2S11aE";
   // CHECK-NEXT: }
   // CHECK-NEXT: } // namespace detail
-  // CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1)
+  // CHECK-NEXT: } // namespace _V1
   // CHECK-NEXT: } // namespace sycl
 };
 constexpr sycl::specialization_id b{2};
 // CHECK-NEXT: namespace sycl {
-// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) {
+// CHECK-NEXT: inline namespace _V1 {
 // CHECK-NEXT: namespace detail {
 // CHECK-NEXT: template<>
 // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::b>() {
 // CHECK-NEXT: return "____ZL1b";
 // CHECK-NEXT: }
 // CHECK-NEXT: } // namespace detail
-// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1)
+// CHECK-NEXT: } // namespace _V1
 // CHECK-NEXT: } // namespace sycl
 inline constexpr sycl::specialization_id c{3};
 // CHECK-NEXT: namespace sycl {
-// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) {
+// CHECK-NEXT: inline namespace _V1 {
 // CHECK-NEXT: namespace detail {
 // CHECK-NEXT: template<>
 // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::c>() {
 // CHECK-NEXT: return "_Z1c";
 // CHECK-NEXT: }
 // CHECK-NEXT: } // namespace detail
-// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1)
+// CHECK-NEXT: } // namespace _V1
 // CHECK-NEXT: } // namespace sycl
 static constexpr sycl::specialization_id d{4};
 // CHECK-NEXT: namespace sycl {
-// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) {
+// CHECK-NEXT: inline namespace _V1 {
 // CHECK-NEXT: namespace detail {
 // CHECK-NEXT: template<>
 // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::d>() {
 // CHECK-NEXT: return "____ZL1d";
 // CHECK-NEXT: }
 // CHECK-NEXT: } // namespace detail
-// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1)
+// CHECK-NEXT: } // namespace _V1
 // CHECK-NEXT: } // namespace sycl
 
 namespace {
@@ -71,14 +71,14 @@ struct S2 {
   // CHECK-NEXT: } // namespace __sycl_detail
   // CHECK-NEXT: } // namespace
   // CHECK-NEXT: namespace sycl {
-  // CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) {
+  // CHECK-NEXT: inline namespace _V1 {
   // CHECK-NEXT: namespace detail {
   // CHECK-NEXT: template<>
   // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::__sycl_detail::__shim_[[SHIM_ID]]()>() {
   // CHECK-NEXT: return "____ZN12_GLOBAL__N_12S21aE";
   // CHECK-NEXT: }
   // CHECK-NEXT: } // namespace detail
-  // CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1)
+  // CHECK-NEXT: } // namespace _V1
   // CHECK-NEXT: } // namespace sycl
 };
 } // namespace
@@ -89,25 +89,25 @@ struct S3 {
 };
 template class S3<1>;
 // CHECK-NEXT: namespace sycl {
-// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) {
+// CHECK-NEXT: inline namespace _V1 {
 // CHECK-NEXT: namespace detail {
 // CHECK-NEXT: template<>
 // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::S3<1>::a>() {
 // CHECK-NEXT: return "_ZN2S3ILi1EE1aE";
 // CHECK-NEXT: }
 // CHECK-NEXT: } // namespace detail
-// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1)
+// CHECK-NEXT: } // namespace _V1
 // CHECK-NEXT: } // namespace sycl
 template class S3<2>;
 // CHECK-NEXT: namespace sycl {
-// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) {
+// CHECK-NEXT: inline namespace _V1 {
 // CHECK-NEXT: namespace detail {
 // CHECK-NEXT: template<>
 // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::S3<2>::a>() {
 // CHECK-NEXT: return "_ZN2S3ILi2EE1aE";
 // CHECK-NEXT: }
 // CHECK-NEXT: } // namespace detail
-// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1)
+// CHECK-NEXT: } // namespace _V1
 // CHECK-NEXT: } // namespace sycl
 
 namespace {
@@ -127,14 +127,14 @@ template class inner::S3<10>;
 // CHECK-NEXT: } // namespace __sycl_detail
 // CHECK-NEXT: } // namespace
 // CHECK-NEXT: namespace sycl {
-// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) {
+// CHECK-NEXT: inline namespace _V1 {
 // CHECK-NEXT: namespace detail {
 // CHECK-NEXT: template<>
 // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::__sycl_detail::__shim_[[SHIM_ID]]()>() {
 // CHECK-NEXT: return "____ZN12_GLOBAL__N_15inner2S3ILi10EE1aE";
 // CHECK-NEXT: }
 // CHECK-NEXT: } // namespace detail
-// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1)
+// CHECK-NEXT: } // namespace _V1
 // CHECK-NEXT: } // namespace sycl
 
 namespace {
@@ -154,39 +154,39 @@ template class inner::S4<10, 20>;
 // CHECK-NEXT: } // namespace __sycl_detail
 // CHECK-NEXT: } // namespace
 // CHECK-NEXT: namespace sycl {
-// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) {
+// CHECK-NEXT: inline namespace _V1 {
 // CHECK-NEXT: namespace detail {
 // CHECK-NEXT: template<>
 // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::__sycl_detail::__shim_[[SHIM_ID]]()>() {
 // CHECK-NEXT: return "____ZN12_GLOBAL__N_15inner2S4ILi10ELi20EE1aE";
 // CHECK-NEXT: }
 // CHECK-NEXT: } // namespace detail
-// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1)
+// CHECK-NEXT: } // namespace _V1
 // CHECK-NEXT: } // namespace sycl
 
 namespace inner {
 constexpr sycl::specialization_id same_name{5};
 // CHECK-NEXT: namespace sycl {
-// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) {
+// CHECK-NEXT: inline namespace _V1 {
 // CHECK-NEXT: namespace detail {
 // CHECK-NEXT: template<>
 // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::inner::same_name>() {
 // CHECK-NEXT: return "____ZN5innerL9same_nameE";
 // CHECK-NEXT: }
 // CHECK-NEXT: } // namespace detail
-// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1)
+// CHECK-NEXT: } // namespace _V1
 // CHECK-NEXT: } // namespace sycl
 }
 constexpr sycl::specialization_id same_name{6};
 // CHECK-NEXT: namespace sycl {
-// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) {
+// CHECK-NEXT: inline namespace _V1 {
 // CHECK-NEXT: namespace detail {
 // CHECK-NEXT: template<>
 // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::same_name>() {
 // CHECK-NEXT: return "____ZL9same_name";
 // CHECK-NEXT: }
 // CHECK-NEXT: } // namespace detail
-// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1)
+// CHECK-NEXT: } // namespace _V1
 // CHECK-NEXT: } // namespace sycl
 namespace {
 constexpr sycl::specialization_id same_name{7};
@@ -198,14 +198,14 @@ constexpr sycl::specialization_id same_name{7};
 // CHECK-NEXT: } // namespace __sycl_detail
 // CHECK-NEXT: } // namespace
 // CHECK-NEXT: namespace sycl {
-// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) {
+// CHECK-NEXT: inline namespace _V1 {
 // CHECK-NEXT: namespace detail {
 // CHECK-NEXT: template<>
 // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::__sycl_detail::__shim_[[SHIM_ID]]()>() {
 // CHECK-NEXT: return "____ZN12_GLOBAL__N_19same_nameE";
 // CHECK-NEXT: }
 // CHECK-NEXT: } // namespace detail
-// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1)
+// CHECK-NEXT: } // namespace _V1
 // CHECK-NEXT: } // namespace sycl
 }
 namespace {
@@ -219,14 +219,14 @@ constexpr sycl::specialization_id same_name{8};
 // CHECK-NEXT: } // namespace __sycl_detail
 // CHECK-NEXT: } // namespace
 // CHECK-NEXT: namespace sycl {
-// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) {
+// CHECK-NEXT: inline namespace _V1 {
 // CHECK-NEXT: namespace detail {
 // CHECK-NEXT: template<>
 // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::__sycl_detail::__shim_[[SHIM_ID]]()>() {
 // CHECK-NEXT: return "____ZN12_GLOBAL__N_15inner9same_nameE";
 // CHECK-NEXT: }
 // CHECK-NEXT: } // namespace detail
-// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1)
+// CHECK-NEXT: } // namespace _V1
 // CHECK-NEXT: } // namespace sycl
 }
 } // namespace
@@ -243,14 +243,14 @@ constexpr sycl::specialization_id same_name{9};
 // CHECK-NEXT: } // namespace
 // CHECK-NEXT: } // namespace inner
 // CHECK-NEXT: namespace sycl {
-// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) {
+// CHECK-NEXT: inline namespace _V1 {
 // CHECK-NEXT: namespace detail {
 // CHECK-NEXT: template<>
 // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::inner::__sycl_detail::__shim_[[SHIM_ID]]()>() {
 // CHECK-NEXT: return "____ZN5inner12_GLOBAL__N_19same_nameE";
 // CHECK-NEXT: }
 // CHECK-NEXT: } // namespace detail
-// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1)
+// CHECK-NEXT: } // namespace _V1
 // CHECK-NEXT: } // namespace sycl
 }
 } // namespace inner
@@ -258,14 +258,14 @@ constexpr sycl::specialization_id same_name{9};
 namespace outer {
 constexpr sycl::specialization_id same_name{10};
 // CHECK-NEXT: namespace sycl {
-// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) {
+// CHECK-NEXT: inline namespace _V1 {
 // CHECK-NEXT: namespace detail {
 // CHECK-NEXT: template<>
 // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::outer::same_name>() {
 // CHECK-NEXT: return "____ZN5outerL9same_nameE";
 // CHECK-NEXT: }
 // CHECK-NEXT: } // namespace detail
-// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1)
+// CHECK-NEXT: } // namespace _V1
 // CHECK-NEXT: } // namespace sycl
 namespace {
 constexpr sycl::specialization_id same_name{11};
@@ -279,14 +279,14 @@ constexpr sycl::specialization_id same_name{11};
 // CHECK-NEXT: } // namespace
 // CHECK-NEXT: } // namespace outer
 // CHECK-NEXT: namespace sycl {
-// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) {
+// CHECK-NEXT: inline namespace _V1 {
 // CHECK-NEXT: namespace detail {
 // CHECK-NEXT: template<>
 // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::outer::__sycl_detail::__shim_[[SHIM_ID]]()>() {
 // CHECK-NEXT: return "____ZN5outer12_GLOBAL__N_19same_nameE";
 // CHECK-NEXT: }
 // CHECK-NEXT: } // namespace detail
-// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1)
+// CHECK-NEXT: } // namespace _V1
 // CHECK-NEXT: } // namespace sycl
 
 namespace inner {
@@ -301,14 +301,14 @@ constexpr sycl::specialization_id same_name{12};
 // CHECK-NEXT: } // namespace
 // CHECK-NEXT: } // namespace outer
 // CHECK-NEXT: namespace sycl {
-// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) {
+// CHECK-NEXT: inline namespace _V1 {
 // CHECK-NEXT: namespace detail {
 // CHECK-NEXT: template<>
 // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::outer::__sycl_detail::__shim_[[SHIM_ID]]()>() {
 // CHECK-NEXT: return "____ZN5outer12_GLOBAL__N_15inner9same_nameE";
 // CHECK-NEXT: }
 // CHECK-NEXT: } // namespace detail
-// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1)
+// CHECK-NEXT: } // namespace _V1
 // CHECK-NEXT: } // namespace sycl
 
 namespace {
@@ -339,14 +339,14 @@ constexpr sycl::specialization_id same_name{13};
 // CHECK-NEXT: } // namespace
 // CHECK-NEXT: } // namespace outer
 // CHECK-NEXT: namespace sycl {
-// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) {
+// CHECK-NEXT: inline namespace _V1 {
 // CHECK-NEXT: namespace detail {
 // CHECK-NEXT: template<>
 // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::outer::__sycl_detail::__shim_[[SHIM_ID_2]]()>() {
 // CHECK-NEXT: return "____ZN5outer12_GLOBAL__N_15inner12_GLOBAL__N_19same_nameE";
 // CHECK-NEXT: }
 // CHECK-NEXT: } // namespace detail
-// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1)
+// CHECK-NEXT: } // namespace _V1
 // CHECK-NEXT: } // namespace sycl
 }
 } // namespace inner
@@ -364,14 +364,14 @@ constexpr sycl::specialization_id same_name{14};
 // CHECK-NEXT: } // namespace __sycl_detail
 // CHECK-NEXT: } // namespace
 // CHECK-NEXT: namespace sycl {
-// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) {
+// CHECK-NEXT: inline namespace _V1 {
 // CHECK-NEXT: namespace detail {
 // CHECK-NEXT: template<>
 // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::__sycl_detail::__shim_[[SHIM_ID]]()>() {
 // CHECK-NEXT: return "____ZN12_GLOBAL__N_15outer9same_nameE";
 // CHECK-NEXT: }
 // CHECK-NEXT: } // namespace detail
-// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1)
+// CHECK-NEXT: } // namespace _V1
 // CHECK-NEXT: } // namespace sycl
 namespace {
 constexpr sycl::specialization_id same_name{15};
@@ -394,14 +394,14 @@ constexpr sycl::specialization_id same_name{15};
 // CHECK-NEXT: } // namespace __sycl_detail
 // CHECK-NEXT: } // namespace
 // CHECK-NEXT: namespace sycl {
-// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) {
+// CHECK-NEXT: inline namespace _V1 {
 // CHECK-NEXT: namespace detail {
 // CHECK-NEXT: template<>
 // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::__sycl_detail::__shim_[[SHIM_ID2]]()>() {
 // CHECK-NEXT: return "____ZN12_GLOBAL__N_15outer12_GLOBAL__N_19same_nameE";
 // CHECK-NEXT: }
 // CHECK-NEXT: } // namespace detail
-// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1)
+// CHECK-NEXT: } // namespace _V1
 // CHECK-NEXT: } // namespace sycl
 namespace inner {
 constexpr sycl::specialization_id same_name{16};
@@ -424,14 +424,14 @@ constexpr sycl::specialization_id same_name{16};
 // CHECK-NEXT: } // namespace __sycl_detail
 // CHECK-NEXT: } // namespace
 // CHECK-NEXT: namespace sycl {
-// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) {
+// CHECK-NEXT: inline namespace _V1 {
 // CHECK-NEXT: namespace detail {
 // CHECK-NEXT: template<>
 // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::__sycl_detail::__shim_[[SHIM_ID2]]()>() {
 // CHECK-NEXT: return "____ZN12_GLOBAL__N_15outer12_GLOBAL__N_15inner9same_nameE";
 // CHECK-NEXT: }
 // CHECK-NEXT: } // namespace detail
-// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1)
+// CHECK-NEXT: } // namespace _V1
 // CHECK-NEXT: } // namespace sycl
 }
 } // namespace
@@ -442,14 +442,14 @@ namespace outer {
 namespace inner {
 constexpr sycl::specialization_id same_name{17};
 // CHECK: namespace sycl {
-// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) {
+// CHECK-NEXT: inline namespace _V1 {
 // CHECK-NEXT: namespace detail {
 // CHECK-NEXT: template<>
 // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::outer::inner::same_name>() {
 // CHECK-NEXT: return "____ZN5outer5innerL9same_nameE";
 // CHECK-NEXT: }
 // CHECK-NEXT: } // namespace detail
-// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1)
+// CHECK-NEXT: } // namespace _V1
 // CHECK-NEXT: } // namespace sycl
 }
 } // namespace outer
diff --git a/clang/test/CodeGenSYCL/anonymous_integration_footer2.cpp b/clang/test/CodeGenSYCL/anonymous_integration_footer2.cpp
index 86259b10544b1..2eed26bcce59b 100644
--- a/clang/test/CodeGenSYCL/anonymous_integration_footer2.cpp
+++ b/clang/test/CodeGenSYCL/anonymous_integration_footer2.cpp
@@ -15,73 +15,73 @@ struct S1 {
   static constexpr sycl::specialization_id a{1};
 };
 // CHECK: namespace sycl {
-// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) {
+// CHECK-NEXT: inline namespace _V1 {
 // CHECK-NEXT: namespace detail {
 // CHECK-NEXT: template<>
 // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::S1::a>() {
 // CHECK-NEXT: return "_ZN2S11aE";
 // CHECK-NEXT: }
 // CHECK-NEXT: } // namespace detail
-// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1)
+// CHECK-NEXT: } // namespace _V1
 // CHECK-NEXT: } // namespace sycl
 
 constexpr sycl::specialization_id b{202};
 // CHECK: namespace sycl {
-// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) {
+// CHECK-NEXT: inline namespace _V1 {
 // CHECK-NEXT: namespace detail {
 // CHECK-NEXT: template<>
 // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::b>() {
 // CHECK-NEXT: return "____ZL1b";
 // CHECK-NEXT: }
 // CHECK-NEXT: } // namespace detail
-// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1)
+// CHECK-NEXT: } // namespace _V1
 // CHECK-NEXT: } // namespace sycl
 inline constexpr sycl::specialization_id c{3};
 // CHECK: namespace sycl {
-// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) {
+// CHECK-NEXT: inline namespace _V1 {
 // CHECK-NEXT: namespace detail {
 // CHECK-NEXT: template<>
 // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::c>() {
 // CHECK-NEXT: return "_Z1c";
 // CHECK-NEXT: }
 // CHECK-NEXT: } // namespace detail
-// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1)
+// CHECK-NEXT: } // namespace _V1
 // CHECK-NEXT: } // namespace sycl
 static constexpr sycl::specialization_id d{205};
 // CHECK: namespace sycl {
-// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) {
+// CHECK-NEXT: inline namespace _V1 {
 // CHECK-NEXT: namespace detail {
 // CHECK-NEXT: template<>
 // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::d>() {
 // CHECK-NEXT: return "____ZL1d";
 // CHECK-NEXT: }
 // CHECK-NEXT: } // namespace detail
-// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1)
+// CHECK-NEXT: } // namespace _V1
 // CHECK-NEXT: } // namespace sycl
 
 namespace inner {
 constexpr sycl::specialization_id same_name{5};
 // CHECK: namespace sycl {
-// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) {
+// CHECK-NEXT: inline namespace _V1 {
 // CHECK-NEXT: namespace detail {
 // CHECK-NEXT: template<>
 // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::inner::same_name>() {
 // CHECK-NEXT: return "____ZN5innerL9same_nameE";
 // CHECK-NEXT: }
 // CHECK-NEXT: } // namespace detail
-// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1)
+// CHECK-NEXT: } // namespace _V1
 // CHECK-NEXT: } // namespace sycl
 }
 constexpr sycl::specialization_id same_name{6};
 // CHECK: namespace sycl {
-// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) {
+// CHECK-NEXT: inline namespace _V1 {
 // CHECK-NEXT: namespace detail {
 // CHECK-NEXT: template<>
 // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::same_name>() {
 // CHECK-NEXT: return "____ZL9same_name";
 // CHECK-NEXT: }
 // CHECK-NEXT: } // namespace detail
-// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1)
+// CHECK-NEXT: } // namespace _V1
 // CHECK-NEXT: } // namespace sycl
 namespace {
 constexpr sycl::specialization_id same_name{207};
@@ -93,14 +93,14 @@ constexpr sycl::specialization_id same_name{207};
 // CHECK-NEXT: } // namespace __sycl_detail
 // CHECK-NEXT: } // namespace
 // CHECK-NEXT: namespace sycl {
-// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) {
+// CHECK-NEXT: inline namespace _V1 {
 // CHECK-NEXT: namespace detail {
 // CHECK-NEXT: template<>
 // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::__sycl_detail::__shim_[[SHIM_ID]]()>() {
 // CHECK-NEXT: return "____ZN12_GLOBAL__N_19same_nameE";
 // CHECK-NEXT: }
 // CHECK-NEXT: } // namespace detail
-// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1)
+// CHECK-NEXT: } // namespace _V1
 // CHECK-NEXT: } // namespace sycl
 }
 namespace {
@@ -114,14 +114,14 @@ constexpr sycl::specialization_id same_name{208};
 // CHECK-NEXT: } // namespace __sycl_detail
 // CHECK-NEXT: } // namespace
 // CHECK-NEXT: namespace sycl {
-// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) {
+// CHECK-NEXT: inline namespace _V1 {
 // CHECK-NEXT: namespace detail {
 // CHECK-NEXT: template<>
 // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::__sycl_detail::__shim_[[SHIM_ID]]()>() {
 // CHECK-NEXT: return "____ZN12_GLOBAL__N_15inner9same_nameE";
 // CHECK-NEXT: }
 // CHECK-NEXT: } // namespace detail
-// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1)
+// CHECK-NEXT: } // namespace _V1
 // CHECK-NEXT: } // namespace sycl
 }
 } // namespace
@@ -141,14 +141,14 @@ constexpr sycl::specialization_id same_name{209};
 // CHECK-NEXT: } // inline namespace inner
 // CHECK-NEXT: } // namespace outer
 // CHECK-NEXT: namespace sycl {
-// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) {
+// CHECK-NEXT: inline namespace _V1 {
 // CHECK-NEXT: namespace detail {
 // CHECK-NEXT: template<>
 // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::outer::inner::__sycl_detail::__shim_[[SHIM_ID]]()>() {
 // CHECK-NEXT: return "____ZN5outer5inner12_GLOBAL__N_19same_nameE";
 // CHECK-NEXT: }
 // CHECK-NEXT: } // namespace detail
-// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1)
+// CHECK-NEXT: } // namespace _V1
 // CHECK-NEXT: } // namespace sycl
 }
 }
diff --git a/clang/test/CodeGenSYCL/device_global_int_footer_header.cpp b/clang/test/CodeGenSYCL/device_global_int_footer_header.cpp
index 0ba2cc486b584..42793f34abdd5 100644
--- a/clang/test/CodeGenSYCL/device_global_int_footer_header.cpp
+++ b/clang/test/CodeGenSYCL/device_global_int_footer_header.cpp
@@ -14,7 +14,7 @@ int main() {
 }
 
 // CHECK-HEADER: namespace sycl {
-// CHECK-HEADER-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) {
+// CHECK-HEADER-NEXT: inline namespace _V1 {
 // CHECK-HEADER-NEXT: namespace detail {
 // CHECK-HEADER-NEXT: namespace {
 // CHECK-HEADER-NEXT: class __sycl_device_global_registration {
@@ -24,7 +24,7 @@ int main() {
 // CHECK-HEADER-NEXT: __sycl_device_global_registration __sycl_device_global_registrar;
 // CHECK-HEADER-NEXT: } // namespace
 // CHECK-HEADER: } // namespace detail
-// CHECK-HEADER: } // __SYCL_INLINE_VER_NAMESPACE(_V1)
+// CHECK-HEADER: } // namespace _V1
 // CHECK-HEADER: } // namespace sycl
 
 // CHECK-FOOTER: #include <sycl/detail/defines_elementary.hpp>
diff --git a/clang/test/CodeGenSYCL/device_globals_with_spec_ids.cpp b/clang/test/CodeGenSYCL/device_globals_with_spec_ids.cpp
index 8eb773ead6b3c..26fe81abb89f5 100644
--- a/clang/test/CodeGenSYCL/device_globals_with_spec_ids.cpp
+++ b/clang/test/CodeGenSYCL/device_globals_with_spec_ids.cpp
@@ -13,14 +13,14 @@ int main() {
 // CHECK: #include <sycl/detail/defines_elementary.hpp>
 constexpr sycl::specialization_id a{2};
 // CHECK-NEXT: namespace sycl {
-// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) {
+// CHECK-NEXT: inline namespace _V1 {
 // CHECK-NEXT: namespace detail {
 // CHECK-NEXT: template<>
 // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::a>() {
 // CHECK-NEXT: return "____ZL1a";
 // CHECK-NEXT: }
 // CHECK-NEXT: } // namespace detail
-// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1)
+// CHECK-NEXT: } // namespace _V1
 // CHECK-NEXT: } // namespace sycl
 sycl::ext::oneapi::device_global<int> b;
 
@@ -29,14 +29,14 @@ struct Wrapper {
   static sycl::ext::oneapi::device_global<float> b;
 };
 // CHECK-NEXT: namespace sycl {
-// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) {
+// CHECK-NEXT: inline namespace _V1 {
 // CHECK-NEXT: namespace detail {
 // CHECK-NEXT: template<>
 // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::Wrapper::a>() {
 // CHECK-NEXT:   return "_ZN7Wrapper1aE";
 // CHECK-NEXT: }
 // CHECK-NEXT: } // namespace detail
-// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1)
+// CHECK-NEXT: } // namespace _V1
 // CHECK-NEXT: } // namespace sycl
 
 template <typename T>
@@ -47,14 +47,14 @@ struct TemplateWrapper {
 
 template class TemplateWrapper<float>;
 // CHECK: namespace sycl {
-// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) {
+// CHECK-NEXT: inline namespace _V1 {
 // CHECK-NEXT: namespace detail {
 // CHECK-NEXT: template<>
 // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::TemplateWrapper<float>::a>() {
 // CHECK-NEXT:   return "_ZN15TemplateWrapperIfE1aE";
 // CHECK-NEXT: }
 // CHECK-NEXT: } // namespace detail
-// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1)
+// CHECK-NEXT: } // namespace _V1
 // CHECK-NEXT: } // namespace sycl
 
 namespace {
@@ -71,14 +71,14 @@ sycl::ext::oneapi::device_global<int> b;
 // CHECK-NEXT: } // namespace
 
 // CHECK: namespace sycl {
-// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) {
+// CHECK-NEXT: inline namespace _V1 {
 // CHECK-NEXT: namespace detail {
 // CHECK-NEXT: template<>
 // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::__sycl_detail::__shim_[[SHIM0]]()>() {
 // CHECK-NEXT:   return "____ZN12_GLOBAL__N_11aE";
 // CHECK-NEXT: }
 // CHECK-NEXT: } // namespace detail
-// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1)
+// CHECK-NEXT: } // namespace _V1
 // CHECK-NEXT: } // namespace sycl
 
 // CHECK: namespace {
@@ -117,14 +117,14 @@ constexpr sycl::specialization_id a{2};
 // CHECK-NEXT: } // namespace
 // CHECK-NEXT: } // namespace outer
 // CHECK-NEXT: namespace sycl {
-// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) {
+// CHECK-NEXT: inline namespace _V1 {
 // CHECK-NEXT: namespace detail {
 // CHECK-NEXT: template<>
 // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::outer::__sycl_detail::__shim_[[SHIM3]]()>() {
 // CHECK-NEXT:   return "____ZN5outer12_GLOBAL__N_15inner12_GLOBAL__N_11aE";
 // CHECK-NEXT: }
 // CHECK-NEXT: } // namespace detail
-// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1)
+// CHECK-NEXT: } // namespace _V1
 // CHECK-NEXT: } // namespace sycl
 sycl::ext::oneapi::device_global<int> b;
 // CHECK: namespace outer {
@@ -177,14 +177,14 @@ struct Wrapper {
 // CHECK-NEXT: } // namespace
 // CHECK-NEXT: } // namespace outer
 // CHECK-NEXT: namespace sycl {
-// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) {
+// CHECK-NEXT: inline namespace _V1 {
 // CHECK-NEXT: namespace detail {
 // CHECK-NEXT: template<>
 // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::outer::__sycl_detail::__shim_[[SHIM7]]()>() {
 // CHECK-NEXT:   return "____ZN5outer12_GLOBAL__N_15inner12_GLOBAL__N_17Wrapper1aE";
 // CHECK-NEXT: }
 // CHECK-NEXT: } // namespace detail
-// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1)
+// CHECK-NEXT: } // namespace _V1
 // CHECK-NEXT: } // namespace sycl
 
 // CHECK-NEXT: namespace outer {
diff --git a/clang/test/CodeGenSYCL/host_pipe_int_footer_header.cpp b/clang/test/CodeGenSYCL/host_pipe_int_footer_header.cpp
index 31899db188470..f6537fee5fc4c 100644
--- a/clang/test/CodeGenSYCL/host_pipe_int_footer_header.cpp
+++ b/clang/test/CodeGenSYCL/host_pipe_int_footer_header.cpp
@@ -21,7 +21,7 @@ void foo() {
 }
 
 // CHECK-HEADER: namespace sycl {
-// CHECK-HEADER-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) {
+// CHECK-HEADER-NEXT: inline namespace _V1 {
 // CHECK-HEADER-NEXT: namespace detail {
 // CHECK-HEADER-NEXT: namespace {
 // CHECK-HEADER-NEXT: class __sycl_host_pipe_registration {
@@ -31,7 +31,7 @@ void foo() {
 // CHECK-HEADER-NEXT: __sycl_host_pipe_registration __sycl_host_pipe_registrar;
 // CHECK-HEADER-NEXT: } // namespace
 // CHECK-HEADER: } // namespace detail
-// CHECK-HEADER: } // __SYCL_INLINE_VER_NAMESPACE(_V1)
+// CHECK-HEADER: } // namespace _V1
 // CHECK-HEADER: } // namespace sycl
 
 // CHECK-FOOTER: #include <sycl/detail/defines_elementary.hpp>
diff --git a/clang/test/CodeGenSYCL/int_header_without_kernels.cpp b/clang/test/CodeGenSYCL/int_header_without_kernels.cpp
index 7533255770b9a..05c4382cf6b09 100644
--- a/clang/test/CodeGenSYCL/int_header_without_kernels.cpp
+++ b/clang/test/CodeGenSYCL/int_header_without_kernels.cpp
@@ -10,7 +10,7 @@
 using namespace sycl::ext::oneapi;
 
 // CHECK-HEADER: namespace sycl {
-// CHECK-HEADER-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) {
+// CHECK-HEADER-NEXT: inline namespace _V1 {
 // CHECK-HEADER-NEXT: namespace detail {
 // CHECK-HEADER-NEXT: namespace {
 // CHECK-HEADER-NEXT: class __sycl_device_global_registration {
@@ -20,7 +20,7 @@ using namespace sycl::ext::oneapi;
 // CHECK-HEADER-NEXT: __sycl_device_global_registration __sycl_device_global_registrar;
 // CHECK-HEADER-NEXT: } // namespace
 // CHECK-HEADER: } // namespace detail
-// CHECK-HEADER: } // __SYCL_INLINE_VER_NAMESPACE(_V1)
+// CHECK-HEADER: } // namespace _V1
 // CHECK-HEADER: } // namespace sycl
 
 // CHECK-FOOTER: #include <sycl/detail/defines_elementary.hpp>
diff --git a/clang/test/CodeGenSYCL/integration_footer.cpp b/clang/test/CodeGenSYCL/integration_footer.cpp
index 85d7717ecbddf..44346dcf1a281 100644
--- a/clang/test/CodeGenSYCL/integration_footer.cpp
+++ b/clang/test/CodeGenSYCL/integration_footer.cpp
@@ -13,27 +13,27 @@ using namespace sycl;
 
 sycl::specialization_id<int> GlobalSpecID;
 // CHECK: namespace sycl {
-// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) {
+// CHECK-NEXT: inline namespace _V1 {
 // CHECK-NEXT: namespace detail {
 // CHECK-NEXT: template<>
 // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::GlobalSpecID>() {
 // CHECK-NEXT: return "_Z12GlobalSpecID";
 // CHECK-NEXT: }
 // CHECK-NEXT: } // namespace detail
-// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1)
+// CHECK-NEXT: } // namespace _V1
 // CHECK-NEXT: } // namespace sycl
 
 struct Wrapper {
   static specialization_id<int> WrapperSpecID;
   // CHECK: namespace sycl {
-  // CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) {
+  // CHECK-NEXT: inline namespace _V1 {
   // CHECK-NEXT: namespace detail {
   // CHECK-NEXT: template<>
   // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::Wrapper::WrapperSpecID>() {
   // CHECK-NEXT: return "_ZN7Wrapper13WrapperSpecIDE";
   // CHECK-NEXT: }
   // CHECK-NEXT: } // namespace detail
-  // CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1)
+  // CHECK-NEXT: } // namespace _V1
   // CHECK-NEXT: } // namespace sycl
 };
 
@@ -43,74 +43,74 @@ struct WrapperTemplate {
 };
 template class WrapperTemplate<int>;
 // CHECK: namespace sycl {
-// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) {
+// CHECK-NEXT: inline namespace _V1 {
 // CHECK-NEXT: namespace detail {
 // CHECK-NEXT: template<>
 // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::WrapperTemplate<int>::WrapperSpecID>() {
 // CHECK-NEXT: return "_ZN15WrapperTemplateIiE13WrapperSpecIDE";
 // CHECK-NEXT: }
 // CHECK-NEXT: } // namespace detail
-// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1)
+// CHECK-NEXT: } // namespace _V1
 // CHECK-NEXT: } // namespace sycl
 template class WrapperTemplate<double>;
 // CHECK: namespace sycl {
-// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) {
+// CHECK-NEXT: inline namespace _V1 {
 // CHECK-NEXT: namespace detail {
 // CHECK-NEXT: template<>
 // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::WrapperTemplate<double>::WrapperSpecID>() {
 // CHECK-NEXT: return "_ZN15WrapperTemplateIdE13WrapperSpecIDE";
 // CHECK-NEXT: }
 // CHECK-NEXT: } // namespace detail
-// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1)
+// CHECK-NEXT: } // namespace _V1
 // CHECK-NEXT: } // namespace sycl
 
 namespace Foo {
 specialization_id<int> NSSpecID;
 // CHECK: namespace sycl {
-// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) {
+// CHECK-NEXT: inline namespace _V1 {
 // CHECK-NEXT: namespace detail {
 // CHECK-NEXT: template<>
 // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::Foo::NSSpecID>() {
 // CHECK-NEXT: return "_ZN3Foo8NSSpecIDE";
 // CHECK-NEXT: }
 // CHECK-NEXT: } // namespace detail
-// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1)
+// CHECK-NEXT: } // namespace _V1
 // CHECK-NEXT: } // namespace sycl
 inline namespace Bar {
 specialization_id<int> InlineNSSpecID;
 // CHECK: namespace sycl {
-// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) {
+// CHECK-NEXT: inline namespace _V1 {
 // CHECK-NEXT: namespace detail {
 // CHECK-NEXT: template<>
 // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::Foo::InlineNSSpecID>() {
 // CHECK-NEXT: return "_ZN3Foo3Bar14InlineNSSpecIDE";
 // CHECK-NEXT: }
 // CHECK-NEXT: } // namespace detail
-// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1)
+// CHECK-NEXT: } // namespace _V1
 // CHECK-NEXT: } // namespace sycl
 specialization_id<int> NSSpecID;
 // CHECK: namespace sycl {
-// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) {
+// CHECK-NEXT: inline namespace _V1 {
 // CHECK-NEXT: namespace detail {
 // CHECK-NEXT: template<>
 // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::Foo::Bar::NSSpecID>() {
 // CHECK-NEXT: return "_ZN3Foo3Bar8NSSpecIDE";
 // CHECK-NEXT: }
 // CHECK-NEXT: } // namespace detail
-// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1)
+// CHECK-NEXT: } // namespace _V1
 // CHECK-NEXT: } // namespace sycl
 
 struct Wrapper {
   static specialization_id<int> WrapperSpecID;
   // CHECK: namespace sycl {
-  // CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) {
+  // CHECK-NEXT: inline namespace _V1 {
   // CHECK-NEXT: namespace detail {
   // CHECK-NEXT: template<>
   // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::Foo::Wrapper::WrapperSpecID>() {
   // CHECK-NEXT: return "_ZN3Foo3Bar7Wrapper13WrapperSpecIDE";
   // CHECK-NEXT: }
   // CHECK-NEXT: } // namespace detail
-  // CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1)
+  // CHECK-NEXT: } // namespace _V1
   // CHECK-NEXT: } // namespace sycl
 };
 
@@ -120,25 +120,25 @@ struct WrapperTemplate {
 };
 template class WrapperTemplate<int>;
 // CHECK: namespace sycl {
-// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) {
+// CHECK-NEXT: inline namespace _V1 {
 // CHECK-NEXT: namespace detail {
 // CHECK-NEXT: template<>
 // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::Foo::WrapperTemplate<int>::WrapperSpecID>() {
 // CHECK-NEXT: return "_ZN3Foo3Bar15WrapperTemplateIiE13WrapperSpecIDE";
 // CHECK-NEXT: }
 // CHECK-NEXT: } // namespace detail
-// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1)
+// CHECK-NEXT: } // namespace _V1
 // CHECK-NEXT: } // namespace sycl
 template class WrapperTemplate<double>;
 // CHECK: namespace sycl {
-// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) {
+// CHECK-NEXT: inline namespace _V1 {
 // CHECK-NEXT: namespace detail {
 // CHECK-NEXT: template<>
 // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::Foo::WrapperTemplate<double>::WrapperSpecID>() {
 // CHECK-NEXT: return "_ZN3Foo3Bar15WrapperTemplateIdE13WrapperSpecIDE";
 // CHECK-NEXT: }
 // CHECK-NEXT: } // namespace detail
-// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1)
+// CHECK-NEXT: } // namespace _V1
 // CHECK-NEXT: } // namespace sycl
 } // namespace Bar
 namespace {
@@ -155,14 +155,14 @@ specialization_id<int> AnonNSSpecID;
 // CHECK-NEXT: } // namespace Foo
 
 // CHECK: namespace sycl {
-// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) {
+// CHECK-NEXT: inline namespace _V1 {
 // CHECK-NEXT: namespace detail {
 // CHECK-NEXT: template<>
 // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::Foo::__sycl_detail::__shim_[[SHIM0]]()>() {
 // CHECK-NEXT: return "____ZN3Foo12_GLOBAL__N_112AnonNSSpecIDE";
 // CHECK-NEXT: }
 // CHECK-NEXT: } // namespace detail
-// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1)
+// CHECK-NEXT: } // namespace _V1
 // CHECK-NEXT: } // namespace sycl
 } // namespace
 
@@ -202,14 +202,14 @@ auto x = HasVarTemplate::VarTempl<int, 2>.getDefaultValue();
 // CHECK-NEXT: } // namespace __sycl_detail
 // CHECK-NEXT: } // namespace
 // CHECK-NEXT: namespace sycl {
-// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) {
+// CHECK-NEXT: inline namespace _V1 {
 // CHECK-NEXT: namespace detail {
 // CHECK-NEXT: template<>
 // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::__sycl_detail::__shim_[[SHIM1]]()>() {
 // CHECK-NEXT: return "____ZN12_GLOBAL__N_114HasVarTemplate8VarTemplIiLi2EEE";
 // CHECK-NEXT: }
 // CHECK-NEXT: } // namespace detail
-// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1)
+// CHECK-NEXT: } // namespace _V1
 // CHECK-NEXT: } // namespace sycl
 
 template <typename T> struct GlobalWrapper {
diff --git a/clang/test/CodeGenSYCL/kernel-param-acc-array-ih.cpp b/clang/test/CodeGenSYCL/kernel-param-acc-array-ih.cpp
index 4d6cf68f8a7df..15a1a2bd2f9e7 100644
--- a/clang/test/CodeGenSYCL/kernel-param-acc-array-ih.cpp
+++ b/clang/test/CodeGenSYCL/kernel-param-acc-array-ih.cpp
@@ -9,7 +9,7 @@
 // CHECK: class kernel_A;
 
 // CHECK: namespace sycl {
-// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) {
+// CHECK-NEXT: inline namespace _V1 {
 // CHECK-NEXT: namespace detail {
 
 // CHECK: static constexpr
diff --git a/clang/test/CodeGenSYCL/kernel-param-member-acc-array-ih.cpp b/clang/test/CodeGenSYCL/kernel-param-member-acc-array-ih.cpp
index 2d77af1a0280b..2050aac50626c 100644
--- a/clang/test/CodeGenSYCL/kernel-param-member-acc-array-ih.cpp
+++ b/clang/test/CodeGenSYCL/kernel-param-member-acc-array-ih.cpp
@@ -9,7 +9,7 @@
 // CHECK: class kernel_C;
 
 // CHECK: namespace sycl {
-// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) {
+// CHECK-NEXT: inline namespace _V1 {
 // CHECK-NEXT: namespace detail {
 
 // CHECK: static constexpr
diff --git a/clang/test/CodeGenSYCL/kernel-param-pod-array-ih.cpp b/clang/test/CodeGenSYCL/kernel-param-pod-array-ih.cpp
index cbd207c3d9223..68b0f412a701a 100644
--- a/clang/test/CodeGenSYCL/kernel-param-pod-array-ih.cpp
+++ b/clang/test/CodeGenSYCL/kernel-param-pod-array-ih.cpp
@@ -8,7 +8,7 @@
 // CHECK: class kernel_B;
 
 // CHECK: namespace sycl {
-// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) {
+// CHECK-NEXT: inline namespace _V1 {
 // CHECK-NEXT: namespace detail {
 
 // CHECK: static constexpr
diff --git a/clang/test/CodeGenSYCL/union-kernel-param-ih.cpp b/clang/test/CodeGenSYCL/union-kernel-param-ih.cpp
index b00bac5bd23ab..aa030417b68ee 100644
--- a/clang/test/CodeGenSYCL/union-kernel-param-ih.cpp
+++ b/clang/test/CodeGenSYCL/union-kernel-param-ih.cpp
@@ -9,7 +9,7 @@
 // CHECK: class kernel_A;
 
 // CHECK: namespace sycl {
-// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) {
+// CHECK-NEXT: inline namespace _V1 {
 // CHECK-NEXT: namespace detail {
 
 // CHECK: static constexpr
diff --git a/clang/test/CodeGenSYCL/wrapped-accessor.cpp b/clang/test/CodeGenSYCL/wrapped-accessor.cpp
index 79f573ea8854a..6d46d03cad2e5 100644
--- a/clang/test/CodeGenSYCL/wrapped-accessor.cpp
+++ b/clang/test/CodeGenSYCL/wrapped-accessor.cpp
@@ -6,7 +6,7 @@
 // CHECK: class wrapped_access;
 
 // CHECK: namespace sycl {
-// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) {
+// CHECK-NEXT: inline namespace _V1 {
 // CHECK-NEXT: namespace detail {
 
 // CHECK: static constexpr
diff --git a/clang/test/Frontend/Inputs/sycl.hpp b/clang/test/Frontend/Inputs/sycl.hpp
index dd00fbe2034d3..1e5b4bd124e92 100644
--- a/clang/test/Frontend/Inputs/sycl.hpp
+++ b/clang/test/Frontend/Inputs/sycl.hpp
@@ -628,5 +628,5 @@ class image {
   }
 };
 
-} // inline namespace _V1
+} // namespace _V1
 } // namespace sycl
diff --git a/clang/test/SemaSYCL/Inputs/sycl.hpp b/clang/test/SemaSYCL/Inputs/sycl.hpp
index 00693f501fcb9..3fc13d86201de 100644
--- a/clang/test/SemaSYCL/Inputs/sycl.hpp
+++ b/clang/test/SemaSYCL/Inputs/sycl.hpp
@@ -414,7 +414,7 @@ class __attribute__((sycl_special_class)) __SYCL_TYPE(annotated_ptr) annotated_p
 } // namespace experimental
 } // namespace oneapi
 } // namespace ext
-} // inline namespace _V1
+} // namespace _V1
 } // namespace sycl
 
 #endif
diff --git a/clang/test/SemaSYCL/Inputs/sycl/detail/defines_elementary.hpp b/clang/test/SemaSYCL/Inputs/sycl/detail/defines_elementary.hpp
index d21230727dcb8..ecca3de1368fe 100644
--- a/clang/test/SemaSYCL/Inputs/sycl/detail/defines_elementary.hpp
+++ b/clang/test/SemaSYCL/Inputs/sycl/detail/defines_elementary.hpp
@@ -1,4 +1,3 @@
 #pragma once
 
-#define __SYCL_INLINE_VER_NAMESPACE(X) inline namespace X
 #define __SYCL_DLL_LOCAL
diff --git a/clang/test/SemaSYCL/Inputs/sycl/detail/kernel_desc.hpp b/clang/test/SemaSYCL/Inputs/sycl/detail/kernel_desc.hpp
index 11b23c00e21b1..6ef9122d45209 100644
--- a/clang/test/SemaSYCL/Inputs/sycl/detail/kernel_desc.hpp
+++ b/clang/test/SemaSYCL/Inputs/sycl/detail/kernel_desc.hpp
@@ -3,7 +3,7 @@
 #include <sycl/detail/defines_elementary.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 #ifndef __SYCL_DEVICE_ONLY__
@@ -57,5 +57,5 @@ namespace detail {
     static constexpr int64_t getKernelSize() { return 0; }
   };
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/.clang-format b/sycl/.clang-format
index 412e67480725c..d9e54adc5d653 100644
--- a/sycl/.clang-format
+++ b/sycl/.clang-format
@@ -1,2 +1,2 @@
 BasedOnStyle: LLVM
-NamespaceMacros: ['__SYCL_INLINE_NAMESPACE', '__SYCL_INLINE_VER_NAMESPACE']
+NamespaceMacros: ['__SYCL_INLINE_NAMESPACE']
diff --git a/sycl/doc/design/SYCL2020-SpecializationConstants.md b/sycl/doc/design/SYCL2020-SpecializationConstants.md
index 6a430001b9f46..e05151794d62d 100644
--- a/sycl/doc/design/SYCL2020-SpecializationConstants.md
+++ b/sycl/doc/design/SYCL2020-SpecializationConstants.md
@@ -785,7 +785,7 @@ The integration footer will look like:
 
 ```
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 // Note: we do not declare `get_spec_constant_symbolic_ID` here and assume that
 // it is declared in some other header which was already included.
@@ -814,7 +814,7 @@ inline const char *get_spec_constant_symbolic_ID<id_float>() {
 }
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 // Detailed description of this header is provided below in corresponding RT section
diff --git a/sycl/doc/doxygen.cfg.in b/sycl/doc/doxygen.cfg.in
index c9c3122f510c8..abebc9ea52631 100644
--- a/sycl/doc/doxygen.cfg.in
+++ b/sycl/doc/doxygen.cfg.in
@@ -2105,7 +2105,6 @@ INCLUDE_FILE_PATTERNS  =
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 PREDEFINED             = "__SYCL_INLINE_NAMESPACE(X)=namespace X" \
-                         "__SYCL_INLINE_VER_NAMESPACE(X)=namespace X" \
                          "__SYCL_EXPORT" \
                          "__SYCL_EXPORT_DEPRECATED(x)=" \
                          "__ESIMD_NS=sycl::ext::intel::esimd" \
diff --git a/sycl/include/CL/__spirv/spirv_types.hpp b/sycl/include/CL/__spirv/spirv_types.hpp
index ab56a4a8b35b2..5d9da888f315e 100644
--- a/sycl/include/CL/__spirv/spirv_types.hpp
+++ b/sycl/include/CL/__spirv/spirv_types.hpp
@@ -184,12 +184,12 @@ struct ConstantPipeStorage {
 };
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 // Arbitrary precision integer type
 template <int Bits> using ap_int = _BitInt(Bits);
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 #endif // __SYCL_DEVICE_ONLY__
 
diff --git a/sycl/include/sycl/access/access.hpp b/sycl/include/sycl/access/access.hpp
index 1f92c6b8ed397..5a5054fea3fb0 100644
--- a/sycl/include/sycl/access/access.hpp
+++ b/sycl/include/sycl/access/access.hpp
@@ -12,7 +12,7 @@
 #include <sycl/detail/defines.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace access {
 
 enum class target {
@@ -377,5 +377,5 @@ template <typename ToT, typename FromT> inline ToT cast_AS(FromT from) {
 #undef __OPENCL_CONSTANT_AS__
 #undef __OPENCL_PRIVATE_AS__
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/accessor.hpp b/sycl/include/sycl/accessor.hpp
index b857af948f695..9a673a3278ec1 100644
--- a/sycl/include/sycl/accessor.hpp
+++ b/sycl/include/sycl/accessor.hpp
@@ -211,7 +211,7 @@
 /// accessor(3)
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 class stream;
 namespace ext::intel::esimd::detail {
 // Forward declare a "back-door" access class to support ESIMD.
@@ -4075,7 +4075,7 @@ class __SYCL_EBO host_sampled_image_accessor
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
 };
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 namespace std {
diff --git a/sycl/include/sycl/aliases.hpp b/sycl/include/sycl/aliases.hpp
index 8805651d33627..f5772aad50eff 100644
--- a/sycl/include/sycl/aliases.hpp
+++ b/sycl/include/sycl/aliases.hpp
@@ -16,12 +16,12 @@
 #include <cstdint>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 template <typename T, int N> class vec;
 namespace detail::half_impl {
 class half;
 } // namespace detail::half_impl
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 #define __SYCL_MAKE_VECTOR_ALIAS(ALIAS, TYPE, N)                               \
@@ -91,7 +91,7 @@ class half;
   __SYCL_MAKE_VECTOR_ALIAS(half, half, N)
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 using byte __SYCL2020_DEPRECATED("use std::byte instead") = std::uint8_t;
 using schar __SYCL2020_DEPRECATED("") = signed char;
 using uchar __SYCL2020_DEPRECATED("") = unsigned char;
@@ -156,7 +156,7 @@ __SYCL_MAKE_VECTOR_ALIASES_FOR_VECTOR_LENGTH(4)
 __SYCL_MAKE_VECTOR_ALIASES_FOR_VECTOR_LENGTH(8)
 __SYCL_MAKE_VECTOR_ALIASES_FOR_VECTOR_LENGTH(16)
 #endif
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 #undef __SYCL_MAKE_VECTOR_ALIAS
diff --git a/sycl/include/sycl/aspects.hpp b/sycl/include/sycl/aspects.hpp
index d2e389f4c9f8a..e60e25510d79f 100644
--- a/sycl/include/sycl/aspects.hpp
+++ b/sycl/include/sycl/aspects.hpp
@@ -10,7 +10,7 @@
 #include <sycl/detail/defines.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 #define __SYCL_ASPECT(ASPECT, ID) ASPECT = ID,
 #define __SYCL_ASPECT_DEPRECATED(ASPECT, ID, MESSAGE)                          \
@@ -25,5 +25,5 @@ enum class __SYCL_TYPE(aspect) aspect {
 #undef __SYCL_ASPECT_DEPRECATED
 #undef __SYCL_ASPECT
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/async_handler.hpp b/sycl/include/sycl/async_handler.hpp
index 01ba71dc51efd..39d8a443d3d30 100644
--- a/sycl/include/sycl/async_handler.hpp
+++ b/sycl/include/sycl/async_handler.hpp
@@ -13,11 +13,11 @@
 #include <functional>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 // Forward declaration
 class exception_list;
 
 using async_handler = std::function<void(sycl::exception_list)>;
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/atomic.hpp b/sycl/include/sycl/atomic.hpp
index b972541c578f7..c729cae307e9c 100644
--- a/sycl/include/sycl/atomic.hpp
+++ b/sycl/include/sycl/atomic.hpp
@@ -26,7 +26,7 @@
                 "SYCL atomic function not available for float type")
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 // Forward declaration
 template <typename pointerT, access::address_space addressSpace,
@@ -68,13 +68,13 @@ template <> struct GetSpirvMemoryScope<access::address_space::local_space> {
 };
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 #ifndef __SYCL_DEVICE_ONLY__
 // host implementation of SYCL atomics
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 // Translate sycl::memory_order or __spv::MemorySemanticsMask::Flag
 // into std::memory_order
@@ -83,7 +83,7 @@ inline std::memory_order getStdMemoryOrder(__spv::MemorySemanticsMask::Flag) {
   return std::memory_order_relaxed;
 }
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 // std::atomic version of atomic SPIR-V builtins
@@ -165,7 +165,7 @@ extern T __spirv_AtomicMax(std::atomic<T> *Ptr, __spv::Scope::Flag,
 #endif // !defined(__SYCL_DEVICE_ONLY__)
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 template <typename T, access::address_space addressSpace =
                           access::address_space::global_space>
@@ -401,7 +401,7 @@ T atomic_fetch_max(atomic<T, addressSpace> Object, T Operand,
   return Object.fetch_max(Operand, MemoryOrder);
 }
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 #undef __SYCL_STATIC_ASSERT_NOT_FLOAT
diff --git a/sycl/include/sycl/atomic_fence.hpp b/sycl/include/sycl/atomic_fence.hpp
index 95b66092f3ec8..1c1d38bcb7268 100644
--- a/sycl/include/sycl/atomic_fence.hpp
+++ b/sycl/include/sycl/atomic_fence.hpp
@@ -17,7 +17,7 @@
 #endif
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 inline void atomic_fence(memory_order order, memory_scope scope) {
 #ifdef __SYCL_DEVICE_ONLY__
@@ -31,5 +31,5 @@ inline void atomic_fence(memory_order order, memory_scope scope) {
 #endif
 }
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/atomic_ref.hpp b/sycl/include/sycl/atomic_ref.hpp
index 5e77c1fda5e3a..74bd32ca048c5 100644
--- a/sycl/include/sycl/atomic_ref.hpp
+++ b/sycl/include/sycl/atomic_ref.hpp
@@ -24,7 +24,7 @@
 #include <type_traits>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 using memory_order = sycl::memory_order;
@@ -720,5 +720,5 @@ class atomic_ref
                                 AddressSpace>::operator=;
 };
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/backend.hpp b/sycl/include/sycl/backend.hpp
index 6ebb66da93619..b735634393f25 100644
--- a/sycl/include/sycl/backend.hpp
+++ b/sycl/include/sycl/backend.hpp
@@ -45,7 +45,7 @@
 #include <type_traits>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 namespace detail {
 // TODO each backend can have its own custom errc enumeration
@@ -363,5 +363,5 @@ make_kernel_bundle(const typename backend_traits<Backend>::template input_type<
           false, State, Backend);
   return detail::createSyclObjFromImpl<kernel_bundle<State>>(KBImpl);
 }
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/backend/opencl.hpp b/sycl/include/sycl/backend/opencl.hpp
index fd4646d237190..6b13bb9767dbd 100644
--- a/sycl/include/sycl/backend/opencl.hpp
+++ b/sycl/include/sycl/backend/opencl.hpp
@@ -14,7 +14,7 @@
 #include <string>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace opencl {
 // Implementation of various "make" functions resides in SYCL RT because
 // creating SYCL objects requires knowing details not accessible here.
@@ -65,5 +65,5 @@ T make(const context &Context,
   return make_queue(Context, detail::pi::cast<pi_native_handle>(Interop));
 }
 } // namespace opencl
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/backend_types.hpp b/sycl/include/sycl/backend_types.hpp
index ce308e3d52d82..fdc7d7461d8f5 100644
--- a/sycl/include/sycl/backend_types.hpp
+++ b/sycl/include/sycl/backend_types.hpp
@@ -13,7 +13,7 @@
 #include <ostream>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 enum class backend : char {
   host __SYCL2020_DEPRECATED("'host' backend is no longer supported") = 0,
@@ -64,5 +64,5 @@ inline std::ostream &operator<<(std::ostream &Out, backend be) {
   return Out;
 }
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/bit_cast.hpp b/sycl/include/sycl/bit_cast.hpp
index 179ac1304988f..11d0ea7421104 100644
--- a/sycl/include/sycl/bit_cast.hpp
+++ b/sycl/include/sycl/bit_cast.hpp
@@ -18,7 +18,7 @@
 #endif
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 template <typename To, typename From>
 #if __cpp_lib_bit_cast || __has_builtin(__builtin_bit_cast)
@@ -45,5 +45,5 @@ constexpr
 
 #endif // __cpp_lib_bit_cast
 }
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/buffer.hpp b/sycl/include/sycl/buffer.hpp
index bf56a88e760d8..d81d413eb589f 100644
--- a/sycl/include/sycl/buffer.hpp
+++ b/sycl/include/sycl/buffer.hpp
@@ -22,7 +22,7 @@
 #include <sycl/stl.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 class handler;
 class queue;
@@ -840,7 +840,7 @@ buffer(const T *, const range<dimensions> &, const property_list & = {})
     -> buffer<T, dimensions>;
 #endif // __cpp_deduction_guides
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 namespace std {
diff --git a/sycl/include/sycl/builtins.hpp b/sycl/include/sycl/builtins.hpp
index 72134be3d666f..43f23204b46c4 100644
--- a/sycl/include/sycl/builtins.hpp
+++ b/sycl/include/sycl/builtins.hpp
@@ -22,7 +22,7 @@
 
 namespace sycl {
 
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 namespace detail {
 template <class T, size_t N> vec<T, 2> to_vec2(marray<T, N> x, size_t start) {
@@ -2560,7 +2560,7 @@ std::enable_if_t<detail::is_svgenfloatf<T>::value, T> tan(T x) __NOEXC {
 }
 
 #endif // __FAST_MATH__
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 #ifdef __SYCL_DEVICE_ONLY__
diff --git a/sycl/include/sycl/builtins_esimd.hpp b/sycl/include/sycl/builtins_esimd.hpp
index 1b97dc8a054fd..57f23a252a2ed 100644
--- a/sycl/include/sycl/builtins_esimd.hpp
+++ b/sycl/include/sycl/builtins_esimd.hpp
@@ -19,7 +19,7 @@
 #define __NOEXC /*noexcept*/
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 // cos
 template <int SZ>
@@ -65,7 +65,7 @@ log(__ESIMD_NS::simd<float, SZ> x) __NOEXC {
 #endif // __SYCL_DEVICE_ONLY__
 }
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 #undef __NOEXC
diff --git a/sycl/include/sycl/context.hpp b/sycl/include/sycl/context.hpp
index 1c4cd91678567..cff35b33ee28f 100644
--- a/sycl/include/sycl/context.hpp
+++ b/sycl/include/sycl/context.hpp
@@ -18,7 +18,7 @@
 // 4.6.2 Context class
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 // Forward declarations
 class device;
 class platform;
@@ -238,7 +238,7 @@ class __SYCL_EXPORT context : public detail::OwnerLessBase<context> {
   friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj);
 };
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 namespace std {
diff --git a/sycl/include/sycl/detail/accessor_iterator.hpp b/sycl/include/sycl/detail/accessor_iterator.hpp
index 192bd63b67b0a..aec69ff3ef30a 100644
--- a/sycl/include/sycl/detail/accessor_iterator.hpp
+++ b/sycl/include/sycl/detail/accessor_iterator.hpp
@@ -35,7 +35,7 @@
 /// > over the elements that are within the sub-range.
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 template <typename AccessorDataT, int AccessorDimensions,
           access::mode AccessMode, access::target AccessTarget,
@@ -347,5 +347,5 @@ template <typename DataT, int Dimensions> class accessor_iterator {
 #endif // NDEBUG
 };
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/detail/aligned_allocator.hpp b/sycl/include/sycl/detail/aligned_allocator.hpp
index 39e5abd4a8b61..5e18b7e15d186 100644
--- a/sycl/include/sycl/detail/aligned_allocator.hpp
+++ b/sycl/include/sycl/detail/aligned_allocator.hpp
@@ -16,7 +16,7 @@
 #include <new>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 template <typename T> class aligned_allocator {
 public:
@@ -77,7 +77,7 @@ template <typename T> class aligned_allocator {
   size_t MAlignment = 128;
 };
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 namespace std {
diff --git a/sycl/include/sycl/detail/array.hpp b/sycl/include/sycl/detail/array.hpp
index 91ccca296ab00..5a73c331aec86 100644
--- a/sycl/include/sycl/detail/array.hpp
+++ b/sycl/include/sycl/detail/array.hpp
@@ -13,7 +13,7 @@
 #include <sycl/exception.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 template <int dimensions> class id;
 template <int dimensions> class range;
 namespace detail {
@@ -120,5 +120,5 @@ template <int dimensions = 1> class array {
 };
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/detail/assert_happened.hpp b/sycl/include/sycl/detail/assert_happened.hpp
index ae4e1b707ab48..7ae7ae6b18fe4 100644
--- a/sycl/include/sycl/detail/assert_happened.hpp
+++ b/sycl/include/sycl/detail/assert_happened.hpp
@@ -19,7 +19,7 @@ __devicelib_assert_read(void *);
 #endif
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 // NOTE Layout of this structure should be aligned with the one in
 // libdevice/include/assert-happened.hpp
@@ -40,5 +40,5 @@ struct AssertHappened {
   uint64_t LID2 = 0;
 };
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/detail/backend_traits.hpp b/sycl/include/sycl/detail/backend_traits.hpp
index 7f9cf23ec325a..c3741fe30ea61 100644
--- a/sycl/include/sycl/detail/backend_traits.hpp
+++ b/sycl/include/sycl/detail/backend_traits.hpp
@@ -12,7 +12,7 @@
 #include <sycl/detail/common.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 template <backend Backend, typename SYCLObjectT> struct interop;
@@ -33,5 +33,5 @@ template <backend Backend> struct InteropFeatureSupportMap {
   static constexpr bool MakeImage = false;
 };
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/detail/backend_traits_cuda.hpp b/sycl/include/sycl/detail/backend_traits_cuda.hpp
index ac75566573627..c45aabb4769e4 100644
--- a/sycl/include/sycl/detail/backend_traits_cuda.hpp
+++ b/sycl/include/sycl/detail/backend_traits_cuda.hpp
@@ -35,7 +35,7 @@ typedef unsigned int CUdeviceptr;
 #endif
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 // TODO the interops for context, device, event, platform and program
@@ -102,5 +102,5 @@ template <> struct BackendReturn<backend::ext_oneapi_cuda, queue> {
 };
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/detail/backend_traits_hip.hpp b/sycl/include/sycl/detail/backend_traits_hip.hpp
index 90a5913ac0774..aa480f8a099d2 100644
--- a/sycl/include/sycl/detail/backend_traits_hip.hpp
+++ b/sycl/include/sycl/detail/backend_traits_hip.hpp
@@ -29,7 +29,7 @@ typedef struct ihipModule_t *HIPmodule;
 typedef void *HIPdeviceptr;
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 // TODO the interops for context, device, event, platform and program
@@ -96,5 +96,5 @@ template <> struct BackendReturn<backend::ext_oneapi_hip, queue> {
 };
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/detail/backend_traits_level_zero.hpp b/sycl/include/sycl/detail/backend_traits_level_zero.hpp
index 3db321833276b..44f336681aa3f 100644
--- a/sycl/include/sycl/detail/backend_traits_level_zero.hpp
+++ b/sycl/include/sycl/detail/backend_traits_level_zero.hpp
@@ -37,7 +37,7 @@ typedef struct _ze_kernel_handle_t *ze_kernel_handle_t;
 typedef struct _ze_module_handle_t *ze_module_handle_t;
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 // Forward declarations
@@ -212,5 +212,5 @@ template <> struct InteropFeatureSupportMap<backend::ext_oneapi_level_zero> {
 };
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/detail/backend_traits_opencl.hpp b/sycl/include/sycl/detail/backend_traits_opencl.hpp
index 190d01e89c564..6729f9c783fb1 100644
--- a/sycl/include/sycl/detail/backend_traits_opencl.hpp
+++ b/sycl/include/sycl/detail/backend_traits_opencl.hpp
@@ -25,7 +25,7 @@
 #include <sycl/queue.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 // TODO the interops for context, device, event, platform and program
@@ -153,5 +153,5 @@ inline PiDevice
     cast(cl_device_id) = delete; // Use piextCreateDeviceWithNativeHandle
 } // namespace pi
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/detail/boolean.hpp b/sycl/include/sycl/detail/boolean.hpp
index 21ee47b0ac441..62c887ceb3b9f 100644
--- a/sycl/include/sycl/detail/boolean.hpp
+++ b/sycl/include/sycl/detail/boolean.hpp
@@ -15,7 +15,7 @@
 #include <type_traits>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 template <int Num> struct Assigner {
@@ -127,5 +127,5 @@ template <> struct Boolean<1> {
 };
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/detail/cg.hpp b/sycl/include/sycl/detail/cg.hpp
index 47b5a50067db7..b29be33cb0be7 100644
--- a/sycl/include/sycl/detail/cg.hpp
+++ b/sycl/include/sycl/detail/cg.hpp
@@ -30,7 +30,7 @@
 #include <vector>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 // Forward declarations
 class queue;
@@ -509,5 +509,5 @@ class CGExecCommandBuffer : public CG {
 };
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/detail/cg_types.hpp b/sycl/include/sycl/detail/cg_types.hpp
index 4b433cc222687..748369c8c1391 100644
--- a/sycl/include/sycl/detail/cg_types.hpp
+++ b/sycl/include/sycl/detail/cg_types.hpp
@@ -19,7 +19,7 @@
 #include <sycl/range.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 // The structure represents kernel argument.
@@ -416,5 +416,5 @@ class HostKernel : public HostKernelBase {
 };
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/detail/common.hpp b/sycl/include/sycl/detail/common.hpp
index 7983baca607ec..e716991485e03 100644
--- a/sycl/include/sycl/detail/common.hpp
+++ b/sycl/include/sycl/detail/common.hpp
@@ -20,7 +20,7 @@
 // Default signature enables the passing of user code location information to
 // public methods as a default argument.
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 // The check for output iterator is commented out as it blocks set_final_data
@@ -147,11 +147,11 @@ class __SYCL_EXPORT tls_code_loc_t {
 };
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 __SYCL_EXPORT const char *stringifyErrorCode(pi_int32 error);
@@ -162,7 +162,7 @@ inline std::string codeToString(pi_int32 code) {
 }
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 #ifdef __SYCL_DEVICE_ONLY__
@@ -257,7 +257,7 @@ inline std::string codeToString(pi_int32 code) {
 #endif
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 // Produces N-dimensional object of type T whose all components are initialized
 // to given integer value.
@@ -459,5 +459,5 @@ static constexpr std::array<T, N> RepeatValue(const T &Arg) {
 }
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/detail/common_info.hpp b/sycl/include/sycl/detail/common_info.hpp
index c8eb643cd221f..a84adc5af11d8 100644
--- a/sycl/include/sycl/detail/common_info.hpp
+++ b/sycl/include/sycl/detail/common_info.hpp
@@ -13,12 +13,12 @@
 #include <vector>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 std::vector<std::string> __SYCL_EXPORT split_string(const std::string &str,
                                                     char delimeter);
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/detail/defines_elementary.hpp b/sycl/include/sycl/detail/defines_elementary.hpp
index 08cb77e479194..bd899117fd69f 100644
--- a/sycl/include/sycl/detail/defines_elementary.hpp
+++ b/sycl/include/sycl/detail/defines_elementary.hpp
@@ -8,8 +8,6 @@
 
 #pragma once
 
-#define __SYCL_INLINE_VER_NAMESPACE(X) inline namespace X
-
 #ifndef __has_attribute
 #define __has_attribute(x) 0
 #endif
diff --git a/sycl/include/sycl/detail/device_filter.hpp b/sycl/include/sycl/detail/device_filter.hpp
index c0c97aad0b524..44e4a2d4ff3a9 100644
--- a/sycl/include/sycl/detail/device_filter.hpp
+++ b/sycl/include/sycl/detail/device_filter.hpp
@@ -17,7 +17,7 @@
 #include <string>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 // ---------------------------------------
@@ -129,5 +129,5 @@ inline std::ostream &operator<<(std::ostream &Out,
 }
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/detail/device_global_map.hpp b/sycl/include/sycl/detail/device_global_map.hpp
index 2e97a7c706f2a..23168677c2600 100644
--- a/sycl/include/sycl/detail/device_global_map.hpp
+++ b/sycl/include/sycl/detail/device_global_map.hpp
@@ -9,7 +9,7 @@
 #pragma once
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 namespace device_global_map {
 
@@ -17,5 +17,5 @@ __SYCL_EXPORT void add(const void *DeviceGlobalPtr, const char *UniqueId);
 
 } // namespace device_global_map
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/detail/generic_type_lists.hpp b/sycl/include/sycl/detail/generic_type_lists.hpp
index c8fc23a7a3b76..3937111446617 100644
--- a/sycl/include/sycl/detail/generic_type_lists.hpp
+++ b/sycl/include/sycl/detail/generic_type_lists.hpp
@@ -20,14 +20,14 @@
 
 // Forward declarations
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 template <typename T, int N> class vec;
 template <typename Type, std::size_t NumElements> class marray;
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 namespace gtl {
 // floating point types
@@ -591,5 +591,5 @@ using nonlocal_address_space_list =
                        access::address_space::ext_intel_global_host_space>;
 } // namespace gvl
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/detail/generic_type_traits.hpp b/sycl/include/sycl/detail/generic_type_traits.hpp
index 22ac73db586eb..9e447024a179b 100644
--- a/sycl/include/sycl/detail/generic_type_traits.hpp
+++ b/sycl/include/sycl/detail/generic_type_traits.hpp
@@ -21,7 +21,7 @@
 #include <limits>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 template <typename T> using is_floatn = is_contained<T, gtl::vector_float_list>;
@@ -786,5 +786,5 @@ template <typename... Args> inline void check_vector_size() {
 }
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/detail/group_sort_impl.hpp b/sycl/include/sycl/detail/group_sort_impl.hpp
index 2cbf6d01c59da..f100403a148c9 100644
--- a/sycl/include/sycl/detail/group_sort_impl.hpp
+++ b/sycl/include/sycl/detail/group_sort_impl.hpp
@@ -19,7 +19,7 @@
 #ifdef __SYCL_DEVICE_ONLY__
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 // ---- merge sort implementation
@@ -654,6 +654,6 @@ void privateStaticSort(GroupT group, T *keys, U *values, std::byte *scratch,
 }
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 #endif
diff --git a/sycl/include/sycl/detail/handler_proxy.hpp b/sycl/include/sycl/detail/handler_proxy.hpp
index a04ca37af7c2a..2d74646315e47 100644
--- a/sycl/include/sycl/detail/handler_proxy.hpp
+++ b/sycl/include/sycl/detail/handler_proxy.hpp
@@ -12,7 +12,7 @@
 #include <sycl/detail/export.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 class handler;
 
@@ -37,5 +37,5 @@ __SYCL_EXPORT void
 associateWithHandler(handler &, SampledImageAccessorBaseHost *, image_target);
 #endif
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/detail/helpers.hpp b/sycl/include/sycl/detail/helpers.hpp
index a02b15a6df5c7..6f297777152b5 100644
--- a/sycl/include/sycl/detail/helpers.hpp
+++ b/sycl/include/sycl/detail/helpers.hpp
@@ -23,7 +23,7 @@
 #include <vector>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 class context;
 class event;
 template <int Dims, bool WithOffset> class item;
@@ -252,5 +252,5 @@ template <size_t count, class F> void loop(F &&f) {
 }
 } // namespace detail
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/detail/host_pipe_map.hpp b/sycl/include/sycl/detail/host_pipe_map.hpp
index 5e2e222bd9fb5..f61c93e04c951 100644
--- a/sycl/include/sycl/detail/host_pipe_map.hpp
+++ b/sycl/include/sycl/detail/host_pipe_map.hpp
@@ -9,7 +9,7 @@
 #pragma once
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 namespace host_pipe_map {
 
@@ -17,5 +17,5 @@ __SYCL_EXPORT void add(const void *HostPipePtr, const char *UniqueId);
 
 } // namespace host_pipe_map
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/detail/host_profiling_info.hpp b/sycl/include/sycl/detail/host_profiling_info.hpp
index 4b906205300bf..b8257f56d9fcb 100644
--- a/sycl/include/sycl/detail/host_profiling_info.hpp
+++ b/sycl/include/sycl/detail/host_profiling_info.hpp
@@ -12,7 +12,7 @@
 #include <sycl/detail/export.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 /// Profiling info for the host execution.
@@ -36,5 +36,5 @@ class __SYCL_EXPORT HostProfilingInfo {
   void end();
 };
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/detail/image_accessor_util.hpp b/sycl/include/sycl/detail/image_accessor_util.hpp
index eb2315006414e..5ab87b4f5a3f4 100644
--- a/sycl/include/sycl/detail/image_accessor_util.hpp
+++ b/sycl/include/sycl/detail/image_accessor_util.hpp
@@ -23,7 +23,7 @@
 #include <cstdint>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 template <typename T>
@@ -1152,6 +1152,6 @@ DataT imageReadSamplerHostImpl(const CoordT &Coords, const image_sampler &Smpl,
 }
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 #endif
diff --git a/sycl/include/sycl/detail/image_ocl_types.hpp b/sycl/include/sycl/detail/image_ocl_types.hpp
index 2a923cb8a17a0..60db7ccb645c8 100644
--- a/sycl/include/sycl/detail/image_ocl_types.hpp
+++ b/sycl/include/sycl/detail/image_ocl_types.hpp
@@ -34,14 +34,14 @@
 #include <CL/__spirv/spirv_ops.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 // Type trait to get the associated sampled image type for a given image type.
 template <typename ImageType> struct sampled_opencl_image_type;
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 #define __SYCL_INVOKE_SPIRV_CALL_ARG1(call)                                    \
@@ -164,7 +164,7 @@ static RetType __invoke__ImageReadSampler(ImageT Img, CoordT Coords,
 }
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 // Function to return the number of channels for Image Channel Order returned by
@@ -306,7 +306,7 @@ __SYCL_IMAGETY_WRITE_2_DIM_IARRAY
 __SYCL_IMAGETY_DISCARD_WRITE_2_DIM_IARRAY
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 #undef __SYCL_SAMPLED_AND_IMAGETY_DEFINE
diff --git a/sycl/include/sycl/detail/impl_utils.hpp b/sycl/include/sycl/detail/impl_utils.hpp
index 622d2d540a6fd..ec7d049329b57 100644
--- a/sycl/include/sycl/detail/impl_utils.hpp
+++ b/sycl/include/sycl/detail/impl_utils.hpp
@@ -13,7 +13,7 @@
 #include <cassert>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 // Helper function for extracting implementation from SYCL's interface objects.
@@ -51,5 +51,5 @@ template <class T> T createSyclObjFromImpl(decltype(T::impl) ImplObj) {
 }
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/detail/info_desc_helpers.hpp b/sycl/include/sycl/detail/info_desc_helpers.hpp
index b6f652b33520c..331680f0acf56 100644
--- a/sycl/include/sycl/detail/info_desc_helpers.hpp
+++ b/sycl/include/sycl/detail/info_desc_helpers.hpp
@@ -14,7 +14,7 @@
 #include <sycl/info/info_desc.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 template <typename T> struct PiInfoCode;
 template <typename T> struct is_platform_info_desc : std::false_type {};
@@ -120,5 +120,5 @@ struct IsSubGroupInfo<info::kernel_device_specific::compile_sub_group_size>
 #undef __SYCL_PARAM_TRAITS_SPEC
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/detail/item_base.hpp b/sycl/include/sycl/detail/item_base.hpp
index 602b6741f9f6c..432cde97ae65e 100644
--- a/sycl/include/sycl/detail/item_base.hpp
+++ b/sycl/include/sycl/detail/item_base.hpp
@@ -12,7 +12,7 @@
 #include <sycl/range.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 template <int dimensions> class id;
 template <int dimensions> class range;
 
@@ -72,5 +72,5 @@ template <int Dims> struct ItemBase<Dims, false> {
 };
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/detail/kernel_desc.hpp b/sycl/include/sycl/detail/kernel_desc.hpp
index 9f7c4db7dac55..40122cb7f481f 100644
--- a/sycl/include/sycl/detail/kernel_desc.hpp
+++ b/sycl/include/sycl/detail/kernel_desc.hpp
@@ -14,7 +14,7 @@
 #include <sycl/detail/export.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 #ifndef __SYCL_DEVICE_ONLY__
@@ -151,5 +151,5 @@ template <class KernelNameType> struct KernelInfo {
 #endif //__SYCL_UNNAMED_LAMBDA__
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/detail/kernel_properties.hpp b/sycl/include/sycl/detail/kernel_properties.hpp
index 1cd510f1f2cf2..581a2c8c5dfbf 100644
--- a/sycl/include/sycl/detail/kernel_properties.hpp
+++ b/sycl/include/sycl/detail/kernel_properties.hpp
@@ -14,7 +14,7 @@
 #include <sycl/ext/oneapi/properties/property_value.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 enum class register_alloc_mode_enum : uint32_t {
   automatic = 0,
@@ -56,5 +56,5 @@ struct PropertyMetaInfo<sycl::detail::register_alloc_mode_key::value_t<Mode>> {
 };
 } // namespace detail
 } // namespace ext::oneapi::experimental
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/detail/locked.hpp b/sycl/include/sycl/detail/locked.hpp
index 5b1d6395da089..f3ebaff6621f7 100644
--- a/sycl/include/sycl/detail/locked.hpp
+++ b/sycl/include/sycl/detail/locked.hpp
@@ -14,7 +14,7 @@
 #include <mutex>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 /// Represents a reference to value with appropriate lock acquired.
 /// Employed for acquire/release logic. Acquire action is construction
@@ -30,5 +30,5 @@ template <typename T> class Locked {
   T &get() const { return m_Value.get(); }
 };
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/detail/memcpy.hpp b/sycl/include/sycl/detail/memcpy.hpp
index d51f623c89dac..ff96bf3e688f1 100644
--- a/sycl/include/sycl/detail/memcpy.hpp
+++ b/sycl/include/sycl/detail/memcpy.hpp
@@ -11,7 +11,7 @@
 #include <cstddef>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 inline void memcpy(void *Dst, const void *Src, size_t Size) {
   char *Destination = reinterpret_cast<char *>(Dst);
@@ -21,5 +21,5 @@ inline void memcpy(void *Dst, const void *Src, size_t Size) {
   }
 }
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/detail/native_cpu.hpp b/sycl/include/sycl/detail/native_cpu.hpp
index 065e81f781186..8e13b575f5695 100644
--- a/sycl/include/sycl/detail/native_cpu.hpp
+++ b/sycl/include/sycl/detail/native_cpu.hpp
@@ -12,7 +12,7 @@
 #include <memory>
 #include <vector>
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 struct NativeCPUArgDesc {
@@ -22,7 +22,7 @@ struct NativeCPUArgDesc {
 };
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 struct __nativecpu_state {
diff --git a/sycl/include/sycl/detail/os_util.hpp b/sycl/include/sycl/detail/os_util.hpp
index 2946616b5b1e6..d2f8d4aa0f792 100644
--- a/sycl/include/sycl/detail/os_util.hpp
+++ b/sycl/include/sycl/detail/os_util.hpp
@@ -40,7 +40,7 @@
 #endif // _WIN32
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 /// Groups the OS-dependent services.
@@ -84,5 +84,5 @@ class __SYCL_EXPORT OSUtil {
 };
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/detail/owner_less_base.hpp b/sycl/include/sycl/detail/owner_less_base.hpp
index b810596c1f217..788245ddd53f3 100644
--- a/sycl/include/sycl/detail/owner_less_base.hpp
+++ b/sycl/include/sycl/detail/owner_less_base.hpp
@@ -13,7 +13,7 @@
 #include <sycl/ext/oneapi/weak_object_base.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 // Common CRTP base class supplying a common definition of owner-before ordering
@@ -53,5 +53,5 @@ template <class SyclObjT> class OwnerLessBase {
 };
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/detail/pi.hpp b/sycl/include/sycl/detail/pi.hpp
index 65f447a144b02..56b2e9570f8cd 100644
--- a/sycl/include/sycl/detail/pi.hpp
+++ b/sycl/include/sycl/detail/pi.hpp
@@ -33,7 +33,7 @@ struct trace_event_data_t;
 #endif
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 class context;
 
@@ -298,7 +298,7 @@ template <class To, class FromE> To cast(std::vector<FromE> Values) {
 } // namespace pi
 } // namespace detail
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 #undef _PI_API
diff --git a/sycl/include/sycl/detail/property_helper.hpp b/sycl/include/sycl/detail/property_helper.hpp
index 5ada3ee10c4d9..3dfadf746d272 100644
--- a/sycl/include/sycl/detail/property_helper.hpp
+++ b/sycl/include/sycl/detail/property_helper.hpp
@@ -11,7 +11,7 @@
 #include <sycl/detail/defines_elementary.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 namespace detail {
 
@@ -101,5 +101,5 @@ template <int ID> class PropertyWithData : public PropertyWithDataBase {
 
 } // namespace detail
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/detail/property_list_base.hpp b/sycl/include/sycl/detail/property_list_base.hpp
index 96ff4aab89a55..335f751998c2c 100644
--- a/sycl/include/sycl/detail/property_list_base.hpp
+++ b/sycl/include/sycl/detail/property_list_base.hpp
@@ -17,7 +17,7 @@
 #include <vector>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 class PropertyListBase {
 protected:
@@ -130,5 +130,5 @@ class PropertyListBase {
   std::vector<std::shared_ptr<PropertyWithDataBase>> MPropsWithData;
 };
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/detail/reduction_forward.hpp b/sycl/include/sycl/detail/reduction_forward.hpp
index cc32eb8a4d4a6..730ed63f76753 100644
--- a/sycl/include/sycl/detail/reduction_forward.hpp
+++ b/sycl/include/sycl/detail/reduction_forward.hpp
@@ -15,7 +15,7 @@
 #include <sycl/detail/common.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 template <typename T, class BinaryOperation, int Dims, size_t Extent,
           bool ExplicitIdentity, typename RedOutVar>
@@ -65,5 +65,5 @@ template <typename T> struct IsReduction;
 template <typename FirstT, typename... RestT> struct AreAllButLastReductions;
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/detail/service_kernel_names.hpp b/sycl/include/sycl/detail/service_kernel_names.hpp
index c3609695f60b2..b1ed3289310bd 100644
--- a/sycl/include/sycl/detail/service_kernel_names.hpp
+++ b/sycl/include/sycl/detail/service_kernel_names.hpp
@@ -9,7 +9,7 @@
 #pragma once
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 namespace __sycl_service_kernel__ {
 
@@ -17,5 +17,5 @@ class AssertInfoCopier;
 
 } // namespace __sycl_service_kernel__
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/detail/spec_const_integration.hpp b/sycl/include/sycl/detail/spec_const_integration.hpp
index e375dc05c2127..843c0eaec810c 100644
--- a/sycl/include/sycl/detail/spec_const_integration.hpp
+++ b/sycl/include/sycl/detail/spec_const_integration.hpp
@@ -12,7 +12,7 @@
 // This header file should only be included to integration footer.
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 // Translates SYCL 2020 `specialization_id` to a unique symbolic identifier
 // which is used internally by the toolchain
@@ -20,5 +20,5 @@ template <auto &SpecName> const char *get_spec_constant_symbolic_ID() {
   return get_spec_constant_symbolic_ID_impl<SpecName>();
 }
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/detail/spinlock.hpp b/sycl/include/sycl/detail/spinlock.hpp
index e512ebd37a21f..5743e6ee5e797 100644
--- a/sycl/include/sycl/detail/spinlock.hpp
+++ b/sycl/include/sycl/detail/spinlock.hpp
@@ -14,7 +14,7 @@
 #include <thread>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 /// SpinLock is a synchronization primitive, that uses atomic variable and
 /// causes thread trying acquire lock wait in loop while repeatedly check if
@@ -36,5 +36,5 @@ class SpinLock {
   std::atomic_flag MLock = ATOMIC_FLAG_INIT;
 };
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/detail/spirv.hpp b/sycl/include/sycl/detail/spirv.hpp
index b01017c4db75f..d793d826f2b9b 100644
--- a/sycl/include/sycl/detail/spirv.hpp
+++ b/sycl/include/sycl/detail/spirv.hpp
@@ -21,7 +21,7 @@
 
 #ifdef __SYCL_DEVICE_ONLY__
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 struct sub_group;
 namespace ext {
 namespace oneapi {
@@ -1183,6 +1183,6 @@ __SYCL_GROUP_COLLECTIVE_OVERLOAD(LogicalOrKHR)
 
 } // namespace spirv
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 #endif //  __SYCL_DEVICE_ONLY__
diff --git a/sycl/include/sycl/detail/stl_type_traits.hpp b/sycl/include/sycl/detail/stl_type_traits.hpp
index 747632f649c20..bc5f428cf6176 100644
--- a/sycl/include/sycl/detail/stl_type_traits.hpp
+++ b/sycl/include/sycl/detail/stl_type_traits.hpp
@@ -14,7 +14,7 @@
 #include <type_traits>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 // Custom type traits.
@@ -51,5 +51,5 @@ struct is_output_iterator<T, output_iterator_requirements<T>> {
 };
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/detail/sycl_mem_obj_allocator.hpp b/sycl/include/sycl/detail/sycl_mem_obj_allocator.hpp
index dffc146635c86..85bc98abd71f9 100644
--- a/sycl/include/sycl/detail/sycl_mem_obj_allocator.hpp
+++ b/sycl/include/sycl/detail/sycl_mem_obj_allocator.hpp
@@ -11,7 +11,7 @@
 #include <sycl/detail/aligned_allocator.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 template <typename DataT>
@@ -87,5 +87,5 @@ class SYCLMemObjAllocatorHolder : public SYCLMemObjAllocator {
   std::size_t MValueSize;
 };
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/detail/tuple.hpp b/sycl/include/sycl/detail/tuple.hpp
index fb9708d717131..1447d8489cd53 100644
--- a/sycl/include/sycl/detail/tuple.hpp
+++ b/sycl/include/sycl/detail/tuple.hpp
@@ -16,7 +16,7 @@
 #include <type_traits>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 template <typename... T> struct tuple;
@@ -189,7 +189,7 @@ template <> struct tuple<> {
 };
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 namespace std {
diff --git a/sycl/include/sycl/detail/type_list.hpp b/sycl/include/sycl/detail/type_list.hpp
index 1ecca91febf56..154c5460fa876 100644
--- a/sycl/include/sycl/detail/type_list.hpp
+++ b/sycl/include/sycl/detail/type_list.hpp
@@ -12,7 +12,7 @@
 #include <sycl/detail/stl_type_traits.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 template <typename T> using head_t = typename T::head;
@@ -140,5 +140,5 @@ using find_twice_as_large_type_t =
     find_type_t<TypeList, is_type_size_double_of, T>;
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/detail/type_traits.hpp b/sycl/include/sycl/detail/type_traits.hpp
index 596ce1ef4c44d..36ad45752c962 100644
--- a/sycl/include/sycl/detail/type_traits.hpp
+++ b/sycl/include/sycl/detail/type_traits.hpp
@@ -19,7 +19,7 @@
 #include <type_traits>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 template <class T> struct is_fixed_size_group : std::false_type {};
 
@@ -479,5 +479,5 @@ template <typename Ret, typename... Args> struct function_traits<Ret(Args...)> {
 };
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/detail/usm_impl.hpp b/sycl/include/sycl/detail/usm_impl.hpp
index 2eb39ba77575d..db49f4d4daeeb 100644
--- a/sycl/include/sycl/detail/usm_impl.hpp
+++ b/sycl/include/sycl/detail/usm_impl.hpp
@@ -12,7 +12,7 @@
 #include <sycl/usm/usm_enums.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail::usm {
 
 __SYCL_EXPORT void *alignedAlloc(size_t Alignment, size_t Bytes,
@@ -28,5 +28,5 @@ __SYCL_EXPORT void free(void *Ptr, const context &Ctxt,
                         const code_location &CL);
 
 } // namespace detail::usm
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/detail/util.hpp b/sycl/include/sycl/detail/util.hpp
index 835cdac410ebd..1ce0a059bee19 100644
--- a/sycl/include/sycl/detail/util.hpp
+++ b/sycl/include/sycl/detail/util.hpp
@@ -17,7 +17,7 @@
 #include <vector>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 /// Groups and provides access to all the locks used the SYCL runtime.
@@ -68,7 +68,7 @@ struct CmpCStr {
 using SerializedObj = std::vector<unsigned char>;
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 #endif //__SYCL_DEVICE_ONLY
diff --git a/sycl/include/sycl/detail/vector_traits.hpp b/sycl/include/sycl/detail/vector_traits.hpp
index ac86fb1654a36..c6ccfd2323645 100644
--- a/sycl/include/sycl/detail/vector_traits.hpp
+++ b/sycl/include/sycl/detail/vector_traits.hpp
@@ -13,7 +13,7 @@
 #include <type_traits>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 // 4.10.2.6 Memory layout and alignment
@@ -26,5 +26,5 @@ template <typename T, int N>
 struct vector_alignment
     : vector_alignment_impl<std::remove_cv_t<std::remove_reference_t<T>>, N> {};
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/device.hpp b/sycl/include/sycl/device.hpp
index 9f4202f674be4..d32b916645a07 100644
--- a/sycl/include/sycl/device.hpp
+++ b/sycl/include/sycl/device.hpp
@@ -24,7 +24,7 @@
 #include <utility>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 // Forward declarations
 class device_selector;
 template <backend BackendName, class SyclObjectT>
@@ -289,7 +289,7 @@ class __SYCL_EXPORT device : public detail::OwnerLessBase<device> {
       -> backend_return_t<BackendName, SyclObjectT>;
 };
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 namespace std {
diff --git a/sycl/include/sycl/device_event.hpp b/sycl/include/sycl/device_event.hpp
index c7e91dcd47862..0b3f381dfc510 100644
--- a/sycl/include/sycl/device_event.hpp
+++ b/sycl/include/sycl/device_event.hpp
@@ -12,7 +12,7 @@
 #include <CL/__spirv/spirv_types.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 /// Encapsulates a single SYCL device event which is available only within SYCL
 /// kernel functions and can be used to wait for asynchronous operations within
@@ -34,5 +34,5 @@ class device_event {
   void wait() { __spirv_GroupWaitEvents(__spv::Scope::Workgroup, 1, &m_Event); }
 };
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/device_selector.hpp b/sycl/include/sycl/device_selector.hpp
index 4a23f701d53aa..361a685ad0bb2 100644
--- a/sycl/include/sycl/device_selector.hpp
+++ b/sycl/include/sycl/device_selector.hpp
@@ -17,7 +17,7 @@
 // 4.6.1 Device selection class
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 // Forward declarations
 class device;
@@ -169,5 +169,5 @@ detail::DSelectorInvocableType aspect_selector() {
   return aspect_selector({AspectList...}, {});
 }
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/event.hpp b/sycl/include/sycl/event.hpp
index 52d7fe21aa12c..99c6b44ae8bc2 100644
--- a/sycl/include/sycl/event.hpp
+++ b/sycl/include/sycl/event.hpp
@@ -20,7 +20,7 @@
 #include <memory>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 // Forward declaration
 class context;
 
@@ -150,7 +150,7 @@ class __SYCL_EXPORT event : public detail::OwnerLessBase<event> {
       -> backend_return_t<BackendName, SyclObjectT>;
 };
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 namespace std {
diff --git a/sycl/include/sycl/exception.hpp b/sycl/include/sycl/exception.hpp
index 5906277ab3717..0805636228da1 100644
--- a/sycl/include/sycl/exception.hpp
+++ b/sycl/include/sycl/exception.hpp
@@ -19,7 +19,7 @@
 #include <exception>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 // Forward declaration
 class context;
@@ -324,7 +324,7 @@ class __SYCL2020_DEPRECATED(
       : device_error(make_error_code(errc::feature_not_supported), Msg, Err) {}
 };
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 namespace std {
diff --git a/sycl/include/sycl/exception_list.hpp b/sycl/include/sycl/exception_list.hpp
index 4b2f73831442c..50913a7f32206 100644
--- a/sycl/include/sycl/exception_list.hpp
+++ b/sycl/include/sycl/exception_list.hpp
@@ -20,7 +20,7 @@
 #include <vector>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 // Forward declaration
 namespace detail {
@@ -71,5 +71,5 @@ inline void defaultAsyncHandler(exception_list Exceptions) {
   std::terminate();
 }
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/codeplay/experimental/fusion_properties.hpp b/sycl/include/sycl/ext/codeplay/experimental/fusion_properties.hpp
index 5ec2aef927a45..3216584751cb0 100644
--- a/sycl/include/sycl/ext/codeplay/experimental/fusion_properties.hpp
+++ b/sycl/include/sycl/ext/codeplay/experimental/fusion_properties.hpp
@@ -13,7 +13,7 @@
 #include <sycl/properties/property_traits.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::codeplay::experimental::property {
 
 class promote_private
@@ -98,5 +98,5 @@ struct is_property_of<
     ext::codeplay::experimental::property::queue::enable_fusion, queue>
     : std::true_type {};
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/codeplay/experimental/fusion_wrapper.hpp b/sycl/include/sycl/ext/codeplay/experimental/fusion_wrapper.hpp
index 368aea65ed9fa..f38a4f3ec548b 100644
--- a/sycl/include/sycl/ext/codeplay/experimental/fusion_wrapper.hpp
+++ b/sycl/include/sycl/ext/codeplay/experimental/fusion_wrapper.hpp
@@ -11,7 +11,7 @@
 #include <sycl/queue.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 namespace detail {
 class fusion_wrapper_impl;
@@ -90,5 +90,5 @@ class __SYCL_EXPORT fusion_wrapper {
   std::shared_ptr<detail::fusion_wrapper_impl> MImpl;
 };
 } // namespace ext::codeplay::experimental
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/intel/esimd/alt_ui.hpp b/sycl/include/sycl/ext/intel/esimd/alt_ui.hpp
index 7b72c54b0962b..70565dabdef76 100644
--- a/sycl/include/sycl/ext/intel/esimd/alt_ui.hpp
+++ b/sycl/include/sycl/ext/intel/esimd/alt_ui.hpp
@@ -12,7 +12,7 @@
 #include <sycl/ext/intel/esimd/simd_view.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::intel::esimd {
 /// @addtogroup sycl_esimd_misc
 /// @{
@@ -66,5 +66,5 @@ __ESIMD_API auto merge(simd_view<BaseT1, RegionT1> v1,
 /// @} sycl_esimd_misc
 
 } // namespace ext::intel::esimd
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/intel/esimd/common.hpp b/sycl/include/sycl/ext/intel/esimd/common.hpp
index e23791c7ca815..2d74af253a11a 100644
--- a/sycl/include/sycl/ext/intel/esimd/common.hpp
+++ b/sycl/include/sycl/ext/intel/esimd/common.hpp
@@ -32,7 +32,7 @@
 /// @endcond ESIMD_DETAIL
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::intel::esimd {
 
 /// @addtogroup sycl_esimd_core
@@ -341,5 +341,5 @@ template <__ESIMD_NS::atomic_op Op> constexpr int get_num_args() {
 } // namespace detail
 
 } // namespace ext::intel::esimd
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/intel/esimd/detail/bfloat16_type_traits.hpp b/sycl/include/sycl/ext/intel/esimd/detail/bfloat16_type_traits.hpp
index 6b3dff557b990..943e169eed3bf 100644
--- a/sycl/include/sycl/ext/intel/esimd/detail/bfloat16_type_traits.hpp
+++ b/sycl/include/sycl/ext/intel/esimd/detail/bfloat16_type_traits.hpp
@@ -18,7 +18,7 @@
 /// @cond ESIMD_DETAIL
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::intel::esimd::detail {
 
 using bfloat16 = sycl::ext::oneapi::bfloat16;
@@ -105,7 +105,7 @@ inline std::ostream &operator<<(std::ostream &O, bfloat16 const &rhs) {
 }
 
 } // namespace ext::intel::esimd::detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 /// @endcond ESIMD_DETAIL
diff --git a/sycl/include/sycl/ext/intel/esimd/detail/elem_type_traits.hpp b/sycl/include/sycl/ext/intel/esimd/detail/elem_type_traits.hpp
index 243077373ec99..a3f9f1146f4cd 100644
--- a/sycl/include/sycl/ext/intel/esimd/detail/elem_type_traits.hpp
+++ b/sycl/include/sycl/ext/intel/esimd/detail/elem_type_traits.hpp
@@ -86,7 +86,7 @@
 /// @cond ESIMD_DETAIL
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::intel::esimd::detail {
 
 // -----------------------------------------------------------------------------
@@ -607,7 +607,7 @@ static inline constexpr bool is_generic_floating_point_v =
     element_type_traits<T>::is_floating_point;
 
 } // namespace ext::intel::esimd::detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 /// @endcond ESIMD_DETAIL
diff --git a/sycl/include/sycl/ext/intel/esimd/detail/half_type_traits.hpp b/sycl/include/sycl/ext/intel/esimd/detail/half_type_traits.hpp
index b84543d779acd..d7c572b4eb5a1 100644
--- a/sycl/include/sycl/ext/intel/esimd/detail/half_type_traits.hpp
+++ b/sycl/include/sycl/ext/intel/esimd/detail/half_type_traits.hpp
@@ -17,7 +17,7 @@
 /// @cond ESIMD_DETAIL
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::intel::esimd::detail {
 
 // Standalone definitions to use w/o instantiating element_type_traits.
@@ -151,7 +151,7 @@ inline std::istream &operator>>(std::istream &I, sycl::half &rhs) {
 }
 
 } // namespace ext::intel::esimd::detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 /// @endcond ESIMD_DETAIL
diff --git a/sycl/include/sycl/ext/intel/esimd/detail/host_util.hpp b/sycl/include/sycl/ext/intel/esimd/detail/host_util.hpp
index d6123d5d2db36..7e5f708262998 100644
--- a/sycl/include/sycl/ext/intel/esimd/detail/host_util.hpp
+++ b/sycl/include/sycl/ext/intel/esimd/detail/host_util.hpp
@@ -22,15 +22,15 @@
 #define SIMDCF_ELEMENT_SKIP(i)
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail::half_impl {
 class half;
 } // namespace detail::half_impl
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::intel::esimd::emu::detail {
 
 using half = sycl::detail::half_impl::half;
@@ -702,7 +702,7 @@ template <> struct dwordtype<unsigned int> {
 };
 
 } // namespace ext::intel::esimd::emu::detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 #endif // #ifndef __SYCL_DEVICE_ONLY__
diff --git a/sycl/include/sycl/ext/intel/esimd/detail/intrin.hpp b/sycl/include/sycl/ext/intel/esimd/detail/intrin.hpp
index 3b9d6f1347728..eecbd065927f4 100644
--- a/sycl/include/sycl/ext/intel/esimd/detail/intrin.hpp
+++ b/sycl/include/sycl/ext/intel/esimd/detail/intrin.hpp
@@ -134,7 +134,7 @@ __esimd_wrindirect(__ESIMD_DNS::vector_type_t<T, N> OldVal,
                    __ESIMD_DNS::simd_mask_storage_t<M> Mask = 1);
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::intel::esimd::detail {
 
 template <class T> using __st = __raw_t<T>;
@@ -209,7 +209,7 @@ ESIMD_INLINE
 }
 
 } // namespace ext::intel::esimd::detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 // vload
diff --git a/sycl/include/sycl/ext/intel/esimd/detail/math_intrin.hpp b/sycl/include/sycl/ext/intel/esimd/detail/math_intrin.hpp
index db0af8d212c1a..88b40646fc90a 100644
--- a/sycl/include/sycl/ext/intel/esimd/detail/math_intrin.hpp
+++ b/sycl/include/sycl/ext/intel/esimd/detail/math_intrin.hpp
@@ -216,7 +216,7 @@ __ESIMD_INTRIN int __esimd_lane_id();
   }
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::intel::esimd::detail {
 // TODO support half vectors in std sycl math functions.
 ESIMD_MATH_INTRINSIC_IMPL(float, sin)
@@ -224,7 +224,7 @@ ESIMD_MATH_INTRINSIC_IMPL(float, cos)
 ESIMD_MATH_INTRINSIC_IMPL(float, exp)
 ESIMD_MATH_INTRINSIC_IMPL(float, log)
 } // namespace ext::intel::esimd::detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 #undef __ESIMD_SIMT_BEGIN
diff --git a/sycl/include/sycl/ext/intel/esimd/detail/memory_intrin.hpp b/sycl/include/sycl/ext/intel/esimd/detail/memory_intrin.hpp
index 68edd9bfdbacf..8bf7022713024 100644
--- a/sycl/include/sycl/ext/intel/esimd/detail/memory_intrin.hpp
+++ b/sycl/include/sycl/ext/intel/esimd/detail/memory_intrin.hpp
@@ -37,7 +37,7 @@ const std::array<__ESIMD_NS::rgba_channel, 4> ChannelMaskArray{
 #endif // ifndef __SYCL_DEVICE_ONLY__
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 namespace ext::intel::esimd {
 template <typename AccessorTy>
@@ -89,7 +89,7 @@ constexpr unsigned int ElemsPerAddrDecoding(unsigned int ElemsPerAddrEncoded) {
 }
 
 } // namespace ext::intel::esimd::detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 // flat_read does flat-address gather
diff --git a/sycl/include/sycl/ext/intel/esimd/detail/operators.hpp b/sycl/include/sycl/ext/intel/esimd/detail/operators.hpp
index aef195b3668e2..e5dc3dc8e48d2 100644
--- a/sycl/include/sycl/ext/intel/esimd/detail/operators.hpp
+++ b/sycl/include/sycl/ext/intel/esimd/detail/operators.hpp
@@ -24,7 +24,7 @@
 // etc. on the table).
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::intel::esimd::detail {
 // clang-format off
 /// @addtogroup sycl_esimd_core
@@ -483,5 +483,5 @@ __ESIMD_DEF_SIMD_VIEW_CMP_OP(>=, __ESIMD_DNS::is_simd_type_v<SimdT1>)
 #undef __ESIMD_DEF_SIMD_VIEW_CMP_OP
 
 } // namespace ext::intel::esimd::detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/intel/esimd/detail/region.hpp b/sycl/include/sycl/ext/intel/esimd/detail/region.hpp
index 162d57e14a00a..56f7d3091e48d 100644
--- a/sycl/include/sycl/ext/intel/esimd/detail/region.hpp
+++ b/sycl/include/sycl/ext/intel/esimd/detail/region.hpp
@@ -18,7 +18,7 @@
 #include <utility>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::intel::esimd {
 
 /// @cond ESIMD_DETAIL
@@ -134,7 +134,7 @@ template <typename T, typename U> T getBaseRegion(std::pair<T, U> Reg) {
 /// @endcond ESIMD_DETAIL
 
 } // namespace ext::intel::esimd
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 /// @endcond ESIMD_DETAIL
diff --git a/sycl/include/sycl/ext/intel/esimd/detail/simd_mask_impl.hpp b/sycl/include/sycl/ext/intel/esimd/detail/simd_mask_impl.hpp
index fa2a42a08eb95..54a9b97bd34c3 100644
--- a/sycl/include/sycl/ext/intel/esimd/detail/simd_mask_impl.hpp
+++ b/sycl/include/sycl/ext/intel/esimd/detail/simd_mask_impl.hpp
@@ -15,7 +15,7 @@
 #include <sycl/ext/oneapi/experimental/detail/invoke_simd_types.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::intel::esimd::detail {
 
 /// @addtogroup sycl_esimd_core_vectors
@@ -151,5 +151,5 @@ class simd_mask_impl
 /// @} sycl_esimd_core_vectors
 
 } // namespace ext::intel::esimd::detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/intel/esimd/detail/simd_obj_impl.hpp b/sycl/include/sycl/ext/intel/esimd/detail/simd_obj_impl.hpp
index c1ab27c8d507c..a24333700cd7e 100644
--- a/sycl/include/sycl/ext/intel/esimd/detail/simd_obj_impl.hpp
+++ b/sycl/include/sycl/ext/intel/esimd/detail/simd_obj_impl.hpp
@@ -19,7 +19,7 @@
 #include <sycl/ext/intel/esimd/simd_view.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::intel::esimd {
 
 /// @addtogroup sycl_esimd_core
@@ -929,5 +929,5 @@ template <>
 struct is_simd_flag_type<detail::dqword_element_aligned_tag> : std::true_type {
 };
 } // namespace ext::intel::esimd
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/intel/esimd/detail/simd_view_impl.hpp b/sycl/include/sycl/ext/intel/esimd/detail/simd_view_impl.hpp
index 462504542f170..a7a21013d3426 100644
--- a/sycl/include/sycl/ext/intel/esimd/detail/simd_view_impl.hpp
+++ b/sycl/include/sycl/ext/intel/esimd/detail/simd_view_impl.hpp
@@ -15,7 +15,7 @@
 #include <sycl/ext/intel/esimd/detail/type_format.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::intel::esimd::detail {
 
 /// @addtogroup sycl_esimd_core_vectors
@@ -603,5 +603,5 @@ class simd_view_impl {
 /// @} sycl_esimd_core_vectors
 
 } // namespace ext::intel::esimd::detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/intel/esimd/detail/sycl_util.hpp b/sycl/include/sycl/ext/intel/esimd/detail/sycl_util.hpp
index 3bc57f39b33a2..e3e9b9652e131 100644
--- a/sycl/include/sycl/ext/intel/esimd/detail/sycl_util.hpp
+++ b/sycl/include/sycl/ext/intel/esimd/detail/sycl_util.hpp
@@ -16,7 +16,7 @@
 #include <sycl/accessor.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::intel::esimd::detail {
 
 // Checks that given type is a SYCL accessor type. Sets its static field
@@ -86,7 +86,7 @@ __ESIMD_API uint32_t localAccessorToOffset(local_accessor<T, Dimensions> acc) {
 }
 
 } // namespace ext::intel::esimd::detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 /// @endcond ESIMD_DETAIL
diff --git a/sycl/include/sycl/ext/intel/esimd/detail/test_proxy.hpp b/sycl/include/sycl/ext/intel/esimd/detail/test_proxy.hpp
index 42f8294e3c579..a42571a673216 100644
--- a/sycl/include/sycl/ext/intel/esimd/detail/test_proxy.hpp
+++ b/sycl/include/sycl/ext/intel/esimd/detail/test_proxy.hpp
@@ -54,7 +54,7 @@
   } while (false)
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::intel::esimd::detail::test {
 
 // The test_proxy class.
@@ -103,7 +103,7 @@ class test_proxy {
 };
 
 } // namespace ext::intel::esimd::detail::test
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 #endif // __ESIMD_ENABLE_TEST_PROXY
diff --git a/sycl/include/sycl/ext/intel/esimd/detail/tfloat32_type_traits.hpp b/sycl/include/sycl/ext/intel/esimd/detail/tfloat32_type_traits.hpp
index 29b751b938181..b66222c346a2d 100644
--- a/sycl/include/sycl/ext/intel/esimd/detail/tfloat32_type_traits.hpp
+++ b/sycl/include/sycl/ext/intel/esimd/detail/tfloat32_type_traits.hpp
@@ -18,7 +18,7 @@
 /// @cond ESIMD_DETAIL
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::intel::esimd::detail {
 
 // Standalone definitions to use w/o instantiating element_type_traits.
@@ -81,7 +81,7 @@ inline std::ostream &operator<<(std::ostream &O, tfloat32 const &rhs) {
 template <> struct is_esimd_arithmetic_type<tfloat32, void> : std::true_type {};
 
 } // namespace ext::intel::esimd::detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 /// @endcond ESIMD_DETAIL
diff --git a/sycl/include/sycl/ext/intel/esimd/detail/type_format.hpp b/sycl/include/sycl/ext/intel/esimd/detail/type_format.hpp
index ea252d58faec7..21d67170f73c5 100644
--- a/sycl/include/sycl/ext/intel/esimd/detail/type_format.hpp
+++ b/sycl/include/sycl/ext/intel/esimd/detail/type_format.hpp
@@ -16,7 +16,7 @@
 #include <sycl/ext/intel/esimd/detail/types.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::intel::esimd::detail {
 
 template <typename BaseTy, typename EltTy> struct compute_format_type;
@@ -84,7 +84,7 @@ using compute_format_type_2d_t =
     typename compute_format_type_2d<Ty, EltTy, Height, Width>::type;
 
 } // namespace ext::intel::esimd::detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 /// @endcond ESIMD_DETAIL
diff --git a/sycl/include/sycl/ext/intel/esimd/detail/types.hpp b/sycl/include/sycl/ext/intel/esimd/detail/types.hpp
index 4a1455325c27c..f4b4833c17b1c 100644
--- a/sycl/include/sycl/ext/intel/esimd/detail/types.hpp
+++ b/sycl/include/sycl/ext/intel/esimd/detail/types.hpp
@@ -27,7 +27,7 @@
 #include <cstdint>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::intel::esimd {
 
 // simd and simd_view_impl forward declarations
@@ -391,5 +391,5 @@ using computation_type_t =
 template <int N> using mask_type_t = detail::simd_mask_storage_t<N>;
 
 } // namespace ext::intel::esimd
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/intel/esimd/detail/util.hpp b/sycl/include/sycl/ext/intel/esimd/detail/util.hpp
index 8b751217e5233..42ca5eb0997d6 100644
--- a/sycl/include/sycl/ext/intel/esimd/detail/util.hpp
+++ b/sycl/include/sycl/ext/intel/esimd/detail/util.hpp
@@ -24,7 +24,7 @@
 #endif // __SYCL_DEVICE_ONLY__
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::intel::esimd::detail {
 
 /// ESIMD intrinsic operand size in bytes.
@@ -196,7 +196,7 @@ auto accessorToPointer(AccessorTy Acc, OffsetTy Offset = 0) {
 #endif // __ESIMD_FORCE_STATELESS_MEM
 
 } // namespace ext::intel::esimd::detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 /// @endcond ESIMD_DETAIL
diff --git a/sycl/include/sycl/ext/intel/esimd/emu/detail/esimd_emulator_device_interface.hpp b/sycl/include/sycl/ext/intel/esimd/emu/detail/esimd_emulator_device_interface.hpp
index 5b59ba763db77..9a3c3ee0cfa28 100644
--- a/sycl/include/sycl/ext/intel/esimd/emu/detail/esimd_emulator_device_interface.hpp
+++ b/sycl/include/sycl/ext/intel/esimd/emu/detail/esimd_emulator_device_interface.hpp
@@ -29,7 +29,7 @@
 #include <mutex>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 /// This is the device interface version required (and used) by this
@@ -71,7 +71,7 @@ struct ESIMDEmuPluginOpaqueData {
 __SYCL_EXPORT ESIMDDeviceInterface *getESIMDDeviceInterface();
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 /// @endcond ESIMD_EMU
diff --git a/sycl/include/sycl/ext/intel/esimd/math.hpp b/sycl/include/sycl/ext/intel/esimd/math.hpp
index 1e03d922ee8ee..9bfb4db46f314 100644
--- a/sycl/include/sycl/ext/intel/esimd/math.hpp
+++ b/sycl/include/sycl/ext/intel/esimd/math.hpp
@@ -22,7 +22,7 @@
 #include <cstdint>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::intel::esimd {
 
 /// @addtogroup sycl_esimd_math
@@ -1087,5 +1087,5 @@ ESIMD_INLINE ESIMD_NODEBUG T0 reduce(simd<T1, SZ> v, BinaryOperation op) {
 /// @} sycl_esimd_math
 
 } // namespace ext::intel::esimd
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/intel/esimd/memory.hpp b/sycl/include/sycl/ext/intel/esimd/memory.hpp
index d669f61d2f2f3..c172f75527cbd 100644
--- a/sycl/include/sycl/ext/intel/esimd/memory.hpp
+++ b/sycl/include/sycl/ext/intel/esimd/memory.hpp
@@ -21,7 +21,7 @@
 #include <cstdint>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::intel::esimd {
 
 /// @addtogroup sycl_esimd_memory
@@ -2475,5 +2475,5 @@ simd_obj_impl<T, N, T1, SFINAE>::copy_to(AccessorT acc,
 /// @endcond EXCLUDE
 
 } // namespace ext::intel::esimd
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/intel/esimd/native/common.hpp b/sycl/include/sycl/ext/intel/esimd/native/common.hpp
index 0df73949a40b2..3543652072a6e 100644
--- a/sycl/include/sycl/ext/intel/esimd/native/common.hpp
+++ b/sycl/include/sycl/ext/intel/esimd/native/common.hpp
@@ -15,7 +15,7 @@
 #include <cstdint>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::intel::esimd::native::lsc {
 
 /// @addtogroup sycl_esimd_memory
@@ -61,5 +61,5 @@ enum class atomic_op : uint8_t {
 /// @} sycl_esimd_memory_lsc
 
 } // namespace ext::intel::esimd::native::lsc
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/intel/esimd/simd.hpp b/sycl/include/sycl/ext/intel/esimd/simd.hpp
index 1a41e95c90f48..4165c282b5ef9 100644
--- a/sycl/include/sycl/ext/intel/esimd/simd.hpp
+++ b/sycl/include/sycl/ext/intel/esimd/simd.hpp
@@ -26,7 +26,7 @@
 #endif // __SYCL_DEVICE_ONLY__
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::intel::esimd {
 
 /// @addtogroup sycl_esimd_core
@@ -205,7 +205,7 @@ template <int N> using simd_mask = detail::simd_mask_type<N>;
 /// @} sycl_esimd_core_vectors
 
 } // namespace ext::intel::esimd
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 /// @ingroup sycl_esimd_misc
diff --git a/sycl/include/sycl/ext/intel/esimd/simd_view.hpp b/sycl/include/sycl/ext/intel/esimd/simd_view.hpp
index 6fd24741bae88..f7d9345a6b1ee 100644
--- a/sycl/include/sycl/ext/intel/esimd/simd_view.hpp
+++ b/sycl/include/sycl/ext/intel/esimd/simd_view.hpp
@@ -14,7 +14,7 @@
 #include <sycl/ext/intel/esimd/detail/types.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::intel::esimd {
 
 /// @addtogroup sycl_esimd_core_vectors
@@ -226,5 +226,5 @@ class simd_view<BaseTy, std::pair<region1d_scalar_t<ViewedElemT>, NestedRegion>>
 /// @} sycl_esimd_core_vectors
 
 } // namespace ext::intel::esimd
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/intel/esimd/xmx/common.hpp b/sycl/include/sycl/ext/intel/esimd/xmx/common.hpp
index 9f3722e2f1693..896eb1c6c9f82 100644
--- a/sycl/include/sycl/ext/intel/esimd/xmx/common.hpp
+++ b/sycl/include/sycl/ext/intel/esimd/xmx/common.hpp
@@ -13,7 +13,7 @@
 #include <sycl/detail/defines_elementary.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::intel::esimd::xmx {
 
 /// Describes the element types in the input matrices.
@@ -35,5 +35,5 @@ enum class dpas_argument_type {
 };
 
 } // namespace ext::intel::esimd::xmx
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/intel/esimd/xmx/dpas.hpp b/sycl/include/sycl/ext/intel/esimd/xmx/dpas.hpp
index fc109a5c8297f..ef0fb1f557a01 100644
--- a/sycl/include/sycl/ext/intel/esimd/xmx/dpas.hpp
+++ b/sycl/include/sycl/ext/intel/esimd/xmx/dpas.hpp
@@ -17,7 +17,7 @@
 #include <sycl/ext/oneapi/bfloat16.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 namespace ext::intel::esimd::xmx {
 
@@ -343,5 +343,5 @@ auto dpasw(__ESIMD_NS::simd<BT, BN> B, __ESIMD_NS::simd<AT, AN> A) {
 /// @} sycl_esimd_xmx_systolic_array_api
 
 } // namespace ext::intel::esimd::xmx
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/intel/experimental/esimd/common.hpp b/sycl/include/sycl/ext/intel/experimental/esimd/common.hpp
index 5758bfccdf324..4a497af5b5631 100644
--- a/sycl/include/sycl/ext/intel/experimental/esimd/common.hpp
+++ b/sycl/include/sycl/ext/intel/experimental/esimd/common.hpp
@@ -18,7 +18,7 @@
 #include <type_traits>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::intel::experimental::esimd {
 
 /// @addtogroup sycl_esimd_core
@@ -297,5 +297,5 @@ enum class split_barrier_action : uint8_t {
 /// @} sycl_esimd_core
 
 } // namespace ext::intel::experimental::esimd
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/intel/experimental/esimd/detail/util.hpp b/sycl/include/sycl/ext/intel/experimental/esimd/detail/util.hpp
index db1278230f173..c96214aec7aad 100644
--- a/sycl/include/sycl/ext/intel/experimental/esimd/detail/util.hpp
+++ b/sycl/include/sycl/ext/intel/experimental/esimd/detail/util.hpp
@@ -15,7 +15,7 @@
 #include <sycl/ext/intel/esimd/detail/util.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::intel::experimental::esimd::detail {
 
 template <unsigned int N, unsigned int M>
@@ -53,7 +53,7 @@ template <typename enumClass, enumClass... T>
 inline constexpr bool is_one_of_enum_v = is_one_of_enum<enumClass, T...>::value;
 
 } // namespace ext::intel::experimental::esimd::detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 /// @endcond ESIMD_DETAIL
diff --git a/sycl/include/sycl/ext/intel/experimental/esimd/math.hpp b/sycl/include/sycl/ext/intel/experimental/esimd/math.hpp
index 99fb8d574c48f..f6f71d47d1332 100644
--- a/sycl/include/sycl/ext/intel/experimental/esimd/math.hpp
+++ b/sycl/include/sycl/ext/intel/experimental/esimd/math.hpp
@@ -18,7 +18,7 @@
 #include <sycl/ext/intel/experimental/esimd/detail/util.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::intel::experimental::esimd {
 
 /// @addtogroup sycl_esimd_bitmanip
@@ -1765,5 +1765,5 @@ bfn(T src0, T src1, T src2) {
 /// @} sycl_esimd_logical
 
 } // namespace ext::intel::experimental::esimd
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/intel/experimental/esimd/memory.hpp b/sycl/include/sycl/ext/intel/experimental/esimd/memory.hpp
index 16864a1c3f2c4..6bb9267493fc8 100644
--- a/sycl/include/sycl/ext/intel/experimental/esimd/memory.hpp
+++ b/sycl/include/sycl/ext/intel/experimental/esimd/memory.hpp
@@ -16,7 +16,7 @@
 #include <sycl/ext/intel/experimental/esimd/detail/util.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::intel {
 namespace experimental::esimd {
 
@@ -3577,5 +3577,5 @@ template <int SLMAmount> class slm_allocator {
 
 } // namespace esimd
 } // namespace ext::intel
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/intel/experimental/esimd/tfloat32.hpp b/sycl/include/sycl/ext/intel/experimental/esimd/tfloat32.hpp
index 4808e764a9879..1a22fcedf2e16 100644
--- a/sycl/include/sycl/ext/intel/experimental/esimd/tfloat32.hpp
+++ b/sycl/include/sycl/ext/intel/experimental/esimd/tfloat32.hpp
@@ -14,7 +14,7 @@
 #include <sycl/bit_cast.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext {
 namespace intel {
 namespace experimental {
@@ -65,5 +65,5 @@ class tfloat32 {
 } // namespace intel
 } // namespace ext
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/intel/experimental/fpga_annotated_properties.hpp b/sycl/include/sycl/ext/intel/experimental/fpga_annotated_properties.hpp
index a4b71a179098c..1eb0ce06a1cbd 100644
--- a/sycl/include/sycl/ext/intel/experimental/fpga_annotated_properties.hpp
+++ b/sycl/include/sycl/ext/intel/experimental/fpga_annotated_properties.hpp
@@ -12,7 +12,7 @@
 #include <sycl/ext/oneapi/experimental/common_annotated_properties/properties.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext {
 namespace intel {
 namespace experimental {
@@ -371,5 +371,5 @@ template <typename... Args> struct checkValidFPGAPropertySet {
 } // namespace experimental
 } // namespace oneapi
 } // namespace ext
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/intel/experimental/fpga_kernel_properties.hpp b/sycl/include/sycl/ext/intel/experimental/fpga_kernel_properties.hpp
index 1e0e60e8f0f97..5e74f2abfcdf3 100644
--- a/sycl/include/sycl/ext/intel/experimental/fpga_kernel_properties.hpp
+++ b/sycl/include/sycl/ext/intel/experimental/fpga_kernel_properties.hpp
@@ -13,7 +13,7 @@
 #include <sycl/ext/oneapi/properties/property_value.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::intel::experimental {
 
 template <typename T, typename PropertyListT> class fpga_kernel_attribute;
@@ -150,5 +150,5 @@ struct PropertyMetaInfo<intel::experimental::pipelined_key::value_t<Value>> {
 
 } // namespace detail
 } // namespace ext::oneapi::experimental
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/intel/experimental/fpga_lsu.hpp b/sycl/include/sycl/ext/intel/experimental/fpga_lsu.hpp
index 275157cea5b4b..6acc0c1dd4923 100644
--- a/sycl/include/sycl/ext/intel/experimental/fpga_lsu.hpp
+++ b/sycl/include/sycl/ext/intel/experimental/fpga_lsu.hpp
@@ -13,7 +13,7 @@
 #include <sycl/pointers.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::intel::experimental {
 
 constexpr uint8_t BURST_COALESCE = 0x1;
@@ -200,5 +200,5 @@ template <class... _mem_access_params> class lsu final {
 };
 
 } // namespace ext::intel::experimental
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/intel/experimental/fpga_utils.hpp b/sycl/include/sycl/ext/intel/experimental/fpga_utils.hpp
index fbef746369d7d..7960447e81e82 100644
--- a/sycl/include/sycl/ext/intel/experimental/fpga_utils.hpp
+++ b/sycl/include/sycl/ext/intel/experimental/fpga_utils.hpp
@@ -15,7 +15,7 @@
 #include <tuple>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::intel::experimental::detail {
 
 template <template <int32_t> class _Type, class _T>
@@ -56,5 +56,5 @@ using defaultLatencyConstraintProperty =
     latency_constraint_key::value_t<0, latency_control_type::none, 0>;
 
 } // namespace ext::intel::experimental::detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/intel/experimental/grf_size_properties.hpp b/sycl/include/sycl/ext/intel/experimental/grf_size_properties.hpp
index 40ee564eac767..a408599798445 100644
--- a/sycl/include/sycl/ext/intel/experimental/grf_size_properties.hpp
+++ b/sycl/include/sycl/ext/intel/experimental/grf_size_properties.hpp
@@ -14,7 +14,7 @@
 #define SYCL_EXT_INTEL_GRF_SIZE 1
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::intel::experimental {
 struct grf_size_key {
   template <unsigned int Size>
@@ -88,5 +88,5 @@ struct ConflictingProperties<
 
 } // namespace detail
 } // namespace ext::oneapi::experimental
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/intel/experimental/kernel_execution_properties.hpp b/sycl/include/sycl/ext/intel/experimental/kernel_execution_properties.hpp
index e334f9ed092ae..b4aa5dac13602 100644
--- a/sycl/include/sycl/ext/intel/experimental/kernel_execution_properties.hpp
+++ b/sycl/include/sycl/ext/intel/experimental/kernel_execution_properties.hpp
@@ -11,7 +11,7 @@
 #include <sycl/ext/oneapi/properties/property.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::intel::experimental {
 
 template <typename T, typename PropertyListT> class gpu_kernel_attribute;
@@ -63,5 +63,5 @@ struct IsRuntimeProperty<intel::experimental::cache_config_key>
 
 } // namespace detail
 } // namespace ext::oneapi::experimental
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/intel/experimental/online_compiler.hpp b/sycl/include/sycl/ext/intel/experimental/online_compiler.hpp
index 7767dbdce941e..ebb51028f8d99 100644
--- a/sycl/include/sycl/ext/intel/experimental/online_compiler.hpp
+++ b/sycl/include/sycl/ext/intel/experimental/online_compiler.hpp
@@ -16,7 +16,7 @@
 #include <vector>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::intel::experimental {
 
 using byte = unsigned char;
@@ -221,5 +221,5 @@ online_compiler<source_language::cm>::compile(const std::string &src) {
 }
 
 } // namespace ext::intel::experimental
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/intel/experimental/pipe_properties.hpp b/sycl/include/sycl/ext/intel/experimental/pipe_properties.hpp
index 5d90b88202750..d38453ab472e9 100644
--- a/sycl/include/sycl/ext/intel/experimental/pipe_properties.hpp
+++ b/sycl/include/sycl/ext/intel/experimental/pipe_properties.hpp
@@ -13,7 +13,7 @@
 #include <sycl/ext/oneapi/properties/property_value.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext {
 namespace intel {
 namespace experimental {
@@ -149,5 +149,5 @@ struct IsCompileTimeProperty<intel::experimental::protocol_key>
 } // namespace experimental
 } // namespace oneapi
 } // namespace ext
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/intel/experimental/pipes.hpp b/sycl/include/sycl/ext/intel/experimental/pipes.hpp
index 15478aa993674..0bbea2ad3cec0 100644
--- a/sycl/include/sycl/ext/intel/experimental/pipes.hpp
+++ b/sycl/include/sycl/ext/intel/experimental/pipes.hpp
@@ -25,7 +25,7 @@
 #endif
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext {
 namespace intel {
 namespace experimental {
@@ -445,5 +445,5 @@ class pipe : public pipe_base {
 } // namespace experimental
 } // namespace intel
 } // namespace ext
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/intel/experimental/usm_properties.hpp b/sycl/include/sycl/ext/intel/experimental/usm_properties.hpp
index bd68327e055c0..be066b122e819 100644
--- a/sycl/include/sycl/ext/intel/experimental/usm_properties.hpp
+++ b/sycl/include/sycl/ext/intel/experimental/usm_properties.hpp
@@ -1,44 +1,44 @@
-#pragma once
-
-#include <sycl/context.hpp>
-#include <sycl/detail/property_helper.hpp>
-#include <sycl/properties/property_traits.hpp>
-
-namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
-namespace ext {
-
-namespace oneapi::property::usm {
-class device_read_only
-    : public sycl::detail::DataLessProperty<sycl::detail::DeviceReadOnly> {
-public:
-  device_read_only() = default;
-};
-} // namespace oneapi::property::usm
-
-namespace intel::experimental::property::usm {
-
-class buffer_location
-    : public sycl::detail::PropertyWithData<
-          sycl::detail::PropWithDataKind::AccPropBufferLocation> {
-public:
-  buffer_location(uint64_t Location) : MLocation(Location) {}
-  uint64_t get_buffer_location() const { return MLocation; }
-
-private:
-  uint64_t MLocation;
-};
-
-} // namespace intel::experimental::property::usm
-} // namespace ext
-
-template <>
-struct is_property<ext::oneapi::property::usm::device_read_only>
-    : std::true_type {};
-
-template <>
-struct is_property<ext::intel::experimental::property::usm::buffer_location>
-    : std::true_type {};
-
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
-} // namespace sycl
+#pragma once
+
+#include <sycl/context.hpp>
+#include <sycl/detail/property_helper.hpp>
+#include <sycl/properties/property_traits.hpp>
+
+namespace sycl {
+inline namespace _V1 {
+namespace ext {
+
+namespace oneapi::property::usm {
+class device_read_only
+    : public sycl::detail::DataLessProperty<sycl::detail::DeviceReadOnly> {
+public:
+  device_read_only() = default;
+};
+} // namespace oneapi::property::usm
+
+namespace intel::experimental::property::usm {
+
+class buffer_location
+    : public sycl::detail::PropertyWithData<
+          sycl::detail::PropWithDataKind::AccPropBufferLocation> {
+public:
+  buffer_location(uint64_t Location) : MLocation(Location) {}
+  uint64_t get_buffer_location() const { return MLocation; }
+
+private:
+  uint64_t MLocation;
+};
+
+} // namespace intel::experimental::property::usm
+} // namespace ext
+
+template <>
+struct is_property<ext::oneapi::property::usm::device_read_only>
+    : std::true_type {};
+
+template <>
+struct is_property<ext::intel::experimental::property::usm::buffer_location>
+    : std::true_type {};
+
+} // namespace _V1
+} // namespace sycl
diff --git a/sycl/include/sycl/ext/intel/fpga_device_selector.hpp b/sycl/include/sycl/ext/intel/fpga_device_selector.hpp
index 8cf3e920045c3..f3d6b1bb00d70 100644
--- a/sycl/include/sycl/ext/intel/fpga_device_selector.hpp
+++ b/sycl/include/sycl/ext/intel/fpga_device_selector.hpp
@@ -15,7 +15,7 @@
 #include <string_view>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 // Forward declaration
 class platform;
@@ -103,5 +103,5 @@ class __SYCL2020_DEPRECATED(
 
 } // namespace ext::intel
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/intel/fpga_dsp_control.hpp b/sycl/include/sycl/ext/intel/fpga_dsp_control.hpp
index a8eea8f4f1e68..3c52357d95ab1 100644
--- a/sycl/include/sycl/ext/intel/fpga_dsp_control.hpp
+++ b/sycl/include/sycl/ext/intel/fpga_dsp_control.hpp
@@ -8,7 +8,7 @@
 #pragma once
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext {
 namespace intel {
 
@@ -89,5 +89,5 @@ void math_dsp_control(Function f) {
 
 } // namespace intel
 } // namespace ext
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/intel/fpga_loop_fuse.hpp b/sycl/include/sycl/ext/intel/fpga_loop_fuse.hpp
index 4f0a1fa1d5ecc..9d631f01ea08c 100644
--- a/sycl/include/sycl/ext/intel/fpga_loop_fuse.hpp
+++ b/sycl/include/sycl/ext/intel/fpga_loop_fuse.hpp
@@ -8,7 +8,7 @@
 #pragma once
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext {
 namespace intel {
 
@@ -24,5 +24,5 @@ void fpga_loop_fuse_independent [[intel::loop_fuse_independent(_N)]] (_F f) {
 
 } // namespace intel
 } // namespace ext
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/intel/fpga_lsu.hpp b/sycl/include/sycl/ext/intel/fpga_lsu.hpp
index da331ce51cb1f..9f61edc4aa054 100644
--- a/sycl/include/sycl/ext/intel/fpga_lsu.hpp
+++ b/sycl/include/sycl/ext/intel/fpga_lsu.hpp
@@ -12,7 +12,7 @@
 #include <sycl/pointers.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::intel {
 constexpr uint8_t BURST_COALESCE = 0x1;
 constexpr uint8_t CACHE = 0x2;
@@ -125,5 +125,5 @@ template <class... _mem_access_params> class lsu final {
 };
 } // namespace ext::intel
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/intel/fpga_reg.hpp b/sycl/include/sycl/ext/intel/fpga_reg.hpp
index b8941f39811e9..5e20bfe121765 100644
--- a/sycl/include/sycl/ext/intel/fpga_reg.hpp
+++ b/sycl/include/sycl/ext/intel/fpga_reg.hpp
@@ -12,7 +12,7 @@
 #include <type_traits>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::intel {
 
 // Returns a registered copy of the input
@@ -42,7 +42,7 @@ template <typename _T>
 
 } // namespace ext::intel
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 // Keep it consistent with FPGA attributes like intelfpga::memory()
diff --git a/sycl/include/sycl/ext/intel/fpga_utils.hpp b/sycl/include/sycl/ext/intel/fpga_utils.hpp
index a6954fac357ba..56b9c8fdcf251 100644
--- a/sycl/include/sycl/ext/intel/fpga_utils.hpp
+++ b/sycl/include/sycl/ext/intel/fpga_utils.hpp
@@ -13,7 +13,7 @@
 #include <sycl/stl.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::intel {
 
 template <template <int32_t> class _Type, class _T>
@@ -31,5 +31,5 @@ struct _GetValue<_Type, _T1, _T...> {
 };
 } // namespace ext::intel
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/intel/math.hpp b/sycl/include/sycl/ext/intel/math.hpp
index 59a4813ef1ee4..c354027444a69 100644
--- a/sycl/include/sycl/ext/intel/math.hpp
+++ b/sycl/include/sycl/ext/intel/math.hpp
@@ -53,7 +53,7 @@ _iml_half_internal __imf_truncf16(_iml_half_internal);
 };
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::intel::math {
 
 static_assert(sizeof(sycl::half) == sizeof(_iml_half_internal),
@@ -230,5 +230,5 @@ std::enable_if_t<std::is_same_v<Tp, sycl::half2>, sycl::half2> trunc(Tp x) {
 }
 
 } // namespace ext::intel::math
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/intel/math/imf_half_trivial.hpp b/sycl/include/sycl/ext/intel/math/imf_half_trivial.hpp
index 24b925a8ac28c..6fea2317e5be7 100644
--- a/sycl/include/sycl/ext/intel/math/imf_half_trivial.hpp
+++ b/sycl/include/sycl/ext/intel/math/imf_half_trivial.hpp
@@ -12,7 +12,7 @@
 #include <sycl/half_type.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::intel::math {
 sycl::half hadd(sycl::half x, sycl::half y) { return x + y; }
 
@@ -311,5 +311,5 @@ sycl::half habs(sycl::half x) { return sycl::fabs(x); }
 
 sycl::half2 habs2(sycl::half2 x) { return sycl::fabs(x); }
 } // namespace ext::intel::math
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/intel/math/imf_simd.hpp b/sycl/include/sycl/ext/intel/math/imf_simd.hpp
index 0048f4d9f2df1..72a9e5e96450d 100644
--- a/sycl/include/sycl/ext/intel/math/imf_simd.hpp
+++ b/sycl/include/sycl/ext/intel/math/imf_simd.hpp
@@ -96,7 +96,7 @@ unsigned int __imf_vsadu4(unsigned int, unsigned int);
 };
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::intel::math {
 
 template <typename Tp>
@@ -583,5 +583,5 @@ std::enable_if_t<std::is_same_v<Tp, unsigned int>, unsigned int> vsadu4(Tp x,
   return __imf_vsadu4(x, y);
 }
 } // namespace ext::intel::math
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/intel/pipes.hpp b/sycl/include/sycl/ext/intel/pipes.hpp
index 8b8dffeba04f4..1206e9d7d8920 100644
--- a/sycl/include/sycl/ext/intel/pipes.hpp
+++ b/sycl/include/sycl/ext/intel/pipes.hpp
@@ -13,7 +13,7 @@
 #include <sycl/stl.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::intel {
 
 template <class _name, class _dataT, int32_t _min_capacity = 0> class pipe {
@@ -227,5 +227,5 @@ class kernel_writeable_io_pipe {
 
 } // namespace ext::intel
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/intel/usm_pointers.hpp b/sycl/include/sycl/ext/intel/usm_pointers.hpp
index 7c4243e4e7015..a7113f7b2a5ca 100644
--- a/sycl/include/sycl/ext/intel/usm_pointers.hpp
+++ b/sycl/include/sycl/ext/intel/usm_pointers.hpp
@@ -10,7 +10,7 @@
 #include <sycl/access/access.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 template <typename ElementType, access::address_space Space,
           access::decorated DecorateAddress>
@@ -60,5 +60,5 @@ using decorated_host_ptr =
 
 } // namespace intel
 } // namespace ext
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/oneapi/accessor_property_list.hpp b/sycl/include/sycl/ext/oneapi/accessor_property_list.hpp
index f401022696a92..d7e84171df07c 100644
--- a/sycl/include/sycl/ext/oneapi/accessor_property_list.hpp
+++ b/sycl/include/sycl/ext/oneapi/accessor_property_list.hpp
@@ -14,7 +14,7 @@
 #include <sycl/property_list.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 // Forward declaration
 template <typename DataT, int Dimensions, access::mode AccessMode,
           access::target AccessTarget, access::placeholder IsPlaceholder,
@@ -228,5 +228,5 @@ class __SYCL_TYPE(accessor_property_list) accessor_property_list
 };
 } // namespace ext::oneapi
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/oneapi/backend/hip.hpp b/sycl/include/sycl/ext/oneapi/backend/hip.hpp
index 35a8ae078e2a8..0ffd01337a65c 100644
--- a/sycl/include/sycl/ext/oneapi/backend/hip.hpp
+++ b/sycl/include/sycl/ext/oneapi/backend/hip.hpp
@@ -11,7 +11,7 @@
 #include <sycl/backend.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 template <>
 inline backend_return_t<backend::ext_oneapi_hip, device>
@@ -27,5 +27,5 @@ get_native<backend::ext_oneapi_hip, device>(const device &Obj) {
       Obj.getNative());
 }
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/oneapi/backend/level_zero.hpp b/sycl/include/sycl/ext/oneapi/backend/level_zero.hpp
index 9095e2f87a2be..c8b085fa49740 100644
--- a/sycl/include/sycl/ext/oneapi/backend/level_zero.hpp
+++ b/sycl/include/sycl/ext/oneapi/backend/level_zero.hpp
@@ -13,7 +13,7 @@
 #include <vector>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::oneapi::level_zero {
 // Implementation of various "make" functions resides in libsycl.so and thus
 // their interface needs to be backend agnostic.
@@ -229,5 +229,5 @@ namespace __SYCL2020_DEPRECATED("use 'ext::oneapi::level_zero' instead")
 using namespace ext::oneapi::level_zero;
 }
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/oneapi/backend/level_zero_ownership.hpp b/sycl/include/sycl/ext/oneapi/backend/level_zero_ownership.hpp
index d892211770cc4..7c18a6e4d669b 100644
--- a/sycl/include/sycl/ext/oneapi/backend/level_zero_ownership.hpp
+++ b/sycl/include/sycl/ext/oneapi/backend/level_zero_ownership.hpp
@@ -11,7 +11,7 @@
 #include <sycl/detail/defines_elementary.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::oneapi::level_zero {
 
 // Since Level-Zero is not doing any reference counting itself, we have to
@@ -21,5 +21,5 @@ namespace ext::oneapi::level_zero {
 enum class ownership { transfer, keep };
 
 } // namespace ext::oneapi::level_zero
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/oneapi/bf16_storage_builtins.hpp b/sycl/include/sycl/ext/oneapi/bf16_storage_builtins.hpp
index b38637dc2415d..9595dbc733ade 100644
--- a/sycl/include/sycl/ext/oneapi/bf16_storage_builtins.hpp
+++ b/sycl/include/sycl/ext/oneapi/bf16_storage_builtins.hpp
@@ -1,85 +1,85 @@
-#pragma once
-
-#include <CL/__spirv/spirv_ops.hpp>
-#include <sycl/builtins.hpp>
-#include <sycl/detail/builtins.hpp>
-#include <sycl/detail/generic_type_lists.hpp>
-#include <sycl/detail/generic_type_traits.hpp>
-#include <sycl/detail/type_traits.hpp>
-
-namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
-namespace ext::oneapi {
-
-namespace detail {
-
-template <typename T> struct is_bf16_storage_type {
-  static constexpr int value = false;
-};
-
-template <> struct is_bf16_storage_type<uint16_t> {
-  static constexpr int value = true;
-};
-
-template <> struct is_bf16_storage_type<uint32_t> {
-  static constexpr int value = true;
-};
-
-template <int N> struct is_bf16_storage_type<vec<uint16_t, N>> {
-  static constexpr int value = true;
-};
-
-template <int N> struct is_bf16_storage_type<vec<uint32_t, N>> {
-  static constexpr int value = true;
-};
-
-} // namespace detail
-
-template <typename T>
-std::enable_if_t<detail::is_bf16_storage_type<T>::value, T> fabs(T x) {
-#ifdef __SYCL_DEVICE_ONLY__
-  return __clc_fabs(x);
-#else
-  (void)x;
-  throw runtime_error("bf16 is not supported on host device.",
-                      PI_ERROR_INVALID_DEVICE);
-#endif
-}
-template <typename T>
-std::enable_if_t<detail::is_bf16_storage_type<T>::value, T> fmin(T x, T y) {
-#ifdef __SYCL_DEVICE_ONLY__
-  return __clc_fmin(x, y);
-#else
-  (void)x;
-  (void)y;
-  throw runtime_error("bf16 is not supported on host device.",
-                      PI_ERROR_INVALID_DEVICE);
-#endif
-}
-template <typename T>
-std::enable_if_t<detail::is_bf16_storage_type<T>::value, T> fmax(T x, T y) {
-#ifdef __SYCL_DEVICE_ONLY__
-  return __clc_fmax(x, y);
-#else
-  (void)x;
-  (void)y;
-  throw runtime_error("bf16 is not supported on host device.",
-                      PI_ERROR_INVALID_DEVICE);
-#endif
-}
-template <typename T>
-std::enable_if_t<detail::is_bf16_storage_type<T>::value, T> fma(T x, T y, T z) {
-#ifdef __SYCL_DEVICE_ONLY__
-  return __clc_fma(x, y, z);
-#else
-  (void)x;
-  (void)y;
-  (void)z;
-  throw runtime_error("bf16 is not supported on host device.",
-                      PI_ERROR_INVALID_DEVICE);
-#endif
-}
-
-} // namespace ext::oneapi
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
-} // namespace sycl
+#pragma once
+
+#include <CL/__spirv/spirv_ops.hpp>
+#include <sycl/builtins.hpp>
+#include <sycl/detail/builtins.hpp>
+#include <sycl/detail/generic_type_lists.hpp>
+#include <sycl/detail/generic_type_traits.hpp>
+#include <sycl/detail/type_traits.hpp>
+
+namespace sycl {
+inline namespace _V1 {
+namespace ext::oneapi {
+
+namespace detail {
+
+template <typename T> struct is_bf16_storage_type {
+  static constexpr int value = false;
+};
+
+template <> struct is_bf16_storage_type<uint16_t> {
+  static constexpr int value = true;
+};
+
+template <> struct is_bf16_storage_type<uint32_t> {
+  static constexpr int value = true;
+};
+
+template <int N> struct is_bf16_storage_type<vec<uint16_t, N>> {
+  static constexpr int value = true;
+};
+
+template <int N> struct is_bf16_storage_type<vec<uint32_t, N>> {
+  static constexpr int value = true;
+};
+
+} // namespace detail
+
+template <typename T>
+std::enable_if_t<detail::is_bf16_storage_type<T>::value, T> fabs(T x) {
+#ifdef __SYCL_DEVICE_ONLY__
+  return __clc_fabs(x);
+#else
+  (void)x;
+  throw runtime_error("bf16 is not supported on host device.",
+                      PI_ERROR_INVALID_DEVICE);
+#endif
+}
+template <typename T>
+std::enable_if_t<detail::is_bf16_storage_type<T>::value, T> fmin(T x, T y) {
+#ifdef __SYCL_DEVICE_ONLY__
+  return __clc_fmin(x, y);
+#else
+  (void)x;
+  (void)y;
+  throw runtime_error("bf16 is not supported on host device.",
+                      PI_ERROR_INVALID_DEVICE);
+#endif
+}
+template <typename T>
+std::enable_if_t<detail::is_bf16_storage_type<T>::value, T> fmax(T x, T y) {
+#ifdef __SYCL_DEVICE_ONLY__
+  return __clc_fmax(x, y);
+#else
+  (void)x;
+  (void)y;
+  throw runtime_error("bf16 is not supported on host device.",
+                      PI_ERROR_INVALID_DEVICE);
+#endif
+}
+template <typename T>
+std::enable_if_t<detail::is_bf16_storage_type<T>::value, T> fma(T x, T y, T z) {
+#ifdef __SYCL_DEVICE_ONLY__
+  return __clc_fma(x, y, z);
+#else
+  (void)x;
+  (void)y;
+  (void)z;
+  throw runtime_error("bf16 is not supported on host device.",
+                      PI_ERROR_INVALID_DEVICE);
+#endif
+}
+
+} // namespace ext::oneapi
+} // namespace _V1
+} // namespace sycl
diff --git a/sycl/include/sycl/ext/oneapi/bfloat16.hpp b/sycl/include/sycl/ext/oneapi/bfloat16.hpp
index dfdcfb6e4b2cf..13d077b0f1d65 100644
--- a/sycl/include/sycl/ext/oneapi/bfloat16.hpp
+++ b/sycl/include/sycl/ext/oneapi/bfloat16.hpp
@@ -18,7 +18,7 @@ extern "C" __DPCPP_SYCL_EXTERNAL float
 __devicelib_ConvertBF16ToFINTEL(const uint16_t &) noexcept;
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::oneapi {
 
 class bfloat16;
@@ -213,5 +213,5 @@ inline bfloat16 bitsToBfloat16(const Bfloat16StorageT Value) {
 
 } // namespace ext::oneapi
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/oneapi/device_global/device_global.hpp b/sycl/include/sycl/ext/oneapi/device_global/device_global.hpp
index 1c10d1d5d7138..7a2d834188886 100644
--- a/sycl/include/sycl/ext/oneapi/device_global/device_global.hpp
+++ b/sycl/include/sycl/ext/oneapi/device_global/device_global.hpp
@@ -27,7 +27,7 @@
 #endif
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::oneapi::experimental {
 
 namespace detail {
@@ -216,7 +216,7 @@ class
 };
 
 } // namespace ext::oneapi::experimental
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 #undef __SYCL_HOST_NOT_SUPPORTED
diff --git a/sycl/include/sycl/ext/oneapi/device_global/properties.hpp b/sycl/include/sycl/ext/oneapi/device_global/properties.hpp
index da627043807c8..99817c910a6d6 100644
--- a/sycl/include/sycl/ext/oneapi/device_global/properties.hpp
+++ b/sycl/include/sycl/ext/oneapi/device_global/properties.hpp
@@ -12,7 +12,7 @@
 #include <sycl/ext/oneapi/properties/property_value.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::oneapi::experimental {
 
 template <typename T, typename PropertyListT> class device_global;
@@ -130,5 +130,5 @@ struct PropertyMetaInfo<implement_in_csr_key::value_t<Enable>> {
 
 } // namespace detail
 } // namespace ext::oneapi::experimental
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/oneapi/dot_product.hpp b/sycl/include/sycl/ext/oneapi/dot_product.hpp
index 7d2ef8582a151..4fda07052e25a 100644
--- a/sycl/include/sycl/ext/oneapi/dot_product.hpp
+++ b/sycl/include/sycl/ext/oneapi/dot_product.hpp
@@ -14,7 +14,7 @@
 #include <sycl/types.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::oneapi {
 
 union Us {
@@ -76,5 +76,5 @@ int32_t dot_acc(vec<int8_t, 4> a, vec<uint8_t, 4> b, int32_t c) {
 
 } // namespace ext::oneapi
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/oneapi/experimental/annotated_arg/annotated_arg.hpp b/sycl/include/sycl/ext/oneapi/experimental/annotated_arg/annotated_arg.hpp
index e1eac0d1bad29..e9e15da78caf2 100644
--- a/sycl/include/sycl/ext/oneapi/experimental/annotated_arg/annotated_arg.hpp
+++ b/sycl/include/sycl/ext/oneapi/experimental/annotated_arg/annotated_arg.hpp
@@ -18,7 +18,7 @@
 #include <sycl/ext/oneapi/properties/properties.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext {
 namespace oneapi {
 namespace experimental {
@@ -272,5 +272,5 @@ __SYCL_TYPE(annotated_arg) annotated_arg<T, detail::properties_t<Props...>> {
 } // namespace experimental
 } // namespace oneapi
 } // namespace ext
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/oneapi/experimental/annotated_ptr/annotated_ptr.hpp b/sycl/include/sycl/ext/oneapi/experimental/annotated_ptr/annotated_ptr.hpp
index d69031390b6ee..30dc79c174801 100644
--- a/sycl/include/sycl/ext/oneapi/experimental/annotated_ptr/annotated_ptr.hpp
+++ b/sycl/include/sycl/ext/oneapi/experimental/annotated_ptr/annotated_ptr.hpp
@@ -18,7 +18,7 @@
 #include <sycl/ext/oneapi/properties/properties.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext {
 namespace oneapi {
 namespace experimental {
@@ -339,5 +339,5 @@ __SYCL_TYPE(annotated_ptr) annotated_ptr<T, detail::properties_t<Props...>> {
 } // namespace experimental
 } // namespace oneapi
 } // namespace ext
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/oneapi/experimental/backend/backend_traits_cuda.hpp b/sycl/include/sycl/ext/oneapi/experimental/backend/backend_traits_cuda.hpp
index 93b8c760e1081..0dedc6648fd44 100644
--- a/sycl/include/sycl/ext/oneapi/experimental/backend/backend_traits_cuda.hpp
+++ b/sycl/include/sycl/ext/oneapi/experimental/backend/backend_traits_cuda.hpp
@@ -31,7 +31,7 @@ typedef struct CUevent_st *CUevent;
 typedef struct CUmod_st *CUmodule;
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 // TODO the interops for context, device, event, platform and program
@@ -124,5 +124,5 @@ template <> struct InteropFeatureSupportMap<backend::ext_oneapi_cuda> {
 };
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/oneapi/experimental/backend/cuda.hpp b/sycl/include/sycl/ext/oneapi/experimental/backend/cuda.hpp
index 2cc326946415d..c5072699ad01c 100644
--- a/sycl/include/sycl/ext/oneapi/experimental/backend/cuda.hpp
+++ b/sycl/include/sycl/ext/oneapi/experimental/backend/cuda.hpp
@@ -15,7 +15,7 @@
 #include <vector>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::oneapi::cuda {
 
 // Implementation of ext_oneapi_cuda::make<device>
@@ -99,5 +99,5 @@ inline queue make_queue<backend::ext_oneapi_cuda>(
                             /*Backend*/ backend::ext_oneapi_cuda);
 }
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/oneapi/experimental/ballot_group.hpp b/sycl/include/sycl/ext/oneapi/experimental/ballot_group.hpp
index f1022db9ebedb..335da7151a00c 100644
--- a/sycl/include/sycl/ext/oneapi/experimental/ballot_group.hpp
+++ b/sycl/include/sycl/ext/oneapi/experimental/ballot_group.hpp
@@ -11,7 +11,7 @@
 #include <sycl/ext/oneapi/sub_group_mask.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::oneapi::experimental {
 
 template <typename ParentGroup> class ballot_group;
@@ -156,5 +156,5 @@ template <typename ParentGroup>
 struct is_group<ext::oneapi::experimental::ballot_group<ParentGroup>>
     : std::true_type {};
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/oneapi/experimental/bfloat16_math.hpp b/sycl/include/sycl/ext/oneapi/experimental/bfloat16_math.hpp
index 0d55d7572faf9..838ad3d500490 100644
--- a/sycl/include/sycl/ext/oneapi/experimental/bfloat16_math.hpp
+++ b/sycl/include/sycl/ext/oneapi/experimental/bfloat16_math.hpp
@@ -18,7 +18,7 @@
 #include <type_traits>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::oneapi::experimental {
 
 namespace detail {
@@ -296,5 +296,5 @@ BFLOAT16_MATH_FP32_WRAPPERS_MARRAY(trunc)
 #undef BFLOAT16_MATH_FP32_WRAPPERS
 #undef BFLOAT16_MATH_FP32_WRAPPERS_MARRAY
 } // namespace ext::oneapi::experimental
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/oneapi/experimental/builtins.hpp b/sycl/include/sycl/ext/oneapi/experimental/builtins.hpp
index 92157c07e88cb..0941a46459653 100644
--- a/sycl/include/sycl/ext/oneapi/experimental/builtins.hpp
+++ b/sycl/include/sycl/ext/oneapi/experimental/builtins.hpp
@@ -27,7 +27,7 @@
 #endif
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::oneapi::experimental {
 
 // Provides functionality to print data from kernels in a C way:
@@ -179,7 +179,7 @@ exp2(sycl::marray<half, N> x) __NOEXC {
 } // namespace native
 
 } // namespace ext::oneapi::experimental
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 #undef __SYCL_CONSTANT_AS
diff --git a/sycl/include/sycl/ext/oneapi/experimental/common_annotated_properties/properties.hpp b/sycl/include/sycl/ext/oneapi/experimental/common_annotated_properties/properties.hpp
index 2b06980e6ab1d..69cfa8c9e16dc 100644
--- a/sycl/include/sycl/ext/oneapi/experimental/common_annotated_properties/properties.hpp
+++ b/sycl/include/sycl/ext/oneapi/experimental/common_annotated_properties/properties.hpp
@@ -14,7 +14,7 @@
 #include <sycl/ext/oneapi/properties/property_value.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext {
 namespace oneapi {
 namespace experimental {
@@ -60,5 +60,5 @@ struct check_property_list<T, Prop, Props...>
 } // namespace experimental
 } // namespace oneapi
 } // namespace ext
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/oneapi/experimental/cuda/barrier.hpp b/sycl/include/sycl/ext/oneapi/experimental/cuda/barrier.hpp
index 1937ff2605168..55c37889a8991 100644
--- a/sycl/include/sycl/ext/oneapi/experimental/cuda/barrier.hpp
+++ b/sycl/include/sycl/ext/oneapi/experimental/cuda/barrier.hpp
@@ -14,7 +14,7 @@
 #include <cstddef>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext {
 namespace oneapi {
 namespace experimental {
@@ -149,5 +149,5 @@ class barrier {
 } // namespace experimental
 } // namespace oneapi
 } // namespace ext
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/oneapi/experimental/cuda/builtins.hpp b/sycl/include/sycl/ext/oneapi/experimental/cuda/builtins.hpp
index cdbf6ab642844..cffeb6d855bb9 100644
--- a/sycl/include/sycl/ext/oneapi/experimental/cuda/builtins.hpp
+++ b/sycl/include/sycl/ext/oneapi/experimental/cuda/builtins.hpp
@@ -19,7 +19,7 @@
 #endif
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext {
 namespace oneapi {
 namespace experimental {
@@ -221,5 +221,5 @@ ldg(const T *ptr) {
 } // namespace experimental
 } // namespace oneapi
 } // namespace ext
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/oneapi/experimental/cuda/non_uniform_algorithms.hpp b/sycl/include/sycl/ext/oneapi/experimental/cuda/non_uniform_algorithms.hpp
index eea68d89a35fe..21111098734db 100644
--- a/sycl/include/sycl/ext/oneapi/experimental/cuda/non_uniform_algorithms.hpp
+++ b/sycl/include/sycl/ext/oneapi/experimental/cuda/non_uniform_algorithms.hpp
@@ -10,7 +10,7 @@
 #include <sycl/known_identity.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 #if defined(__SYCL_DEVICE_ONLY__) && defined(__NVPTX__)
 
@@ -333,5 +333,5 @@ masked_scan_cuda_shfls(Group g, T x, BinaryOperation binary_op,
 
 #endif // defined(__SYCL_DEVICE_ONLY__) && defined(__NVPTX__)
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/oneapi/experimental/detail/invoke_simd_types.hpp b/sycl/include/sycl/ext/oneapi/experimental/detail/invoke_simd_types.hpp
index 9921046c1978b..7ba72d02832a6 100644
--- a/sycl/include/sycl/ext/oneapi/experimental/detail/invoke_simd_types.hpp
+++ b/sycl/include/sycl/ext/oneapi/experimental/detail/invoke_simd_types.hpp
@@ -19,7 +19,7 @@
 #include <sycl/detail/defines_elementary.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 namespace ext::oneapi::experimental {
 
@@ -42,5 +42,5 @@ template <class T, int N>
 using simd_mask =
     std::experimental::simd_mask<T, simd_abi::native_fixed_size<T, N>>;
 } // namespace ext::oneapi::experimental
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/oneapi/experimental/device_architecture.hpp b/sycl/include/sycl/ext/oneapi/experimental/device_architecture.hpp
index 40031dea73a31..6f6eae3477f52 100644
--- a/sycl/include/sycl/ext/oneapi/experimental/device_architecture.hpp
+++ b/sycl/include/sycl/ext/oneapi/experimental/device_architecture.hpp
@@ -11,7 +11,7 @@
 #include <sycl/detail/defines_elementary.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::oneapi::experimental {
 
 enum class architecture {
@@ -524,5 +524,5 @@ constexpr static auto if_architecture_is(T fnTrue) {
 }
 
 } // namespace ext::oneapi::experimental
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/oneapi/experimental/fixed_size_group.hpp b/sycl/include/sycl/ext/oneapi/experimental/fixed_size_group.hpp
index cbc6be038f4ba..a03d25886b34e 100644
--- a/sycl/include/sycl/ext/oneapi/experimental/fixed_size_group.hpp
+++ b/sycl/include/sycl/ext/oneapi/experimental/fixed_size_group.hpp
@@ -11,7 +11,7 @@
 #include <sycl/ext/oneapi/experimental/non_uniform_groups.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::oneapi::experimental {
 
 template <size_t PartitionSize, typename ParentGroup> class fixed_size_group;
@@ -175,5 +175,5 @@ struct is_group<
     ext::oneapi::experimental::fixed_size_group<PartitionSize, ParentGroup>>
     : std::true_type {};
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/oneapi/experimental/graph.hpp b/sycl/include/sycl/ext/oneapi/experimental/graph.hpp
index 47031708b9b6d..be5210922fb08 100644
--- a/sycl/include/sycl/ext/oneapi/experimental/graph.hpp
+++ b/sycl/include/sycl/ext/oneapi/experimental/graph.hpp
@@ -18,7 +18,7 @@
 #include <vector>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 class handler;
 class queue;
@@ -283,5 +283,5 @@ template <>
 struct is_property_of<ext::oneapi::experimental::property::node::depends_on,
                       ext::oneapi::experimental::node> : std::true_type {};
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/oneapi/experimental/group_helpers_sorters.hpp b/sycl/include/sycl/ext/oneapi/experimental/group_helpers_sorters.hpp
index 1cb7a61fec605..e55ccac0bc808 100644
--- a/sycl/include/sycl/ext/oneapi/experimental/group_helpers_sorters.hpp
+++ b/sycl/include/sycl/ext/oneapi/experimental/group_helpers_sorters.hpp
@@ -14,7 +14,7 @@
 #include <sycl/sycl_span.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::oneapi::experimental {
 
 // ---- group helpers
@@ -194,6 +194,6 @@ class radix_sorter {
 };
 
 } // namespace ext::oneapi::experimental
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 #endif
diff --git a/sycl/include/sycl/ext/oneapi/experimental/group_sort.hpp b/sycl/include/sycl/ext/oneapi/experimental/group_sort.hpp
index 96a4211acae5f..9aa8c3bec9d3b 100644
--- a/sycl/include/sycl/ext/oneapi/experimental/group_sort.hpp
+++ b/sycl/include/sycl/ext/oneapi/experimental/group_sort.hpp
@@ -17,7 +17,7 @@
 #include "group_helpers_sorters.hpp"
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::oneapi::experimental {
 namespace detail {
 
@@ -132,6 +132,6 @@ joint_sort(experimental::group_with_scratchpad<Group, Extent> exec, Iter first,
 }
 
 } // namespace ext::oneapi::experimental
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 #endif
diff --git a/sycl/include/sycl/ext/oneapi/experimental/invoke_simd.hpp b/sycl/include/sycl/ext/oneapi/experimental/invoke_simd.hpp
index 6c3d1bc0374d6..8cca0f3c8bef7 100644
--- a/sycl/include/sycl/ext/oneapi/experimental/invoke_simd.hpp
+++ b/sycl/include/sycl/ext/oneapi/experimental/invoke_simd.hpp
@@ -64,7 +64,7 @@ __builtin_invoke_simd(HelperFunc helper, UserSimdFuncAndSpmdArgs... args)
 #endif // __SYCL_DEVICE_ONLY__
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 namespace ext::oneapi::experimental {
 
@@ -479,5 +479,5 @@ __attribute__((always_inline)) auto invoke_simd(sycl::sub_group sg,
 }
 
 } // namespace ext::oneapi::experimental
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/oneapi/experimental/non_uniform_groups.hpp b/sycl/include/sycl/ext/oneapi/experimental/non_uniform_groups.hpp
index b099787f0fa25..90275945b13fc 100644
--- a/sycl/include/sycl/ext/oneapi/experimental/non_uniform_groups.hpp
+++ b/sycl/include/sycl/ext/oneapi/experimental/non_uniform_groups.hpp
@@ -13,7 +13,7 @@
 #include <sycl/types.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 namespace detail {
 
@@ -78,5 +78,5 @@ class opportunistic_group;
 
 } // namespace ext::oneapi::experimental
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/oneapi/experimental/opportunistic_group.hpp b/sycl/include/sycl/ext/oneapi/experimental/opportunistic_group.hpp
index ce4e74b2abb96..eb4b41269461d 100644
--- a/sycl/include/sycl/ext/oneapi/experimental/opportunistic_group.hpp
+++ b/sycl/include/sycl/ext/oneapi/experimental/opportunistic_group.hpp
@@ -11,7 +11,7 @@
 #include <sycl/ext/oneapi/sub_group_mask.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::oneapi::experimental {
 
 class opportunistic_group;
@@ -156,5 +156,5 @@ template <>
 struct is_group<ext::oneapi::experimental::opportunistic_group>
     : std::true_type {};
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/oneapi/experimental/root_group.hpp b/sycl/include/sycl/ext/oneapi/experimental/root_group.hpp
index d19553af6f978..8cbc88ccf6194 100644
--- a/sycl/include/sycl/ext/oneapi/experimental/root_group.hpp
+++ b/sycl/include/sycl/ext/oneapi/experimental/root_group.hpp
@@ -16,7 +16,7 @@
 #define SYCL_EXT_ONEAPI_ROOT_GROUP 1
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::oneapi::experimental {
 
 namespace info::kernel_queue_specific {
@@ -136,5 +136,5 @@ void group_barrier(ext::oneapi::experimental::root_group<dimensions> G,
 #endif
 }
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/oneapi/experimental/sycl_complex.hpp b/sycl/include/sycl/ext/oneapi/experimental/sycl_complex.hpp
index cc2e83d754287..23d10acb9c7b6 100644
--- a/sycl/include/sycl/ext/oneapi/experimental/sycl_complex.hpp
+++ b/sycl/include/sycl/ext/oneapi/experimental/sycl_complex.hpp
@@ -20,7 +20,7 @@
 #include <type_traits>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext {
 namespace oneapi {
 namespace experimental {
@@ -1004,7 +1004,7 @@ constexpr complex<float> operator""if(unsigned long long __im) {
 } // namespace oneapi
 } // namespace ext
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 #undef _SYCL_EXT_CPLX_INLINE_VISIBILITY
diff --git a/sycl/include/sycl/ext/oneapi/experimental/tangle_group.hpp b/sycl/include/sycl/ext/oneapi/experimental/tangle_group.hpp
index e3e8a077edf2d..f1518405b6f0c 100644
--- a/sycl/include/sycl/ext/oneapi/experimental/tangle_group.hpp
+++ b/sycl/include/sycl/ext/oneapi/experimental/tangle_group.hpp
@@ -11,7 +11,7 @@
 #include <sycl/ext/oneapi/sub_group_mask.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::oneapi::experimental {
 
 template <typename ParentGroup> class tangle_group;
@@ -156,5 +156,5 @@ template <typename ParentGroup>
 struct is_group<ext::oneapi::experimental::tangle_group<ParentGroup>>
     : std::true_type {};
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/oneapi/experimental/uniform.hpp b/sycl/include/sycl/ext/oneapi/experimental/uniform.hpp
index ff071514b6014..5e70b820fbf57 100644
--- a/sycl/include/sycl/ext/oneapi/experimental/uniform.hpp
+++ b/sycl/include/sycl/ext/oneapi/experimental/uniform.hpp
@@ -15,13 +15,11 @@
 // 1 - Initial extension version. Base features are supported.
 #define SYCL_EXT_ONEAPI_UNIFORM 1
 
-#include <sycl/detail/defines_elementary.hpp> // for __SYCL_INLINE_VER_NAMESPACE
-
 #include <type_traits>
 
 // Forward declarations of types not allowed to be wrapped in uniform:
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 struct sub_group;
 template <int, bool> class item;
@@ -32,11 +30,11 @@ template <int> class group;
 template <int> class nd_range;
 using sycl::sub_group;
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::oneapi::experimental {
 namespace detail {
 
@@ -108,5 +106,5 @@ template <class T> class uniform {
 };
 
 } // namespace ext::oneapi::experimental
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/oneapi/experimental/user_defined_reductions.hpp b/sycl/include/sycl/ext/oneapi/experimental/user_defined_reductions.hpp
index 728479efe2a68..af29c7581e237 100644
--- a/sycl/include/sycl/ext/oneapi/experimental/user_defined_reductions.hpp
+++ b/sycl/include/sycl/ext/oneapi/experimental/user_defined_reductions.hpp
@@ -12,7 +12,7 @@
 #include <sycl/group_algorithm.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::oneapi::experimental {
 namespace detail {
 template <typename GroupHelper, typename T, typename BinaryOperation>
@@ -135,5 +135,5 @@ joint_reduce(GroupHelper group_helper, Ptr first, Ptr last, T init,
 #endif
 }
 } // namespace ext::oneapi::experimental
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/oneapi/filter_selector.hpp b/sycl/include/sycl/ext/oneapi/filter_selector.hpp
index a78c5ae73bc1b..f4cd247e05f29 100644
--- a/sycl/include/sycl/ext/oneapi/filter_selector.hpp
+++ b/sycl/include/sycl/ext/oneapi/filter_selector.hpp
@@ -16,7 +16,7 @@
 // 4.6.1 Device selection class
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 // Forward declarations
 class device;
@@ -51,5 +51,5 @@ class __SYCL_EXPORT filter_selector : public ext::oneapi::filter_selector {
 };
 } // namespace __SYCL2020_DEPRECATED("use 'ext::oneapi' instead")ONEAPI
 #endif // __SYCL_INTERNAL_API
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/oneapi/functional.hpp b/sycl/include/sycl/ext/oneapi/functional.hpp
index dafe25efa33f1..309178f14577e 100644
--- a/sycl/include/sycl/ext/oneapi/functional.hpp
+++ b/sycl/include/sycl/ext/oneapi/functional.hpp
@@ -14,7 +14,7 @@
 #include <functional>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::oneapi {
 
 template <typename T = void> using plus = std::plus<T>;
@@ -119,5 +119,5 @@ static T calc(Group g, typename GroupOpTag<T>::type, T x,
 } // namespace detail
 #endif // __SYCL_DEVICE_ONLY__
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/oneapi/group_local_memory.hpp b/sycl/include/sycl/ext/oneapi/group_local_memory.hpp
index 1e35ffbaf8e26..a30553de58d58 100644
--- a/sycl/include/sycl/ext/oneapi/group_local_memory.hpp
+++ b/sycl/include/sycl/ext/oneapi/group_local_memory.hpp
@@ -20,7 +20,7 @@
 #include <utility>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::oneapi {
 template <typename T, typename Group>
 std::enable_if_t<
@@ -67,5 +67,5 @@ std::enable_if_t<
 #endif
 }
 } // namespace ext::oneapi
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/oneapi/kernel_properties/properties.hpp b/sycl/include/sycl/ext/oneapi/kernel_properties/properties.hpp
index 8303f34123b84..5463d2a183f7c 100644
--- a/sycl/include/sycl/ext/oneapi/kernel_properties/properties.hpp
+++ b/sycl/include/sycl/ext/oneapi/kernel_properties/properties.hpp
@@ -16,7 +16,7 @@
 #include <array>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::oneapi::experimental {
 namespace detail {
 // Trait for checking that all size_t values are non-zero.
@@ -183,7 +183,7 @@ struct HasKernelPropertiesGetMethod<T,
 
 } // namespace detail
 } // namespace ext::oneapi::experimental
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 #ifdef __SYCL_DEVICE_ONLY__
diff --git a/sycl/include/sycl/ext/oneapi/latency_control/properties.hpp b/sycl/include/sycl/ext/oneapi/latency_control/properties.hpp
index 4c0522e69c96d..61df621d83c9b 100644
--- a/sycl/include/sycl/ext/oneapi/latency_control/properties.hpp
+++ b/sycl/include/sycl/ext/oneapi/latency_control/properties.hpp
@@ -12,7 +12,7 @@
 #include <sycl/ext/oneapi/properties/property_value.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::intel::experimental {
 
 enum class latency_control_type {
@@ -84,5 +84,5 @@ struct IsCompileTimeProperty<intel::experimental::latency_constraint_key>
 
 } // namespace detail
 } // namespace ext::oneapi::experimental
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/oneapi/matrix/matrix-intel.hpp b/sycl/include/sycl/ext/oneapi/matrix/matrix-intel.hpp
index cee1a76bd9a77..224789a0f304b 100644
--- a/sycl/include/sycl/ext/oneapi/matrix/matrix-intel.hpp
+++ b/sycl/include/sycl/ext/oneapi/matrix/matrix-intel.hpp
@@ -15,7 +15,7 @@
 #include <sycl/feature_test.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext {
 namespace intel::experimental::matrix::layout {
 constexpr sycl::ext::oneapi::experimental::matrix::layout packed =
@@ -519,5 +519,5 @@ joint_matrix_store(Group sg,
 } // namespace intel::experimental::matrix
 
 } // namespace ext
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/oneapi/matrix/matrix-jit.hpp b/sycl/include/sycl/ext/oneapi/matrix/matrix-jit.hpp
index 3fe1c2e2285dc..08fa7219075c3 100644
--- a/sycl/include/sycl/ext/oneapi/matrix/matrix-jit.hpp
+++ b/sycl/include/sycl/ext/oneapi/matrix/matrix-jit.hpp
@@ -15,7 +15,7 @@
 #include <sycl/feature_test.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::oneapi::experimental::matrix {
 
 enum class matrix_layout { row_major, col_major, packed_a, packed_b };
@@ -643,5 +643,5 @@ class wi_data {
 #undef SPV_MATRIX_LAYOUT_TRAITS
 
 } // namespace ext::oneapi::experimental::matrix
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/oneapi/matrix/matrix-tensorcores.hpp b/sycl/include/sycl/ext/oneapi/matrix/matrix-tensorcores.hpp
index 018c66cf5213d..53f11ab3f5e08 100644
--- a/sycl/include/sycl/ext/oneapi/matrix/matrix-tensorcores.hpp
+++ b/sycl/include/sycl/ext/oneapi/matrix/matrix-tensorcores.hpp
@@ -12,7 +12,7 @@
 #include <sycl/ext/oneapi/bfloat16.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext {
 namespace oneapi {
 namespace experimental {
@@ -606,5 +606,5 @@ void joint_matrix_mad_cuda(
 } // namespace detail
 } // namespace oneapi
 } // namespace ext
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/oneapi/matrix/matrix-unified-utils.hpp b/sycl/include/sycl/ext/oneapi/matrix/matrix-unified-utils.hpp
index 6f820fb82575a..f51e146fd9a0c 100644
--- a/sycl/include/sycl/ext/oneapi/matrix/matrix-unified-utils.hpp
+++ b/sycl/include/sycl/ext/oneapi/matrix/matrix-unified-utils.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext {
 namespace oneapi {
 namespace experimental {
@@ -28,5 +28,5 @@ class tf32 {
 } // namespace experimental
 } // namespace oneapi
 } // namespace ext
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/oneapi/matrix/matrix-unified.hpp b/sycl/include/sycl/ext/oneapi/matrix/matrix-unified.hpp
index 8e4a5e5692fc0..ea0d5ace9ea92 100644
--- a/sycl/include/sycl/ext/oneapi/matrix/matrix-unified.hpp
+++ b/sycl/include/sycl/ext/oneapi/matrix/matrix-unified.hpp
@@ -11,7 +11,7 @@
 #include "utils.hpp"
 #include <sycl/ext/oneapi/matrix/matrix-tensorcores.hpp>
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext {
 namespace oneapi {
 namespace experimental {
@@ -440,5 +440,5 @@ inline __SYCL_ALWAYS_INLINE float round_to_tf32(const float &a) {
 } // namespace experimental
 } // namespace oneapi
 } // namespace ext
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/oneapi/matrix/static-query-use.hpp b/sycl/include/sycl/ext/oneapi/matrix/static-query-use.hpp
index bb919b68db8ed..f9e46fc4fbab5 100644
--- a/sycl/include/sycl/ext/oneapi/matrix/static-query-use.hpp
+++ b/sycl/include/sycl/ext/oneapi/matrix/static-query-use.hpp
@@ -21,7 +21,7 @@
 #pragma once
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext {
 namespace oneapi {
 namespace experimental::matrix {
@@ -593,5 +593,5 @@ struct tpu_params<
 } // namespace experimental::matrix
 } // namespace oneapi
 } // namespace ext
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/oneapi/matrix/static-query.hpp b/sycl/include/sycl/ext/oneapi/matrix/static-query.hpp
index 3975a2c90945a..965ee55bb591a 100644
--- a/sycl/include/sycl/ext/oneapi/matrix/static-query.hpp
+++ b/sycl/include/sycl/ext/oneapi/matrix/static-query.hpp
@@ -21,7 +21,7 @@
 #pragma once
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext {
 namespace oneapi {
 namespace experimental {
@@ -413,5 +413,5 @@ struct tpu_params<
 } // namespace experimental
 } // namespace oneapi
 } // namespace ext
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/oneapi/matrix/utils.hpp b/sycl/include/sycl/ext/oneapi/matrix/utils.hpp
index 7341cc70cfce5..d7519503fc143 100644
--- a/sycl/include/sycl/ext/oneapi/matrix/utils.hpp
+++ b/sycl/include/sycl/ext/oneapi/matrix/utils.hpp
@@ -12,7 +12,7 @@
 #include <sycl/multi_ptr.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 // Helper to return decorated pointer for different values
@@ -29,5 +29,5 @@ DecorT *getDecorated(multi_ptr<T, Space, IsDecorated> ptr) {
 }
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/oneapi/owner_less.hpp b/sycl/include/sycl/ext/oneapi/owner_less.hpp
index 65702d81adabb..069fd3dbaf75c 100644
--- a/sycl/include/sycl/ext/oneapi/owner_less.hpp
+++ b/sycl/include/sycl/ext/oneapi/owner_less.hpp
@@ -22,7 +22,7 @@
 #include <sycl/queue.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::oneapi {
 
 namespace detail {
@@ -125,5 +125,5 @@ struct owner_less<host_sampled_image_accessor<DataT, Dimensions>>
           host_sampled_image_accessor<DataT, Dimensions>> {};
 
 } // namespace ext::oneapi
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/oneapi/properties/properties.hpp b/sycl/include/sycl/ext/oneapi/properties/properties.hpp
index 5c29b612e14b3..e7d547eb89cd6 100644
--- a/sycl/include/sycl/ext/oneapi/properties/properties.hpp
+++ b/sycl/include/sycl/ext/oneapi/properties/properties.hpp
@@ -18,7 +18,7 @@
 #include <type_traits>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::oneapi::experimental {
 
 namespace detail {
@@ -250,5 +250,5 @@ struct is_device_copyable<
     std::enable_if_t<!std::is_trivially_copyable_v<
         ext::oneapi::experimental::properties<PropertiesT>>>>
     : is_device_copyable<PropertiesT> {};
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/oneapi/properties/property.hpp b/sycl/include/sycl/ext/oneapi/properties/property.hpp
index b39c6476ec3e6..a6112a6d7ea9f 100644
--- a/sycl/include/sycl/ext/oneapi/properties/property.hpp
+++ b/sycl/include/sycl/ext/oneapi/properties/property.hpp
@@ -155,7 +155,7 @@ template <> struct IsRuntimeProperty<foo> : std::true_type {};
 #pragma once
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext {
 namespace oneapi {
 namespace experimental {
@@ -233,5 +233,5 @@ template <typename, typename> struct is_property_key_of : std::false_type {};
 } // namespace experimental
 } // namespace oneapi
 } // namespace ext
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/oneapi/properties/property_utils.hpp b/sycl/include/sycl/ext/oneapi/properties/property_utils.hpp
index 7675255d1ecbf..9f49dc3684888 100644
--- a/sycl/include/sycl/ext/oneapi/properties/property_utils.hpp
+++ b/sycl/include/sycl/ext/oneapi/properties/property_utils.hpp
@@ -15,7 +15,7 @@
 #include <tuple>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::oneapi::experimental {
 
 // Forward declaration
@@ -338,5 +338,5 @@ struct NoConflictingProperties
 
 } // namespace detail
 } // namespace ext::oneapi::experimental
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/oneapi/properties/property_value.hpp b/sycl/include/sycl/ext/oneapi/properties/property_value.hpp
index 9c8996bf76c61..1a1e613bd0d70 100644
--- a/sycl/include/sycl/ext/oneapi/properties/property_value.hpp
+++ b/sycl/include/sycl/ext/oneapi/properties/property_value.hpp
@@ -12,7 +12,7 @@
 #include <sycl/ext/oneapi/properties/property_utils.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::oneapi::experimental {
 namespace detail {
 
@@ -85,5 +85,5 @@ struct IsCompileTimePropertyValue<property_value<PropertyT, PropertyValueTs...>>
 
 } // namespace detail
 } // namespace ext::oneapi::experimental
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/oneapi/sub_group.hpp b/sycl/include/sycl/ext/oneapi/sub_group.hpp
index ce0a80d4bd3ef..e532dece049b3 100644
--- a/sycl/include/sycl/ext/oneapi/sub_group.hpp
+++ b/sycl/include/sycl/ext/oneapi/sub_group.hpp
@@ -13,7 +13,7 @@
 #include <tuple>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::oneapi {
 struct __SYCL_DEPRECATED("use sycl::sub_group() instead") sub_group
     : sycl::sub_group {
@@ -31,5 +31,5 @@ struct __SYCL_DEPRECATED("use sycl::sub_group() instead") sub_group
   sub_group() = default;
 };
 } // namespace ext::oneapi
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/oneapi/sub_group_mask.hpp b/sycl/include/sycl/ext/oneapi/sub_group_mask.hpp
index d59c9ade330a4..e3e7d137f7834 100644
--- a/sycl/include/sycl/ext/oneapi/sub_group_mask.hpp
+++ b/sycl/include/sycl/ext/oneapi/sub_group_mask.hpp
@@ -18,7 +18,7 @@
 #include <climits>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 class Builder;
 
@@ -317,5 +317,5 @@ group_ballot(Group g, bool predicate) {
 #undef BITS_TYPE
 
 } // namespace ext::oneapi
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/oneapi/weak_object.hpp b/sycl/include/sycl/ext/oneapi/weak_object.hpp
index 7cdf65937585c..f8c4967d7c2d1 100644
--- a/sycl/include/sycl/ext/oneapi/weak_object.hpp
+++ b/sycl/include/sycl/ext/oneapi/weak_object.hpp
@@ -16,7 +16,7 @@
 #include <optional>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::oneapi {
 namespace detail {
 // Import from detail:: into ext::oneapi::detail:: to improve readability later
@@ -227,5 +227,5 @@ class weak_object<stream> : public detail::weak_object_base<stream> {
 };
 
 } // namespace ext::oneapi
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/ext/oneapi/weak_object_base.hpp b/sycl/include/sycl/ext/oneapi/weak_object_base.hpp
index bd0b19494876b..1b5b7fe68f181 100644
--- a/sycl/include/sycl/ext/oneapi/weak_object_base.hpp
+++ b/sycl/include/sycl/ext/oneapi/weak_object_base.hpp
@@ -11,7 +11,7 @@
 #include <sycl/detail/defines_elementary.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::oneapi::detail {
 template <typename SYCLObjT> class weak_object_base;
 
@@ -77,5 +77,5 @@ template <typename SYCLObjT> class weak_object_base {
   detail::getSyclWeakObjImpl(const weak_object_base<Obj> &WeakObj);
 };
 } // namespace ext::oneapi::detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/functional.hpp b/sycl/include/sycl/functional.hpp
index f3090ef35a732..a33baeb0e7708 100644
--- a/sycl/include/sycl/functional.hpp
+++ b/sycl/include/sycl/functional.hpp
@@ -13,7 +13,7 @@
 #include <functional>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 template <typename T = void> using plus = std::plus<T>;
 template <typename T = void> using multiplies = std::multiplies<T>;
@@ -71,5 +71,5 @@ template <> struct maximum<void> {
   }
 };
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/group.hpp b/sycl/include/sycl/group.hpp
index f438d12bbbacb..db8d3e710eb4b 100644
--- a/sycl/include/sycl/group.hpp
+++ b/sycl/include/sycl/group.hpp
@@ -27,7 +27,7 @@
 #include <stdexcept>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 class Builder;
 
@@ -711,5 +711,5 @@ template <int Dims> group<Dims> this_group() {
 #endif
 }
 } // namespace ext::oneapi::experimental
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/group_algorithm.hpp b/sycl/include/sycl/group_algorithm.hpp
index 46a94133c0f4e..93bde1e892c4f 100644
--- a/sycl/include/sycl/group_algorithm.hpp
+++ b/sycl/include/sycl/group_algorithm.hpp
@@ -26,7 +26,7 @@
 #include <sycl/sub_group.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 // ---- linear_id_to_id
@@ -1077,5 +1077,5 @@ joint_inclusive_scan(Group g, InPtr first, InPtr last, OutPtr result,
   return joint_inclusive_scan(g, first, last, result, binary_op, init);
 }
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/group_barrier.hpp b/sycl/include/sycl/group_barrier.hpp
index 43414f3125599..edd36037cc7a1 100644
--- a/sycl/include/sycl/group_barrier.hpp
+++ b/sycl/include/sycl/group_barrier.hpp
@@ -19,7 +19,7 @@
 #include <sycl/sub_group.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 template <typename Group>
 std::enable_if_t<is_group_v<Group>>
@@ -37,5 +37,5 @@ group_barrier(Group G, memory_scope FenceScope = Group::fence_scope) {
 #endif
 }
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/h_item.hpp b/sycl/include/sycl/h_item.hpp
index 8f9123e7ad734..cb4f6eea9f570 100644
--- a/sycl/include/sycl/h_item.hpp
+++ b/sycl/include/sycl/h_item.hpp
@@ -14,7 +14,7 @@
 #include <sycl/range.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 namespace detail {
 class Builder;
@@ -136,5 +136,5 @@ template <int Dimensions> class h_item {
   item<Dimensions, false> logicalLocalItem;
 };
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/half_type.hpp b/sycl/include/sycl/half_type.hpp
index 6a835053877a3..153424e27f7ef 100644
--- a/sycl/include/sycl/half_type.hpp
+++ b/sycl/include/sycl/half_type.hpp
@@ -33,7 +33,7 @@
 #endif
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail::half_impl {
 class half;
 }
@@ -576,7 +576,7 @@ inline float cast_if_host_half(half_impl::half val) {
 
 } // namespace detail
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 // Partial specialization of some functions in namespace `std`
diff --git a/sycl/include/sycl/handler.hpp b/sycl/include/sycl/handler.hpp
index 97e6e38ccc8a0..7c91cbddee7ec 100644
--- a/sycl/include/sycl/handler.hpp
+++ b/sycl/include/sycl/handler.hpp
@@ -92,7 +92,7 @@ class __copyAcc2Acc;
 class MockHandler;
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 // Forward declaration
 
@@ -3208,5 +3208,5 @@ class __SYCL_EXPORT handler {
   // Set value of the gpu cache configuration for the kernel.
   void setKernelCacheConfig(sycl::detail::pi::PiKernelCacheConfig);
 };
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/id.hpp b/sycl/include/sycl/id.hpp
index 8aa45a528089f..d22069aff5b3e 100644
--- a/sycl/include/sycl/id.hpp
+++ b/sycl/include/sycl/id.hpp
@@ -15,7 +15,7 @@
 #include <sycl/range.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 // Forward declarations
 namespace detail {
 template <typename TransformedArgType, int Dims, typename KernelType>
@@ -374,5 +374,5 @@ template <int Dims> id<Dims> this_id() {
 #endif
 }
 } // namespace ext::oneapi::experimental
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/image.hpp b/sycl/include/sycl/image.hpp
index b5bd8b77cb35b..2d2a609bf40d1 100644
--- a/sycl/include/sycl/image.hpp
+++ b/sycl/include/sycl/image.hpp
@@ -22,7 +22,7 @@
 #include <cstddef>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 // forward declarations
 class handler;
@@ -1115,7 +1115,7 @@ class sampled_image
   friend class sampled_image_accessor;
 };
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 namespace std {
diff --git a/sycl/include/sycl/info/info_desc.hpp b/sycl/include/sycl/info/info_desc.hpp
index be57a9430ca60..9c6f933bd6f32 100644
--- a/sycl/include/sycl/info/info_desc.hpp
+++ b/sycl/include/sycl/info/info_desc.hpp
@@ -14,7 +14,7 @@
 #include <sycl/range.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 class device;
 class platform;
@@ -198,5 +198,5 @@ template <int Dimensions> struct max_work_groups;
 #include <sycl/info/ext_oneapi_device_traits.def>
 #undef __SYCL_PARAM_TRAITS_SPEC
 #undef __SYCL_PARAM_TRAITS_TEMPLATE_SPEC
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/interop_handle.hpp b/sycl/include/sycl/interop_handle.hpp
index 478ea5a69cc4e..c87673d90c058 100644
--- a/sycl/include/sycl/interop_handle.hpp
+++ b/sycl/include/sycl/interop_handle.hpp
@@ -18,7 +18,7 @@
 #include <memory>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 namespace detail {
 class AccessorBaseHost;
@@ -211,5 +211,5 @@ class interop_handle {
   std::vector<ReqToMem> MMemObjs;
 };
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/item.hpp b/sycl/include/sycl/item.hpp
index 54c0207b35128..83c3805843434 100644
--- a/sycl/include/sycl/item.hpp
+++ b/sycl/include/sycl/item.hpp
@@ -18,7 +18,7 @@
 #include <cstddef>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 class Builder;
 template <typename TransformedArgType, int Dims, typename KernelType>
@@ -167,5 +167,5 @@ template <int Dims> item<Dims> this_item() {
 #endif
 }
 } // namespace ext::oneapi::experimental
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/kernel.hpp b/sycl/include/sycl/kernel.hpp
index a17cea47611f0..3227b910cf675 100644
--- a/sycl/include/sycl/kernel.hpp
+++ b/sycl/include/sycl/kernel.hpp
@@ -21,7 +21,7 @@
 #include <memory>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 // Forward declaration
 class context;
 class queue;
@@ -181,7 +181,7 @@ class __SYCL_EXPORT kernel : public detail::OwnerLessBase<kernel> {
   friend auto get_native(const SyclObjectT &Obj)
       -> backend_return_t<BackendName, SyclObjectT>;
 };
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 namespace std {
diff --git a/sycl/include/sycl/kernel_bundle.hpp b/sycl/include/sycl/kernel_bundle.hpp
index 55e32c9e23c4f..57a0acca8d9a8 100644
--- a/sycl/include/sycl/kernel_bundle.hpp
+++ b/sycl/include/sycl/kernel_bundle.hpp
@@ -25,7 +25,7 @@
 #include <vector>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 // Forward declaration
 template <backend Backend> class backend_traits;
 template <backend Backend, bundle_state State>
@@ -736,7 +736,7 @@ build(const kernel_bundle<bundle_state::input> &InputBundle,
   return build(InputBundle, InputBundle.get_devices(), PropList);
 }
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 namespace std {
diff --git a/sycl/include/sycl/kernel_bundle_enums.hpp b/sycl/include/sycl/kernel_bundle_enums.hpp
index 532e15053f45e..45a37fe6694bd 100644
--- a/sycl/include/sycl/kernel_bundle_enums.hpp
+++ b/sycl/include/sycl/kernel_bundle_enums.hpp
@@ -9,7 +9,7 @@
 #pragma once
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 enum class bundle_state : char { input = 0, object = 1, executable = 2 };
 
diff --git a/sycl/include/sycl/kernel_handler.hpp b/sycl/include/sycl/kernel_handler.hpp
index a29a9915dc280..9054e81104c47 100644
--- a/sycl/include/sycl/kernel_handler.hpp
+++ b/sycl/include/sycl/kernel_handler.hpp
@@ -15,7 +15,7 @@
 #include <type_traits>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 /// Reading the value of a specialization constant
 ///
 /// \ingroup sycl_api
@@ -65,5 +65,5 @@ class __SYCL_TYPE(kernel_handler) kernel_handler {
   char *MSpecializationConstantsBuffer = nullptr;
 };
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/known_identity.hpp b/sycl/include/sycl/known_identity.hpp
index a19bbdabfee79..56db9aa532822 100644
--- a/sycl/include/sycl/known_identity.hpp
+++ b/sycl/include/sycl/known_identity.hpp
@@ -15,7 +15,7 @@
 #include <type_traits>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 template <typename T, class BinaryOperation>
@@ -408,5 +408,5 @@ template <typename BinaryOperation, typename AccumulatorT>
 inline constexpr AccumulatorT known_identity_v =
     sycl::known_identity<BinaryOperation, AccumulatorT>::value;
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/marray.hpp b/sycl/include/sycl/marray.hpp
index 850d6939383e1..3bed691e5091e 100644
--- a/sycl/include/sycl/marray.hpp
+++ b/sycl/include/sycl/marray.hpp
@@ -19,7 +19,7 @@
 #include <utility>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 template <typename DataT, std::size_t N> class marray;
 
@@ -404,5 +404,5 @@ __SYCL_MAKE_MARRAY_ALIASES_FOR_MARRAY_LENGTH(16)
 #undef __SYCL_MAKE_MARRAY_ALIASES_FOR_SIGNED_AND_UNSIGNED_TYPES
 #undef __SYCL_MAKE_MARRAY_ALIASES_FOR_MARRAY_LENGTH
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/memory_enums.hpp b/sycl/include/sycl/memory_enums.hpp
index f4f7a4b8462f1..08ae069168c60 100644
--- a/sycl/include/sycl/memory_enums.hpp
+++ b/sycl/include/sycl/memory_enums.hpp
@@ -11,7 +11,7 @@
 #include <sycl/detail/defines_elementary.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 enum class memory_order : int {
   relaxed = 0,
@@ -101,5 +101,5 @@ static constexpr std::memory_order getStdMemoryOrder(sycl::memory_order order) {
 #endif // __SYCL_DEVICE_ONLY__
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/multi_ptr.hpp b/sycl/include/sycl/multi_ptr.hpp
index 0b15decdc4ef3..9927ac18c25f0 100644
--- a/sycl/include/sycl/multi_ptr.hpp
+++ b/sycl/include/sycl/multi_ptr.hpp
@@ -15,7 +15,7 @@
 #include <sycl/detail/type_traits.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 namespace detail {
 
@@ -1607,5 +1607,5 @@ bool operator<=(std::nullptr_t,
   return true;
 }
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/nd_item.hpp b/sycl/include/sycl/nd_item.hpp
index 211fba9f1a6ad..c04422492c252 100644
--- a/sycl/include/sycl/nd_item.hpp
+++ b/sycl/include/sycl/nd_item.hpp
@@ -24,7 +24,7 @@
 #include <type_traits>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 class Builder;
 }
@@ -266,5 +266,5 @@ template <int Dims> nd_item<Dims> this_nd_item() {
 #endif
 }
 } // namespace ext::oneapi::experimental
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/nd_range.hpp b/sycl/include/sycl/nd_range.hpp
index 4bb7ff97c959c..15299e5493603 100644
--- a/sycl/include/sycl/nd_range.hpp
+++ b/sycl/include/sycl/nd_range.hpp
@@ -14,7 +14,7 @@
 #include <type_traits>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 /// Defines the iteration domain of both the work-groups and the overall
 /// dispatch.
@@ -68,5 +68,5 @@ template <int Dimensions = 1> class nd_range {
   }
 };
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/pipes.hpp b/sycl/include/sycl/pipes.hpp
index 58aee3c04484d..4bee6b99b54b3 100644
--- a/sycl/include/sycl/pipes.hpp
+++ b/sycl/include/sycl/pipes.hpp
@@ -11,8 +11,8 @@
 #include <sycl/ext/intel/pipes.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 template <class name, class dataT, int32_t min_capacity = 0>
 using pipe = ext::intel::pipe<name, dataT, min_capacity>;
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/platform.hpp b/sycl/include/sycl/platform.hpp
index ad995bf15abce..ca257d250ea05 100644
--- a/sycl/include/sycl/platform.hpp
+++ b/sycl/include/sycl/platform.hpp
@@ -21,7 +21,7 @@
 #include <utility>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 // TODO: make code thread-safe
 
 // Forward declaration
@@ -186,7 +186,7 @@ class __SYCL_EXPORT platform : public detail::OwnerLessBase<platform> {
   friend auto get_native(const SyclObjectT &Obj)
       -> backend_return_t<BackendName, SyclObjectT>;
 }; // class platform
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 namespace std {
diff --git a/sycl/include/sycl/pointers.hpp b/sycl/include/sycl/pointers.hpp
index 2872e0703312d..4c49e1e490c7f 100644
--- a/sycl/include/sycl/pointers.hpp
+++ b/sycl/include/sycl/pointers.hpp
@@ -10,7 +10,7 @@
 #include <sycl/access/access.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 template <typename ElementType, access::address_space Space,
           access::decorated DecorateAddress>
@@ -95,5 +95,5 @@ using decorated_private_ptr =
     multi_ptr<ElementType, access::address_space::private_space,
               access::decorated::yes>;
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/properties/accessor_properties.hpp b/sycl/include/sycl/properties/accessor_properties.hpp
index 2b040f1950784..08cd5a7ca5b5c 100644
--- a/sycl/include/sycl/properties/accessor_properties.hpp
+++ b/sycl/include/sycl/properties/accessor_properties.hpp
@@ -15,7 +15,7 @@
 #include <type_traits>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace property {
 
 class no_init : public detail::DataLessProperty<detail::NoInit> {};
@@ -220,5 +220,5 @@ template <>
 struct IsCompileTimePropertyInstance<
     ext::oneapi::property::no_offset::instance<>> : std::true_type {};
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/properties/buffer_properties.hpp b/sycl/include/sycl/properties/buffer_properties.hpp
index 35b8f1b0ea94d..b4c70ae85d9f0 100644
--- a/sycl/include/sycl/properties/buffer_properties.hpp
+++ b/sycl/include/sycl/properties/buffer_properties.hpp
@@ -15,7 +15,7 @@
 #include <mutex>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 namespace property::buffer {
 class use_host_ptr : public detail::DataLessProperty<detail::BufferUseHostPtr> {
@@ -102,5 +102,5 @@ struct is_property_of<ext::oneapi::property::buffer::use_pinned_host_memory,
                       buffer<T, Dimensions, AllocatorT, void>>
     : std::true_type {};
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/properties/context_properties.hpp b/sycl/include/sycl/properties/context_properties.hpp
index d0764493fb063..bf21c6e53b44a 100644
--- a/sycl/include/sycl/properties/context_properties.hpp
+++ b/sycl/include/sycl/properties/context_properties.hpp
@@ -13,7 +13,7 @@
 #include <sycl/properties/property_traits.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::oneapi::cuda::property::context {
 class __SYCL_DEPRECATED("the primary contexts are now always used")
     use_primary_context : public ::sycl::detail::DataLessProperty<
@@ -43,5 +43,5 @@ template <>
 struct is_property_of<ext::oneapi::cuda::property::context::use_primary_context,
                       context> : std::true_type {};
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/properties/image_properties.hpp b/sycl/include/sycl/properties/image_properties.hpp
index 026d91d1f888d..d946abdad4d74 100644
--- a/sycl/include/sycl/properties/image_properties.hpp
+++ b/sycl/include/sycl/properties/image_properties.hpp
@@ -13,7 +13,7 @@
 #include <sycl/properties/property_traits.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace property::image {
 class use_host_ptr : public detail::DataLessProperty<detail::ImageUseHostPtr> {
 };
@@ -82,5 +82,5 @@ struct is_property_of<property::image::context_bound,
                       unsampled_image<Dimensions, AllocatorT>>
     : std::true_type {};
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/properties/property_traits.hpp b/sycl/include/sycl/properties/property_traits.hpp
index b7918b4704be6..6715e7609a32a 100644
--- a/sycl/include/sycl/properties/property_traits.hpp
+++ b/sycl/include/sycl/properties/property_traits.hpp
@@ -11,7 +11,7 @@
 #include <sycl/detail/property_helper.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 // Property traits
 template <typename propertyT>
@@ -30,5 +30,5 @@ template <typename propertyT, typename syclObjectT>
 inline constexpr bool is_property_of_v =
     is_property_of<propertyT, syclObjectT>::value;
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/properties/queue_properties.hpp b/sycl/include/sycl/properties/queue_properties.hpp
index 9cde7957d0267..f8451ad460a3b 100644
--- a/sycl/include/sycl/properties/queue_properties.hpp
+++ b/sycl/include/sycl/properties/queue_properties.hpp
@@ -12,7 +12,7 @@
 #include <sycl/properties/property_traits.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 #define __SYCL_DATA_LESS_PROP(NS_QUALIFIER, PROP_NAME, ENUM_VAL)               \
   namespace NS_QUALIFIER {                                                     \
   class PROP_NAME                                                              \
@@ -54,5 +54,5 @@ class queue;
 
 #include <sycl/properties/queue_properties.def>
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/properties/reduction_properties.hpp b/sycl/include/sycl/properties/reduction_properties.hpp
index ee544a4c3bd9f..51092f33dc5d0 100644
--- a/sycl/include/sycl/properties/reduction_properties.hpp
+++ b/sycl/include/sycl/properties/reduction_properties.hpp
@@ -13,12 +13,12 @@
 #include <sycl/properties/property_traits.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace property::reduction {
 class initialize_to_identity
     : public detail::DataLessProperty<detail::InitializeToIdentity> {};
 } // namespace property::reduction
 
 // Reduction property trait specializations
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/property_list.hpp b/sycl/include/sycl/property_list.hpp
index 9566f9ea8e390..156105a0a6613 100644
--- a/sycl/include/sycl/property_list.hpp
+++ b/sycl/include/sycl/property_list.hpp
@@ -12,7 +12,7 @@
 #include <sycl/properties/property_traits.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::oneapi {
 template <typename... PropsT> class accessor_property_list;
 } // namespace ext::oneapi
@@ -67,5 +67,5 @@ class property_list : protected detail::PropertyListBase {
   friend class ext::oneapi::accessor_property_list;
 };
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/property_list_conversion.hpp b/sycl/include/sycl/property_list_conversion.hpp
index 214088dc53d94..9b9445e26ceee 100644
--- a/sycl/include/sycl/property_list_conversion.hpp
+++ b/sycl/include/sycl/property_list_conversion.hpp
@@ -14,11 +14,11 @@
 #include <sycl/property_list.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 template <typename... T>
 inline property_list::operator ext::oneapi::accessor_property_list<T...>() {
   return ext::oneapi::accessor_property_list<T...>(MDataLessProps,
                                                    MPropsWithData);
 }
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/queue.hpp b/sycl/include/sycl/queue.hpp
index e64e9182ec977..1df6990acf876 100644
--- a/sycl/include/sycl/queue.hpp
+++ b/sycl/include/sycl/queue.hpp
@@ -36,7 +36,7 @@
 #endif
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 // Forward declaration
 class context;
@@ -2263,7 +2263,7 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase<queue> {
                                const std::vector<event> &DepEvents);
 };
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 namespace std {
@@ -2283,7 +2283,7 @@ template <> struct hash<sycl::queue> {
 #include <cinttypes>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 namespace detail {
 #define __SYCL_ASSERT_START 1
@@ -2367,7 +2367,7 @@ event submitAssertCapture(queue &Self, event &Event, queue *SecondaryQueue,
 #undef __SYCL_ASSERT_START
 } // namespace detail
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 #endif // __SYCL_USE_FALLBACK_ASSERT
 
diff --git a/sycl/include/sycl/range.hpp b/sycl/include/sycl/range.hpp
index ac8c0622dcfcb..24f3f857029b1 100644
--- a/sycl/include/sycl/range.hpp
+++ b/sycl/include/sycl/range.hpp
@@ -14,7 +14,7 @@
 #include <type_traits>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 template <int Dimensions> class id;
 
 /// Defines the iteration domain of either a single work-group in a parallel
@@ -240,5 +240,5 @@ inline std::array<size_t, 3> rangeToArray(const range<1> &r) {
 }
 } // namespace detail
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/reduction.hpp b/sycl/include/sycl/reduction.hpp
index a08eb89eca28e..ac6046e880c41 100644
--- a/sycl/include/sycl/reduction.hpp
+++ b/sycl/include/sycl/reduction.hpp
@@ -27,7 +27,7 @@
 #include <tuple>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 /// Base non-template class which is a base class for all reduction
@@ -2885,5 +2885,5 @@ auto reduction(span<T, Extent> Span, const T &Identity,
   return detail::make_reduction<BinaryOperation, 1, Extent, true>(
       Span.data(), Identity, Combiner, InitializeToIdentity);
 }
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/sampler.hpp b/sycl/include/sycl/sampler.hpp
index 24e94b4c157b2..55b275965de1e 100644
--- a/sycl/include/sycl/sampler.hpp
+++ b/sycl/include/sycl/sampler.hpp
@@ -16,7 +16,7 @@
 #include <sycl/property_list.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 enum class addressing_mode : unsigned int {
   mirrored_repeat = PI_SAMPLER_ADDRESSING_MODE_MIRRORED_REPEAT,
   repeat = PI_SAMPLER_ADDRESSING_MODE_REPEAT,
@@ -132,7 +132,7 @@ struct image_sampler {
   filtering_mode filtering;
 };
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 namespace std {
diff --git a/sycl/include/sycl/specialization_id.hpp b/sycl/include/sycl/specialization_id.hpp
index 8570becba9e49..102fde3c27e74 100644
--- a/sycl/include/sycl/specialization_id.hpp
+++ b/sycl/include/sycl/specialization_id.hpp
@@ -9,7 +9,7 @@
 #pragma once
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 /// Declaring a specialization constant
 ///
@@ -34,5 +34,5 @@ template <typename T> class __SYCL_TYPE(specialization_id) specialization_id {
   T MDefaultValue;
 };
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/stl.hpp b/sycl/include/sycl/stl.hpp
index e78f86425c430..ba20d3c5b92f9 100644
--- a/sycl/include/sycl/stl.hpp
+++ b/sycl/include/sycl/stl.hpp
@@ -15,7 +15,7 @@
 #include <memory>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 #if defined(_WIN32) && !defined(_DLL) && !defined(__SYCL_DEVICE_ONLY__)
 // SYCL library is designed such a way that STL objects cross DLL boundary,
@@ -45,5 +45,5 @@ std::unique_ptr<T> make_unique_ptr(ArgsT &&...Args) {
   return std::unique_ptr<T>(new T(std::forward<ArgsT>(Args)...));
 }
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/stream.hpp b/sycl/include/sycl/stream.hpp
index 7030777ea9fb2..ae52ac19bb5c0 100644
--- a/sycl/include/sycl/stream.hpp
+++ b/sycl/include/sycl/stream.hpp
@@ -16,7 +16,7 @@
 #include <sycl/handler.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 namespace detail {
 
@@ -1264,7 +1264,7 @@ inline const stream &operator<<(const stream &Out, const T &RHS) {
   return Out;
 }
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 namespace std {
 template <> struct hash<sycl::stream> {
diff --git a/sycl/include/sycl/sub_group.hpp b/sycl/include/sycl/sub_group.hpp
index 5ac7d370d047a..f7cc2cc46e4f2 100644
--- a/sycl/include/sycl/sub_group.hpp
+++ b/sycl/include/sycl/sub_group.hpp
@@ -25,7 +25,7 @@
 #include <type_traits>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 template <typename T, access::address_space Space,
           access::decorated DecorateAddress>
 class multi_ptr;
@@ -823,5 +823,5 @@ inline sycl::sub_group this_sub_group() {
 } // namespace experimental
 } // namespace ext::oneapi
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/sycl_span.hpp b/sycl/include/sycl/sycl_span.hpp
index 4b66561af3257..8f9ee2802526d 100644
--- a/sycl/include/sycl/sycl_span.hpp
+++ b/sycl/include/sycl/sycl_span.hpp
@@ -135,7 +135,7 @@ template<class Container>
 #define _SYCL_SPAN_INLINE_VISIBILITY inline
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 // byte is unsigned char at sycl/image.hpp:58
 using byte = unsigned char;
@@ -632,7 +632,7 @@ span(_Container &) -> span<typename _Container::value_type>;
 template <class _Container>
 span(const _Container &) -> span<const typename _Container::value_type>;
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 #endif // _SYCL_SPAN
diff --git a/sycl/include/sycl/types.hpp b/sycl/include/sycl/types.hpp
index dc26dc249cb81..11816a461a603 100644
--- a/sycl/include/sycl/types.hpp
+++ b/sycl/include/sycl/types.hpp
@@ -73,7 +73,7 @@
 // 4.10.2: SYCL vector types
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 enum class rounding_mode { automatic = 0, rte = 1, rtz = 2, rtp = 3, rtn = 4 };
 struct elem {
@@ -2150,11 +2150,11 @@ __SYCL_RELLOGOP(&&)
 __SYCL_RELLOGOP(||)
 #undef __SYCL_RELLOGOP
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 // Vectors of size 1 are handled separately and therefore 1 is not included in
@@ -2435,7 +2435,7 @@ struct CheckDeviceCopyable<
 #endif // __SYCL_DEVICE_ONLY__
 } // namespace detail
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 #undef __SYCL_ALIGNED_VAR
diff --git a/sycl/include/sycl/usm.hpp b/sycl/include/sycl/usm.hpp
index a3da53bf43c27..dbcc8866b0818 100644
--- a/sycl/include/sycl/usm.hpp
+++ b/sycl/include/sycl/usm.hpp
@@ -16,7 +16,7 @@
 #include <cstddef>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 ///
 // Explicit USM
 ///
@@ -314,5 +314,5 @@ __SYCL_EXPORT void release_from_device_copy(const void *Ptr,
 
 } // namespace ext::oneapi::experimental
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/usm/usm_allocator.hpp b/sycl/include/sycl/usm/usm_allocator.hpp
index bd2a09a18f8ab..e7f35e9d6da6a 100644
--- a/sycl/include/sycl/usm/usm_allocator.hpp
+++ b/sycl/include/sycl/usm/usm_allocator.hpp
@@ -20,7 +20,7 @@
 #include <memory>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 template <typename T, usm::alloc AllocKind, size_t Alignment = 0>
 class usm_allocator {
 public:
@@ -125,5 +125,5 @@ class usm_allocator {
   property_list MPropList;
 };
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/usm/usm_enums.hpp b/sycl/include/sycl/usm/usm_enums.hpp
index c02e78945be59..7caf0963ce692 100644
--- a/sycl/include/sycl/usm/usm_enums.hpp
+++ b/sycl/include/sycl/usm/usm_enums.hpp
@@ -8,11 +8,11 @@
 #pragma once
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace usm {
 
 enum class alloc { host = 0, device = 1, shared = 2, unknown = 3 };
 
 } // namespace usm
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/include/sycl/usm/usm_pointer_info.hpp b/sycl/include/sycl/usm/usm_pointer_info.hpp
index f00a958145071..950dd0fb20dee 100644
--- a/sycl/include/sycl/usm/usm_pointer_info.hpp
+++ b/sycl/include/sycl/usm/usm_pointer_info.hpp
@@ -12,7 +12,7 @@
 #include <sycl/usm/usm_enums.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 class device;
 class context;
@@ -31,5 +31,5 @@ __SYCL_EXPORT usm::alloc get_pointer_type(const void *ptr, const context &ctxt);
 /// \param ctxt is the sycl context the ptr was allocated in
 __SYCL_EXPORT device get_pointer_device(const void *ptr, const context &ctxt);
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/accessor.cpp b/sycl/source/accessor.cpp
index b885f5da2cde2..b4fb635de7cae 100644
--- a/sycl/source/accessor.cpp
+++ b/sycl/source/accessor.cpp
@@ -10,7 +10,7 @@
 #include <sycl/accessor.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 device getDeviceFromHandler(handler &CommandGroupHandlerRef) {
   return CommandGroupHandlerRef.MQueue->get_device();
@@ -177,5 +177,5 @@ image_sampler SampledImageAccessorBaseHost::getSampler() const {
 }
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/backend.cpp b/sycl/source/backend.cpp
index a187fcccc3150..5f138dcd7981c 100644
--- a/sycl/source/backend.cpp
+++ b/sycl/source/backend.cpp
@@ -26,7 +26,7 @@
 #include <memory>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 static const PluginPtr &getPlugin(backend Backend) {
@@ -299,5 +299,5 @@ kernel make_kernel(pi_native_handle NativeHandle, const context &TargetContext,
 }
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/backend/level_zero.cpp b/sycl/source/backend/level_zero.cpp
index a38a8c1674566..086846a79ad40 100644
--- a/sycl/source/backend/level_zero.cpp
+++ b/sycl/source/backend/level_zero.cpp
@@ -14,7 +14,7 @@
 #include <sycl/sycl.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::oneapi::level_zero {
 using namespace detail;
 
@@ -81,5 +81,5 @@ __SYCL_EXPORT event make_event(const context &Context,
 }
 
 } // namespace ext::oneapi::level_zero
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/backend/opencl.cpp b/sycl/source/backend/opencl.cpp
index 9472a941256f8..5a282542c5b24 100644
--- a/sycl/source/backend/opencl.cpp
+++ b/sycl/source/backend/opencl.cpp
@@ -17,7 +17,7 @@
 #include <string_view>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace opencl {
 using namespace detail;
 
@@ -113,5 +113,5 @@ __SYCL_EXPORT bool has_extension(const sycl::device &SyclDevice,
   return ExtensionsString.find(Extension) != std::string::npos;
 }
 } // namespace opencl
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/buffer.cpp b/sycl/source/buffer.cpp
index 6e5e682b9429a..db2d1d882f484 100644
--- a/sycl/source/buffer.cpp
+++ b/sycl/source/buffer.cpp
@@ -8,7 +8,7 @@
 #include <memory>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 buffer_plain::buffer_plain(
@@ -129,5 +129,5 @@ void buffer_plain::handleRelease() const {
 }
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/context.cpp b/sycl/source/context.cpp
index 6bdae5261699f..065c5af414b05 100644
--- a/sycl/source/context.cpp
+++ b/sycl/source/context.cpp
@@ -25,7 +25,7 @@
 // 4.6.2 Context class
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 context::context(const property_list &PropList) : context(device{}, PropList) {}
 
@@ -144,5 +144,5 @@ context::context(std::shared_ptr<detail::context_impl> Impl) : impl(Impl) {}
 
 pi_native_handle context::getNative() const { return impl->getNative(); }
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/accessor_impl.cpp b/sycl/source/detail/accessor_impl.cpp
index 105ac933924fb..1d349627e64e7 100644
--- a/sycl/source/detail/accessor_impl.cpp
+++ b/sycl/source/detail/accessor_impl.cpp
@@ -13,7 +13,7 @@
 #include <detail/xpti_registry.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 AccessorImplHost::~AccessorImplHost() {
@@ -81,5 +81,5 @@ void sampledImageConstructorNotification(
 }
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/accessor_impl.hpp b/sycl/source/detail/accessor_impl.hpp
index b85859de2c405..408d25060df3f 100644
--- a/sycl/source/detail/accessor_impl.hpp
+++ b/sycl/source/detail/accessor_impl.hpp
@@ -17,7 +17,7 @@
 #include <sycl/stl.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 template <typename, int, access::mode, access::target, access::placeholder,
           typename>
 class accessor;
@@ -187,5 +187,5 @@ using SampledImageAccessorImplPtr =
 using Requirement = AccessorImplHost;
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/allowlist.cpp b/sycl/source/detail/allowlist.cpp
index 529ace810be76..881a014c4831f 100644
--- a/sycl/source/detail/allowlist.cpp
+++ b/sycl/source/detail/allowlist.cpp
@@ -16,7 +16,7 @@
 #include <regex>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 constexpr char BackendNameKeyName[] = "BackendName";
@@ -412,5 +412,5 @@ void applyAllowList(std::vector<sycl::detail::pi::PiDevice> &PiDevices,
 }
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/allowlist.hpp b/sycl/source/detail/allowlist.hpp
index 5a6b890b37151..28b194f842068 100644
--- a/sycl/source/detail/allowlist.hpp
+++ b/sycl/source/detail/allowlist.hpp
@@ -16,7 +16,7 @@
 #include <vector>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 using DeviceDescT = std::map<std::string, std::string>;
@@ -32,5 +32,5 @@ void applyAllowList(std::vector<sycl::detail::pi::PiDevice> &PiDevices,
                     const PluginPtr &Plugin);
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/backend_impl.hpp b/sycl/source/detail/backend_impl.hpp
index 31037b165e799..ca23ceb48815c 100644
--- a/sycl/source/detail/backend_impl.hpp
+++ b/sycl/source/detail/backend_impl.hpp
@@ -11,7 +11,7 @@
 #include <sycl/backend_types.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 template <class T> backend getImplBackend(const T &Impl) {
@@ -20,5 +20,5 @@ template <class T> backend getImplBackend(const T &Impl) {
 }
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/buffer_impl.cpp b/sycl/source/detail/buffer_impl.cpp
index d881161b698bc..394707dbcdcac 100644
--- a/sycl/source/detail/buffer_impl.cpp
+++ b/sycl/source/detail/buffer_impl.cpp
@@ -14,7 +14,7 @@
 #include <detail/xpti_registry.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 #ifdef XPTI_ENABLE_INSTRUMENTATION
 uint8_t GBufferStreamID;
@@ -93,5 +93,5 @@ buffer_impl::getNativeVector(backend BackendName) const {
   return Handles;
 }
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/buffer_impl.hpp b/sycl/source/detail/buffer_impl.hpp
index 4ccb10621d3dd..0e1b7b7dfb999 100644
--- a/sycl/source/detail/buffer_impl.hpp
+++ b/sycl/source/detail/buffer_impl.hpp
@@ -25,7 +25,7 @@
 #include <type_traits>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 // Forward declarations
 template <typename DataT, int Dimensions, access::mode AccessMode,
           access::target AccessTarget, access::placeholder IsPlaceholder,
@@ -172,5 +172,5 @@ class __SYCL_EXPORT buffer_impl final : public SYCLMemObjT {
 };
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/circular_buffer.hpp b/sycl/source/detail/circular_buffer.hpp
index 2a149e591b9a4..2bb70a806b30d 100644
--- a/sycl/source/detail/circular_buffer.hpp
+++ b/sycl/source/detail/circular_buffer.hpp
@@ -15,7 +15,7 @@
 #include <utility>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 // A partial implementation of a circular buffer: once its capacity is full,
@@ -95,5 +95,5 @@ template <typename T> class CircularBuffer {
 };
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/common.cpp b/sycl/source/detail/common.cpp
index aa441e157b389..6cef67e8c924c 100644
--- a/sycl/source/detail/common.cpp
+++ b/sycl/source/detail/common.cpp
@@ -10,7 +10,7 @@
 #include <sycl/detail/common_info.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 /// @brief CodeLocation information slot in thread local storage
 /// @details This structure is maintained by the SYCL runtime to manage the
@@ -91,5 +91,5 @@ std::vector<std::string> split_string(const std::string &str, char delimeter) {
 }
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/config.cpp b/sycl/source/detail/config.cpp
index 386f83054e446..a8238a4eb8b2e 100644
--- a/sycl/source/detail/config.cpp
+++ b/sycl/source/detail/config.cpp
@@ -17,7 +17,7 @@
 #include <limits>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 #ifndef SYCL_CONFIG_FILE_NAME
@@ -186,5 +186,5 @@ const std::array<std::pair<std::string, backend>, 8> &getSyclBeMap() {
 }
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/config.hpp b/sycl/source/detail/config.hpp
index febb5770a5b78..5664cd5c29121 100644
--- a/sycl/source/detail/config.hpp
+++ b/sycl/source/detail/config.hpp
@@ -24,7 +24,7 @@
 #include <utility>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 #ifdef DISABLE_CONFIG_FROM_ENV
@@ -611,5 +611,5 @@ template <> class SYCLConfig<SYCL_ENABLE_FUSION_CACHING> {
 #undef INVALID_CONFIG_EXCEPTION
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/context_impl.cpp b/sycl/source/detail/context_impl.cpp
index d9515db091379..a0b665d5f6490 100644
--- a/sycl/source/detail/context_impl.cpp
+++ b/sycl/source/detail/context_impl.cpp
@@ -26,7 +26,7 @@
 #include <algorithm>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 context_impl::context_impl(const device &Device, async_handler AsyncHandler,
@@ -496,5 +496,5 @@ context_impl::getProgramForHostPipe(const device &Device,
 }
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/context_impl.hpp b/sycl/source/detail/context_impl.hpp
index f0b8abd7e7f1f..4fee28493bd2a 100644
--- a/sycl/source/detail/context_impl.hpp
+++ b/sycl/source/detail/context_impl.hpp
@@ -25,7 +25,7 @@
 #include <set>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 // Forward declaration
 class device;
 namespace detail {
@@ -322,5 +322,5 @@ void GetCapabilitiesIntersectionSet(const std::vector<sycl::device> &Devices,
 }
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/context_info.hpp b/sycl/source/detail/context_info.hpp
index 319643ade9d03..ccb66811b8124 100644
--- a/sycl/source/detail/context_info.hpp
+++ b/sycl/source/detail/context_info.hpp
@@ -14,7 +14,7 @@
 #include <sycl/info/info_desc.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 template <typename Param>
@@ -30,5 +30,5 @@ typename Param::return_type get_context_info(sycl::detail::pi::PiContext Ctx,
 }
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/device_binary_image.cpp b/sycl/source/detail/device_binary_image.cpp
index 9d9c657550cec..3610f22d8519c 100644
--- a/sycl/source/detail/device_binary_image.cpp
+++ b/sycl/source/detail/device_binary_image.cpp
@@ -14,7 +14,7 @@
 #include <memory>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 std::ostream &operator<<(std::ostream &Out, const DeviceBinaryProperty &P) {
@@ -210,5 +210,5 @@ DynRTDeviceBinaryImage::~DynRTDeviceBinaryImage() {
 }
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/device_binary_image.hpp b/sycl/source/detail/device_binary_image.hpp
index 52836b24d140a..b2a74febe392f 100644
--- a/sycl/source/detail/device_binary_image.hpp
+++ b/sycl/source/detail/device_binary_image.hpp
@@ -16,7 +16,7 @@
 #include <memory>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 // A wrapper for passing around byte array properties
@@ -259,5 +259,5 @@ class DynRTDeviceBinaryImage : public RTDeviceBinaryImage {
 };
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/device_filter.cpp b/sycl/source/detail/device_filter.cpp
index fbe849f0ba250..99bbcad3d7a22 100644
--- a/sycl/source/detail/device_filter.cpp
+++ b/sycl/source/detail/device_filter.cpp
@@ -16,7 +16,7 @@
 #include <string_view>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 std::vector<std::string_view> tokenize(const std::string_view &Filter,
@@ -407,5 +407,5 @@ bool device_filter_list::deviceNumberCompatible(int DeviceNum) {
 }
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/device_global_map.cpp b/sycl/source/detail/device_global_map.cpp
index 952588745fc3b..2409a007fb274 100644
--- a/sycl/source/detail/device_global_map.cpp
+++ b/sycl/source/detail/device_global_map.cpp
@@ -9,7 +9,7 @@
 #include <detail/program_manager/program_manager.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail::device_global_map {
 
 __SYCL_EXPORT void add(const void *DeviceGlobalPtr, const char *UniqueId) {
@@ -18,5 +18,5 @@ __SYCL_EXPORT void add(const void *DeviceGlobalPtr, const char *UniqueId) {
 }
 
 } // namespace detail::device_global_map
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/device_global_map_entry.cpp b/sycl/source/detail/device_global_map_entry.cpp
index 89afd2ff5199a..eee46e0761ee0 100644
--- a/sycl/source/detail/device_global_map_entry.cpp
+++ b/sycl/source/detail/device_global_map_entry.cpp
@@ -14,7 +14,7 @@
 #include <detail/usm/usm_impl.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 DeviceGlobalUSMMem::~DeviceGlobalUSMMem() {
@@ -105,5 +105,5 @@ void DeviceGlobalMapEntry::removeAssociatedResources(
 }
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/device_global_map_entry.hpp b/sycl/source/detail/device_global_map_entry.hpp
index 2289ea54f330f..bf845f89fb8d3 100644
--- a/sycl/source/detail/device_global_map_entry.hpp
+++ b/sycl/source/detail/device_global_map_entry.hpp
@@ -19,7 +19,7 @@
 #include <sycl/detail/defines_elementary.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 // Forward declaration
@@ -123,5 +123,5 @@ struct DeviceGlobalMapEntry {
 };
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/device_image_impl.hpp b/sycl/source/detail/device_image_impl.hpp
index 841d9afb2319d..e1bdd7a77004f 100644
--- a/sycl/source/detail/device_image_impl.hpp
+++ b/sycl/source/detail/device_image_impl.hpp
@@ -29,7 +29,7 @@
 #include <vector>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 template <class T> struct LessByHash {
@@ -361,5 +361,5 @@ class device_image_impl {
 };
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/device_impl.cpp b/sycl/source/detail/device_impl.cpp
index 33147b61f95cc..5c1e854bff183 100644
--- a/sycl/source/detail/device_impl.cpp
+++ b/sycl/source/detail/device_impl.cpp
@@ -14,7 +14,7 @@
 #include <algorithm>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 device_impl::device_impl()
@@ -540,5 +540,5 @@ uint64_t device_impl::getCurrentDeviceTime() {
 }
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/device_impl.hpp b/sycl/source/detail/device_impl.hpp
index 1a13a97b35e05..8f5d727cefadc 100644
--- a/sycl/source/detail/device_impl.hpp
+++ b/sycl/source/detail/device_impl.hpp
@@ -20,7 +20,7 @@
 #include <utility>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 // Forward declaration
 class platform;
@@ -272,5 +272,5 @@ class device_impl {
 }; // class device_impl
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/device_info.hpp b/sycl/source/detail/device_info.hpp
index 900561288fcbe..0f086248269f2 100644
--- a/sycl/source/detail/device_info.hpp
+++ b/sycl/source/detail/device_info.hpp
@@ -27,7 +27,7 @@
 #include <thread>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 inline std::vector<info::fp_config> read_fp_bitfield(pi_device_fp_config bits) {
@@ -1822,5 +1822,5 @@ get_device_info_host<ext::oneapi::experimental::info::device::graph_support>() {
 }
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/error_handling/error_handling.cpp b/sycl/source/detail/error_handling/error_handling.cpp
index bde902e5381cd..f7ab280c6fa7f 100644
--- a/sycl/source/detail/error_handling/error_handling.cpp
+++ b/sycl/source/detail/error_handling/error_handling.cpp
@@ -17,7 +17,7 @@
 #include <sycl/detail/pi.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail::enqueue_kernel_launch {
 
 void handleInvalidWorkGroupSize(const device_impl &DeviceImpl, pi_kernel Kernel,
@@ -437,5 +437,5 @@ void handleErrorOrWarning(pi_result Error, pi_kernel_group_info Descriptor,
 }
 } // namespace detail::kernel_get_group_info
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/error_handling/error_handling.hpp b/sycl/source/detail/error_handling/error_handling.hpp
index f634a1a5e40df..49bad6f2a5e33 100644
--- a/sycl/source/detail/error_handling/error_handling.hpp
+++ b/sycl/source/detail/error_handling/error_handling.hpp
@@ -13,7 +13,7 @@
 #include <sycl/detail/pi.h>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 namespace enqueue_kernel_launch {
@@ -35,5 +35,5 @@ void handleErrorOrWarning(pi_result, pi_kernel_group_info, const PluginPtr &);
 } // namespace kernel_get_group_info
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/event_impl.cpp b/sycl/source/detail/event_impl.cpp
index 22e0cfb083889..85893d0c1a14d 100644
--- a/sycl/source/detail/event_impl.cpp
+++ b/sycl/source/detail/event_impl.cpp
@@ -26,7 +26,7 @@
 #endif
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 #ifdef XPTI_ENABLE_INSTRUMENTATION
 extern xpti::trace_event_data_t *GSYCLGraphEvent;
@@ -464,5 +464,5 @@ bool event_impl::isCompleted() {
 }
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/event_impl.hpp b/sycl/source/detail/event_impl.hpp
index 660f6bdf1bb9d..4259ab803b3be 100644
--- a/sycl/source/detail/event_impl.hpp
+++ b/sycl/source/detail/event_impl.hpp
@@ -22,7 +22,7 @@
 #include <optional>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::oneapi::experimental::detail {
 class graph_impl;
 }
@@ -339,5 +339,5 @@ class event_impl {
 };
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/event_info.hpp b/sycl/source/detail/event_info.hpp
index ae9da36222fc1..05aaed8a36adb 100644
--- a/sycl/source/detail/event_info.hpp
+++ b/sycl/source/detail/event_info.hpp
@@ -15,7 +15,7 @@
 #include <sycl/info/info_desc.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 template <typename Param>
@@ -44,5 +44,5 @@ typename Param::return_type get_event_info(sycl::detail::pi::PiEvent Event,
 }
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/filter_selector_impl.cpp b/sycl/source/detail/filter_selector_impl.cpp
index 506518d887509..8e9dce1f19356 100644
--- a/sycl/source/detail/filter_selector_impl.cpp
+++ b/sycl/source/detail/filter_selector_impl.cpp
@@ -20,7 +20,7 @@
 #include <vector>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::oneapi::detail {
 
 std::vector<std::string> tokenize(const std::string &Filter,
@@ -170,5 +170,5 @@ void filter_selector_impl::reset() const {
 namespace __SYCL2020_DEPRECATED("use 'ext::oneapi' instead") ONEAPI {
 using namespace ext::oneapi;
 }
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/filter_selector_impl.hpp b/sycl/source/detail/filter_selector_impl.hpp
index 02c0b65c2c8a2..560a46524a1d6 100644
--- a/sycl/source/detail/filter_selector_impl.hpp
+++ b/sycl/source/detail/filter_selector_impl.hpp
@@ -14,7 +14,7 @@
 #include <vector>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 // Forward declarations
 class device;
@@ -45,5 +45,5 @@ class filter_selector_impl {
 namespace __SYCL2020_DEPRECATED("use 'ext::oneapi' instead") ONEAPI {
 using namespace ext::oneapi;
 }
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/fusion/fusion_wrapper.cpp b/sycl/source/detail/fusion/fusion_wrapper.cpp
index 708351fae4cfd..c5ae26d266d9b 100644
--- a/sycl/source/detail/fusion/fusion_wrapper.cpp
+++ b/sycl/source/detail/fusion/fusion_wrapper.cpp
@@ -12,7 +12,7 @@
 #include <detail/queue_impl.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::codeplay::experimental {
 
 fusion_wrapper::fusion_wrapper(queue &Queue) {
@@ -42,5 +42,5 @@ event fusion_wrapper::complete_fusion(const property_list &PropList) {
 }
 
 } // namespace ext::codeplay::experimental
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/fusion/fusion_wrapper_impl.cpp b/sycl/source/detail/fusion/fusion_wrapper_impl.cpp
index 92130f76fd2ad..492b0bc4aa852 100644
--- a/sycl/source/detail/fusion/fusion_wrapper_impl.cpp
+++ b/sycl/source/detail/fusion/fusion_wrapper_impl.cpp
@@ -11,7 +11,7 @@
 #include <detail/scheduler/scheduler.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 fusion_wrapper_impl::fusion_wrapper_impl(
@@ -41,5 +41,5 @@ event fusion_wrapper_impl::complete_fusion(const property_list &PropList) {
 }
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/fusion/fusion_wrapper_impl.hpp b/sycl/source/detail/fusion/fusion_wrapper_impl.hpp
index fe6365e300f54..dec5f6d0c9bc7 100644
--- a/sycl/source/detail/fusion/fusion_wrapper_impl.hpp
+++ b/sycl/source/detail/fusion/fusion_wrapper_impl.hpp
@@ -11,7 +11,7 @@
 #include <detail/queue_impl.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 class fusion_wrapper_impl {
 public:
@@ -31,5 +31,5 @@ class fusion_wrapper_impl {
   std::shared_ptr<detail::queue_impl> MQueue;
 };
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/global_handler.cpp b/sycl/source/detail/global_handler.cpp
index d1fef23699272..a03d6a03b54e9 100644
--- a/sycl/source/detail/global_handler.cpp
+++ b/sycl/source/detail/global_handler.cpp
@@ -30,7 +30,7 @@
 #include <vector>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 using LockGuard = std::lock_guard<SpinLock>;
@@ -375,5 +375,5 @@ extern "C" __SYCL_EXPORT BOOL WINAPI DllMain(HINSTANCE hinstDLL,
 __attribute__((destructor(110))) static void syclUnload() { shutdown(); }
 #endif
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/global_handler.hpp b/sycl/source/detail/global_handler.hpp
index e9c695934f070..70337a9dc1511 100644
--- a/sycl/source/detail/global_handler.hpp
+++ b/sycl/source/detail/global_handler.hpp
@@ -15,7 +15,7 @@
 #include <unordered_map>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 class platform_impl;
 class context_impl;
@@ -126,5 +126,5 @@ class GlobalHandler {
   InstWithLock<ThreadPool> MHostTaskThreadPool;
 };
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/graph_impl.cpp b/sycl/source/detail/graph_impl.cpp
index a6eb5d7eaba6f..1a4f07285fe4b 100644
--- a/sycl/source/detail/graph_impl.cpp
+++ b/sycl/source/detail/graph_impl.cpp
@@ -20,7 +20,7 @@
 #define FORCE_EMULATION_MODE 0
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 namespace ext {
 namespace oneapi {
@@ -611,5 +611,5 @@ void executable_command_graph::update(
 } // namespace experimental
 } // namespace oneapi
 } // namespace ext
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/graph_impl.hpp b/sycl/source/detail/graph_impl.hpp
index 51c59db9a71c9..1972d19b261ad 100644
--- a/sycl/source/detail/graph_impl.hpp
+++ b/sycl/source/detail/graph_impl.hpp
@@ -22,7 +22,7 @@
 #include <set>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 namespace ext {
 namespace oneapi {
@@ -429,5 +429,5 @@ class exec_graph_impl {
 } // namespace experimental
 } // namespace oneapi
 } // namespace ext
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/handler_impl.hpp b/sycl/source/detail/handler_impl.hpp
index 744035650e710..0efca386b17d3 100644
--- a/sycl/source/detail/handler_impl.hpp
+++ b/sycl/source/detail/handler_impl.hpp
@@ -13,7 +13,7 @@
 #include <memory>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 using KernelBundleImplPtr = std::shared_ptr<detail::kernel_bundle_impl>;
@@ -107,5 +107,5 @@ class handler_impl {
 };
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/handler_proxy.cpp b/sycl/source/detail/handler_proxy.cpp
index 34d6214922fc5..05ea058cc5d3b 100644
--- a/sycl/source/detail/handler_proxy.cpp
+++ b/sycl/source/detail/handler_proxy.cpp
@@ -11,7 +11,7 @@
 #include <sycl/handler.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 void associateWithHandler(handler &CGH, AccessorBaseHost *Acc,
@@ -30,5 +30,5 @@ void associateWithHandler(handler &CGH, SampledImageAccessorBaseHost *Acc,
 }
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/helpers.cpp b/sycl/source/detail/helpers.cpp
index 363f4cb56de38..4103653d236a7 100644
--- a/sycl/source/detail/helpers.cpp
+++ b/sycl/source/detail/helpers.cpp
@@ -18,7 +18,7 @@
 #include <memory>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 using ContextImplPtr = std::shared_ptr<sycl::detail::context_impl>;
 namespace detail {
 std::vector<sycl::detail::pi::PiEvent>
@@ -69,5 +69,5 @@ void markBufferAsInternal(const std::shared_ptr<buffer_impl> &BufImpl) {
 }
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/host_pipe_map.cpp b/sycl/source/detail/host_pipe_map.cpp
index 3b0315e7f00b2..5b2d9d6ad5a5d 100644
--- a/sycl/source/detail/host_pipe_map.cpp
+++ b/sycl/source/detail/host_pipe_map.cpp
@@ -9,7 +9,7 @@
 #include <detail/program_manager/program_manager.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 namespace host_pipe_map {
 
@@ -20,5 +20,5 @@ __SYCL_EXPORT void add(const void *HostPipePtr, const char *UniqueId) {
 
 } // namespace host_pipe_map
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/host_pipe_map_entry.hpp b/sycl/source/detail/host_pipe_map_entry.hpp
index 0191a29b983f5..e27581df32a6f 100644
--- a/sycl/source/detail/host_pipe_map_entry.hpp
+++ b/sycl/source/detail/host_pipe_map_entry.hpp
@@ -13,7 +13,7 @@
 #include <unordered_map>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 struct HostPipeMapEntry {
@@ -57,5 +57,5 @@ struct HostPipeMapEntry {
 };
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/image_accessor_util.cpp b/sycl/source/detail/image_accessor_util.cpp
index 322c4f8baa8a4..246ab9db9290b 100644
--- a/sycl/source/detail/image_accessor_util.cpp
+++ b/sycl/source/detail/image_accessor_util.cpp
@@ -10,7 +10,7 @@
 #include <sycl/builtins.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 // For Nearest Filtering mode, process float4 Coordinates and
@@ -184,5 +184,5 @@ float4 getBorderColor(const image_channel_order ImgChannelOrder) {
 }
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/image_impl.cpp b/sycl/source/detail/image_impl.cpp
index dcde60b4b485a..0b512ae1aedbe 100644
--- a/sycl/source/detail/image_impl.cpp
+++ b/sycl/source/detail/image_impl.cpp
@@ -15,7 +15,7 @@
 #include <vector>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 #ifdef XPTI_ENABLE_INSTRUMENTATION
 uint8_t GImageStreamID;
@@ -500,5 +500,5 @@ void image_impl::unsampledImageDestructorNotification(void *UserObj) {
 }
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/image_impl.hpp b/sycl/source/detail/image_impl.hpp
index 042f859bf7d31..4505517064938 100644
--- a/sycl/source/detail/image_impl.hpp
+++ b/sycl/source/detail/image_impl.hpp
@@ -22,7 +22,7 @@
 #include <sycl/stl.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 // forward declarations
 enum class image_channel_order : unsigned int;
@@ -350,5 +350,5 @@ class __SYCL_EXPORT image_impl final : public SYCLMemObjT {
   std::optional<image_sampler> MSampler = std::nullopt;
 };
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/jit_compiler.cpp b/sycl/source/detail/jit_compiler.cpp
index ce550ee8456f3..b1e13d7d8237d 100644
--- a/sycl/source/detail/jit_compiler.cpp
+++ b/sycl/source/detail/jit_compiler.cpp
@@ -19,7 +19,7 @@
 #include <sycl/kernel_bundle.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 jit_compiler::jit_compiler() : MJITContext{new ::jit_compiler::JITContext{}} {}
@@ -1009,7 +1009,7 @@ std::vector<uint8_t> jit_compiler::encodeReqdWorkGroupSize(
 }
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 #endif // SYCL_EXT_CODEPLAY_KERNEL_FUSION
diff --git a/sycl/source/detail/jit_compiler.hpp b/sycl/source/detail/jit_compiler.hpp
index feca2a8f18265..307f784904704 100644
--- a/sycl/source/detail/jit_compiler.hpp
+++ b/sycl/source/detail/jit_compiler.hpp
@@ -26,7 +26,7 @@ struct pi_device_binaries_struct;
 struct _pi_offload_entry_struct;
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 class jit_compiler {
@@ -66,5 +66,5 @@ class jit_compiler {
 };
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/jit_device_binaries.cpp b/sycl/source/detail/jit_device_binaries.cpp
index d0cc9e824bc07..a206eed5d12bf 100644
--- a/sycl/source/detail/jit_device_binaries.cpp
+++ b/sycl/source/detail/jit_device_binaries.cpp
@@ -9,7 +9,7 @@
 #include <detail/jit_device_binaries.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 OffloadEntryContainer::OffloadEntryContainer(const std::string &Name,
@@ -134,5 +134,5 @@ pi_device_binaries DeviceBinariesCollection::getPIDeviceStruct() {
 }
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/jit_device_binaries.hpp b/sycl/source/detail/jit_device_binaries.hpp
index cecab17870650..dd52f10aeea67 100644
--- a/sycl/source/detail/jit_device_binaries.hpp
+++ b/sycl/source/detail/jit_device_binaries.hpp
@@ -13,7 +13,7 @@
 #include <sycl/detail/pi.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 /// Representation of _pi_offload_entry for creation of JIT device binaries at
@@ -151,5 +151,5 @@ class DeviceBinariesCollection {
 };
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/kernel_arg_mask.hpp b/sycl/source/detail/kernel_arg_mask.hpp
index 196d912f7571d..e26202eaa9cea 100644
--- a/sycl/source/detail/kernel_arg_mask.hpp
+++ b/sycl/source/detail/kernel_arg_mask.hpp
@@ -11,7 +11,7 @@
 #include <vector>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 using KernelArgMask = std::vector<bool>;
 inline KernelArgMask createKernelArgMask(const ByteArray &Bytes) {
@@ -31,5 +31,5 @@ inline KernelArgMask createKernelArgMask(const ByteArray &Bytes) {
   return Result;
 }
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/kernel_bundle_impl.hpp b/sycl/source/detail/kernel_bundle_impl.hpp
index bfe48a1569679..a990a1efe579b 100644
--- a/sycl/source/detail/kernel_bundle_impl.hpp
+++ b/sycl/source/detail/kernel_bundle_impl.hpp
@@ -25,7 +25,7 @@
 #include <vector>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 static bool checkAllDevicesAreInContext(const std::vector<device> &Devices,
@@ -521,5 +521,5 @@ class kernel_bundle_impl {
 };
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/kernel_id_impl.hpp b/sycl/source/detail/kernel_id_impl.hpp
index ed6e53b33e1a5..2512e173eaad4 100644
--- a/sycl/source/detail/kernel_id_impl.hpp
+++ b/sycl/source/detail/kernel_id_impl.hpp
@@ -9,7 +9,7 @@
 #pragma once
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 // Used for sorting vector of kernel_id's
@@ -42,5 +42,5 @@ class kernel_id_impl {
 };
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/kernel_impl.cpp b/sycl/source/detail/kernel_impl.cpp
index b773a750d174b..5326b70ca3b02 100644
--- a/sycl/source/detail/kernel_impl.cpp
+++ b/sycl/source/detail/kernel_impl.cpp
@@ -14,7 +14,7 @@
 #include <memory>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 kernel_impl::kernel_impl(sycl::detail::pi::PiKernel Kernel,
@@ -127,5 +127,5 @@ void kernel_impl::checkIfValidForNumArgsInfoQuery() const {
 }
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/kernel_impl.hpp b/sycl/source/detail/kernel_impl.hpp
index d2c8eaf2e1bf8..5cbc6649aacfb 100644
--- a/sycl/source/detail/kernel_impl.hpp
+++ b/sycl/source/detail/kernel_impl.hpp
@@ -22,7 +22,7 @@
 #include <memory>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 // Forward declaration
 class program_impl;
@@ -256,5 +256,5 @@ kernel_impl::get_info(const device &Device,
 }
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/kernel_info.hpp b/sycl/source/detail/kernel_info.hpp
index ff711f72573a0..c8a186cde8d64 100644
--- a/sycl/source/detail/kernel_info.hpp
+++ b/sycl/source/detail/kernel_info.hpp
@@ -19,7 +19,7 @@
 #include <type_traits>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 template <typename Param>
@@ -212,5 +212,5 @@ inline uint32_t get_kernel_device_specific_info_host<
                              PI_ERROR_INVALID_KERNEL);
 }
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/kernel_program_cache.cpp b/sycl/source/detail/kernel_program_cache.cpp
index 2dafda430f527..f3c7d3b728b01 100644
--- a/sycl/source/detail/kernel_program_cache.cpp
+++ b/sycl/source/detail/kernel_program_cache.cpp
@@ -11,7 +11,7 @@
 #include <detail/plugin.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 KernelProgramCache::~KernelProgramCache() {
   for (auto &ProgIt : MCachedPrograms.Cache) {
@@ -41,5 +41,5 @@ KernelProgramCache::~KernelProgramCache() {
   }
 }
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/kernel_program_cache.hpp b/sycl/source/detail/kernel_program_cache.hpp
index 67ea5ab77533b..d2cf9b507a3b6 100644
--- a/sycl/source/detail/kernel_program_cache.hpp
+++ b/sycl/source/detail/kernel_program_cache.hpp
@@ -26,7 +26,7 @@
 class MockKernelProgramCache;
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 class context_impl;
 class KernelProgramCache {
@@ -208,5 +208,5 @@ class KernelProgramCache {
   friend class ::MockKernelProgramCache;
 };
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/mem_alloc_helper.hpp b/sycl/source/detail/mem_alloc_helper.hpp
index 64bb619423260..517058d9dece4 100644
--- a/sycl/source/detail/mem_alloc_helper.hpp
+++ b/sycl/source/detail/mem_alloc_helper.hpp
@@ -11,7 +11,7 @@
 #include <sycl/detail/pi.h>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 void memBufferCreateHelper(const PluginPtr &Plugin, pi_context Ctx,
                            pi_mem_flags Flags, size_t Size, void *HostPtr,
@@ -29,5 +29,5 @@ void memUnmapHelper(const PluginPtr &Plugin, pi_queue command_queue,
                     pi_uint32 num_events_in_wait_list,
                     const pi_event *event_wait_list, pi_event *event);
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/memory_manager.cpp b/sycl/source/detail/memory_manager.cpp
index b3c76220c9e1b..9591f08a5f568 100644
--- a/sycl/source/detail/memory_manager.cpp
+++ b/sycl/source/detail/memory_manager.cpp
@@ -26,7 +26,7 @@
 #endif
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 #ifdef XPTI_ENABLE_INSTRUMENTATION
@@ -1433,5 +1433,5 @@ void MemoryManager::ext_oneapi_copy_usm_cmd_buffer(
 }
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/memory_manager.hpp b/sycl/source/detail/memory_manager.hpp
index 87cacdd830336..a824e70deee3e 100644
--- a/sycl/source/detail/memory_manager.hpp
+++ b/sycl/source/detail/memory_manager.hpp
@@ -19,7 +19,7 @@
 #include <vector>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 class queue_impl;
@@ -229,5 +229,5 @@ class __SYCL_EXPORT MemoryManager {
       sycl::detail::pi::PiExtSyncPoint *OutSyncPoint);
 };
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/online_compiler/online_compiler.cpp b/sycl/source/detail/online_compiler/online_compiler.cpp
index 8980c30e531e8..2e5b3ce8f8807 100644
--- a/sycl/source/detail/online_compiler/online_compiler.cpp
+++ b/sycl/source/detail/online_compiler/online_compiler.cpp
@@ -15,7 +15,7 @@
 #include "ocloc_api.h"
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext::intel::experimental {
 namespace detail {
 
@@ -247,5 +247,5 @@ namespace __SYCL2020_DEPRECATED(
     "use 'ext::intel::experimental' instead") INTEL {
 using namespace ext::intel::experimental;
 }
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/os_util.cpp b/sycl/source/detail/os_util.cpp
index d2e07da03271f..dde34762843f8 100644
--- a/sycl/source/detail/os_util.cpp
+++ b/sycl/source/detail/os_util.cpp
@@ -43,7 +43,7 @@
 #endif // __SYCL_RT_OS
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 #if defined(__SYCL_RT_OS_LINUX)
@@ -275,5 +275,5 @@ int OSUtil::makeDir(const char *Dir) {
 }
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/persistent_device_code_cache.cpp b/sycl/source/detail/persistent_device_code_cache.cpp
index dbd6a3d48b8e0..f00af7ea605a0 100644
--- a/sycl/source/detail/persistent_device_code_cache.cpp
+++ b/sycl/source/detail/persistent_device_code_cache.cpp
@@ -23,7 +23,7 @@
 #endif
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 /* Lock file suffix */
@@ -369,5 +369,5 @@ std::string PersistentDeviceCodeCache::getRootDir() {
 }
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/persistent_device_code_cache.hpp b/sycl/source/detail/persistent_device_code_cache.hpp
index c8f34e5510aef..323d52b859579 100644
--- a/sycl/source/detail/persistent_device_code_cache.hpp
+++ b/sycl/source/detail/persistent_device_code_cache.hpp
@@ -21,7 +21,7 @@
 #include <vector>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 /* This is temporary solution until std::filesystem is available when SYCL RT
@@ -192,5 +192,5 @@ class PersistentDeviceCodeCache {
   }
 };
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/pi.cpp b/sycl/source/detail/pi.cpp
index 557bda763b70d..33dfdaf005e41 100644
--- a/sycl/source/detail/pi.cpp
+++ b/sycl/source/detail/pi.cpp
@@ -39,7 +39,7 @@
 #endif
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 #ifdef XPTI_ENABLE_INSTRUMENTATION
 // Global (to the SYCL runtime) graph handle that all command groups are a
@@ -710,5 +710,5 @@ getBinaryImageFormat(const unsigned char *ImgData, size_t ImgSize) {
 
 } // namespace pi
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/pi_utils.hpp b/sycl/source/detail/pi_utils.hpp
index cdc096b621987..877cbd0d14e52 100644
--- a/sycl/source/detail/pi_utils.hpp
+++ b/sycl/source/detail/pi_utils.hpp
@@ -15,7 +15,7 @@
 #include <optional>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 // RAII object for keeping ownership of a PI event.
@@ -63,5 +63,5 @@ struct OwnedPiEvent {
 };
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/pipes.cpp b/sycl/source/detail/pipes.cpp
index 9b8b805a07662..64c8df4e52984 100755
--- a/sycl/source/detail/pipes.cpp
+++ b/sycl/source/detail/pipes.cpp
@@ -11,7 +11,7 @@
 #include <sycl/ext/intel/experimental/pipes.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace ext {
 namespace intel {
 namespace experimental {
@@ -25,5 +25,5 @@ __SYCL_EXPORT std::string pipe_base::get_pipe_name(const void *HostPipePtr) {
 } // namespace experimental
 } // namespace intel
 } // namespace ext
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/platform_impl.cpp b/sycl/source/detail/platform_impl.cpp
index da057900ff53e..7ccbd43771c65 100644
--- a/sycl/source/detail/platform_impl.cpp
+++ b/sycl/source/detail/platform_impl.cpp
@@ -25,7 +25,7 @@
 #include <vector>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 using PlatformImplPtr = std::shared_ptr<platform_impl>;
@@ -665,5 +665,5 @@ platform_impl::getDeviceImplHelper(sycl::detail::pi::PiDevice PiDevice) {
 #undef __SYCL_PARAM_TRAITS_SPEC
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/platform_impl.hpp b/sycl/source/detail/platform_impl.hpp
index a9dd32598ab13..3b08d39ad3738 100644
--- a/sycl/source/detail/platform_impl.hpp
+++ b/sycl/source/detail/platform_impl.hpp
@@ -19,7 +19,7 @@
 #include <sycl/stl.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 // Forward declaration
 class device_selector;
@@ -237,5 +237,5 @@ class platform_impl {
 };
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/platform_info.hpp b/sycl/source/detail/platform_info.hpp
index 2f2e54d209ca0..778da1cf4247c 100644
--- a/sycl/source/detail/platform_info.hpp
+++ b/sycl/source/detail/platform_info.hpp
@@ -15,7 +15,7 @@
 #include <sycl/info/info_desc.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 inline std::string
@@ -89,5 +89,5 @@ get_platform_info_host<info::platform::extensions>() {
 }
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/platform_util.cpp b/sycl/source/detail/platform_util.cpp
index a8ec01e3a9e48..09250ca13d7cf 100644
--- a/sycl/source/detail/platform_util.cpp
+++ b/sycl/source/detail/platform_util.cpp
@@ -25,7 +25,7 @@
 #endif
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 #if defined(__x86_64__) || defined(__i386__)
@@ -152,5 +152,5 @@ void PlatformUtil::prefetch(const char *Ptr, size_t NumBytes) {
 }
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/platform_util.hpp b/sycl/source/detail/platform_util.hpp
index 02a5ecf30d23f..cd9353198d08a 100644
--- a/sycl/source/detail/platform_util.hpp
+++ b/sycl/source/detail/platform_util.hpp
@@ -20,7 +20,7 @@
 #endif
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 struct PlatformUtil {
@@ -47,5 +47,5 @@ struct PlatformUtil {
 };
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/plugin.hpp b/sycl/source/detail/plugin.hpp
index 47c1fe2cc34b6..bcc2d8ef71193 100644
--- a/sycl/source/detail/plugin.hpp
+++ b/sycl/source/detail/plugin.hpp
@@ -23,7 +23,7 @@
 #endif
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 #ifdef XPTI_ENABLE_INSTRUMENTATION
 extern xpti::trace_event_data_t *GPICallEvent;
@@ -310,5 +310,5 @@ class plugin {
 using PluginPtr = std::shared_ptr<plugin>;
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/plugin_printers.hpp b/sycl/source/detail/plugin_printers.hpp
index 541569841022b..0da8e1c0efc26 100644
--- a/sycl/source/detail/plugin_printers.hpp
+++ b/sycl/source/detail/plugin_printers.hpp
@@ -15,7 +15,7 @@
 #include <type_traits>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 namespace pi {
 
@@ -178,5 +178,5 @@ void printOuts(Arg0 arg0, Args... args) {
 
 } // namespace pi
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/posix_pi.cpp b/sycl/source/detail/posix_pi.cpp
index ede90e96a1324..e72f4d8b0af2f 100644
--- a/sycl/source/detail/posix_pi.cpp
+++ b/sycl/source/detail/posix_pi.cpp
@@ -14,7 +14,7 @@
 #include <string>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail::pi {
 
 void *loadOsLibrary(const std::string &LibraryPath) {
@@ -49,5 +49,5 @@ void *getOsLibraryFuncAddress(void *Library, const std::string &FunctionName) {
 }
 
 } // namespace detail::pi
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/program_impl.cpp b/sycl/source/detail/program_impl.cpp
index 43f9399fae10e..ecb0096e6261d 100644
--- a/sycl/source/detail/program_impl.cpp
+++ b/sycl/source/detail/program_impl.cpp
@@ -23,7 +23,7 @@
 #include <mutex>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 program_impl::program_impl(ContextImplPtr Context,
@@ -518,5 +518,5 @@ pi_native_handle program_impl::getNative() const {
 }
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/program_impl.hpp b/sycl/source/detail/program_impl.hpp
index b86cda17fe3c4..a951f3dbbe59b 100644
--- a/sycl/source/detail/program_impl.hpp
+++ b/sycl/source/detail/program_impl.hpp
@@ -24,7 +24,7 @@
 #include <mutex>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 // Forward declarations
 class kernel;
@@ -402,5 +402,5 @@ class program_impl {
 };
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/program_manager/program_manager.cpp b/sycl/source/detail/program_manager/program_manager.cpp
index d1d2b6eea1e3a..a45a43e6bad94 100644
--- a/sycl/source/detail/program_manager/program_manager.cpp
+++ b/sycl/source/detail/program_manager/program_manager.cpp
@@ -43,7 +43,7 @@
 #include <variant>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 using ContextImplPtr = std::shared_ptr<sycl::detail::context_impl>;
@@ -2552,7 +2552,7 @@ bool doesDevSupportDeviceRequirements(const device &Dev,
 }
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 extern "C" void __sycl_register_lib(pi_device_binaries desc) {
diff --git a/sycl/source/detail/program_manager/program_manager.hpp b/sycl/source/detail/program_manager/program_manager.hpp
index 7e48138e51934..b2640cfc065de 100644
--- a/sycl/source/detail/program_manager/program_manager.hpp
+++ b/sycl/source/detail/program_manager/program_manager.hpp
@@ -45,7 +45,7 @@ extern "C" __SYCL_EXPORT void __sycl_unregister_lib(pi_device_binaries desc);
 // +++ }
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 class context;
 namespace detail {
 
@@ -443,5 +443,5 @@ class ProgramManager {
   std::mutex m_HostPipesMutex;
 };
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/queue_impl.cpp b/sycl/source/detail/queue_impl.cpp
index 9be486bba066b..8760904ed6724 100644
--- a/sycl/source/detail/queue_impl.cpp
+++ b/sycl/source/detail/queue_impl.cpp
@@ -24,7 +24,7 @@
 #endif
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 template <>
 uint32_t queue_impl::get_info<info::queue::reference_count>() const {
@@ -582,5 +582,5 @@ bool queue_impl::ext_oneapi_empty() const {
 }
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/queue_impl.hpp b/sycl/source/detail/queue_impl.hpp
index a30a46bde31e0..cf3e06e5e8e30 100644
--- a/sycl/source/detail/queue_impl.hpp
+++ b/sycl/source/detail/queue_impl.hpp
@@ -42,7 +42,7 @@
 #endif
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 // forward declaration
 
@@ -874,5 +874,5 @@ class queue_impl {
 };
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/reduction.cpp b/sycl/source/detail/reduction.cpp
index 47ba843243cda..d2b858aabdf74 100644
--- a/sycl/source/detail/reduction.cpp
+++ b/sycl/source/detail/reduction.cpp
@@ -11,7 +11,7 @@
 #include <sycl/reduction.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 // TODO: The algorithm of choosing the work-group size is definitely
@@ -166,5 +166,5 @@ __SYCL_EXPORT size_t reduGetPreferredWGSize(std::shared_ptr<queue_impl> &Queue,
 }
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/sampler_impl.cpp b/sycl/source/detail/sampler_impl.cpp
index d942801d722b8..33774ec38ef47 100644
--- a/sycl/source/detail/sampler_impl.cpp
+++ b/sycl/source/detail/sampler_impl.cpp
@@ -11,7 +11,7 @@
 #include <sycl/property_list.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 sampler_impl::sampler_impl(coordinate_normalization_mode normalizationMode,
@@ -94,5 +94,5 @@ sampler_impl::get_coordinate_normalization_mode() const {
 }
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/sampler_impl.hpp b/sycl/source/detail/sampler_impl.hpp
index 07a79a21cd64b..7b3878e149ff9 100644
--- a/sycl/source/detail/sampler_impl.hpp
+++ b/sycl/source/detail/sampler_impl.hpp
@@ -18,7 +18,7 @@
 #include <unordered_map>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 enum class addressing_mode : unsigned int;
 enum class filtering_mode : unsigned int;
@@ -73,5 +73,5 @@ class __SYCL_EXPORT sampler_impl {
 };
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/scheduler/commands.cpp b/sycl/source/detail/scheduler/commands.cpp
index 3b40edd1961bc..bb3c7072c0157 100644
--- a/sycl/source/detail/scheduler/commands.cpp
+++ b/sycl/source/detail/scheduler/commands.cpp
@@ -49,7 +49,7 @@
 #endif
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 #ifdef XPTI_ENABLE_INSTRUMENTATION
@@ -3182,5 +3182,5 @@ void KernelFusionCommand::printDot(std::ostream &Stream) const {
 }
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/scheduler/commands.hpp b/sycl/source/detail/scheduler/commands.hpp
index d444dfb6dc5df..db47cc9e9b4ce 100644
--- a/sycl/source/detail/scheduler/commands.hpp
+++ b/sycl/source/detail/scheduler/commands.hpp
@@ -24,7 +24,7 @@
 #include <sycl/detail/cg.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 #ifdef XPTI_ENABLE_INSTRUMENTATION
@@ -767,5 +767,5 @@ void applyFuncOnFilteredArgs(
 void ReverseRangeDimensionsForKernel(NDRDescT &NDR);
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/scheduler/graph_builder.cpp b/sycl/source/detail/scheduler/graph_builder.cpp
index 3e4dc1d862195..bc1822ba532a7 100644
--- a/sycl/source/detail/scheduler/graph_builder.cpp
+++ b/sycl/source/detail/scheduler/graph_builder.cpp
@@ -31,7 +31,7 @@
 #include <vector>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 /// Checks whether two requirements overlap or not.
@@ -1632,5 +1632,5 @@ bool Scheduler::GraphBuilder::isInFusionMode(QueueIdT Id) {
 }
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/scheduler/graph_processor.cpp b/sycl/source/detail/scheduler/graph_processor.cpp
index 885aa6edfeeeb..f22913f990e9c 100644
--- a/sycl/source/detail/scheduler/graph_processor.cpp
+++ b/sycl/source/detail/scheduler/graph_processor.cpp
@@ -14,7 +14,7 @@
 #include <vector>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 static Command *getCommand(const EventImplPtr &Event) {
@@ -158,5 +158,5 @@ bool Scheduler::GraphProcessor::enqueueCommand(
 }
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/scheduler/leaves_collection.cpp b/sycl/source/detail/scheduler/leaves_collection.cpp
index 586baf973ff98..aadf2e35483f0 100644
--- a/sycl/source/detail/scheduler/leaves_collection.cpp
+++ b/sycl/source/detail/scheduler/leaves_collection.cpp
@@ -12,7 +12,7 @@
 #include <algorithm>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 // TODO merge with GraphBuilder's version of doOverlap (see graph_builder.cpp).
@@ -145,5 +145,5 @@ size_t LeavesCollection::eraseHostAccessorCommand(EmptyCommand *Cmd) {
 }
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/scheduler/leaves_collection.hpp b/sycl/source/detail/scheduler/leaves_collection.hpp
index c8f73645fcb06..300a7c7657778 100644
--- a/sycl/source/detail/scheduler/leaves_collection.hpp
+++ b/sycl/source/detail/scheduler/leaves_collection.hpp
@@ -17,7 +17,7 @@
 #include <utility>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 struct MemObjRecord;
@@ -272,5 +272,5 @@ class LeavesCollection {
 };
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/scheduler/scheduler.cpp b/sycl/source/detail/scheduler/scheduler.cpp
index 17a4936c0a398..da2579a80a645 100644
--- a/sycl/source/detail/scheduler/scheduler.cpp
+++ b/sycl/source/detail/scheduler/scheduler.cpp
@@ -22,7 +22,7 @@
 #include <vector>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 bool Scheduler::checkLeavesCompletion(MemObjRecord *Record) {
@@ -620,5 +620,5 @@ KernelFusionCommand *Scheduler::isPartOfActiveFusion(Command *Cmd) {
 }
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/scheduler/scheduler.hpp b/sycl/source/detail/scheduler/scheduler.hpp
index de16bb389c754..0681f5f80cff2 100644
--- a/sycl/source/detail/scheduler/scheduler.hpp
+++ b/sycl/source/detail/scheduler/scheduler.hpp
@@ -172,7 +172,7 @@
 class MockScheduler;
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 class queue_impl;
 class event_impl;
@@ -896,5 +896,5 @@ class Scheduler {
 };
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/spec_constant_impl.cpp b/sycl/source/detail/spec_constant_impl.cpp
index ba661577920ca..13fbf9fcc9bdd 100644
--- a/sycl/source/detail/spec_constant_impl.cpp
+++ b/sycl/source/detail/spec_constant_impl.cpp
@@ -17,7 +17,7 @@
 #include <cstring>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 void spec_constant_impl::set(size_t Size, const void *Val) {
@@ -50,5 +50,5 @@ std::ostream &operator<<(std::ostream &Out, const spec_constant_impl &V) {
 }
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/spec_constant_impl.hpp b/sycl/source/detail/spec_constant_impl.hpp
index 4db3a130d8492..b576cc243b542 100644
--- a/sycl/source/detail/spec_constant_impl.hpp
+++ b/sycl/source/detail/spec_constant_impl.hpp
@@ -17,7 +17,7 @@
 #include <vector>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 // Represents a specialization constant value in SYCL runtime.
@@ -47,5 +47,5 @@ void stableSerializeSpecConstRegistry(const SpecConstRegistryT &Reg,
                                       SerializedObj &Dst);
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/stream_impl.cpp b/sycl/source/detail/stream_impl.cpp
index 7d0a8a073da91..1bd7b220e30a8 100644
--- a/sycl/source/detail/stream_impl.cpp
+++ b/sycl/source/detail/stream_impl.cpp
@@ -15,7 +15,7 @@
 #include <cstdio>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 stream_impl::stream_impl(size_t BufferSize, size_t MaxStatementSize,
@@ -125,5 +125,5 @@ void stream_impl::flush(const EventImplPtr &LeadEvent) {
 
 void stream_impl::flush() { flush(nullptr); }
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/stream_impl.hpp b/sycl/source/detail/stream_impl.hpp
index 0a672f163777c..823653016c162 100644
--- a/sycl/source/detail/stream_impl.hpp
+++ b/sycl/source/detail/stream_impl.hpp
@@ -19,7 +19,7 @@
 #include <vector>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 class __SYCL_EXPORT stream_impl {
@@ -96,5 +96,5 @@ class __SYCL_EXPORT stream_impl {
 };
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/sycl_mem_obj_i.hpp b/sycl/source/detail/sycl_mem_obj_i.hpp
index 39ac363afde69..061429a069549 100644
--- a/sycl/source/detail/sycl_mem_obj_i.hpp
+++ b/sycl/source/detail/sycl_mem_obj_i.hpp
@@ -12,7 +12,7 @@
 #include <sycl/stl.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 namespace detail {
 
@@ -86,5 +86,5 @@ class SYCLMemObjI {
 };
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/sycl_mem_obj_t.cpp b/sycl/source/detail/sycl_mem_obj_t.cpp
index c6608bff484a2..f861b2f9389de 100644
--- a/sycl/source/detail/sycl_mem_obj_t.cpp
+++ b/sycl/source/detail/sycl_mem_obj_t.cpp
@@ -14,7 +14,7 @@
 #include <detail/sycl_mem_obj_t.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 SYCLMemObjT::SYCLMemObjT(pi_native_handle MemObject, const context &SyclContext,
@@ -224,5 +224,5 @@ void SYCLMemObjT::detachMemoryObject(
 }
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/sycl_mem_obj_t.hpp b/sycl/source/detail/sycl_mem_obj_t.hpp
index 4089f2074ad64..fd74b1bc99dc5 100644
--- a/sycl/source/detail/sycl_mem_obj_t.hpp
+++ b/sycl/source/detail/sycl_mem_obj_t.hpp
@@ -24,7 +24,7 @@
 #include <type_traits>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 // Forward declarations
@@ -322,5 +322,5 @@ class __SYCL_EXPORT SYCLMemObjT : public SYCLMemObjI {
   bool MIsInternal = false;
 };
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/thread_pool.hpp b/sycl/source/detail/thread_pool.hpp
index 798573a40eca9..35adb98e9d570 100644
--- a/sycl/source/detail/thread_pool.hpp
+++ b/sycl/source/detail/thread_pool.hpp
@@ -19,7 +19,7 @@
 #include <sycl/detail/defines.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 class ThreadPool {
@@ -106,5 +106,5 @@ class ThreadPool {
 };
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/usm/usm_impl.cpp b/sycl/source/detail/usm/usm_impl.cpp
index 03aad6f79cdf1..13e747100bc3d 100644
--- a/sycl/source/detail/usm/usm_impl.cpp
+++ b/sycl/source/detail/usm/usm_impl.cpp
@@ -28,7 +28,7 @@
 #endif
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 using alloc = sycl::usm::alloc;
 
@@ -683,5 +683,5 @@ void release_from_device_copy(const void *Ptr, const queue &Queue) {
 }
 } // namespace ext::oneapi::experimental
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/usm/usm_impl.hpp b/sycl/source/detail/usm/usm_impl.hpp
index 3b4443993ccd5..77ab25b0ee3e7 100644
--- a/sycl/source/detail/usm/usm_impl.hpp
+++ b/sycl/source/detail/usm/usm_impl.hpp
@@ -11,7 +11,7 @@
 #include <sycl/usm.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 namespace usm {
 
@@ -24,5 +24,5 @@ void freeInternal(void *Ptr, const context_impl *CtxImpl);
 
 } // namespace usm
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/util.cpp b/sycl/source/detail/util.cpp
index e209059c0e44f..3aef8ea8c6bc8 100644
--- a/sycl/source/detail/util.cpp
+++ b/sycl/source/detail/util.cpp
@@ -10,11 +10,11 @@
 #include <sycl/detail/util.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 Sync &Sync::getInstance() { return GlobalHandler::instance().getSync(); }
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/windows_pi.cpp b/sycl/source/detail/windows_pi.cpp
index d390ab2b37c01..1b99d73b89657 100644
--- a/sycl/source/detail/windows_pi.cpp
+++ b/sycl/source/detail/windows_pi.cpp
@@ -16,7 +16,7 @@
 #include "pi_win_proxy_loader.hpp"
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 namespace pi {
 
@@ -67,5 +67,5 @@ void *getOsLibraryFuncAddress(void *Library, const std::string &FunctionName) {
 
 } // namespace pi
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/xpti_registry.cpp b/sycl/source/detail/xpti_registry.cpp
index 7bb659573ef41..c08e620b0583d 100644
--- a/sycl/source/detail/xpti_registry.cpp
+++ b/sycl/source/detail/xpti_registry.cpp
@@ -14,7 +14,7 @@
 #include <sstream>
 #endif
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 #ifdef XPTI_ENABLE_INSTRUMENTATION
 xpti::trace_event_data_t *XPTIRegistry::createTraceEvent(
@@ -363,5 +363,5 @@ void XPTIRegistry::sampledImageHostAccessorNotification(
 }
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/detail/xpti_registry.hpp b/sycl/source/detail/xpti_registry.hpp
index 3a09534351bff..e82723938c0dc 100644
--- a/sycl/source/detail/xpti_registry.hpp
+++ b/sycl/source/detail/xpti_registry.hpp
@@ -22,7 +22,7 @@
 #endif
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 // We define a sycl stream name and this will be used by the instrumentation
 // framework
@@ -271,5 +271,5 @@ class XPTIScope {
 #endif
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/device.cpp b/sycl/source/device.cpp
index fdc689e22bd22..dd52430b4a904 100644
--- a/sycl/source/device.cpp
+++ b/sycl/source/device.cpp
@@ -18,7 +18,7 @@
 #include <algorithm>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 void force_type(info::device_type &t, const info::device_type &ft) {
   if (t == info::device_type::all) {
@@ -259,5 +259,5 @@ bool device::ext_oneapi_architecture_is(
   return impl->extOneapiArchitectureIs(arch);
 }
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/device_selector.cpp b/sycl/source/device_selector.cpp
index 9682ba396636c..56718015de027 100644
--- a/sycl/source/device_selector.cpp
+++ b/sycl/source/device_selector.cpp
@@ -25,7 +25,7 @@
 #include <regex>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 namespace detail {
 
@@ -349,5 +349,5 @@ device filter_selector::select_device() const {
   return ext::oneapi::filter_selector::select_device();
 }
 } // namespace __SYCL2020_DEPRECATED("use 'ext::oneapi' instead")ONEAPI
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/esimd_emulator_device_interface.cpp b/sycl/source/esimd_emulator_device_interface.cpp
index 03c1d1e84507a..599ff255976ba 100644
--- a/sycl/source/esimd_emulator_device_interface.cpp
+++ b/sycl/source/esimd_emulator_device_interface.cpp
@@ -19,7 +19,7 @@
 #include <sycl/ext/intel/esimd/emu/detail/esimd_emulator_device_interface.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 __SYCL_EXPORT ESIMDDeviceInterface *getESIMDDeviceInterface() {
@@ -73,5 +73,5 @@ __SYCL_EXPORT ESIMDDeviceInterface *getESIMDDeviceInterface() {
   return Interface;
 }
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/event.cpp b/sycl/source/event.cpp
index a4b2370e97a63..7b19ceeb7bcef 100644
--- a/sycl/source/event.cpp
+++ b/sycl/source/event.cpp
@@ -21,7 +21,7 @@
 #include <unordered_set>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 event::event() : impl(std::make_shared<detail::event_impl>(std::nullopt)) {}
 
@@ -111,5 +111,5 @@ std::vector<pi_native_handle> event::getNativeVector() const {
   return ReturnVector;
 }
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/exception.cpp b/sycl/source/exception.cpp
index 6deba429223f3..88141f613fd53 100644
--- a/sycl/source/exception.cpp
+++ b/sycl/source/exception.cpp
@@ -14,7 +14,7 @@
 #include <cstring>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 exception::exception(std::error_code EC, const char *Msg)
     : exception(EC, nullptr, Msg) {}
@@ -95,5 +95,5 @@ std::error_code make_error_code(sycl::errc Err) noexcept {
   return {static_cast<int>(Err), sycl_category()};
 }
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/exception_list.cpp b/sycl/source/exception_list.cpp
index 89a0c792e8677..2b31ec3177501 100644
--- a/sycl/source/exception_list.cpp
+++ b/sycl/source/exception_list.cpp
@@ -12,7 +12,7 @@
 #include <utility>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 exception_list::size_type exception_list::size() const { return MList.size(); }
 
@@ -30,5 +30,5 @@ void exception_list::PushBack(value_type &&Value) {
 
 void exception_list::Clear() noexcept { MList.clear(); }
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/feature_test.hpp.in b/sycl/source/feature_test.hpp.in
index ca2b725fe0808..bd2371651e4ab 100644
--- a/sycl/source/feature_test.hpp.in
+++ b/sycl/source/feature_test.hpp.in
@@ -16,7 +16,7 @@
 #include <sycl/detail/defines_elementary.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 #ifdef __clang__
 #ifndef __has_extension
@@ -103,5 +103,5 @@ __SYCL_INLINE_VER_NAMESPACE(_V1) {
 #include "detail/plugins/esimd_emulator/features.hpp"
 #endif
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/handler.cpp b/sycl/source/handler.cpp
index 603efada0cec7..34075982c4948 100644
--- a/sycl/source/handler.cpp
+++ b/sycl/source/handler.cpp
@@ -29,7 +29,7 @@
 #include <sycl/stream.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 namespace detail {
 
@@ -1081,5 +1081,5 @@ handler::getCommandGraph() const {
   return MQueue->getCommandGraph();
 }
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/image.cpp b/sycl/source/image.cpp
index 25f067f5e7600..042c01b827273 100644
--- a/sycl/source/image.cpp
+++ b/sycl/source/image.cpp
@@ -9,7 +9,7 @@
 #include <memory>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 
 image_plain::image_plain(image_channel_order Order, image_channel_type Type,
@@ -226,5 +226,5 @@ void image_plain::unsampledImageDestructorNotification(void *UserObj) {
 }
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/interop_handle.cpp b/sycl/source/interop_handle.cpp
index 2e0d6a40afa47..0b0ab39199370 100644
--- a/sycl/source/interop_handle.cpp
+++ b/sycl/source/interop_handle.cpp
@@ -17,7 +17,7 @@
 #include <algorithm>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 backend interop_handle::get_backend() const noexcept {
   return detail::getImplBackend(MQueue);
@@ -52,5 +52,5 @@ interop_handle::getNativeQueue(int32_t &NativeHandleDesc) const {
   return MQueue->getNative(NativeHandleDesc);
 }
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/kernel.cpp b/sycl/source/kernel.cpp
index e90a76a068ab9..369b631c88464 100644
--- a/sycl/source/kernel.cpp
+++ b/sycl/source/kernel.cpp
@@ -14,7 +14,7 @@
 #include <sycl/kernel.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 kernel::kernel(cl_kernel ClKernel, const context &SyclContext)
     : impl(std::make_shared<detail::kernel_impl>(
@@ -96,5 +96,5 @@ pi_native_handle kernel::getNative() const { return impl->getNative(); }
 
 pi_native_handle kernel::getNativeImpl() const { return impl->getNative(); }
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/kernel_bundle.cpp b/sycl/source/kernel_bundle.cpp
index 2cbb432ad2318..e656ec555113b 100644
--- a/sycl/source/kernel_bundle.cpp
+++ b/sycl/source/kernel_bundle.cpp
@@ -14,7 +14,7 @@
 #include <set>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 kernel_id::kernel_id(const char *Name)
     : impl(std::make_shared<detail::kernel_id_impl>(Name)) {}
@@ -346,5 +346,5 @@ bool is_compatible(const std::vector<kernel_id> &KernelIDs, const device &Dev) {
   return true;
 }
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/platform.cpp b/sycl/source/platform.cpp
index c1c08ce9377bd..02ccc39132b9f 100644
--- a/sycl/source/platform.cpp
+++ b/sycl/source/platform.cpp
@@ -16,7 +16,7 @@
 #include <sycl/platform.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 platform::platform() : platform(default_selector_v) {}
 
@@ -95,5 +95,5 @@ context platform::ext_oneapi_get_default_context() const {
   return detail::createSyclObjFromImpl<context>(It->second);
 }
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/queue.cpp b/sycl/source/queue.cpp
index 7b69e5bfe3001..3ad5c6aaf4beb 100644
--- a/sycl/source/queue.cpp
+++ b/sycl/source/queue.cpp
@@ -20,7 +20,7 @@
 #include <algorithm>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 queue::queue(const context &SyclContext, const device_selector &DeviceSelector,
              const async_handler &AsyncHandler, const property_list &PropList) {
@@ -268,5 +268,5 @@ bool queue::ext_codeplay_supports_fusion() const {
       ext::codeplay::experimental::property::queue::enable_fusion>();
 }
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/queue_v3.cpp b/sycl/source/queue_v3.cpp
index 4d5e1583aa6b5..249bd37f69015 100755
--- a/sycl/source/queue_v3.cpp
+++ b/sycl/source/queue_v3.cpp
@@ -27,7 +27,7 @@
 #include <algorithm>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 queue::queue(const context &SyclContext, const device_selector &DeviceSelector,
              const async_handler &AsyncHandler, const property_list &PropList) {
@@ -70,5 +70,5 @@ queue::queue(const context &SyclContext, const device &SyclDevice,
             detail::getSyclObjImpl(SyclContext)->get_async_handler(),
             PropList) {}
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/sampler.cpp b/sycl/source/sampler.cpp
index ebd6d1fdeea95..303eb8d47c82a 100644
--- a/sycl/source/sampler.cpp
+++ b/sycl/source/sampler.cpp
@@ -12,7 +12,7 @@
 #include <sycl/sampler.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 sampler::sampler(coordinate_normalization_mode normalizationMode,
                  addressing_mode addressingMode, filtering_mode filteringMode,
                  const property_list &propList)
@@ -61,5 +61,5 @@ bool sampler::operator!=(const sampler &rhs) const {
 
 #undef __SYCL_PARAM_TRAITS_SPEC
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/source/stream.cpp b/sycl/source/stream.cpp
index e86d19b835058..3b598a4ffc7cc 100644
--- a/sycl/source/stream.cpp
+++ b/sycl/source/stream.cpp
@@ -12,7 +12,7 @@
 #include <sycl/stream.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 // Maximum possible size of a flush buffer statement in bytes
 static constexpr size_t MAX_STATEMENT_SIZE =
@@ -88,5 +88,5 @@ bool stream::operator!=(const stream &RHS) const { return !(impl == RHS.impl); }
 
 #undef __SYCL_PARAM_TRAITS_SPEC
 
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/test-e2e/ESIMD/linear/bitmap_helpers.h b/sycl/test-e2e/ESIMD/linear/bitmap_helpers.h
index 466ecf79f0882..60ba2c0141bf9 100644
--- a/sycl/test-e2e/ESIMD/linear/bitmap_helpers.h
+++ b/sycl/test-e2e/ESIMD/linear/bitmap_helpers.h
@@ -25,11 +25,11 @@
 #include <sycl/detail/defines.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
-  namespace ext {
-  namespace intel {
-  namespace util {
-  namespace bitmap {
+inline namespace _V1 {
+namespace ext {
+namespace intel {
+namespace util {
+namespace bitmap {
 
 #ifndef PACKED
 #ifdef _MSC_VER
@@ -289,7 +289,7 @@ __SYCL_INLINE_VER_NAMESPACE(_V1) {
   } // end namespace util
   } // end namespace intel
   } // end namespace ext
-} // end __SYCL_INLINE_VER_NAMESPACE(_V1)
+  } // namespace _V1
 } // namespace sycl
 
 #endif // ESIMD_EXAMPLES_COMMON_BITMAP_HELPERS_H
diff --git a/sycl/tools/xpti_helpers/pi_arguments_handler.hpp b/sycl/tools/xpti_helpers/pi_arguments_handler.hpp
index c3983bc48b8e4..2f60177b95d99 100644
--- a/sycl/tools/xpti_helpers/pi_arguments_handler.hpp
+++ b/sycl/tools/xpti_helpers/pi_arguments_handler.hpp
@@ -19,7 +19,7 @@
 #include <tuple>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace xpti_helpers {
 
 template <typename TupleT, size_t... Is>
@@ -105,5 +105,5 @@ class PiArgumentsHandler {
 #undef _PI_API
 };
 } // namespace xpti_helpers
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/unittests/Extensions/DeviceGlobal.cpp b/sycl/unittests/Extensions/DeviceGlobal.cpp
index dc34b822a1013..c135bc4ffb70f 100644
--- a/sycl/unittests/Extensions/DeviceGlobal.cpp
+++ b/sycl/unittests/Extensions/DeviceGlobal.cpp
@@ -41,7 +41,7 @@ sycl::ext::oneapi::experimental::device_global<
     DeviceGlobalImgScope;
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 template <>
 struct KernelInfo<DeviceGlobalTestKernel>
@@ -56,7 +56,7 @@ struct KernelInfo<DeviceGlobalImgScopeTestKernel>
   }
 };
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 static sycl::unittest::PiImage generateDeviceGlobalImage() {
diff --git a/sycl/unittests/Extensions/USMMemcpy2D.cpp b/sycl/unittests/Extensions/USMMemcpy2D.cpp
index ffdaa86ff95a6..9ed0079378d5a 100644
--- a/sycl/unittests/Extensions/USMMemcpy2D.cpp
+++ b/sycl/unittests/Extensions/USMMemcpy2D.cpp
@@ -22,7 +22,7 @@ constexpr const char *USMMemcpyHelperKernelNameLong = "__usmmemcpy2d_long";
 constexpr const char *USMMemcpyHelperKernelNameChar = "__usmmemcpy2d_char";
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 template <>
 struct KernelInfo<class __usmfill2d<long>>
@@ -122,7 +122,7 @@ struct KernelInfo<class __usmmemcpy2d<unsigned char>>
   }
 };
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 static sycl::unittest::PiImage generateMemopsImage() {
diff --git a/sycl/unittests/SYCL2020/IsCompatible.cpp b/sycl/unittests/SYCL2020/IsCompatible.cpp
index 14214e0101b13..eafbc00ccbe96 100644
--- a/sycl/unittests/SYCL2020/IsCompatible.cpp
+++ b/sycl/unittests/SYCL2020/IsCompatible.cpp
@@ -15,7 +15,7 @@ class TestKernelGPU;
 class TestKernelACC;
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 template <>
 struct KernelInfo<TestKernelCPU> : public unittest::MockKernelInfoBase {
@@ -65,7 +65,7 @@ struct KernelInfo<TestKernelACC> : public unittest::MockKernelInfoBase {
 };
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 static sycl::unittest::PiImage
diff --git a/sycl/unittests/SYCL2020/KernelBundle.cpp b/sycl/unittests/SYCL2020/KernelBundle.cpp
index 2192d01720281..48dddeed77848 100644
--- a/sycl/unittests/SYCL2020/KernelBundle.cpp
+++ b/sycl/unittests/SYCL2020/KernelBundle.cpp
@@ -21,7 +21,7 @@ class TestKernelExeOnly;
 class TestKernelWithAspects;
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 template <>
 struct KernelInfo<TestKernel> : public unittest::MockKernelInfoBase {
@@ -39,7 +39,7 @@ struct KernelInfo<TestKernelWithAspects> : public unittest::MockKernelInfoBase {
 };
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 static sycl::unittest::PiImage
diff --git a/sycl/unittests/SYCL2020/KernelBundleStateFiltering.cpp b/sycl/unittests/SYCL2020/KernelBundleStateFiltering.cpp
index fb4e7f3315be9..c2dfa6e51e6b9 100644
--- a/sycl/unittests/SYCL2020/KernelBundleStateFiltering.cpp
+++ b/sycl/unittests/SYCL2020/KernelBundleStateFiltering.cpp
@@ -26,7 +26,7 @@ class KernelC;
 class KernelD;
 class KernelE;
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 template <> struct KernelInfo<KernelA> : public unittest::MockKernelInfoBase {
   static constexpr const char *getName() { return "KernelA"; }
@@ -44,7 +44,7 @@ template <> struct KernelInfo<KernelE> : public unittest::MockKernelInfoBase {
   static constexpr const char *getName() { return "KernelE"; }
 };
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 namespace {
diff --git a/sycl/unittests/SYCL2020/KernelID.cpp b/sycl/unittests/SYCL2020/KernelID.cpp
index 75008fdf82e23..0f27e4eaed63e 100644
--- a/sycl/unittests/SYCL2020/KernelID.cpp
+++ b/sycl/unittests/SYCL2020/KernelID.cpp
@@ -20,7 +20,7 @@ class TestKernel3;
 class ServiceKernel1;
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 template <>
 struct KernelInfo<TestKernel1> : public unittest::MockKernelInfoBase {
@@ -44,7 +44,7 @@ struct KernelInfo<ServiceKernel1> : public unittest::MockKernelInfoBase {
   }
 };
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 static sycl::unittest::PiImage
diff --git a/sycl/unittests/SYCL2020/SpecializationConstant.cpp b/sycl/unittests/SYCL2020/SpecializationConstant.cpp
index 4a2b65435678b..ccda293aa2474 100644
--- a/sycl/unittests/SYCL2020/SpecializationConstant.cpp
+++ b/sycl/unittests/SYCL2020/SpecializationConstant.cpp
@@ -21,7 +21,7 @@ class TestKernel;
 const static sycl::specialization_id<int> SpecConst1{42};
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 template <>
 struct KernelInfo<TestKernel> : public unittest::MockKernelInfoBase {
@@ -34,7 +34,7 @@ template <> const char *get_spec_constant_symbolic_ID<SpecConst1>() {
   return "SC1";
 }
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 static sycl::unittest::PiImage generateImageWithSpecConsts() {
diff --git a/sycl/unittests/assert/assert.cpp b/sycl/unittests/assert/assert.cpp
index 3a9482193fbba..b94d43925d374 100644
--- a/sycl/unittests/assert/assert.cpp
+++ b/sycl/unittests/assert/assert.cpp
@@ -41,7 +41,7 @@
 class TestKernel;
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 template <>
 struct KernelInfo<TestKernel> : public unittest::MockKernelInfoBase {
@@ -69,7 +69,7 @@ struct KernelInfo<::sycl::detail::__sycl_service_kernel__::AssertInfoCopier>
   }
 };
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 static sycl::unittest::PiImage generateDefaultImage() {
diff --git a/sycl/unittests/buffer/KernelArgMemObj.cpp b/sycl/unittests/buffer/KernelArgMemObj.cpp
index 811995bc92e73..f1315ca8df8ac 100644
--- a/sycl/unittests/buffer/KernelArgMemObj.cpp
+++ b/sycl/unittests/buffer/KernelArgMemObj.cpp
@@ -15,7 +15,7 @@
 class TestKernelWithMemObj;
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 template <>
 struct KernelInfo<TestKernelWithMemObj> : public unittest::MockKernelInfoBase {
@@ -30,7 +30,7 @@ struct KernelInfo<TestKernelWithMemObj> : public unittest::MockKernelInfoBase {
   static constexpr uint32_t getKernelSize() { return 32; }
 };
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 static sycl::unittest::PiImage generateImage() {
diff --git a/sycl/unittests/helpers/MockKernelInfo.hpp b/sycl/unittests/helpers/MockKernelInfo.hpp
index af17642b74dd7..ecf137d8a0cd4 100644
--- a/sycl/unittests/helpers/MockKernelInfo.hpp
+++ b/sycl/unittests/helpers/MockKernelInfo.hpp
@@ -12,7 +12,7 @@
 #include <cstdint>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace unittest {
 struct MockKernelInfoBase {
   static constexpr unsigned getNumParams() { return 0; }
@@ -27,5 +27,5 @@ struct MockKernelInfoBase {
 };
 
 } // namespace unittest
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/unittests/helpers/PiImage.hpp b/sycl/unittests/helpers/PiImage.hpp
index dd61ed48ffe3d..1c5890588d210 100644
--- a/sycl/unittests/helpers/PiImage.hpp
+++ b/sycl/unittests/helpers/PiImage.hpp
@@ -16,7 +16,7 @@
 #include <sycl/detail/defines_elementary.hpp>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace unittest {
 /// Convinience wrapper around _pi_device_binary_property_struct.
 class PiProperty {
@@ -537,5 +537,5 @@ addDeviceRequirementsProps(PiPropertySet &Props,
 }
 
 } // namespace unittest
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/unittests/helpers/PiMock.hpp b/sycl/unittests/helpers/PiMock.hpp
index c931ddad0845b..88a48d8e507f1 100644
--- a/sycl/unittests/helpers/PiMock.hpp
+++ b/sycl/unittests/helpers/PiMock.hpp
@@ -45,7 +45,7 @@
 #include <optional>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace unittest {
 
 namespace detail = sycl::detail;
@@ -397,5 +397,5 @@ class PiMock {
 };
 
 } // namespace unittest
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/unittests/helpers/ScopedEnvVar.hpp b/sycl/unittests/helpers/ScopedEnvVar.hpp
index 274d57100bdc3..a9b3352d93342 100644
--- a/sycl/unittests/helpers/ScopedEnvVar.hpp
+++ b/sycl/unittests/helpers/ScopedEnvVar.hpp
@@ -15,7 +15,7 @@
 #include <stdlib.h>
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 
 namespace unittest {
 inline void set_env(const char *Name, const char *Value) {
@@ -64,5 +64,5 @@ class ScopedEnvVar {
   std::function<void()> MConfigReset;
 };
 } // namespace unittest
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
diff --git a/sycl/unittests/helpers/TestKernel.hpp b/sycl/unittests/helpers/TestKernel.hpp
index abeeeaa53e9b5..2c92d815aeb30 100644
--- a/sycl/unittests/helpers/TestKernel.hpp
+++ b/sycl/unittests/helpers/TestKernel.hpp
@@ -14,7 +14,7 @@
 template <size_t KernelSize = 1> class TestKernel;
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 template <size_t KernelSize>
 struct KernelInfo<TestKernel<KernelSize>>
@@ -30,7 +30,7 @@ struct KernelInfo<TestKernel<KernelSize>>
 };
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 static sycl::unittest::PiImage generateDefaultImage() {
diff --git a/sycl/unittests/kernel-and-program/Cache.cpp b/sycl/unittests/kernel-and-program/Cache.cpp
index 0bee628686087..f29e75299bbd2 100644
--- a/sycl/unittests/kernel-and-program/Cache.cpp
+++ b/sycl/unittests/kernel-and-program/Cache.cpp
@@ -39,7 +39,7 @@ class CacheTestKernel2 {
 
 namespace sycl {
 const static specialization_id<int> SpecConst1{42};
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 template <>
 struct KernelInfo<CacheTestKernel> : public unittest::MockKernelInfoBase {
@@ -53,7 +53,7 @@ template <> const char *get_spec_constant_symbolic_ID<SpecConst1>() {
   return "SC1";
 }
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 static sycl::unittest::PiImage generateDefaultImage() {
diff --git a/sycl/unittests/kernel-and-program/KernelBuildOptions.cpp b/sycl/unittests/kernel-and-program/KernelBuildOptions.cpp
index 5ad6a31c3a028..49f1a4c10f2de 100644
--- a/sycl/unittests/kernel-and-program/KernelBuildOptions.cpp
+++ b/sycl/unittests/kernel-and-program/KernelBuildOptions.cpp
@@ -22,7 +22,7 @@ class BuildOptsTestKernel;
 
 static std::string BuildOpts;
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 template <>
 struct KernelInfo<BuildOptsTestKernel> : public unittest::MockKernelInfoBase {
@@ -31,7 +31,7 @@ struct KernelInfo<BuildOptsTestKernel> : public unittest::MockKernelInfoBase {
 };
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 static pi_result redefinedProgramBuild(
diff --git a/sycl/unittests/kernel-and-program/MultipleDevsCache.cpp b/sycl/unittests/kernel-and-program/MultipleDevsCache.cpp
index 650328f4a8f09..1a1632aa932a4 100644
--- a/sycl/unittests/kernel-and-program/MultipleDevsCache.cpp
+++ b/sycl/unittests/kernel-and-program/MultipleDevsCache.cpp
@@ -24,7 +24,7 @@ using namespace sycl;
 class MultipleDevsCacheTestKernel;
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 template <>
 struct KernelInfo<MultipleDevsCacheTestKernel>
@@ -35,7 +35,7 @@ struct KernelInfo<MultipleDevsCacheTestKernel>
 };
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 static sycl::unittest::PiImage generateDefaultImage() {
diff --git a/sycl/unittests/pipes/host_pipe_registration.cpp b/sycl/unittests/pipes/host_pipe_registration.cpp
index 4b5b4520e6d02..7153fb6bacc77 100644
--- a/sycl/unittests/pipes/host_pipe_registration.cpp
+++ b/sycl/unittests/pipes/host_pipe_registration.cpp
@@ -19,7 +19,7 @@
 template <size_t KernelSize = 1> class TestKernel;
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 template <size_t KernelSize> struct KernelInfo<TestKernel<KernelSize>> {
   static constexpr unsigned getNumParams() { return 0; }
@@ -35,7 +35,7 @@ template <size_t KernelSize> struct KernelInfo<TestKernel<KernelSize>> {
 };
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 using namespace sycl;
diff --git a/sycl/unittests/program_manager/EliminatedArgMask.cpp b/sycl/unittests/program_manager/EliminatedArgMask.cpp
index 85546ca153275..259049820a1a2 100644
--- a/sycl/unittests/program_manager/EliminatedArgMask.cpp
+++ b/sycl/unittests/program_manager/EliminatedArgMask.cpp
@@ -25,7 +25,7 @@ constexpr const char EAMTestKernel2Name[] = "EAMTestKernel2";
 constexpr unsigned EAMTestKernelNumArgs = 4;
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 template <>
 struct KernelInfo<EAMTestKernel> : public unittest::MockKernelInfoBase {
@@ -40,7 +40,7 @@ struct KernelInfo<EAMTestKernel2> : public unittest::MockKernelInfoBase {
 };
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 static sycl::unittest::PiImage generateEAMTestKernelImage() {
diff --git a/sycl/unittests/program_manager/passing_link_and_compile_options.cpp b/sycl/unittests/program_manager/passing_link_and_compile_options.cpp
index a1f36996ef019..90669004d4625 100644
--- a/sycl/unittests/program_manager/passing_link_and_compile_options.cpp
+++ b/sycl/unittests/program_manager/passing_link_and_compile_options.cpp
@@ -31,7 +31,7 @@ const char EAMTestKernelName3[] = "LinkCompileTestKernel3";
 constexpr unsigned EAMTestKernelNumArgs3 = 4;
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 template <>
 struct KernelInfo<EAMTestKernel1> : public unittest::MockKernelInfoBase {
@@ -52,7 +52,7 @@ struct KernelInfo<EAMTestKernel3> : public unittest::MockKernelInfoBase {
 };
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 template <typename T>
diff --git a/sycl/unittests/queue/GetProfilingInfo.cpp b/sycl/unittests/queue/GetProfilingInfo.cpp
index 8a6cd3ee3e30b..81b670c0b4e96 100644
--- a/sycl/unittests/queue/GetProfilingInfo.cpp
+++ b/sycl/unittests/queue/GetProfilingInfo.cpp
@@ -25,7 +25,7 @@
 class InfoTestKernel;
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 template <>
 struct KernelInfo<InfoTestKernel> : public unittest::MockKernelInfoBase {
@@ -33,7 +33,7 @@ struct KernelInfo<InfoTestKernel> : public unittest::MockKernelInfoBase {
 };
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 template <typename T> sycl::unittest::PiImage generateTestImage() {
   using namespace sycl::unittest;
diff --git a/sycl/unittests/scheduler/CommandsWaitForEvents.cpp b/sycl/unittests/scheduler/CommandsWaitForEvents.cpp
index 8e0105e992c01..d893c33f5cc26 100644
--- a/sycl/unittests/scheduler/CommandsWaitForEvents.cpp
+++ b/sycl/unittests/scheduler/CommandsWaitForEvents.cpp
@@ -84,7 +84,7 @@ pi_result piEventsWaitRedefine(pi_uint32 num_events,
 class StreamAUXCmdsWait_TestKernel;
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 template <>
 struct KernelInfo<StreamAUXCmdsWait_TestKernel>
@@ -97,7 +97,7 @@ struct KernelInfo<StreamAUXCmdsWait_TestKernel>
 };
 
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 static sycl::unittest::PiImage generateDefaultImage() {
diff --git a/sycl/unittests/scheduler/SchedulerTestUtils.hpp b/sycl/unittests/scheduler/SchedulerTestUtils.hpp
index 09315908cb1fc..43b1986f4506d 100644
--- a/sycl/unittests/scheduler/SchedulerTestUtils.hpp
+++ b/sycl/unittests/scheduler/SchedulerTestUtils.hpp
@@ -24,11 +24,11 @@
 sycl::detail::Requirement getMockRequirement();
 
 namespace sycl {
-__SYCL_INLINE_VER_NAMESPACE(_V1) {
+inline namespace _V1 {
 namespace detail {
 class Command;
 } // namespace detail
-} // __SYCL_INLINE_VER_NAMESPACE(_V1)
+} // namespace _V1
 } // namespace sycl
 
 class MockCommand : public sycl::detail::Command {