diff --git a/clang/lib/Sema/SemaSYCL.cpp b/clang/lib/Sema/SemaSYCL.cpp
index db98c8b5a10a0..ce07e490d2d8f 100644
--- a/clang/lib/Sema/SemaSYCL.cpp
+++ b/clang/lib/Sema/SemaSYCL.cpp
@@ -5220,15 +5220,7 @@ bool Util::isSyclSpecConstantType(QualType Ty) {
       Util::MakeDeclContextDesc(Decl::Kind::Namespace, "experimental"),
       Util::MakeDeclContextDesc(Decl::Kind::ClassTemplateSpecialization,
                                 "spec_constant")};
-  std::array<DeclContextDesc, 5> ScopesDeprecated = {
-      Util::MakeDeclContextDesc(Decl::Kind::Namespace, "cl"),
-      Util::MakeDeclContextDesc(Decl::Kind::Namespace, "sycl"),
-      Util::MakeDeclContextDesc(Decl::Kind::Namespace, "ONEAPI"),
-      Util::MakeDeclContextDesc(Decl::Kind::Namespace, "experimental"),
-      Util::MakeDeclContextDesc(Decl::Kind::ClassTemplateSpecialization,
-                                "spec_constant")};
-  return matchQualifiedTypeName(Ty, Scopes) ||
-         matchQualifiedTypeName(Ty, ScopesDeprecated);
+  return matchQualifiedTypeName(Ty, Scopes);
 }
 
 bool Util::isSyclSpecIdType(QualType Ty) {
@@ -5258,16 +5250,7 @@ bool Util::isSyclAccessorNoAliasPropertyType(QualType Ty) {
       Util::DeclContextDesc{Decl::Kind::CXXRecord, "no_alias"},
       Util::DeclContextDesc{Decl::Kind::ClassTemplateSpecialization,
                             "instance"}};
-  std::array<DeclContextDesc, 6> ScopesDeprecated = {
-      Util::DeclContextDesc{Decl::Kind::Namespace, "cl"},
-      Util::DeclContextDesc{Decl::Kind::Namespace, "sycl"},
-      Util::DeclContextDesc{Decl::Kind::Namespace, "ONEAPI"},
-      Util::DeclContextDesc{Decl::Kind::Namespace, "property"},
-      Util::DeclContextDesc{Decl::Kind::CXXRecord, "no_alias"},
-      Util::DeclContextDesc{Decl::Kind::ClassTemplateSpecialization,
-                            "instance"}};
-  return matchQualifiedTypeName(Ty, Scopes) ||
-         matchQualifiedTypeName(Ty, ScopesDeprecated);
+  return matchQualifiedTypeName(Ty, Scopes);
 }
 
 bool Util::isSyclBufferLocationType(QualType Ty) {
@@ -5280,16 +5263,7 @@ bool Util::isSyclBufferLocationType(QualType Ty) {
       Util::MakeDeclContextDesc(Decl::Kind::CXXRecord, "buffer_location"),
       Util::MakeDeclContextDesc(Decl::Kind::ClassTemplateSpecialization,
                                 "instance")};
-  std::array<DeclContextDesc, 6> ScopesDeprecated = {
-      Util::MakeDeclContextDesc(Decl::Kind::Namespace, "cl"),
-      Util::MakeDeclContextDesc(Decl::Kind::Namespace, "sycl"),
-      Util::MakeDeclContextDesc(Decl::Kind::Namespace, "INTEL"),
-      Util::MakeDeclContextDesc(Decl::Kind::Namespace, "property"),
-      Util::MakeDeclContextDesc(Decl::Kind::CXXRecord, "buffer_location"),
-      Util::MakeDeclContextDesc(Decl::Kind::ClassTemplateSpecialization,
-                                "instance")};
-  return matchQualifiedTypeName(Ty, Scopes) ||
-         matchQualifiedTypeName(Ty, ScopesDeprecated);
+  return matchQualifiedTypeName(Ty, Scopes);
 }
 
 bool Util::isSyclType(QualType Ty, StringRef Name, bool Tmpl) {
@@ -5332,14 +5306,7 @@ bool Util::isAccessorPropertyListType(QualType Ty) {
       Util::MakeDeclContextDesc(Decl::Kind::Namespace, "oneapi"),
       Util::MakeDeclContextDesc(Decl::Kind::ClassTemplateSpecialization,
                                 "accessor_property_list")};
-  std::array<DeclContextDesc, 4> ScopesDeprecated = {
-      Util::MakeDeclContextDesc(Decl::Kind::Namespace, "cl"),
-      Util::MakeDeclContextDesc(Decl::Kind::Namespace, "sycl"),
-      Util::MakeDeclContextDesc(Decl::Kind::Namespace, "ONEAPI"),
-      Util::MakeDeclContextDesc(Decl::Kind::ClassTemplateSpecialization,
-                                "accessor_property_list")};
-  return matchQualifiedTypeName(Ty, Scopes) ||
-         matchQualifiedTypeName(Ty, ScopesDeprecated);
+  return matchQualifiedTypeName(Ty, Scopes);
 }
 
 bool Util::matchContext(const DeclContext *Ctx,
diff --git a/sycl/include/CL/sycl/INTEL/esimd.hpp b/sycl/include/CL/sycl/INTEL/esimd.hpp
deleted file mode 100644
index 01f9c484ed59b..0000000000000
--- a/sycl/include/CL/sycl/INTEL/esimd.hpp
+++ /dev/null
@@ -1,19 +0,0 @@
-//==------------ esimd.hpp - DPC++ Explicit SIMD API redirection header ----==//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-// This header is deprecated and should not be included by applications.
-// The header redirected to below should be used instead.
-//===----------------------------------------------------------------------===//
-
-#pragma once
-
-#include <CL/sycl/detail/defines_elementary.hpp>
-
-__SYCL_WARNING("CL/sycl/INTEL/esimd.hpp usage is deprecated, include "
-               "sycl/ext/intel/experimental/esimd.hpp instead")
-
-#include <sycl/ext/intel/experimental/esimd.hpp>
diff --git a/sycl/include/CL/sycl/INTEL/esimd/detail/emu/esimd_emu_functions_v1.h b/sycl/include/CL/sycl/INTEL/esimd/detail/emu/esimd_emu_functions_v1.h
deleted file mode 100644
index 1fb5d040f5626..0000000000000
--- a/sycl/include/CL/sycl/INTEL/esimd/detail/emu/esimd_emu_functions_v1.h
+++ /dev/null
@@ -1,23 +0,0 @@
-//==----- esimd_emu_functions_v1.h - DPC++ Explicit SIMD API ---------==//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-/// \file esimd_emu_functions_v1.h
-///
-/// \ingroup sycl_pi_esimd_cpu
-
-#pragma once
-
-#include <CL/sycl/detail/defines_elementary.hpp>
-
-__SYCL_WARNING(
-    "CL/sycl/INTEL/esimd/detail/emu/esimd_emu_functions_v1.h usage is "
-    "deprecated, include "
-    "sycl/ext/intel/experimental/esimd/emu/detail/esimd_emu_functions_v1.h "
-    "instead")
-
-#include <sycl/ext/intel/experimental/esimd/emu/detail/esimd_emu_functions_v1.h>
diff --git a/sycl/include/CL/sycl/INTEL/esimd/detail/emu/esimdcpu_device_interface.hpp b/sycl/include/CL/sycl/INTEL/esimd/detail/emu/esimdcpu_device_interface.hpp
deleted file mode 100644
index 306a0669a2b1e..0000000000000
--- a/sycl/include/CL/sycl/INTEL/esimd/detail/emu/esimdcpu_device_interface.hpp
+++ /dev/null
@@ -1,29 +0,0 @@
-//==----- esimdcpu_device_interface.hpp - DPC++ Explicit SIMD API ---------==//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-/// \file esimdcpu_device_interface.hpp
-/// Declarations for ESIMD_CPU-device specific definitions.
-/// ESIMD intrinsic and LibCM functionalities required by intrinsic defined
-///
-/// This interface is for ESIMD intrinsic emulation implementations
-/// such as slm_access to access ESIMD_CPU specific-support therefore
-/// it has to be defined and shared as include directory
-///
-/// \ingroup sycl_pi_esimd_cpu
-
-#pragma once
-
-#include <CL/sycl/detail/defines_elementary.hpp>
-
-__SYCL_WARNING(
-    "CL/sycl/INTEL/esimd/detail/emu/esimdcpu_device_interface.hpp usage is "
-    "deprecated, include "
-    "sycl/ext/intel/experimental/esimd/emu/detail/"
-    "esimdcpu_device_interface.hpp instead")
-
-#include <sycl/ext/intel/experimental/esimd/emu/detail/esimdcpu_device_interface.hpp>
diff --git a/sycl/include/CL/sycl/INTEL/fpga_device_selector.hpp b/sycl/include/CL/sycl/INTEL/fpga_device_selector.hpp
deleted file mode 100644
index 63a1e88ea5613..0000000000000
--- a/sycl/include/CL/sycl/INTEL/fpga_device_selector.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-//==- fpga_device_selector.hpp --- SYCL FPGA device selector shortcut  -----==//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#pragma once
-
-#include <CL/sycl/detail/defines_elementary.hpp>
-
-__SYCL_WARNING(
-    "CL/sycl/INTEL/fpga_device_selector.hpp usage is deprecated, include "
-    "sycl/ext/intel/fpga_device_selector.hpp instead")
-
-#include <sycl/ext/intel/fpga_device_selector.hpp>
diff --git a/sycl/include/CL/sycl/INTEL/fpga_extensions.hpp b/sycl/include/CL/sycl/INTEL/fpga_extensions.hpp
deleted file mode 100644
index 696dc1416872a..0000000000000
--- a/sycl/include/CL/sycl/INTEL/fpga_extensions.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-//==----------- fpga_extensions.hpp --- SYCL FPGA Extensions ---------------==//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#pragma once
-
-#include <CL/sycl/detail/defines_elementary.hpp>
-
-__SYCL_WARNING("CL/sycl/INTEL/fpga_extensions.hpp usage is deprecated, include "
-               "sycl/ext/intel/fpga_extensions.hpp instead")
-
-#include <sycl/ext/intel/fpga_extensions.hpp>
diff --git a/sycl/include/CL/sycl/INTEL/fpga_lsu.hpp b/sycl/include/CL/sycl/INTEL/fpga_lsu.hpp
deleted file mode 100644
index baa34398ebef2..0000000000000
--- a/sycl/include/CL/sycl/INTEL/fpga_lsu.hpp
+++ /dev/null
@@ -1,15 +0,0 @@
-//==-------------- fpga_lsu.hpp --- SYCL FPGA LSU Extensions ---------------==//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-#pragma once
-
-#include <CL/sycl/detail/defines_elementary.hpp>
-
-__SYCL_WARNING("CL/sycl/INTEL/fpga_lsu.hpp usage is deprecated, include "
-               "sycl/ext/intel/fpga_lsu.hpp instead")
-
-#include <sycl/ext/intel/fpga_lsu.hpp>
diff --git a/sycl/include/CL/sycl/INTEL/fpga_reg.hpp b/sycl/include/CL/sycl/INTEL/fpga_reg.hpp
deleted file mode 100644
index 69f5f3a3a1fc8..0000000000000
--- a/sycl/include/CL/sycl/INTEL/fpga_reg.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-//==-------------- fpga_reg.hpp --- SYCL FPGA Reg Extensions ---------------==//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#pragma once
-
-#include <CL/sycl/detail/defines_elementary.hpp>
-
-__SYCL_WARNING("CL/sycl/INTEL/fpga_reg.hpp usage is deprecated, include "
-               "sycl/ext/intel/fpga_reg.hpp instead")
-
-#include <sycl/ext/intel/fpga_reg.hpp>
diff --git a/sycl/include/CL/sycl/INTEL/fpga_utils.hpp b/sycl/include/CL/sycl/INTEL/fpga_utils.hpp
deleted file mode 100644
index b03653fdfe18f..0000000000000
--- a/sycl/include/CL/sycl/INTEL/fpga_utils.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-//==------------- fpga_utils.hpp --- SYCL FPGA Reg Extensions --------------==//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#pragma once
-
-#include <CL/sycl/detail/defines_elementary.hpp>
-
-__SYCL_WARNING("CL/sycl/INTEL/fpga_utils.hpp usage is deprecated, include "
-               "sycl/ext/intel/fpga_utils.hpp instead")
-
-#include <sycl/ext/intel/fpga_utils.hpp>
diff --git a/sycl/include/CL/sycl/INTEL/online_compiler.hpp b/sycl/include/CL/sycl/INTEL/online_compiler.hpp
deleted file mode 100644
index 30577aba66456..0000000000000
--- a/sycl/include/CL/sycl/INTEL/online_compiler.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-//===------- online_compiler.hpp - Online source compilation service ------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#pragma once
-
-#include <CL/sycl/detail/defines_elementary.hpp>
-
-__SYCL_WARNING("CL/sycl/INTEL/online_compiler.hpp usage is deprecated, include "
-               "sycl/ext/intel/online_compiler.hpp instead")
-
-#include <sycl/ext/intel/online_compiler.hpp>
diff --git a/sycl/include/CL/sycl/INTEL/pipes.hpp b/sycl/include/CL/sycl/INTEL/pipes.hpp
deleted file mode 100644
index 62c56d90cf200..0000000000000
--- a/sycl/include/CL/sycl/INTEL/pipes.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-//==---------------- pipes.hpp - SYCL pipes ------------*- C++ -*-----------==//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-// ===--------------------------------------------------------------------=== //
-
-#pragma once
-
-#include <CL/sycl/detail/defines_elementary.hpp>
-
-__SYCL_WARNING("CL/sycl/INTEL/pipes.hpp usage is deprecated, include "
-               "sycl/ext/intel/pipes.hpp instead")
-
-#include <sycl/ext/intel/pipes.hpp>
diff --git a/sycl/include/CL/sycl/ONEAPI/accessor_property_list.hpp b/sycl/include/CL/sycl/ONEAPI/accessor_property_list.hpp
deleted file mode 100644
index ff5e6b05e325e..0000000000000
--- a/sycl/include/CL/sycl/ONEAPI/accessor_property_list.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-//==----- accessor_property_list.hpp --- SYCL accessor property list -------==//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#pragma once
-
-#include <CL/sycl/detail/defines_elementary.hpp>
-
-__SYCL_WARNING("CL/sycl/ONEAPI/accessor_property_list.hpp usage is "
-               "deprecated, include "
-               "sycl/ext/oneapi/accessor_property_list.hpp instead")
-
-#include <sycl/ext/oneapi/accessor_property_list.hpp>
diff --git a/sycl/include/CL/sycl/ONEAPI/atomic.hpp b/sycl/include/CL/sycl/ONEAPI/atomic.hpp
deleted file mode 100644
index 71a8b5af905c3..0000000000000
--- a/sycl/include/CL/sycl/ONEAPI/atomic.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-//==--------------- atomic.hpp - SYCL_ONEAPI_extended_atomics --------------==//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#pragma once
-
-#include <CL/sycl/detail/defines_elementary.hpp>
-
-__SYCL_WARNING("CL/sycl/ONEAPI/atomic.hpp usage is "
-               "deprecated, include "
-               "sycl/ext/oneapi/atomic.hpp instead")
-
-#include <sycl/ext/oneapi/atomic.hpp>
diff --git a/sycl/include/CL/sycl/ONEAPI/atomic_accessor.hpp b/sycl/include/CL/sycl/ONEAPI/atomic_accessor.hpp
deleted file mode 100644
index 1671b12b0f67e..0000000000000
--- a/sycl/include/CL/sycl/ONEAPI/atomic_accessor.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-//==-- atomic_accessor.hpp - SYCL_ONEAPI_extended_atomics atomic_accessor --==//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#pragma once
-
-#include <CL/sycl/detail/defines_elementary.hpp>
-
-__SYCL_WARNING("CL/sycl/ONEAPI/atomic_accessor.hpp usage is "
-               "deprecated, include "
-               "sycl/ext/oneapi/atomic_accessor.hpp instead")
-
-#include <sycl/ext/oneapi/atomic_accessor.hpp>
diff --git a/sycl/include/CL/sycl/ONEAPI/atomic_enums.hpp b/sycl/include/CL/sycl/ONEAPI/atomic_enums.hpp
deleted file mode 100644
index f0fd55ad47749..0000000000000
--- a/sycl/include/CL/sycl/ONEAPI/atomic_enums.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-//==--------------- atomic_enums.hpp - SYCL_ONEAPI_extended_atomics enums --==//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#pragma once
-
-#include <CL/sycl/detail/defines_elementary.hpp>
-
-__SYCL_WARNING("CL/sycl/ONEAPI/atomic_enums.hpp usage is "
-               "deprecated, include "
-               "sycl/ext/oneapi/atomic_enums.hpp instead")
-
-#include <sycl/ext/oneapi/atomic_enums.hpp>
diff --git a/sycl/include/CL/sycl/ONEAPI/atomic_fence.hpp b/sycl/include/CL/sycl/ONEAPI/atomic_fence.hpp
deleted file mode 100644
index 0c4c48f178c22..0000000000000
--- a/sycl/include/CL/sycl/ONEAPI/atomic_fence.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-//==---- atomic_fence.hpp - SYCL_ONEAPI_extended_atomics atomic_fence ------==//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#pragma once
-
-#include <CL/sycl/detail/defines_elementary.hpp>
-
-__SYCL_WARNING("CL/sycl/ONEAPI/atomic_fence.hpp usage is "
-               "deprecated, include "
-               "sycl/ext/oneapi/atomic_fence.hpp instead")
-
-#include <sycl/ext/oneapi/atomic_fence.hpp>
diff --git a/sycl/include/CL/sycl/ONEAPI/atomic_ref.hpp b/sycl/include/CL/sycl/ONEAPI/atomic_ref.hpp
deleted file mode 100644
index a7577f72ab43d..0000000000000
--- a/sycl/include/CL/sycl/ONEAPI/atomic_ref.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-//==----- atomic_ref.hpp - SYCL_ONEAPI_extended_atomics atomic_ref ---------==//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#pragma once
-
-#include <CL/sycl/detail/defines_elementary.hpp>
-
-__SYCL_WARNING("CL/sycl/ONEAPI/atomic_ref.hpp usage is "
-               "deprecated, include "
-               "sycl/ext/oneapi/atomic_ref.hpp instead")
-
-#include <sycl/ext/oneapi/atomic_ref.hpp>
diff --git a/sycl/include/CL/sycl/ONEAPI/dot_product.hpp b/sycl/include/CL/sycl/ONEAPI/dot_product.hpp
deleted file mode 100755
index 692b579622412..0000000000000
--- a/sycl/include/CL/sycl/ONEAPI/dot_product.hpp
+++ /dev/null
@@ -1,19 +0,0 @@
-//==----------- dot_product.hpp ------- SYCL dot-product -------------------==//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// DP4A extension
-
-#pragma once
-
-#include <CL/sycl/detail/defines_elementary.hpp>
-
-__SYCL_WARNING("CL/sycl/ONEAPI/dot_product.hpp usage is "
-               "deprecated, include "
-               "sycl/ext/oneapi/dot_product.hpp instead")
-
-#include <sycl/ext/oneapi/dot_product.hpp>
diff --git a/sycl/include/CL/sycl/ONEAPI/experimental/builtins.hpp b/sycl/include/CL/sycl/ONEAPI/experimental/builtins.hpp
deleted file mode 100644
index 87958f5fae083..0000000000000
--- a/sycl/include/CL/sycl/ONEAPI/experimental/builtins.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-//==------ builtins.hpp - Non-standard SYCL built-in functions -------------==//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#pragma once
-
-#include <CL/sycl/detail/defines_elementary.hpp>
-
-__SYCL_WARNING(
-    "CL/sycl/ONEAPI/experimental/builtins.hpp usage is deprecated, include "
-    "sycl/ext/oneapi/experimental/builtins.hpp instead")
-
-#include <sycl/ext/oneapi/experimental/builtins.hpp>
diff --git a/sycl/include/CL/sycl/ONEAPI/experimental/spec_constant.hpp b/sycl/include/CL/sycl/ONEAPI/experimental/spec_constant.hpp
deleted file mode 100644
index 45550da647d3f..0000000000000
--- a/sycl/include/CL/sycl/ONEAPI/experimental/spec_constant.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-//==----------- spec_constant.hpp - SYCL public ONEAPI API header file -----==//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#pragma once
-
-#include <CL/sycl/detail/defines_elementary.hpp>
-
-__SYCL_WARNING("CL/sycl/ONEAPI/experimental/spec_constant.hpp usage is "
-               "deprecated, include "
-               "sycl/ext/oneapi/experimental/spec_constant.hpp instead")
-
-#include <sycl/ext/oneapi/experimental/spec_constant.hpp>
diff --git a/sycl/include/CL/sycl/ONEAPI/filter_selector.hpp b/sycl/include/CL/sycl/ONEAPI/filter_selector.hpp
deleted file mode 100644
index 8cb57dbc67cb8..0000000000000
--- a/sycl/include/CL/sycl/ONEAPI/filter_selector.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-//==------ filter_selector.hpp - ONEAPI filter selector -------*- C++ --*---==//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#pragma once
-
-#include <CL/sycl/detail/defines_elementary.hpp>
-
-__SYCL_WARNING("CL/sycl/ONEAPI/filter_selector.hpp usage is "
-               "deprecated, include "
-               "sycl/ext/oneapi/filter_selector.hpp instead")
-
-#include <sycl/ext/oneapi/filter_selector.hpp>
diff --git a/sycl/include/CL/sycl/ONEAPI/functional.hpp b/sycl/include/CL/sycl/ONEAPI/functional.hpp
deleted file mode 100644
index 27e957d7cce17..0000000000000
--- a/sycl/include/CL/sycl/ONEAPI/functional.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-//==----------- functional.hpp --- SYCL functional -------------------------==//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#pragma once
-
-#include <CL/sycl/detail/defines_elementary.hpp>
-
-__SYCL_WARNING("CL/sycl/ONEAPI/functional.hpp usage is "
-               "deprecated, include "
-               "sycl/ext/oneapi/functional.hpp instead")
-
-#include <sycl/ext/oneapi/functional.hpp>
diff --git a/sycl/include/CL/sycl/ONEAPI/group_algorithm.hpp b/sycl/include/CL/sycl/ONEAPI/group_algorithm.hpp
deleted file mode 100644
index 5918d14c0e253..0000000000000
--- a/sycl/include/CL/sycl/ONEAPI/group_algorithm.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-//==----------- group_algorithm.hpp --- SYCL group algorithm----------------==//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#pragma once
-
-#include <CL/sycl/detail/defines_elementary.hpp>
-
-__SYCL_WARNING("CL/sycl/ONEAPI/group_algorithm.hpp usage is "
-               "deprecated, include "
-               "sycl/ext/oneapi/group_algorithm.hpp instead")
-
-#include <sycl/ext/oneapi/group_algorithm.hpp>
diff --git a/sycl/include/CL/sycl/ONEAPI/reduction.hpp b/sycl/include/CL/sycl/ONEAPI/reduction.hpp
deleted file mode 100644
index 0f5347edc3510..0000000000000
--- a/sycl/include/CL/sycl/ONEAPI/reduction.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-//==---------------- reduction.hpp - SYCL reduction ------------*- C++ -*---==//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-// ===--------------------------------------------------------------------=== //
-
-#pragma once
-
-#include <CL/sycl/detail/defines_elementary.hpp>
-
-__SYCL_WARNING("CL/sycl/ONEAPI/reduction.hpp usage is "
-               "deprecated, include "
-               "sycl/ext/oneapi/reduction.hpp instead")
-
-#include <sycl/ext/oneapi/reduction.hpp>
diff --git a/sycl/include/CL/sycl/ONEAPI/sub_group.hpp b/sycl/include/CL/sycl/ONEAPI/sub_group.hpp
deleted file mode 100644
index cde1aad7e899d..0000000000000
--- a/sycl/include/CL/sycl/ONEAPI/sub_group.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-//==----------- sub_group.hpp --- SYCL sub-group ---------------------------==//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#pragma once
-
-#include <CL/sycl/detail/defines_elementary.hpp>
-
-__SYCL_WARNING("CL/sycl/ONEAPI/sub_group.hpp usage is "
-               "deprecated, include "
-               "sycl/ext/oneapi/sub_group.hpp instead")
-
-#include <sycl/ext/oneapi/sub_group.hpp>
diff --git a/sycl/include/CL/sycl/detail/spirv.hpp b/sycl/include/CL/sycl/detail/spirv.hpp
index 19963c7d3dcb3..7d6c15dd75489 100644
--- a/sycl/include/CL/sycl/detail/spirv.hpp
+++ b/sycl/include/CL/sycl/detail/spirv.hpp
@@ -27,9 +27,6 @@ struct sub_group;
 } // namespace oneapi
 } // namespace ext
 
