diff --git a/examples/cython/sycl_buffer/src/use_sycl_buffer.hpp b/examples/cython/sycl_buffer/src/use_sycl_buffer.hpp
index 6d112220bd..1be8f3ddf9 100644
--- a/examples/cython/sycl_buffer/src/use_sycl_buffer.hpp
+++ b/examples/cython/sycl_buffer/src/use_sycl_buffer.hpp
@@ -29,8 +29,11 @@
 
 #pragma once
 
-#include <CL/sycl.hpp>
 #include <algorithm>
+#include <cstddef>
+#include <sycl/sycl.hpp>
+
+using std::size_t;
 
 inline size_t upper_multiple(size_t n, size_t wg)
 {
diff --git a/examples/cython/sycl_buffer/syclbuffer/_buffer_example.pyx b/examples/cython/sycl_buffer/syclbuffer/_buffer_example.pyx
index de3a0f6134..ef53aa2a46 100644
--- a/examples/cython/sycl_buffer/syclbuffer/_buffer_example.pyx
+++ b/examples/cython/sycl_buffer/syclbuffer/_buffer_example.pyx
@@ -35,7 +35,7 @@ cdef extern from "use_sycl_buffer.hpp":
         size_t,         # number of columns of the input matrix
         const T *,      # data pointer of the input matrix
         T *             # pointer for the resulting vector
-    ) nogil except+
+    ) except+ nogil
 
 
 def columnwise_total(cython.floating[:, ::1] mat, queue=None):
@@ -83,7 +83,7 @@ def columnwise_total(cython.floating[:, ::1] mat, queue=None):
         q = c_dpctl.SyclQueue(queue)
     exec_queue_ptr = unwrap_queue(q.get_queue_ref())
 
-    with nogil:
+    with nogil, cython.boundscheck(False):
         native_columnwise_total(
             exec_queue_ptr[0], n_rows, n_cols, &mat[0,0], &res_memslice[0]
         )
diff --git a/examples/cython/use_dpctl_sycl/use_dpctl_sycl/utils.hpp b/examples/cython/use_dpctl_sycl/use_dpctl_sycl/utils.hpp
index dfe7485a60..13d3f21060 100644
--- a/examples/cython/use_dpctl_sycl/use_dpctl_sycl/utils.hpp
+++ b/examples/cython/use_dpctl_sycl/use_dpctl_sycl/utils.hpp
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include <CL/sycl.hpp>
 #include <string>
+#include <sycl/sycl.hpp>
 
 std::string get_device_name(sycl::device d)
 {
diff --git a/examples/cython/usm_memory/src/sycl_blackscholes.hpp b/examples/cython/usm_memory/src/sycl_blackscholes.hpp
index 267549255e..db5da1a89f 100644
--- a/examples/cython/usm_memory/src/sycl_blackscholes.hpp
+++ b/examples/cython/usm_memory/src/sycl_blackscholes.hpp
@@ -28,9 +28,9 @@
 
 #pragma once
 
-#include <CL/sycl.hpp>
 #include <oneapi/mkl.hpp>
 #include <oneapi/mkl/rng/device.hpp>
+#include <sycl/sycl.hpp>
 
 template <typename T> class black_scholes_kernel;
 
diff --git a/examples/pybind11/onemkl_gemv/cpp/main.cpp b/examples/pybind11/onemkl_gemv/cpp/main.cpp
index 0fe6cfd67c..2a337db02d 100644
--- a/examples/pybind11/onemkl_gemv/cpp/main.cpp
+++ b/examples/pybind11/onemkl_gemv/cpp/main.cpp
@@ -25,10 +25,10 @@
 //===----------------------------------------------------------------------===//
 
 #include "cg_solver.hpp"
-#include <CL/sycl.hpp>
 #include <chrono>
 #include <iostream>
 #include <oneapi/mkl.hpp>
+#include <sycl/sycl.hpp>
 
 using T = double;
 
diff --git a/examples/pybind11/onemkl_gemv/sycl_gemm/_onemkl.cpp b/examples/pybind11/onemkl_gemv/sycl_gemm/_onemkl.cpp
index 1e203fe04d..f71e9f2dea 100644
--- a/examples/pybind11/onemkl_gemv/sycl_gemm/_onemkl.cpp
+++ b/examples/pybind11/onemkl_gemv/sycl_gemm/_onemkl.cpp
@@ -27,7 +27,7 @@
 //===----------------------------------------------------------------------===//
 
 // clang-format off
-#include <CL/sycl.hpp>
+#include <sycl/sycl.hpp>
 #include <oneapi/mkl.hpp>
 #include "cg_solver.hpp"
 #include <pybind11/pybind11.h>
diff --git a/examples/pybind11/onemkl_gemv/sycl_gemm/cg_solver.hpp b/examples/pybind11/onemkl_gemv/sycl_gemm/cg_solver.hpp
index 42cef73c5b..32c75a7055 100644
--- a/examples/pybind11/onemkl_gemv/sycl_gemm/cg_solver.hpp
+++ b/examples/pybind11/onemkl_gemv/sycl_gemm/cg_solver.hpp
@@ -27,8 +27,8 @@
 
 #pragma once
 
-#include <CL/sycl.hpp>
 #include <oneapi/mkl.hpp>
+#include <sycl/sycl.hpp>
 
 namespace cg_solver
 {
diff --git a/examples/pybind11/use_dpctl_sycl_kernel/use_kernel/_example.cpp b/examples/pybind11/use_dpctl_sycl_kernel/use_kernel/_example.cpp
index 92d0066db2..cc69b80430 100644
--- a/examples/pybind11/use_dpctl_sycl_kernel/use_kernel/_example.cpp
+++ b/examples/pybind11/use_dpctl_sycl_kernel/use_kernel/_example.cpp
@@ -27,10 +27,10 @@
 //===----------------------------------------------------------------------===//
 
 #include "dpctl4pybind11.hpp"
-#include <CL/sycl.hpp>
 #include <cstdint>
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
+#include <sycl/sycl.hpp>
 #include <vector>
 
 namespace py = pybind11;
diff --git a/examples/pybind11/use_dpctl_sycl_queue/use_queue_device/_example.cpp b/examples/pybind11/use_dpctl_sycl_queue/use_queue_device/_example.cpp
index 5186cfc102..291e450037 100644
--- a/examples/pybind11/use_dpctl_sycl_queue/use_queue_device/_example.cpp
+++ b/examples/pybind11/use_dpctl_sycl_queue/use_queue_device/_example.cpp
@@ -27,11 +27,11 @@
 //===----------------------------------------------------------------------===//
 
 #include "dpctl4pybind11.hpp"
-#include <CL/sycl.hpp>
 #include <cstdint>
 #include <pybind11/numpy.h>
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
+#include <sycl/sycl.hpp>
 
 namespace py = pybind11;