diff --git a/sycl/include/sycl/sycl.hpp b/sycl/include/sycl/sycl.hpp
index 18c37efe23ce6..fe9247585ea55 100644
--- a/sycl/include/sycl/sycl.hpp
+++ b/sycl/include/sycl/sycl.hpp
@@ -105,12 +105,6 @@
 #include <sycl/ext/oneapi/sub_group.hpp>
 #include <sycl/ext/oneapi/sub_group_mask.hpp>
 #include <sycl/ext/oneapi/weak_object.hpp>
-#if !defined(SYCL2020_CONFORMANT_APIS) &&                                      \
-    !defined(__INTEL_PREVIEW_BREAKING_CHANGES)
-// We used to include those and some code might be reliant on that.
-#include <cmath>
-#include <complex>
-#endif
 
 #if !defined(__INTEL_PREVIEW_BREAKING_CHANGES)
 namespace sycl {
diff --git a/sycl/test-e2e/ESIMD/api/functional/value.hpp b/sycl/test-e2e/ESIMD/api/functional/value.hpp
index bc4dd996937c3..06d9eab8fab75 100644
--- a/sycl/test-e2e/ESIMD/api/functional/value.hpp
+++ b/sycl/test-e2e/ESIMD/api/functional/value.hpp
@@ -20,6 +20,7 @@
 #include <sycl/sycl.hpp>
 
 #include <climits>
+#include <cmath>
 #include <limits>
 #include <type_traits>
 
diff --git a/sycl/test-e2e/ESIMD/kmeans/kmeans.cpp b/sycl/test-e2e/ESIMD/kmeans/kmeans.cpp
index 53e2e5df5f6c9..5d3ad4257b815 100644
--- a/sycl/test-e2e/ESIMD/kmeans/kmeans.cpp
+++ b/sycl/test-e2e/ESIMD/kmeans/kmeans.cpp
@@ -11,6 +11,7 @@
 #include "kmeans.h"
 #include "esimd_test_utils.hpp"
 
+#include <cmath>
 #include <fstream>
 #include <iostream>
 #include <string.h>
diff --git a/sycl/test/basic_tests/fp-accuracy.cpp b/sycl/test/basic_tests/fp-accuracy.cpp
index c758e453ab24a..5281e07e69f55 100644
--- a/sycl/test/basic_tests/fp-accuracy.cpp
+++ b/sycl/test/basic_tests/fp-accuracy.cpp
@@ -1,6 +1,9 @@
 // RUN: %clangxx -%fsycl-host-only -c -ffp-accuracy=high -faltmathlib=SVMLAltMathLibrary -fno-math-errno %s
 
 #include <sycl/sycl.hpp>
+
+#include <cmath>
+
 using namespace sycl;
 
 int main() {
diff --git a/sycl/test/basic_tests/no_math_in_global_ns.cpp b/sycl/test/basic_tests/no_math_in_global_ns.cpp
index d22c503b8c322..b234ef0ad5dba 100644
--- a/sycl/test/basic_tests/no_math_in_global_ns.cpp
+++ b/sycl/test/basic_tests/no_math_in_global_ns.cpp
@@ -1,4 +1,5 @@
-// RUN: %clangxx -fsycl -fpreview-breaking-changes -fsyntax-only -Xclang -verify %s -Xclang -verify-ignore-unexpected=warning,note
+// RUN: %clangxx -fsycl  -fsyntax-only -Xclang -verify %s -Xclang -verify-ignore-unexpected=warning,note
+// RUN: %clangxx -fsycl  -fsyntax-only -Xclang -verify %s -Xclang -verify-ignore-unexpected=warning,note -fpreview-breaking-changes
 // expected-no-diagnostics
 
 // MSVC has the following includes:
diff --git a/sycl/test/check_device_code/fp-accuracy.cpp b/sycl/test/check_device_code/fp-accuracy.cpp
index f5a42c2bbc436..13703382b50ac 100644
--- a/sycl/test/check_device_code/fp-accuracy.cpp
+++ b/sycl/test/check_device_code/fp-accuracy.cpp
@@ -8,6 +8,8 @@
 
 #include <sycl/sycl.hpp>
 
+#include <cmath>
+
 SYCL_EXTERNAL auto foo(double x) {
   using namespace sycl;
   return cos(exp(log(x)));