-namespace __SYCL2020_DEPRECATED("use 'ext::oneapi' instead") ONEAPI {
-  using namespace ext::oneapi;
-}
 namespace detail {
 namespace spirv {
 
diff --git a/sycl/include/CL/sycl/detail/type_traits.hpp b/sycl/include/CL/sycl/detail/type_traits.hpp
index 92955d2bfa2b2..9e079561868f2 100644
--- a/sycl/include/CL/sycl/detail/type_traits.hpp
+++ b/sycl/include/CL/sycl/detail/type_traits.hpp
@@ -26,9 +26,6 @@ struct sub_group;
 } // namespace oneapi
 } // namespace ext
 
-namespace __SYCL2020_DEPRECATED("use 'ext::oneapi' instead") ONEAPI {
-  using namespace ext::oneapi;
-}
 namespace detail {
 
 template <typename T> struct is_group : std::false_type {};
diff --git a/sycl/include/CL/sycl/handler.hpp b/sycl/include/CL/sycl/handler.hpp
index a6e4af3da5336..e136ae453d039 100644
--- a/sycl/include/CL/sycl/handler.hpp
+++ b/sycl/include/CL/sycl/handler.hpp
@@ -324,10 +324,6 @@ template <typename FirstT, typename... RestT> struct AreAllButLastReductions;
 } // namespace oneapi
 } // namespace ext
 
