diff --git a/sycl/include/CL/sycl/detail/builtins.hpp b/sycl/include/CL/sycl/detail/builtins.hpp
index 290aaf6e65a41..a1e10c32f205d 100644
--- a/sycl/include/CL/sycl/detail/builtins.hpp
+++ b/sycl/include/CL/sycl/detail/builtins.hpp
@@ -286,6 +286,7 @@ __SYCL_MAKE_CALL_ARG3(select, __FUNC_PREFIX_OCL) // select
 #undef __SYCL_MAKE_CALL_ARG1
 #undef __SYCL_MAKE_CALL_ARG2
 #undef __SYCL_MAKE_CALL_ARG2_SAME
+#undef __SYCL_MAKE_CALL_ARG2_SAME_RESULT
 #undef __SYCL_MAKE_CALL_ARG3
 #undef __SYCL_PPCAT_NX
 #undef __SYCL_PPCAT
diff --git a/sycl/include/CL/sycl/swizzles.def b/sycl/include/CL/sycl/swizzles.def
index 845b6e5653751..fd503e445d7fe 100644
--- a/sycl/include/CL/sycl/swizzles.def
+++ b/sycl/include/CL/sycl/swizzles.def
@@ -820,3 +820,4 @@ __SYCL_ACCESS(N == 16, even, 0, 2, 4, 6, 8, 10, 12, 14)
 #undef __SYCL_EXPAND
 #undef __SYCL_INDEXER
 #undef __SYCL_ACCESS
+#undef __SYCL_SCALAR_ACCESS
diff --git a/sycl/include/CL/sycl/types.hpp b/sycl/include/CL/sycl/types.hpp
index 3dfbb27f56445..2e21aa19e7427 100644
--- a/sycl/include/CL/sycl/types.hpp
+++ b/sycl/include/CL/sycl/types.hpp
@@ -2270,6 +2270,7 @@ __SYCL_DECLARE_FLOAT_VECTOR_CONVERTERS(double)
 #undef __SYCL_DECLARE_BOOL_VECTOR_CONVERTERS
 #undef __SYCL_DECLARE_BOOL_CONVERTER
 #undef __SYCL_DECLARE_SCALAR_BOOL_CONVERTER
+#undef __SYCL_USE_EXT_VECTOR_TYPE__
 
 } // namespace sycl
 } // __SYCL_INLINE_NAMESPACE(cl)