diff --git a/BUILD.gn b/BUILD.gn
index d9e96d39f02a86239d3bd1694fe3d6980db0eaf5..4c817c7d7b559f89369d4068e68e9f6acb4f5e17 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -23,7 +23,7 @@ config("cl_config") {
 
 config("cl_public_config") {
   include_dirs = [
-    "./",
+    "opencl-headers-CL",
     "include",
   ]
 }
@@ -41,7 +41,10 @@ ohos_shared_library("libcl") {
 }
 
 config("opencl_headers_public_config") {
-  include_dirs = [ "./" ]
+  include_dirs = [
+    "opencl-headers-CL",
+    "include",
+  ]
 }
 
 source_set("opencl_headers") {
diff --git a/CL/cl.h b/opencl-headers-CL/CL/cl.h
similarity index 100%
rename from CL/cl.h
rename to opencl-headers-CL/CL/cl.h
diff --git a/CL/cl_d3d10.h b/opencl-headers-CL/CL/cl_d3d10.h
similarity index 100%
rename from CL/cl_d3d10.h
rename to opencl-headers-CL/CL/cl_d3d10.h
diff --git a/CL/cl_d3d11.h b/opencl-headers-CL/CL/cl_d3d11.h
similarity index 100%
rename from CL/cl_d3d11.h
rename to opencl-headers-CL/CL/cl_d3d11.h
diff --git a/CL/cl_dx9_media_sharing.h b/opencl-headers-CL/CL/cl_dx9_media_sharing.h
similarity index 100%
rename from CL/cl_dx9_media_sharing.h
rename to opencl-headers-CL/CL/cl_dx9_media_sharing.h
diff --git a/CL/cl_dx9_media_sharing_intel.h b/opencl-headers-CL/CL/cl_dx9_media_sharing_intel.h
similarity index 100%
rename from CL/cl_dx9_media_sharing_intel.h
rename to opencl-headers-CL/CL/cl_dx9_media_sharing_intel.h
diff --git a/CL/cl_egl.h b/opencl-headers-CL/CL/cl_egl.h
similarity index 100%
rename from CL/cl_egl.h
rename to opencl-headers-CL/CL/cl_egl.h
diff --git a/CL/cl_ext.h b/opencl-headers-CL/CL/cl_ext.h
similarity index 100%
rename from CL/cl_ext.h
rename to opencl-headers-CL/CL/cl_ext.h
diff --git a/CL/cl_ext_intel.h b/opencl-headers-CL/CL/cl_ext_intel.h
similarity index 100%
rename from CL/cl_ext_intel.h
rename to opencl-headers-CL/CL/cl_ext_intel.h
diff --git a/CL/cl_function_types.h b/opencl-headers-CL/CL/cl_function_types.h
similarity index 100%
rename from CL/cl_function_types.h
rename to opencl-headers-CL/CL/cl_function_types.h
diff --git a/CL/cl_gl.h b/opencl-headers-CL/CL/cl_gl.h
similarity index 100%
rename from CL/cl_gl.h
rename to opencl-headers-CL/CL/cl_gl.h
diff --git a/CL/cl_gl_ext.h b/opencl-headers-CL/CL/cl_gl_ext.h
similarity index 100%
rename from CL/cl_gl_ext.h
rename to opencl-headers-CL/CL/cl_gl_ext.h
diff --git a/CL/cl_half.h b/opencl-headers-CL/CL/cl_half.h
similarity index 100%
rename from CL/cl_half.h
rename to opencl-headers-CL/CL/cl_half.h
diff --git a/CL/cl_icd.h b/opencl-headers-CL/CL/cl_icd.h
similarity index 100%
rename from CL/cl_icd.h
rename to opencl-headers-CL/CL/cl_icd.h
diff --git a/CL/cl_layer.h b/opencl-headers-CL/CL/cl_layer.h
similarity index 100%
rename from CL/cl_layer.h
rename to opencl-headers-CL/CL/cl_layer.h
diff --git a/CL/cl_platform.h b/opencl-headers-CL/CL/cl_platform.h
similarity index 100%
rename from CL/cl_platform.h
rename to opencl-headers-CL/CL/cl_platform.h
diff --git a/CL/cl_va_api_media_sharing_intel.h b/opencl-headers-CL/CL/cl_va_api_media_sharing_intel.h
similarity index 100%
rename from CL/cl_va_api_media_sharing_intel.h
rename to opencl-headers-CL/CL/cl_va_api_media_sharing_intel.h
diff --git a/CL/cl_version.h b/opencl-headers-CL/CL/cl_version.h
similarity index 100%
rename from CL/cl_version.h
rename to opencl-headers-CL/CL/cl_version.h
diff --git a/CL/opencl.h b/opencl-headers-CL/CL/opencl.h
similarity index 100%
rename from CL/opencl.h
rename to opencl-headers-CL/CL/opencl.h