-namespace __SYCL2020_DEPRECATED("use 'ext::oneapi' instead") ONEAPI {
-  using namespace ext::oneapi;
-}
-
 /// Command group handler class.
 ///
 /// Objects of the handler class collect information about command group, such
diff --git a/sycl/include/CL/sycl/properties/accessor_properties.hpp b/sycl/include/CL/sycl/properties/accessor_properties.hpp
index f4f560175667e..f9d84cc93872a 100644
--- a/sycl/include/CL/sycl/properties/accessor_properties.hpp
+++ b/sycl/include/CL/sycl/properties/accessor_properties.hpp
@@ -67,9 +67,6 @@ inline constexpr property::buffer_location::instance<A> buffer_location{};
 } // namespace intel
 } // namespace ext
 
-namespace __SYCL2020_DEPRECATED("use 'ext::intel' instead") INTEL {
-  using namespace ext::intel;
-}
 namespace ext {
 namespace oneapi {
 namespace property {
@@ -114,9 +111,6 @@ struct is_compile_time_property<sycl::ext::intel::property::buffer_location>
 } // namespace oneapi
 } // namespace ext
 
-namespace __SYCL2020_DEPRECATED("use 'ext::oneapi' instead") ONEAPI {
-  using namespace ext::oneapi;
-}
 namespace detail {
 template <int I>
 struct IsCompileTimePropertyInstance<
diff --git a/sycl/include/sycl/ext/intel/experimental/bfloat16.hpp b/sycl/include/sycl/ext/intel/experimental/bfloat16.hpp
index 7a74c33ab7229..34b1d255e6345 100644
--- a/sycl/include/sycl/ext/intel/experimental/bfloat16.hpp
+++ b/sycl/include/sycl/ext/intel/experimental/bfloat16.hpp
@@ -141,8 +141,5 @@ class [[sycl_detail::uses_aspects(ext_intel_bf16_conversion)]] bfloat16 {
 } // namespace intel
 } // namespace ext
 
-namespace __SYCL2020_DEPRECATED("use 'ext::intel' instead") INTEL {
-  using namespace ext::intel;
-}
 } // namespace sycl
 } // __SYCL_INLINE_NAMESPACE(cl)
