diff --git a/gstreamer/src/element.rs b/gstreamer/src/element.rs
index 799c0697c..8abed30eb 100644
--- a/gstreamer/src/element.rs
+++ b/gstreamer/src/element.rs
@@ -7,7 +7,6 @@
 // except according to those terms.
 
 use Element;
-use ElementClass;
 
 use once_cell::sync::Lazy;
 
@@ -133,7 +132,7 @@ impl FromGlib<libc::c_ulong> for NotifyWatchId {
 }
 
 pub trait ElementExtManual: 'static {
-    fn get_element_class(&self) -> &ElementClass;
+    fn get_element_class(&self) -> &glib::Class<Element>;
 
     fn change_state(&self, transition: StateChange)
         -> Result<StateChangeSuccess, StateChangeError>;
@@ -271,10 +270,10 @@ pub trait ElementExtManual: 'static {
 }
 
 impl<O: IsA<Element>> ElementExtManual for O {
-    fn get_element_class(&self) -> &ElementClass {
+    fn get_element_class(&self) -> &glib::Class<Element> {
         unsafe {
             let klass = (*(self.as_ptr() as *mut gobject_sys::GTypeInstance)).g_class
-                as *const ElementClass;
+                as *const glib::Class<Element>;
             &*klass
         }
     }
diff --git a/gstreamer/src/subclass/device_provider.rs b/gstreamer/src/subclass/device_provider.rs
index 7693fb36f..111193483 100644
--- a/gstreamer/src/subclass/device_provider.rs
+++ b/gstreamer/src/subclass/device_provider.rs
@@ -15,7 +15,6 @@ use glib::subclass::prelude::*;
 
 use Device;
 use DeviceProvider;
-use DeviceProviderClass;
 use LoggableError;
 
 pub trait DeviceProviderImpl: DeviceProviderImplExt + ObjectImpl + Send + Sync {
@@ -112,7 +111,7 @@ pub unsafe trait DeviceProviderClassSubclassExt: Sized + 'static {
     }
 }
 
-unsafe impl DeviceProviderClassSubclassExt for DeviceProviderClass {}
+unsafe impl DeviceProviderClassSubclassExt for glib::Class<DeviceProvider> {}
 
 unsafe impl<T: DeviceProviderImpl> IsSubclassable<T> for DeviceProvider {
     fn override_vfuncs(klass: &mut glib::Class<Self>) {
diff --git a/gstreamer/src/subclass/element.rs b/gstreamer/src/subclass/element.rs
index 5d1ab42ad..f9ab509a5 100644
--- a/gstreamer/src/subclass/element.rs
+++ b/gstreamer/src/subclass/element.rs
@@ -19,7 +19,6 @@ use glib::translate::*;
 use prelude::*;
 
 use Element;
-use ElementClass;
 use Event;
 use PadTemplate;
 use QueryRef;
@@ -336,7 +335,7 @@ pub unsafe trait ElementClassSubclassExt: Sized + 'static {
     }
 }
 
-unsafe impl ElementClassSubclassExt for ElementClass {}
+unsafe impl ElementClassSubclassExt for glib::Class<Element> {}
 
 unsafe impl<T: ElementImpl> IsSubclassable<T> for Element
 where