diff --git a/pyopencl/__init__.py b/pyopencl/__init__.py
index 6b678b377afd41842317d7dedc4ede8d966f7009..b6e5ea835f0ef4cc9676cce67b6998b204bc0231 100644
--- a/pyopencl/__init__.py
+++ b/pyopencl/__init__.py
@@ -58,12 +58,18 @@ from pyopencl.cffi_cl import (  # noqa
         device_mem_cache_type,
         device_local_mem_type,
         device_exec_capabilities,
+        device_svm_capabilities,
+
         command_queue_properties,
         context_info,
         gl_context_info,
         context_properties,
         command_queue_info,
+        queue_properties,
+
         mem_flags,
+        svm_mem_flags,
+
         channel_order,
         channel_type,
         mem_object_type,
@@ -76,19 +82,20 @@ from pyopencl.cffi_cl import (  # noqa
         program_info,
         program_build_info,
         program_binary_type,
+
         kernel_info,
         kernel_arg_info,
         kernel_arg_address_qualifier,
         kernel_arg_access_qualifier,
+        kernel_arg_type_qualifier,
         kernel_work_group_info,
+
         event_info,
         command_type,
         command_execution_status,
         profiling_info,
         mem_migration_flags,
         mem_migration_flags_ext,
-        device_partition_property_ext,
-        affinity_domain_ext,
         device_partition_property,
         device_affinity_domain,
         gl_object_type,
diff --git a/pyopencl/cffi_cl.py b/pyopencl/cffi_cl.py
index 28e8179405536f2994fc2d8af702010972c5b888..4c9182189203046f3320c7f227a6ffed755d6b75 100644
--- a/pyopencl/cffi_cl.py
+++ b/pyopencl/cffi_cl.py
@@ -259,6 +259,8 @@ class _NoInit(object):
 
 # {{{ constant classes
 
+# /!\ If you add anything here, add it to pyopencl/__init__.py as well.
+
 class program_kind(_NoInit):  # noqa
     pass
 
@@ -441,14 +443,6 @@ class mem_migration_flags_ext(_NoInit):  # noqa
     pass
 
 
-class device_partition_property_ext(_NoInit):  # noqa
-    pass
-
-
-class affinity_domain_ext(_NoInit):  # noqa
-    pass
-
-
 class device_partition_property(_NoInit):  # noqa
     pass
 
@@ -596,15 +590,6 @@ class Device(_Common):
         return [Device._create(devices.ptr[0][i])
                 for i in range(devices.size[0])]
 
-    def create_sub_devices_ext(self, props):
-        props = (tuple(props) +
-                 (device_partition_property_ext.PROPERTIES_LIST_END,))
-        devices = _CArray(_ffi.new('clobj_t**'))
-        _handle_error(_lib.device__create_sub_devices_ext(
-            self.ptr, devices.ptr, devices.size, props))
-        return [Device._create(devices.ptr[0][i])
-                for i in range(devices.size[0])]
-
 # }}}