diff --git a/sycl/include/sycl/ext/intel/experimental/online_compiler.hpp b/sycl/include/sycl/ext/intel/experimental/online_compiler.hpp
index d4f436307cb83..981319abffc85 100644
--- a/sycl/include/sycl/ext/intel/experimental/online_compiler.hpp
+++ b/sycl/include/sycl/ext/intel/experimental/online_compiler.hpp
@@ -227,9 +227,5 @@ namespace __SYCL2020_DEPRECATED(
 } // namespace intel
 } // namespace ext
 
-namespace __SYCL2020_DEPRECATED(
-    "use 'ext::intel::experimental' instead") INTEL {
-  using namespace ext::intel::experimental;
-} // namespace INTEL
 } // namespace sycl
 } // __SYCL_INLINE_NAMESPACE(cl)
diff --git a/sycl/include/sycl/ext/intel/fpga_device_selector.hpp b/sycl/include/sycl/ext/intel/fpga_device_selector.hpp
index 6b4141f3d3bb7..34dcf6a3ba025 100644
--- a/sycl/include/sycl/ext/intel/fpga_device_selector.hpp
+++ b/sycl/include/sycl/ext/intel/fpga_device_selector.hpp
@@ -51,8 +51,5 @@ class fpga_emulator_selector : public platform_selector {
 } // namespace intel
 } // namespace ext
 
