diff --git a/sycl/include/sycl/detail/defines_elementary.hpp b/sycl/include/sycl/detail/defines_elementary.hpp
index f340f1018a257..c2d81d124abd7 100644
--- a/sycl/include/sycl/detail/defines_elementary.hpp
+++ b/sycl/include/sycl/detail/defines_elementary.hpp
@@ -58,7 +58,7 @@
 #endif
 
 #ifndef __SYCL_DEPRECATED
-#if !defined(SYCL2020_DISABLE_DEPRECATION_WARNINGS)
+#if !defined(__SYCL_DISABLE_DEPRECATION_WARNINGS)
 #define __SYCL_DEPRECATED(message) [[deprecated(message)]]
 #else // SYCL_DISABLE_DEPRECATION_WARNINGS
 #define __SYCL_DEPRECATED(message)
diff --git a/sycl/source/CMakeLists.txt b/sycl/source/CMakeLists.txt
index 6a38cf3fc35ed..6035cbe030fa2 100644
--- a/sycl/source/CMakeLists.txt
+++ b/sycl/source/CMakeLists.txt
@@ -53,6 +53,7 @@ function(add_sycl_rt_library LIB_NAME LIB_OBJ_NAME)
       __DPCPP_ENABLE_UNFINISHED_KHR_EXTENSIONS
       __SYCL_INTERNAL_API
       SYCL2020_DISABLE_DEPRECATION_WARNINGS
+      __SYCL_DISABLE_DEPRECATION_WARNINGS
       $<$<BOOL:${MSVC}>:__SYCL_BUILD_SYCL_DLL>
   )
 
diff --git a/sycl/tools/sycl-ls/CMakeLists.txt b/sycl/tools/sycl-ls/CMakeLists.txt
index aa0d8851cf0ac..a1cb33c6553b2 100644
--- a/sycl/tools/sycl-ls/CMakeLists.txt
+++ b/sycl/tools/sycl-ls/CMakeLists.txt
@@ -9,7 +9,12 @@ if (WIN32 AND "${build_type_lower}" MATCHES "debug")
 endif()
 
 # Disable aspect::image & deprecation warnings.
-target_compile_definitions(sycl-ls PRIVATE SYCL_DISABLE_IMAGE_ASPECT_WARNING SYCL2020_DISABLE_DEPRECATION_WARNINGS SYCL_DISABLE_FSYCL_SYCLHPP_WARNING)
+target_compile_definitions(sycl-ls
+  PRIVATE
+  __SYCL_DISABLE_DEPRECATION_WARNINGS
+  SYCL_DISABLE_IMAGE_ASPECT_WARNING
+  SYCL2020_DISABLE_DEPRECATION_WARNINGS
+  SYCL_DISABLE_FSYCL_SYCLHPP_WARNING)
 
 target_link_libraries(sycl-ls
   PRIVATE
diff --git a/sycl/unittests/CMakeLists.txt b/sycl/unittests/CMakeLists.txt
index 62af3d0074cac..9e9614f94183d 100644
--- a/sycl/unittests/CMakeLists.txt
+++ b/sycl/unittests/CMakeLists.txt
@@ -7,7 +7,10 @@ foreach(flag_var
 string(REGEX REPLACE "/MT" "/MD" ${flag_var} "${${flag_var}}")
 endforeach()
 
-add_compile_definitions(SYCL2020_DISABLE_DEPRECATION_WARNINGS SYCL_DISABLE_FSYCL_SYCLHPP_WARNING)
+add_compile_definitions(
+  __SYCL_DISABLE_DEPRECATION_WARNINGS
+  SYCL2020_DISABLE_DEPRECATION_WARNINGS
+  SYCL_DISABLE_FSYCL_SYCLHPP_WARNING)
 
 # suppress warnings which came from Google Test sources
 if (CXX_SUPPORTS_SUGGEST_OVERRIDE_FLAG)