diff --git a/gobject-subclass/src/object.rs b/gobject-subclass/src/object.rs
index 9a9f5cd0..bf0b3a47 100644
--- a/gobject-subclass/src/object.rs
+++ b/gobject-subclass/src/object.rs
@@ -19,7 +19,7 @@ use gobject_ffi;
 use glib;
 use glib::translate::*;
 
-use properties::*;
+pub use properties::*;
 
 pub trait ObjectImpl<T: ObjectType>: 'static {
     fn set_property(&self, _obj: &glib::Object, _id: u32, _value: &glib::Value) {
diff --git a/gst-plugin-audiofx/Cargo.toml b/gst-plugin-audiofx/Cargo.toml
index 584a3fab..f6338cad 100644
--- a/gst-plugin-audiofx/Cargo.toml
+++ b/gst-plugin-audiofx/Cargo.toml
@@ -6,6 +6,7 @@ repository = "https://github.com/sdroege/gst-plugin-rs"
 license = "MIT/Apache-2.0"
 
 [dependencies]
+gobject-subclass = { path="../gobject-subclass" }
 gst-plugin = { path="../gst-plugin" }
 glib = { git = "https://github.com/gtk-rs/glib" }
 gstreamer = { git = "https://github.com/sdroege/gstreamer-rs" }
diff --git a/gst-plugin-audiofx/src/audioecho.rs b/gst-plugin-audiofx/src/audioecho.rs
index 551b1350..92bfc6ab 100644
--- a/gst-plugin-audiofx/src/audioecho.rs
+++ b/gst-plugin-audiofx/src/audioecho.rs
@@ -13,8 +13,8 @@ use gst_audio;
 
 use gst_plugin::base_transform::*;
 use gst_plugin::element::*;
-use gst_plugin::object::*;
-use gst_plugin::properties::*;
+
+use gobject_subclass::object::*;
 
 use std::sync::Mutex;
 use std::{cmp, i32, iter, u64};
diff --git a/gst-plugin-audiofx/src/lib.rs b/gst-plugin-audiofx/src/lib.rs
index e33d1179..71183938 100644
--- a/gst-plugin-audiofx/src/lib.rs
+++ b/gst-plugin-audiofx/src/lib.rs
@@ -10,6 +10,7 @@
 
 extern crate byte_slice_cast;
 extern crate glib;
+extern crate gobject_subclass;
 #[macro_use]
 extern crate gst_plugin;
 #[macro_use]
diff --git a/gst-plugin-simple/Cargo.toml b/gst-plugin-simple/Cargo.toml
index e432ca85..6983197f 100644
--- a/gst-plugin-simple/Cargo.toml
+++ b/gst-plugin-simple/Cargo.toml
@@ -8,6 +8,7 @@ license = "MIT/Apache-2.0"
 [dependencies]
 url = "1.1"
 glib = { git = "https://github.com/gtk-rs/glib" }
+gobject-subclass = { path="../gobject-subclass" }
 gst-plugin = { path="../gst-plugin" }
 gstreamer = { git = "https://github.com/sdroege/gstreamer-rs" }
 gstreamer-base = { git = "https://github.com/sdroege/gstreamer-rs" }
diff --git a/gst-plugin-simple/src/demuxer.rs b/gst-plugin-simple/src/demuxer.rs
index 134647f0..1ff66adc 100644
--- a/gst-plugin-simple/src/demuxer.rs
+++ b/gst-plugin-simple/src/demuxer.rs
@@ -12,8 +12,8 @@ use std::collections::BTreeMap;
 use std::u32;
 use std::u64;
 
+use gobject_subclass::object::*;
 use gst_plugin::element::*;
-use gst_plugin::object::*;
 
 use error::*;
 
diff --git a/gst-plugin-simple/src/lib.rs b/gst-plugin-simple/src/lib.rs
index 0a67edaa..0ca4cec8 100644
--- a/gst-plugin-simple/src/lib.rs
+++ b/gst-plugin-simple/src/lib.rs
@@ -7,6 +7,7 @@
 // except according to those terms.
 
 extern crate glib;
+extern crate gobject_subclass;
 extern crate gst_plugin;
 #[macro_use]
 extern crate gstreamer as gst;
diff --git a/gst-plugin-simple/src/sink.rs b/gst-plugin-simple/src/sink.rs
index ea70e691..febca221 100644
--- a/gst-plugin-simple/src/sink.rs
+++ b/gst-plugin-simple/src/sink.rs
@@ -15,15 +15,16 @@ use gst;
 use gst::prelude::*;
 use gst_base::prelude::*;
 
-use error::*;
+use gobject_subclass::object::*;
+
 use gst_plugin::base_sink::*;
 use gst_plugin::element::*;
-use gst_plugin::object::*;
-use gst_plugin::properties::*;
 use gst_plugin::uri_handler::*;
 
 pub use gst_plugin::base_sink::BaseSink;
 
+use error::*;
+
 use UriValidator;
 
 pub trait SinkImpl: Send + 'static {
diff --git a/gst-plugin-simple/src/source.rs b/gst-plugin-simple/src/source.rs
index 98c3c5e8..2d659a02 100644
--- a/gst-plugin-simple/src/source.rs
+++ b/gst-plugin-simple/src/source.rs
@@ -17,15 +17,16 @@ use gst;
 use gst::prelude::*;
 use gst_base::prelude::*;
 
-use error::*;
+use gobject_subclass::object::*;
+
 use gst_plugin::base_src::*;
 use gst_plugin::element::*;
-use gst_plugin::object::*;
-use gst_plugin::properties::*;
 use gst_plugin::uri_handler::*;
 
 pub use gst_plugin::base_src::BaseSrc;
 
+use error::*;
+
 use UriValidator;
 
 pub trait SourceImpl: Send + 'static {
diff --git a/gst-plugin-togglerecord/Cargo.toml b/gst-plugin-togglerecord/Cargo.toml
index 802bc9a2..4165a1da 100644
--- a/gst-plugin-togglerecord/Cargo.toml
+++ b/gst-plugin-togglerecord/Cargo.toml
@@ -8,6 +8,7 @@ license = "LGPL-2.1+"
 glib = { git = "https://github.com/gtk-rs/glib" }
 gstreamer = { git = "https://github.com/sdroege/gstreamer-rs" }
 gstreamer-video = { git = "https://github.com/sdroege/gstreamer-rs" }
+gobject-subclass = { path="../gobject-subclass" }
 gst-plugin = { path = "../gst-plugin" }
 gtk = { git = "https://github.com/gtk-rs/gtk", features = ["v3_6"], optional = true }
 gio = { git = "https://github.com/gtk-rs/gio", optional = true }
diff --git a/gst-plugin-togglerecord/src/lib.rs b/gst-plugin-togglerecord/src/lib.rs
index bc18d13c..9350c290 100644
--- a/gst-plugin-togglerecord/src/lib.rs
+++ b/gst-plugin-togglerecord/src/lib.rs
@@ -18,6 +18,7 @@
 #![crate_type = "cdylib"]
 
 extern crate glib;
+extern crate gobject_subclass;
 #[macro_use]
 extern crate gst_plugin;
 #[macro_use]
diff --git a/gst-plugin-togglerecord/src/togglerecord.rs b/gst-plugin-togglerecord/src/togglerecord.rs
index 93bfbf44..f891758e 100644
--- a/gst-plugin-togglerecord/src/togglerecord.rs
+++ b/gst-plugin-togglerecord/src/togglerecord.rs
@@ -21,9 +21,8 @@ use gst;
 use gst::prelude::*;
 use gst_video;
 
+use gobject_subclass::object::*;
 use gst_plugin::element::*;
-use gst_plugin::object::*;
-use gst_plugin::properties::*;
 
 use std::cmp;
 use std::collections::HashMap;
diff --git a/gst-plugin-tutorial/Cargo.toml b/gst-plugin-tutorial/Cargo.toml
index f2b2e8ed..2f6784ca 100644
--- a/gst-plugin-tutorial/Cargo.toml
+++ b/gst-plugin-tutorial/Cargo.toml
@@ -6,6 +6,7 @@ repository = "https://github.com/sdroege/gst-plugin-rs"
 license = "MIT/Apache-2.0"
 
 [dependencies]
+gobject-subclass = { path="../gobject-subclass" }
 gst-plugin = { path="../gst-plugin" }
 glib = { git = "https://github.com/gtk-rs/glib" }
 gstreamer = { git = "https://github.com/sdroege/gstreamer-rs" }
diff --git a/gst-plugin-tutorial/src/lib.rs b/gst-plugin-tutorial/src/lib.rs
index 6f37b508..4b1f1998 100644
--- a/gst-plugin-tutorial/src/lib.rs
+++ b/gst-plugin-tutorial/src/lib.rs
@@ -7,6 +7,7 @@
 // except according to those terms.
 
 extern crate glib;
+extern crate gobject_subclass;
 #[macro_use]
 extern crate gst_plugin;
 #[macro_use]
diff --git a/gst-plugin-tutorial/src/rgb2gray.rs b/gst-plugin-tutorial/src/rgb2gray.rs
index 463c6817..9f76f9a5 100644
--- a/gst-plugin-tutorial/src/rgb2gray.rs
+++ b/gst-plugin-tutorial/src/rgb2gray.rs
@@ -11,10 +11,9 @@ use gst;
 use gst::prelude::*;
 use gst_video;
 
+use gobject_subclass::object::*;
 use gst_plugin::base_transform::*;
 use gst_plugin::element::*;
-use gst_plugin::object::*;
-use gst_plugin::properties::*;
 
 use std::i32;
 use std::sync::Mutex;
diff --git a/gst-plugin-tutorial/src/sinesrc.rs b/gst-plugin-tutorial/src/sinesrc.rs
index 1de19782..2612285f 100644
--- a/gst-plugin-tutorial/src/sinesrc.rs
+++ b/gst-plugin-tutorial/src/sinesrc.rs
@@ -14,10 +14,9 @@ use gst_base::prelude::*;
 
 use byte_slice_cast::*;
 
+use gobject_subclass::object::*;
 use gst_plugin::base_src::*;
 use gst_plugin::element::*;
-use gst_plugin::object::*;
-use gst_plugin::properties::*;
 
 use std::ops::Rem;
 use std::sync::Mutex;
diff --git a/gst-plugin/src/base_sink.rs b/gst-plugin/src/base_sink.rs
index cd6012a8..4ff95ce4 100644
--- a/gst-plugin/src/base_sink.rs
+++ b/gst-plugin/src/base_sink.rs
@@ -20,7 +20,9 @@ use gst;
 use gst::prelude::*;
 use gst_base;
 
-use anyimpl::*;
+use gobject_subclass::anyimpl::*;
+use gobject_subclass::object::*;
+
 use element::*;
 use object::*;
 
diff --git a/gst-plugin/src/base_src.rs b/gst-plugin/src/base_src.rs
index 0664a018..fbf23d44 100644
--- a/gst-plugin/src/base_src.rs
+++ b/gst-plugin/src/base_src.rs
@@ -20,7 +20,9 @@ use gst;
 use gst::prelude::*;
 use gst_base;
 
-use anyimpl::*;
+use gobject_subclass::anyimpl::*;
+use gobject_subclass::object::*;
+
 use element::*;
 use object::*;
 
diff --git a/gst-plugin/src/base_transform.rs b/gst-plugin/src/base_transform.rs
index f4cc2394..cf308fa8 100644
--- a/gst-plugin/src/base_transform.rs
+++ b/gst-plugin/src/base_transform.rs
@@ -20,7 +20,9 @@ use gst;
 use gst::prelude::*;
 use gst_base;
 
-use anyimpl::*;
+use gobject_subclass::anyimpl::*;
+use gobject_subclass::object::*;
+
 use element::*;
 use object::*;
 
diff --git a/gst-plugin/src/bin.rs b/gst-plugin/src/bin.rs
index 69ebc2ee..c6b4c016 100644
--- a/gst-plugin/src/bin.rs
+++ b/gst-plugin/src/bin.rs
@@ -18,7 +18,9 @@ use glib::translate::*;
 use gst;
 use gst::prelude::*;
 
-use anyimpl::*;
+use gobject_subclass::anyimpl::*;
+use gobject_subclass::object::*;
+
 use element::*;
 use object::*;
 
diff --git a/gst-plugin/src/element.rs b/gst-plugin/src/element.rs
index a9ce4efc..4b5d0b1f 100644
--- a/gst-plugin/src/element.rs
+++ b/gst-plugin/src/element.rs
@@ -21,7 +21,9 @@ use glib::translate::*;
 use gst;
 use gst::prelude::*;
 
-use anyimpl::*;
+use gobject_subclass::anyimpl::*;
+use gobject_subclass::object::*;
+
 use object::*;
 
 pub trait ElementImpl<T: ElementBase>: ObjectImpl<T> + AnyImpl + Send + Sync + 'static
diff --git a/gst-plugin/src/lib.rs b/gst-plugin/src/lib.rs
index 68d40da4..374ebf66 100644
--- a/gst-plugin/src/lib.rs
+++ b/gst-plugin/src/lib.rs
@@ -10,8 +10,8 @@ extern crate byteorder;
 
 pub extern crate glib_sys as glib_ffi;
 pub extern crate gobject_sys as gobject_ffi;
-pub extern crate gstreamer_sys as gst_ffi;
 extern crate gstreamer_base_sys as gst_base_ffi;
+pub extern crate gstreamer_sys as gst_ffi;
 
 #[macro_use]
 extern crate lazy_static;
@@ -26,10 +26,6 @@ extern crate gstreamer_base as gst_base;
 #[macro_use]
 extern crate gobject_subclass;
 
-pub use gobject_subclass::anyimpl;
-pub use gobject_subclass::guard;
-pub use gobject_subclass::properties;
-
 pub mod object;
 
 #[macro_use]
diff --git a/gst-plugin/src/object.rs b/gst-plugin/src/object.rs
index abc8f35d..7775dee6 100644
--- a/gst-plugin/src/object.rs
+++ b/gst-plugin/src/object.rs
@@ -1,7 +1,7 @@
 use std::ptr;
 use std::sync::atomic::AtomicBool;
 
-pub use gobject_subclass::object::*;
+use gobject_subclass::object::*;
 
 #[repr(C)]
 pub struct ElementInstanceStruct<T: ObjectType> {
diff --git a/gst-plugin/src/pipeline.rs b/gst-plugin/src/pipeline.rs
index 146f6126..d1ad5d94 100644
--- a/gst-plugin/src/pipeline.rs
+++ b/gst-plugin/src/pipeline.rs
@@ -18,7 +18,9 @@ use glib::translate::*;
 use gst;
 use gst::prelude::*;
 
-use anyimpl::*;
+use gobject_subclass::anyimpl::*;
+use gobject_subclass::object::*;
+
 use bin::*;
 use element::*;
 use object::*;
diff --git a/gst-plugin/src/uri_handler.rs b/gst-plugin/src/uri_handler.rs
index 4702ea11..7873bd16 100644
--- a/gst-plugin/src/uri_handler.rs
+++ b/gst-plugin/src/uri_handler.rs
@@ -16,8 +16,8 @@ use glib::translate::*;
 use gst;
 use libc;
 
-use anyimpl::*;
-use object::*;
+use gobject_subclass::anyimpl::*;
+use gobject_subclass::object::*;
 
 pub trait URIHandlerImpl: AnyImpl + Send + Sync + 'static {
     fn get_uri(&self, element: &gst::URIHandler) -> Option<String>;