-namespace __SYCL2020_DEPRECATED("use 'ext::intel' instead") INTEL {
-  using namespace ext::intel;
-}
 } // namespace sycl
 } // __SYCL_INLINE_NAMESPACE(cl)
diff --git a/sycl/include/sycl/ext/intel/fpga_lsu.hpp b/sycl/include/sycl/ext/intel/fpga_lsu.hpp
index 35f99f605154e..9aa9123ccd23c 100644
--- a/sycl/include/sycl/ext/intel/fpga_lsu.hpp
+++ b/sycl/include/sycl/ext/intel/fpga_lsu.hpp
@@ -124,8 +124,5 @@ template <class... _mem_access_params> class lsu final {
 } // namespace intel
 } // namespace ext
 
-namespace __SYCL2020_DEPRECATED("use 'ext::intel' instead") INTEL {
-  using namespace ext::intel;
-}
 } // namespace sycl
 } // __SYCL_INLINE_NAMESPACE(cl)
diff --git a/sycl/include/sycl/ext/intel/fpga_reg.hpp b/sycl/include/sycl/ext/intel/fpga_reg.hpp
index 18b61cf9e1ca2..d60ac19d53164 100644
--- a/sycl/include/sycl/ext/intel/fpga_reg.hpp
+++ b/sycl/include/sycl/ext/intel/fpga_reg.hpp
@@ -46,9 +46,6 @@ fpga_reg(_T t) {
 } // namespace intel
 } // namespace ext
 
-namespace __SYCL2020_DEPRECATED("use 'ext::intel' instead") INTEL {
-  using namespace ext::intel;
-}
 } // namespace sycl
 } // __SYCL_INLINE_NAMESPACE(cl)
 
diff --git a/sycl/include/sycl/ext/intel/fpga_utils.hpp b/sycl/include/sycl/ext/intel/fpga_utils.hpp
index b84293e0244a6..b7d35d6d7d23f 100644
--- a/sycl/include/sycl/ext/intel/fpga_utils.hpp
+++ b/sycl/include/sycl/ext/intel/fpga_utils.hpp
@@ -33,8 +33,5 @@ struct _GetValue<_Type, _T1, _T...> {
 } // namespace intel
 } // namespace ext
 
-namespace __SYCL2020_DEPRECATED("use 'ext::intel' instead") INTEL {
-  using namespace ext::intel;
-}
 } // namespace sycl
 } // __SYCL_INLINE_NAMESPACE(cl)
diff --git a/sycl/include/sycl/ext/intel/pipes.hpp b/sycl/include/sycl/ext/intel/pipes.hpp
index c12aacfd8d398..09e142bb90181 100644
--- a/sycl/include/sycl/ext/intel/pipes.hpp
+++ b/sycl/include/sycl/ext/intel/pipes.hpp
@@ -202,8 +202,5 @@ class kernel_writeable_io_pipe {
 } // namespace intel
 } // namespace ext
 
-namespace __SYCL2020_DEPRECATED("use 'ext::intel' instead") INTEL {
-  using namespace ext::intel;
-}
 } // namespace sycl
 } // __SYCL_INLINE_NAMESPACE(cl)
