diff --git a/include/acl.h b/include/acl.h
index 615ac3e6..a351c938 100644
--- a/include/acl.h
+++ b/include/acl.h
@@ -9,7 +9,7 @@
 #include <string>
 #include <vector>
 
-#include <CL/cl_ext_intel.h>
+#include <CL/cl_ext.h>
 
 #include "acl_visibility.h"
 
diff --git a/include/acl_svm.h b/include/acl_svm.h
index 449d2826..985a97b5 100644
--- a/include/acl_svm.h
+++ b/include/acl_svm.h
@@ -4,7 +4,6 @@
 #ifndef ACL_SVM_H
 #define ACL_SVM_H
 
-#include <CL/cl_ext.h>
 #include <CL/opencl.h>
 
 #include "acl_types.h"
diff --git a/include/acl_usm.h b/include/acl_usm.h
index 0d364b9c..74aaf390 100644
--- a/include/acl_usm.h
+++ b/include/acl_usm.h
@@ -4,8 +4,6 @@
 #ifndef ACL_USM_H
 #define ACL_USM_H
 
-#include <CL/cl_ext.h>
-#include <CL/cl_ext_intel.h>
 #include <CL/opencl.h>
 
 #include "acl_types.h"
diff --git a/src/acl_icd_dispatch.cpp b/src/acl_icd_dispatch.cpp
index 75662b53..b1700bc2 100644
--- a/src/acl_icd_dispatch.cpp
+++ b/src/acl_icd_dispatch.cpp
@@ -5,7 +5,6 @@
 #include <string.h>
 
 // External library headers.
-#include <CL/cl_ext_intel.h>
 #include <CL/cl_ext_intelfpga.h>
 #include <CL/opencl.h>
 
diff --git a/src/acl_kernel.cpp b/src/acl_kernel.cpp
index 0ec9b16f..987b9fac 100644
--- a/src/acl_kernel.cpp
+++ b/src/acl_kernel.cpp
@@ -11,8 +11,6 @@
 #include <vector>
 
 // External library headers.
-#include <CL/cl_ext.h>
-#include <CL/cl_ext_intel.h>
 #include <CL/opencl.h>
 #include <acl_hash/acl_hash.h>
 #include <acl_threadsupport/acl_threadsupport.h>
diff --git a/src/acl_usm.cpp b/src/acl_usm.cpp
index 23b37d9d..3621b8fd 100644
--- a/src/acl_usm.cpp
+++ b/src/acl_usm.cpp
@@ -11,7 +11,6 @@
 #include <unordered_set>
 
 // External library headers.
-#include <CL/cl_ext_intel.h>
 #include <CL/opencl.h>
 
 // Internal headers.
diff --git a/test/fake_bsp/CMakeLists.txt b/test/fake_bsp/CMakeLists.txt
index fae0d711..8b86c5a9 100644
--- a/test/fake_bsp/CMakeLists.txt
+++ b/test/fake_bsp/CMakeLists.txt
@@ -4,6 +4,9 @@
 add_library(fakegoodbsp SHARED fakegoodbsp.cpp)
 target_include_directories(fakegoodbsp PRIVATE "${CMAKE_SOURCE_DIR}/src")
 target_link_libraries(fakegoodbsp PRIVATE acl_headers CppUTest test_acl_test_header)
+target_compile_definitions(fakegoodbsp PRIVATE
+  CL_TARGET_OPENCL_VERSION=300
+  )
 if(WIN32)
   target_compile_definitions(fakegoodbsp PRIVATE AOCL_MMD_CALL=__declspec\(dllexport\))
 endif()
@@ -11,6 +14,9 @@ endif()
 add_library(missingfuncbsp SHARED missingfuncbsp.cpp)
 target_include_directories(missingfuncbsp PRIVATE "${CMAKE_SOURCE_DIR}/src")
 target_link_libraries(missingfuncbsp PRIVATE acl_headers CppUTest test_acl_test_header)
+target_compile_definitions(missingfuncbsp PRIVATE
+  CL_TARGET_OPENCL_VERSION=300
+  )
 if(WIN32)
   target_compile_definitions(missingfuncbsp PRIVATE AOCL_MMD_CALL=__declspec\(dllexport\))
 endif()