diff --git a/pyopencl/cffi_cl.py b/pyopencl/cffi_cl.py
index dd06da856d10274f85d186ddd4728faa040d6fac..f7d24d46b9f20ed768c02cd8397c5ac637c98c3a 100644
--- a/pyopencl/cffi_cl.py
+++ b/pyopencl/cffi_cl.py
@@ -252,7 +252,7 @@ class Context(_Common):
         if devices is not None:
             if dev_type is not None:
                 raise RuntimeError("Context", status_code.INVALID_VALUE, "one of 'devices' or 'dev_type' must be None")
-            ptr_devices = _ffi.new('cl_device_id[]', [device.ptr for device in devices])
+            ptr_devices = _ffi.new('void*[]', [device.ptr for device in devices])
             ptr_ctx = _ffi.new('void **')
             _handle_error(_lib._create_context(ptr_ctx, c_props, len(ptr_devices), _ffi.cast('void**', ptr_devices)))
             
diff --git a/src/c_wrapper/wrap_cl.cpp b/src/c_wrapper/wrap_cl.cpp
index 1000894f1fd06962e5db39a261179fb8349d51f2..ad867f09255a63384332921cee3d45dc386523e0 100644
--- a/src/c_wrapper/wrap_cl.cpp
+++ b/src/c_wrapper/wrap_cl.cpp
@@ -2127,7 +2127,7 @@ void _free2(void **p, uint32_t size) {
   return 0;
 }
 
-::error *event__get_profiling_info(void *ptr, cl_uint param, generic_info *out) {
+::error *event__get_profiling_info(void *ptr, cl_profiling_info param, generic_info *out) {
   C_HANDLE_ERROR(*out = static_cast<pyopencl::event*>(ptr)->get_profiling_info(param););
   return 0;
 }
@@ -2149,7 +2149,7 @@ void _free2(void **p, uint32_t size) {
   return 0;
 }
 
-::error *kernel__get_work_group_info(void *ptr, cl_uint param, void *ptr_device, generic_info *out) {
+::error *kernel__get_work_group_info(void *ptr, cl_kernel_work_group_info param, void *ptr_device, generic_info *out) {
   C_HANDLE_ERROR(*out = static_cast<pyopencl::kernel*>(ptr)->get_work_group_info(param, *static_cast<pyopencl::device*>(ptr_device)););
   return 0;
 }
diff --git a/src/c_wrapper/wrap_cl_core.h b/src/c_wrapper/wrap_cl_core.h
index 7fee97ee9aee28fc55c7876475aca3c166028a9b..6e8e5a832ebb5947937a8193dda442ba8e09f1fe 100644
--- a/src/c_wrapper/wrap_cl_core.h
+++ b/src/c_wrapper/wrap_cl_core.h
@@ -39,11 +39,11 @@ error *program__build(void *ptr_program, char *options, cl_uint num_devices, voi
 error *program__kind(void *ptr_program, int *kind);
 error *program__get_build_info(void *ptr_program, void *ptr_device, cl_program_build_info param, generic_info *out);
 
-error *event__get_profiling_info(void *ptr_event, cl_uint param, generic_info *out);
+error *event__get_profiling_info(void *ptr_event, cl_profiling_info param, generic_info *out);
 
 error *_create_kernel(void **ptr_kernel, void *ptr_program, char *name);
 error *kernel__set_arg_mem_buffer(void *ptr_kernel, cl_uint arg_index, void *ptr_buffer);
-error *kernel__get_work_group_info(void *ptr_kernel, cl_uint param, void *ptr_device, generic_info *out);
+error *kernel__get_work_group_info(void *ptr_kernel, cl_kernel_work_group_info param, void *ptr_device, generic_info *out);
 long _hash(void *ptr_platform, class_t);
 
 error *_enqueue_nd_range_kernel(void **ptr_event, void *ptr_command_queue, void *ptr_kernel, cl_uint work_dim, const size_t *global_work_offset, const size_t *global_work_size, const size_t *local_work_size);