diff --git a/sycl/include/sycl/ext/oneapi/__function_pointer.hpp b/sycl/include/sycl/ext/oneapi/__function_pointer.hpp
index d0d39e447fcc8..4569f47513d04 100644
--- a/sycl/include/sycl/ext/oneapi/__function_pointer.hpp
+++ b/sycl/include/sycl/ext/oneapi/__function_pointer.hpp
@@ -88,9 +88,6 @@ device_func_ptr_holder_t get_device_func_ptr(FuncType F, const char *FuncName,
 } // namespace oneapi
 } // namespace ext
 
-namespace __SYCL2020_DEPRECATED("use 'ext::oneapi' instead") ONEAPI {
-  using namespace ext::oneapi;
-}
 } // namespace sycl
 } // __SYCL_INLINE_NAMESPACE(cl)
 
diff --git a/sycl/include/sycl/ext/oneapi/accessor_property_list.hpp b/sycl/include/sycl/ext/oneapi/accessor_property_list.hpp
index 44c1084c94c8c..fe305d5f9f0e6 100644
--- a/sycl/include/sycl/ext/oneapi/accessor_property_list.hpp
+++ b/sycl/include/sycl/ext/oneapi/accessor_property_list.hpp
@@ -232,8 +232,5 @@ class accessor_property_list : protected sycl::detail::PropertyListBase {
 } // namespace oneapi
 } // namespace ext
 
-namespace __SYCL2020_DEPRECATED("use 'ext::oneapi' instead") ONEAPI {
-  using namespace ext::oneapi;
-}
 } // namespace sycl
 } // __SYCL_INLINE_NAMESPACE(cl)
diff --git a/sycl/include/sycl/ext/oneapi/atomic_accessor.hpp b/sycl/include/sycl/ext/oneapi/atomic_accessor.hpp
index 5cbf498a50236..160efa8881efb 100644
--- a/sycl/include/sycl/ext/oneapi/atomic_accessor.hpp
+++ b/sycl/include/sycl/ext/oneapi/atomic_accessor.hpp
@@ -129,8 +129,5 @@ atomic_accessor(buffer<DataT, Dimensions, AllocatorT>, handler,
 } // namespace oneapi
 } // namespace ext
 
-namespace __SYCL2020_DEPRECATED("use 'ext::oneapi' instead") ONEAPI {
-  using namespace ext::oneapi;
-}
 } // namespace sycl
 } // __SYCL_INLINE_NAMESPACE(cl)
diff --git a/sycl/include/sycl/ext/oneapi/atomic_enums.hpp b/sycl/include/sycl/ext/oneapi/atomic_enums.hpp
index 487251b0fe128..e130a0c6e9ab9 100644
--- a/sycl/include/sycl/ext/oneapi/atomic_enums.hpp
+++ b/sycl/include/sycl/ext/oneapi/atomic_enums.hpp
@@ -73,8 +73,5 @@ getStdMemoryOrder(::cl::sycl::ext::oneapi::memory_order order) {
 } // namespace oneapi
 } // namespace ext
 
-namespace __SYCL2020_DEPRECATED("use 'ext::oneapi' instead") ONEAPI {
-  using namespace ext::oneapi;
-}
 } // namespace sycl
 } // __SYCL_INLINE_NAMESPACE(cl)
diff --git a/sycl/include/sycl/ext/oneapi/atomic_fence.hpp b/sycl/include/sycl/ext/oneapi/atomic_fence.hpp
index 5ec2d296536a2..485c4b7e87657 100644
--- a/sycl/include/sycl/ext/oneapi/atomic_fence.hpp
+++ b/sycl/include/sycl/ext/oneapi/atomic_fence.hpp
@@ -40,8 +40,5 @@ static inline void atomic_fence(memory_order order, memory_scope scope) {
 } // namespace oneapi
 } // namespace ext
 
-namespace __SYCL2020_DEPRECATED("use 'ext::oneapi' instead") ONEAPI {
-  using namespace ext::oneapi;
-}
 } // namespace sycl
 } // __SYCL_INLINE_NAMESPACE(cl)
diff --git a/sycl/include/sycl/ext/oneapi/atomic_ref.hpp b/sycl/include/sycl/ext/oneapi/atomic_ref.hpp
index d741a0f9adde6..59243fdffb7ff 100644
--- a/sycl/include/sycl/ext/oneapi/atomic_ref.hpp
+++ b/sycl/include/sycl/ext/oneapi/atomic_ref.hpp
@@ -674,8 +674,5 @@ class atomic_ref : public detail::atomic_ref_impl<T, DefaultOrder, DefaultScope,
 } // namespace oneapi
 } // namespace ext
 
-namespace __SYCL2020_DEPRECATED("use 'ext::oneapi' instead") ONEAPI {
-  using namespace ext::oneapi;
-}
 } // namespace sycl
 } // __SYCL_INLINE_NAMESPACE(cl)
diff --git a/sycl/include/sycl/ext/oneapi/dot_product.hpp b/sycl/include/sycl/ext/oneapi/dot_product.hpp
index 2f62211b7eb5e..5f81681f0c96c 100755
--- a/sycl/include/sycl/ext/oneapi/dot_product.hpp
+++ b/sycl/include/sycl/ext/oneapi/dot_product.hpp
@@ -75,8 +75,5 @@ int32_t dot_acc(vec<int8_t, 4> a, vec<uint8_t, 4> b, int32_t c) {
 } // namespace oneapi
 } // namespace ext
 
-namespace __SYCL2020_DEPRECATED("use 'ext::oneapi' instead") ONEAPI {
-  using namespace ext::oneapi;
-}
 } // namespace sycl
 } // __SYCL_INLINE_NAMESPACE(cl)
diff --git a/sycl/include/sycl/ext/oneapi/experimental/builtins.hpp b/sycl/include/sycl/ext/oneapi/experimental/builtins.hpp
index 7108e189f51da..8e710f4dd0979 100644
--- a/sycl/include/sycl/ext/oneapi/experimental/builtins.hpp
+++ b/sycl/include/sycl/ext/oneapi/experimental/builtins.hpp
@@ -72,9 +72,6 @@ int printf(const __SYCL_CONSTANT_AS char *__format, Args... args) {
 } // namespace oneapi
 } // namespace ext
 
-namespace __SYCL2020_DEPRECATED("use 'ext::oneapi' instead") ONEAPI {
-  using namespace ext::oneapi;
-}
 } // namespace sycl
 } // __SYCL_INLINE_NAMESPACE(cl)
 
diff --git a/sycl/include/sycl/ext/oneapi/experimental/spec_constant.hpp b/sycl/include/sycl/ext/oneapi/experimental/spec_constant.hpp
index 8180755f41d66..ea966a085c9e9 100644
--- a/sycl/include/sycl/ext/oneapi/experimental/spec_constant.hpp
+++ b/sycl/include/sycl/ext/oneapi/experimental/spec_constant.hpp
@@ -83,8 +83,5 @@ class __SYCL2020_DEPRECATED(
 } // namespace oneapi
 } // namespace ext
 
-namespace __SYCL2020_DEPRECATED("use 'ext::oneapi' instead") ONEAPI {
-  using namespace ext::oneapi;
-}
 } // namespace sycl
 } // __SYCL_INLINE_NAMESPACE(cl)
diff --git a/sycl/include/sycl/ext/oneapi/filter_selector.hpp b/sycl/include/sycl/ext/oneapi/filter_selector.hpp
index 3ad616206fc8c..b6a5af81a0737 100644
--- a/sycl/include/sycl/ext/oneapi/filter_selector.hpp
+++ b/sycl/include/sycl/ext/oneapi/filter_selector.hpp
@@ -41,6 +41,7 @@ class __SYCL_EXPORT filter_selector : public device_selector {
 } // namespace oneapi
 } // namespace ext
 
+#ifdef __SYCL_INTERNAL_API
 namespace __SYCL2020_DEPRECATED("use 'ext::oneapi' instead") ONEAPI {
   using namespace ext::oneapi;
   class __SYCL_EXPORT filter_selector : public ext::oneapi::filter_selector {
@@ -51,5 +52,6 @@ namespace __SYCL2020_DEPRECATED("use 'ext::oneapi' instead") ONEAPI {
     device select_device() const override;
   };
 } // namespace ONEAPI
+#endif // __SYCL_INTERNAL_API
 } // namespace sycl
 } // __SYCL_INLINE_NAMESPACE(cl)
diff --git a/sycl/include/sycl/ext/oneapi/functional.hpp b/sycl/include/sycl/ext/oneapi/functional.hpp
index e7a1820a937f3..46a5a18fd27ac 100644
--- a/sycl/include/sycl/ext/oneapi/functional.hpp
+++ b/sycl/include/sycl/ext/oneapi/functional.hpp
@@ -27,10 +27,6 @@ template <typename T = void> using minimum = sycl::minimum<T>;
 } // namespace oneapi
 } // namespace ext
 
-namespace __SYCL2020_DEPRECATED("use 'ext::oneapi' instead") ONEAPI {
-  using namespace ext::oneapi;
-}
-
 #ifdef __SYCL_DEVICE_ONLY__
 namespace detail {
 
diff --git a/sycl/include/sycl/ext/oneapi/group_algorithm.hpp b/sycl/include/sycl/ext/oneapi/group_algorithm.hpp
index 79a31d1a4ec2c..4ef430643731f 100644
--- a/sycl/include/sycl/ext/oneapi/group_algorithm.hpp
+++ b/sycl/include/sycl/ext/oneapi/group_algorithm.hpp
@@ -549,9 +549,6 @@ leader(Group g) {
 } // namespace oneapi
 } // namespace ext
 
-namespace __SYCL2020_DEPRECATED("use 'ext::oneapi' instead") ONEAPI {
-  using namespace ext::oneapi;
-}
 } // namespace sycl
 } // __SYCL_INLINE_NAMESPACE(cl)
 #endif // __DISABLE_SYCL_ONEAPI_GROUP_ALGORITHMS__
diff --git a/sycl/include/sycl/ext/oneapi/reduction.hpp b/sycl/include/sycl/ext/oneapi/reduction.hpp
index 7d3974f593f80..2384e5e7a40cf 100644
--- a/sycl/include/sycl/ext/oneapi/reduction.hpp
+++ b/sycl/include/sycl/ext/oneapi/reduction.hpp
@@ -2069,6 +2069,7 @@ __SYCL_INLINE_CONSTEXPR AccumulatorT known_identity_v =
 } // namespace oneapi
 } // namespace ext
 
+#ifdef __SYCL_INTERNAL_API
 namespace __SYCL2020_DEPRECATED("use 'ext::oneapi' instead") ONEAPI {
   using namespace ext::oneapi;
   namespace detail {
@@ -2079,5 +2080,6 @@ namespace __SYCL2020_DEPRECATED("use 'ext::oneapi' instead") ONEAPI {
                                          size_t &NWorkGroups);
   } // namespace detail
 } // namespace ONEAPI
+#endif // __SYCL_INTERNAL_API
 } // namespace sycl
 } // __SYCL_INLINE_NAMESPACE(cl)
diff --git a/sycl/include/sycl/ext/oneapi/sub_group.hpp b/sycl/include/sycl/ext/oneapi/sub_group.hpp
index f17107dd92a5e..07d1f8ca5526a 100644
--- a/sycl/include/sycl/ext/oneapi/sub_group.hpp
+++ b/sycl/include/sycl/ext/oneapi/sub_group.hpp
@@ -756,8 +756,5 @@ inline sub_group this_sub_group() {
 } // namespace oneapi
 } // namespace ext
 
-namespace __SYCL2020_DEPRECATED("use 'ext::oneapi' instead") ONEAPI {
-  using namespace ext::oneapi;
-}
 } // namespace sycl
 } // __SYCL_INLINE_NAMESPACE(cl)
diff --git a/sycl/test/esimd/lane_id.cpp b/sycl/test/esimd/lane_id.cpp
index 0f25e7cc4c6e6..48a2377260841 100644
--- a/sycl/test/esimd/lane_id.cpp
+++ b/sycl/test/esimd/lane_id.cpp
@@ -4,7 +4,7 @@
 // __ESIMD_SIMT_END construct.
 
 #include <CL/sycl.hpp>
-#include <CL/sycl/INTEL/esimd.hpp>
+#include <sycl/ext/intel/experimental/esimd.hpp>
 
 using namespace cl::sycl;
 using namespace sycl::ext::intel::experimental::esimd;
diff --git a/sycl/test/esimd/lower-external-funcs.cpp b/sycl/test/esimd/lower-external-funcs.cpp
index 630fd210fd9d3..c3c5c82d45f76 100644
--- a/sycl/test/esimd/lower-external-funcs.cpp
+++ b/sycl/test/esimd/lower-external-funcs.cpp
@@ -7,7 +7,7 @@
 // ESIMD lowering happens for such functions as well.
 
 #include <CL/sycl.hpp>
-#include <CL/sycl/INTEL/esimd.hpp>
+#include <sycl/ext/intel/experimental/esimd.hpp>
 
 constexpr unsigned VL = 8;
 using namespace cl::sycl;
diff --git a/sycl/test/esimd/math_impl.cpp b/sycl/test/esimd/math_impl.cpp
index e4c1bad1f4b13..a1eece176979a 100644
--- a/sycl/test/esimd/math_impl.cpp
+++ b/sycl/test/esimd/math_impl.cpp
@@ -4,7 +4,7 @@
 // sin, cos, exp, log.
 
 #include <CL/sycl.hpp>
-#include <CL/sycl/INTEL/esimd.hpp>
+#include <sycl/ext/intel/experimental/esimd.hpp>
 #include <CL/sycl/builtins_esimd.hpp>
 
 using namespace cl::sycl;
diff --git a/sycl/test/extensions/fpga.cpp b/sycl/test/extensions/fpga.cpp
index 504c3543fa4ac..fe2f16254805d 100644
--- a/sycl/test/extensions/fpga.cpp
+++ b/sycl/test/extensions/fpga.cpp
@@ -1,7 +1,7 @@
 // RUN: %clangxx -fsycl %s -o %t.out
 
 #include <CL/sycl.hpp>
-#include <CL/sycl/INTEL/fpga_extensions.hpp>
+#include <sycl/ext/intel/fpga_extensions.hpp>
 namespace intelfpga {
 template <unsigned ID> struct ethernet_pipe_id {
   static constexpr unsigned id = ID;
@@ -11,19 +11,19 @@ template <typename T, cl::sycl::access::address_space space>
 void lsu_body(cl::sycl::multi_ptr<T, space> input_ptr,
               cl::sycl::multi_ptr<T, space> output_ptr) {
   using PrefetchingLSU =
-      cl::sycl::INTEL::lsu<cl::sycl::INTEL::prefetch<true>,
-                           cl::sycl::INTEL::statically_coalesce<false>>;
+      cl::sycl::ext::intel::lsu<cl::sycl::ext::intel::prefetch<true>,
+                           cl::sycl::ext::intel::statically_coalesce<false>>;
 
   using BurstCoalescedLSU =
-      cl::sycl::INTEL::lsu<cl::sycl::INTEL::burst_coalesce<true>,
-                           cl::sycl::INTEL::statically_coalesce<false>>;
+      cl::sycl::ext::intel::lsu<cl::sycl::ext::intel::burst_coalesce<true>,
+                           cl::sycl::ext::intel::statically_coalesce<false>>;
 
   using CachingLSU =
-      cl::sycl::INTEL::lsu<cl::sycl::INTEL::burst_coalesce<true>,
-                           cl::sycl::INTEL::cache<1024>,
-                           cl::sycl::INTEL::statically_coalesce<false>>;
+      cl::sycl::ext::intel::lsu<cl::sycl::ext::intel::burst_coalesce<true>,
+                           cl::sycl::ext::intel::cache<1024>,
+                           cl::sycl::ext::intel::statically_coalesce<false>>;
 
-  using PipelinedLSU = cl::sycl::INTEL::lsu<>;
+  using PipelinedLSU = cl::sycl::ext::intel::lsu<>;
 
   int X = PrefetchingLSU::load(input_ptr); // int X = input_ptr[0]
   int Y = CachingLSU::load(input_ptr + 1); // int Y = input_ptr[1]
@@ -33,9 +33,9 @@ void lsu_body(cl::sycl::multi_ptr<T, space> input_ptr,
 }
 
 using ethernet_read_pipe =
-    sycl::INTEL::kernel_readable_io_pipe<ethernet_pipe_id<0>, int, 0>;
+    sycl::ext::intel::kernel_readable_io_pipe<ethernet_pipe_id<0>, int, 0>;
 using ethernet_write_pipe =
-    sycl::INTEL::kernel_writeable_io_pipe<ethernet_pipe_id<1>, int, 0>;
+    sycl::ext::intel::kernel_writeable_io_pipe<ethernet_pipe_id<1>, int, 0>;
 } // namespace intelfpga
 
 int main() {
@@ -44,7 +44,7 @@ int main() {
   sycl::buffer<int, 1> Buf{sycl::range{1}};
   Queue.submit([&](sycl::handler &CGH) {
     sycl::ext::oneapi::accessor_property_list PL{
-        sycl::INTEL::buffer_location<1>};
+        sycl::ext::intel::buffer_location<1>};
     sycl::accessor Acc(Buf, CGH, sycl::write_only, PL);
     CGH.single_task<class Test>([=]() { Acc[0] = 42; });
   });
@@ -71,7 +71,7 @@ int main() {
     });
   });
 
-  using Pipe = cl::sycl::INTEL::pipe<class PipeName, int>;
+  using Pipe = cl::sycl::ext::intel::pipe<class PipeName, int>;
   cl::sycl::buffer<int, 1> readBuf(1);
   Queue.submit([&](cl::sycl::handler &cgh) {
     cgh.single_task<class writer>([=]() {
diff --git a/sycl/test/warnings/sycl_2020_deprecations.cpp b/sycl/test/warnings/sycl_2020_deprecations.cpp
index ab08b29cf255d..81c4792149c33 100644
--- a/sycl/test/warnings/sycl_2020_deprecations.cpp
+++ b/sycl/test/warnings/sycl_2020_deprecations.cpp
@@ -4,8 +4,7 @@
 // RUN: %clangxx %fsycl-host-only -fsyntax-only -sycl-std=1.2.1 -Xclang -verify -Xclang -verify-ignore-unexpected=note %s -o %t.out
 
 #include <CL/sycl.hpp>
-#include <CL/sycl/ONEAPI/atomic_fence.hpp>
-#include <CL/sycl/INTEL/online_compiler.hpp>
+#include <sycl/ext/intel/online_compiler.hpp>
 
 int main() {
   cl_context ClCtx;
@@ -141,14 +140,13 @@ int main() {
   // expected-warning@+1{{'extensions' is deprecated: device::extensions is deprecated, use info::device::aspects instead.}}
   auto DE = sycl::info::device::extensions;
 
-  // expected-warning@+4{{'ONEAPI' is deprecated: use 'ext::oneapi' instead}}
   // expected-warning@+3{{'atomic_fence' is deprecated: use sycl::atomic_fence instead}}
-  // expected-warning@+2{{'ONEAPI' is deprecated: use 'ext::oneapi' instead}}
-  // expected-warning@+2{{'ONEAPI' is deprecated: use 'ext::oneapi' instead}}
-  sycl::ONEAPI::atomic_fence(sycl::ONEAPI::memory_order::relaxed,
+  // expected-error@+2{{no member named 'ONEAPI' in namespace 'sycl'}}
+  // expected-error@+2{{no member named 'ONEAPI' in namespace 'sycl'}}
+  sycl::ext::oneapi::atomic_fence(sycl::ONEAPI::memory_order::relaxed,
                              sycl::ONEAPI::memory_scope::work_group);
 
-  // expected-warning@+1{{'INTEL' is deprecated: use 'ext::intel::experimental' instead}}
+  // expected-error@+1{{no member named 'INTEL' in namespace 'sycl'}}
   auto SL = sycl::INTEL::source_language::opencl_c;
   (void)SL;