diff --git a/gstreamer-app/sys/Cargo.toml b/gstreamer-app/sys/Cargo.toml
index 4b3c22852..c8a5da0c0 100644
--- a/gstreamer-app/sys/Cargo.toml
+++ b/gstreamer-app/sys/Cargo.toml
@@ -45,6 +45,7 @@ name = "gstreamer-app-sys"
 readme = "README.md"
 repository = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs"
 version = "0.17.0"
+edition = "2018"
 [package.metadata.docs.rs]
 features = ["dox"]
 [package.metadata.system-deps.gstreamer_app_1_0]
diff --git a/gstreamer-app/sys/build.rs b/gstreamer-app/sys/build.rs
index ff28f9366..c69299ced 100644
--- a/gstreamer-app/sys/build.rs
+++ b/gstreamer-app/sys/build.rs
@@ -1,10 +1,7 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
-#[cfg(not(feature = "dox"))]
-extern crate system_deps;
-
 #[cfg(not(feature = "dox"))]
 use std::process;
 
diff --git a/gstreamer-app/sys/src/lib.rs b/gstreamer-app/sys/src/lib.rs
index e0f65b471..b40309401 100644
--- a/gstreamer-app/sys/src/lib.rs
+++ b/gstreamer-app/sys/src/lib.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]
@@ -10,10 +10,9 @@
 )]
 #![cfg_attr(feature = "dox", feature(doc_cfg))]
 
-extern crate glib_sys as glib;
-extern crate gstreamer_base_sys as gst_base;
-extern crate gstreamer_sys as gst;
-extern crate libc;
+use glib_sys as glib;
+use gstreamer_base_sys as gst_base;
+use gstreamer_sys as gst;
 
 #[allow(unused_imports)]
 use libc::{
diff --git a/gstreamer-app/sys/tests/abi.rs b/gstreamer-app/sys/tests/abi.rs
index 2b9f480db..c1c862343 100644
--- a/gstreamer-app/sys/tests/abi.rs
+++ b/gstreamer-app/sys/tests/abi.rs
@@ -1,10 +1,7 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
-extern crate gstreamer_app_sys;
-extern crate shell_words;
-extern crate tempfile;
 use gstreamer_app_sys::*;
 use std::env;
 use std::error::Error;
diff --git a/gstreamer-app/sys/tests/constant.c b/gstreamer-app/sys/tests/constant.c
index 727db60a1..63be6f6a4 100644
--- a/gstreamer-app/sys/tests/constant.c
+++ b/gstreamer-app/sys/tests/constant.c
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-app/sys/tests/layout.c b/gstreamer-app/sys/tests/layout.c
index 2a4e57910..73f80e89d 100644
--- a/gstreamer-app/sys/tests/layout.c
+++ b/gstreamer-app/sys/tests/layout.c
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-audio/sys/Cargo.toml b/gstreamer-audio/sys/Cargo.toml
index 8b14e9e6b..23c520513 100644
--- a/gstreamer-audio/sys/Cargo.toml
+++ b/gstreamer-audio/sys/Cargo.toml
@@ -48,6 +48,7 @@ name = "gstreamer-audio-sys"
 readme = "README.md"
 repository = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs"
 version = "0.17.0"
+edition = "2018"
 [package.metadata.docs.rs]
 features = ["dox"]
 [package.metadata.system-deps.gstreamer_audio_1_0]
diff --git a/gstreamer-audio/sys/build.rs b/gstreamer-audio/sys/build.rs
index ff28f9366..c69299ced 100644
--- a/gstreamer-audio/sys/build.rs
+++ b/gstreamer-audio/sys/build.rs
@@ -1,10 +1,7 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
-#[cfg(not(feature = "dox"))]
-extern crate system_deps;
-
 #[cfg(not(feature = "dox"))]
 use std::process;
 
diff --git a/gstreamer-audio/sys/src/lib.rs b/gstreamer-audio/sys/src/lib.rs
index 8eba148dc..0eaa36c62 100644
--- a/gstreamer-audio/sys/src/lib.rs
+++ b/gstreamer-audio/sys/src/lib.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]
@@ -10,11 +10,10 @@
 )]
 #![cfg_attr(feature = "dox", feature(doc_cfg))]
 
-extern crate glib_sys as glib;
-extern crate gobject_sys as gobject;
-extern crate gstreamer_base_sys as gst_base;
-extern crate gstreamer_sys as gst;
-extern crate libc;
+use glib_sys as glib;
+use gobject_sys as gobject;
+use gstreamer_base_sys as gst_base;
+use gstreamer_sys as gst;
 
 #[allow(unused_imports)]
 use libc::{
diff --git a/gstreamer-audio/sys/tests/abi.rs b/gstreamer-audio/sys/tests/abi.rs
index c160a74e2..8427a22ff 100644
--- a/gstreamer-audio/sys/tests/abi.rs
+++ b/gstreamer-audio/sys/tests/abi.rs
@@ -1,10 +1,7 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
-extern crate gstreamer_audio_sys;
-extern crate shell_words;
-extern crate tempfile;
 use gstreamer_audio_sys::*;
 use std::env;
 use std::error::Error;
diff --git a/gstreamer-audio/sys/tests/constant.c b/gstreamer-audio/sys/tests/constant.c
index 727db60a1..63be6f6a4 100644
--- a/gstreamer-audio/sys/tests/constant.c
+++ b/gstreamer-audio/sys/tests/constant.c
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-audio/sys/tests/layout.c b/gstreamer-audio/sys/tests/layout.c
index 2a4e57910..73f80e89d 100644
--- a/gstreamer-audio/sys/tests/layout.c
+++ b/gstreamer-audio/sys/tests/layout.c
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-base/sys/Cargo.toml b/gstreamer-base/sys/Cargo.toml
index ff0c1c5be..083263afc 100644
--- a/gstreamer-base/sys/Cargo.toml
+++ b/gstreamer-base/sys/Cargo.toml
@@ -49,6 +49,7 @@ name = "gstreamer-base-sys"
 readme = "README.md"
 repository = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs"
 version = "0.17.0"
+edition = "2018"
 [package.metadata.docs.rs]
 features = ["dox"]
 [package.metadata.system-deps.gstreamer_base_1_0]
diff --git a/gstreamer-base/sys/build.rs b/gstreamer-base/sys/build.rs
index ff28f9366..c69299ced 100644
--- a/gstreamer-base/sys/build.rs
+++ b/gstreamer-base/sys/build.rs
@@ -1,10 +1,7 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
-#[cfg(not(feature = "dox"))]
-extern crate system_deps;
-
 #[cfg(not(feature = "dox"))]
 use std::process;
 
diff --git a/gstreamer-base/sys/src/lib.rs b/gstreamer-base/sys/src/lib.rs
index 1035a1339..51eff1478 100644
--- a/gstreamer-base/sys/src/lib.rs
+++ b/gstreamer-base/sys/src/lib.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]
@@ -10,10 +10,9 @@
 )]
 #![cfg_attr(feature = "dox", feature(doc_cfg))]
 
-extern crate glib_sys as glib;
-extern crate gobject_sys as gobject;
-extern crate gstreamer_sys as gst;
-extern crate libc;
+use glib_sys as glib;
+use gobject_sys as gobject;
+use gstreamer_sys as gst;
 
 #[allow(unused_imports)]
 use libc::{
@@ -2035,7 +2034,7 @@ extern "C" {
         min_latency: *mut gst::GstClockTime,
         max_latency: *mut gst::GstClockTime,
     ) -> gboolean;
-    pub fn gst_base_src_set_async(src: *mut GstBaseSrc, async: gboolean);
+    pub fn gst_base_src_set_async(src: *mut GstBaseSrc, async_: gboolean);
     pub fn gst_base_src_set_automatic_eos(src: *mut GstBaseSrc, automatic_eos: gboolean);
     pub fn gst_base_src_set_blocksize(src: *mut GstBaseSrc, blocksize: c_uint);
     pub fn gst_base_src_set_caps(src: *mut GstBaseSrc, caps: *mut gst::GstCaps) -> gboolean;
diff --git a/gstreamer-base/sys/tests/abi.rs b/gstreamer-base/sys/tests/abi.rs
index c062a9a1c..a215f998d 100644
--- a/gstreamer-base/sys/tests/abi.rs
+++ b/gstreamer-base/sys/tests/abi.rs
@@ -1,10 +1,7 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
-extern crate gstreamer_base_sys;
-extern crate shell_words;
-extern crate tempfile;
 use gstreamer_base_sys::*;
 use std::env;
 use std::error::Error;
diff --git a/gstreamer-base/sys/tests/constant.c b/gstreamer-base/sys/tests/constant.c
index 727db60a1..63be6f6a4 100644
--- a/gstreamer-base/sys/tests/constant.c
+++ b/gstreamer-base/sys/tests/constant.c
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-base/sys/tests/layout.c b/gstreamer-base/sys/tests/layout.c
index 2a4e57910..73f80e89d 100644
--- a/gstreamer-base/sys/tests/layout.c
+++ b/gstreamer-base/sys/tests/layout.c
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-check/sys/Cargo.toml b/gstreamer-check/sys/Cargo.toml
index 0877cf714..ff69e7825 100644
--- a/gstreamer-check/sys/Cargo.toml
+++ b/gstreamer-check/sys/Cargo.toml
@@ -45,6 +45,7 @@ name = "gstreamer-check-sys"
 readme = "README.md"
 repository = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs"
 version = "0.17.0"
+edition = "2018"
 [package.metadata.docs.rs]
 features = ["dox"]
 [package.metadata.system-deps.gstreamer_check_1_0]
diff --git a/gstreamer-check/sys/build.rs b/gstreamer-check/sys/build.rs
index ff28f9366..c69299ced 100644
--- a/gstreamer-check/sys/build.rs
+++ b/gstreamer-check/sys/build.rs
@@ -1,10 +1,7 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
-#[cfg(not(feature = "dox"))]
-extern crate system_deps;
-
 #[cfg(not(feature = "dox"))]
 use std::process;
 
diff --git a/gstreamer-check/sys/src/lib.rs b/gstreamer-check/sys/src/lib.rs
index d5a5c80e2..c2deed7cc 100644
--- a/gstreamer-check/sys/src/lib.rs
+++ b/gstreamer-check/sys/src/lib.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]
@@ -10,10 +10,9 @@
 )]
 #![cfg_attr(feature = "dox", feature(doc_cfg))]
 
-extern crate glib_sys as glib;
-extern crate gobject_sys as gobject;
-extern crate gstreamer_sys as gst;
-extern crate libc;
+use glib_sys as glib;
+use gobject_sys as gobject;
+use gstreamer_sys as gst;
 
 #[allow(unused_imports)]
 use libc::{
diff --git a/gstreamer-check/sys/tests/abi.rs b/gstreamer-check/sys/tests/abi.rs
index adfaee6df..21b7a07d3 100644
--- a/gstreamer-check/sys/tests/abi.rs
+++ b/gstreamer-check/sys/tests/abi.rs
@@ -1,10 +1,7 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
-extern crate gstreamer_check_sys;
-extern crate shell_words;
-extern crate tempfile;
 use gstreamer_check_sys::*;
 use std::env;
 use std::error::Error;
diff --git a/gstreamer-check/sys/tests/constant.c b/gstreamer-check/sys/tests/constant.c
index 727db60a1..63be6f6a4 100644
--- a/gstreamer-check/sys/tests/constant.c
+++ b/gstreamer-check/sys/tests/constant.c
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-check/sys/tests/layout.c b/gstreamer-check/sys/tests/layout.c
index 2a4e57910..73f80e89d 100644
--- a/gstreamer-check/sys/tests/layout.c
+++ b/gstreamer-check/sys/tests/layout.c
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-controller/sys/Cargo.toml b/gstreamer-controller/sys/Cargo.toml
index 1f02ee30c..f68addb2e 100644
--- a/gstreamer-controller/sys/Cargo.toml
+++ b/gstreamer-controller/sys/Cargo.toml
@@ -11,9 +11,6 @@ git = "https://github.com/gtk-rs/gtk-rs"
 [dependencies.gobject-sys]
 git = "https://github.com/gtk-rs/gtk-rs"
 
-[dependencies.gstreamer-base-sys]
-path = "../../gstreamer-base/sys"
-
 [dependencies.gstreamer-sys]
 path = "../../gstreamer/sys"
 
@@ -49,6 +46,7 @@ name = "gstreamer-controller-sys"
 readme = "README.md"
 repository = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs"
 version = "0.17.0"
+edition = "2018"
 [package.metadata.docs.rs]
 features = ["dox"]
 [package.metadata.system-deps.gstreamer_controller_1_0]
diff --git a/gstreamer-controller/sys/Gir.toml b/gstreamer-controller/sys/Gir.toml
index 9a89b0316..ea5d57176 100644
--- a/gstreamer-controller/sys/Gir.toml
+++ b/gstreamer-controller/sys/Gir.toml
@@ -22,4 +22,3 @@ extra_versions = [
 
 [external_libraries]
 gstreamer="Gst"
-gstreamer_base="GstBase"
diff --git a/gstreamer-controller/sys/build.rs b/gstreamer-controller/sys/build.rs
index ff28f9366..c69299ced 100644
--- a/gstreamer-controller/sys/build.rs
+++ b/gstreamer-controller/sys/build.rs
@@ -1,10 +1,7 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
-#[cfg(not(feature = "dox"))]
-extern crate system_deps;
-
 #[cfg(not(feature = "dox"))]
 use std::process;
 
diff --git a/gstreamer-controller/sys/src/lib.rs b/gstreamer-controller/sys/src/lib.rs
index 658587f2b..5210639c6 100644
--- a/gstreamer-controller/sys/src/lib.rs
+++ b/gstreamer-controller/sys/src/lib.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]
@@ -10,11 +10,9 @@
 )]
 #![cfg_attr(feature = "dox", feature(doc_cfg))]
 
-extern crate glib_sys as glib;
-extern crate gobject_sys as gobject;
-extern crate gstreamer_base_sys as gst_base;
-extern crate gstreamer_sys as gst;
-extern crate libc;
+use glib_sys as glib;
+use gobject_sys as gobject;
+use gstreamer_sys as gst;
 
 #[allow(unused_imports)]
 use libc::{
diff --git a/gstreamer-controller/sys/tests/abi.rs b/gstreamer-controller/sys/tests/abi.rs
index faf51791f..d44503c18 100644
--- a/gstreamer-controller/sys/tests/abi.rs
+++ b/gstreamer-controller/sys/tests/abi.rs
@@ -1,10 +1,7 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
-extern crate gstreamer_controller_sys;
-extern crate shell_words;
-extern crate tempfile;
 use gstreamer_controller_sys::*;
 use std::env;
 use std::error::Error;
diff --git a/gstreamer-controller/sys/tests/constant.c b/gstreamer-controller/sys/tests/constant.c
index 727db60a1..63be6f6a4 100644
--- a/gstreamer-controller/sys/tests/constant.c
+++ b/gstreamer-controller/sys/tests/constant.c
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-controller/sys/tests/layout.c b/gstreamer-controller/sys/tests/layout.c
index 2a4e57910..73f80e89d 100644
--- a/gstreamer-controller/sys/tests/layout.c
+++ b/gstreamer-controller/sys/tests/layout.c
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-editing-services/sys/Cargo.toml b/gstreamer-editing-services/sys/Cargo.toml
index 57649352a..8ee5becd6 100644
--- a/gstreamer-editing-services/sys/Cargo.toml
+++ b/gstreamer-editing-services/sys/Cargo.toml
@@ -13,9 +13,6 @@ git = "https://github.com/gtk-rs/gtk-rs"
 [dependencies.gobject-sys]
 git = "https://github.com/gtk-rs/gtk-rs"
 
-[dependencies.gstreamer-base-sys]
-path = "../../gstreamer-base/sys"
-
 [dependencies.gstreamer-pbutils-sys]
 path = "../../gstreamer-pbutils/sys"
 
@@ -54,6 +51,7 @@ name = "gstreamer-editing-services-sys"
 readme = "README.md"
 repository = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs"
 version = "0.17.0"
+edition = "2018"
 [package.metadata.docs.rs]
 features = ["dox"]
 [package.metadata.system-deps.gst_editing_services_1_0]
diff --git a/gstreamer-editing-services/sys/Gir.toml b/gstreamer-editing-services/sys/Gir.toml
index 8f7e769f2..6f286791d 100644
--- a/gstreamer-editing-services/sys/Gir.toml
+++ b/gstreamer-editing-services/sys/Gir.toml
@@ -26,5 +26,4 @@ external_libraries = [
 
 [external_libraries]
 gstreamer="Gst"
-gstreamer_base="GstBase"
 gstreamer_pbutils="GstPbutils"
diff --git a/gstreamer-editing-services/sys/build.rs b/gstreamer-editing-services/sys/build.rs
index ff28f9366..c69299ced 100644
--- a/gstreamer-editing-services/sys/build.rs
+++ b/gstreamer-editing-services/sys/build.rs
@@ -1,10 +1,7 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
-#[cfg(not(feature = "dox"))]
-extern crate system_deps;
-
 #[cfg(not(feature = "dox"))]
 use std::process;
 
diff --git a/gstreamer-editing-services/sys/src/lib.rs b/gstreamer-editing-services/sys/src/lib.rs
index 8fda0f3b0..30fb126f8 100644
--- a/gstreamer-editing-services/sys/src/lib.rs
+++ b/gstreamer-editing-services/sys/src/lib.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]
@@ -10,13 +10,11 @@
 )]
 #![cfg_attr(feature = "dox", feature(doc_cfg))]
 
-extern crate gio_sys as gio;
-extern crate glib_sys as glib;
-extern crate gobject_sys as gobject;
-extern crate gstreamer_base_sys as gst_base;
-extern crate gstreamer_pbutils_sys as gst_pbutils;
-extern crate gstreamer_sys as gst;
-extern crate libc;
+use gio_sys as gio;
+use glib_sys as glib;
+use gobject_sys as gobject;
+use gstreamer_pbutils_sys as gst_pbutils;
+use gstreamer_sys as gst;
 
 #[allow(unused_imports)]
 use libc::{
diff --git a/gstreamer-editing-services/sys/tests/abi.rs b/gstreamer-editing-services/sys/tests/abi.rs
index 5daf69ba3..80da559ed 100644
--- a/gstreamer-editing-services/sys/tests/abi.rs
+++ b/gstreamer-editing-services/sys/tests/abi.rs
@@ -1,10 +1,7 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
-extern crate gstreamer_editing_services_sys;
-extern crate shell_words;
-extern crate tempfile;
 use gstreamer_editing_services_sys::*;
 use std::env;
 use std::error::Error;
diff --git a/gstreamer-editing-services/sys/tests/constant.c b/gstreamer-editing-services/sys/tests/constant.c
index 727db60a1..63be6f6a4 100644
--- a/gstreamer-editing-services/sys/tests/constant.c
+++ b/gstreamer-editing-services/sys/tests/constant.c
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-editing-services/sys/tests/layout.c b/gstreamer-editing-services/sys/tests/layout.c
index 2a4e57910..73f80e89d 100644
--- a/gstreamer-editing-services/sys/tests/layout.c
+++ b/gstreamer-editing-services/sys/tests/layout.c
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-gl/sys/Cargo.toml b/gstreamer-gl/sys/Cargo.toml
index 0c142d6f0..2d929f9e6 100644
--- a/gstreamer-gl/sys/Cargo.toml
+++ b/gstreamer-gl/sys/Cargo.toml
@@ -50,6 +50,7 @@ name = "gstreamer-gl-sys"
 readme = "README.md"
 repository = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs"
 version = "0.17.0"
+edition = "2018"
 [package.metadata.docs.rs]
 features = ["dox"]
 [package.metadata.system-deps.gstreamer_gl_1_0]
diff --git a/gstreamer-gl/sys/build.rs b/gstreamer-gl/sys/build.rs
index ff28f9366..c69299ced 100644
--- a/gstreamer-gl/sys/build.rs
+++ b/gstreamer-gl/sys/build.rs
@@ -1,10 +1,7 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
-#[cfg(not(feature = "dox"))]
-extern crate system_deps;
-
 #[cfg(not(feature = "dox"))]
 use std::process;
 
diff --git a/gstreamer-gl/sys/src/lib.rs b/gstreamer-gl/sys/src/lib.rs
index a4046bba3..2fe9cb7dd 100644
--- a/gstreamer-gl/sys/src/lib.rs
+++ b/gstreamer-gl/sys/src/lib.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]
@@ -10,12 +10,11 @@
 )]
 #![cfg_attr(feature = "dox", feature(doc_cfg))]
 
-extern crate glib_sys as glib;
-extern crate gobject_sys as gobject;
-extern crate gstreamer_base_sys as gst_base;
-extern crate gstreamer_sys as gst;
-extern crate gstreamer_video_sys as gst_video;
-extern crate libc;
+use glib_sys as glib;
+use gobject_sys as gobject;
+use gstreamer_base_sys as gst_base;
+use gstreamer_sys as gst;
+use gstreamer_video_sys as gst_video;
 
 mod manual;
 
diff --git a/gstreamer-gl/sys/tests/abi.rs b/gstreamer-gl/sys/tests/abi.rs
index 5996c90c2..deeea97a1 100644
--- a/gstreamer-gl/sys/tests/abi.rs
+++ b/gstreamer-gl/sys/tests/abi.rs
@@ -1,10 +1,7 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
-extern crate gstreamer_gl_sys;
-extern crate shell_words;
-extern crate tempfile;
 use gstreamer_gl_sys::*;
 use std::env;
 use std::error::Error;
diff --git a/gstreamer-gl/sys/tests/constant.c b/gstreamer-gl/sys/tests/constant.c
index 727db60a1..63be6f6a4 100644
--- a/gstreamer-gl/sys/tests/constant.c
+++ b/gstreamer-gl/sys/tests/constant.c
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-gl/sys/tests/layout.c b/gstreamer-gl/sys/tests/layout.c
index 2a4e57910..73f80e89d 100644
--- a/gstreamer-gl/sys/tests/layout.c
+++ b/gstreamer-gl/sys/tests/layout.c
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-mpegts/sys/Cargo.toml b/gstreamer-mpegts/sys/Cargo.toml
index 0d4e3f210..f3a3a62c2 100644
--- a/gstreamer-mpegts/sys/Cargo.toml
+++ b/gstreamer-mpegts/sys/Cargo.toml
@@ -48,6 +48,7 @@ name = "gstreamer-mpegts-sys"
 readme = "README.md"
 repository = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs"
 version = "0.17.0"
+edition = "2018"
 [package.metadata.docs.rs]
 features = ["dox"]
 [package.metadata.system-deps.gstreamer_mpegts_1_0]
diff --git a/gstreamer-mpegts/sys/build.rs b/gstreamer-mpegts/sys/build.rs
index ff28f9366..c69299ced 100644
--- a/gstreamer-mpegts/sys/build.rs
+++ b/gstreamer-mpegts/sys/build.rs
@@ -1,10 +1,7 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
-#[cfg(not(feature = "dox"))]
-extern crate system_deps;
-
 #[cfg(not(feature = "dox"))]
 use std::process;
 
diff --git a/gstreamer-mpegts/sys/src/lib.rs b/gstreamer-mpegts/sys/src/lib.rs
index eee8cda21..623a2bb48 100644
--- a/gstreamer-mpegts/sys/src/lib.rs
+++ b/gstreamer-mpegts/sys/src/lib.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]
@@ -10,10 +10,9 @@
 )]
 #![cfg_attr(feature = "dox", feature(doc_cfg))]
 
-extern crate glib_sys as glib;
-extern crate gobject_sys as gobject;
-extern crate gstreamer_sys as gst;
-extern crate libc;
+use glib_sys as glib;
+use gobject_sys as gobject;
+use gstreamer_sys as gst;
 
 #[allow(unused_imports)]
 use libc::{
diff --git a/gstreamer-mpegts/sys/tests/abi.rs b/gstreamer-mpegts/sys/tests/abi.rs
index e5029da0c..f4b31b54f 100644
--- a/gstreamer-mpegts/sys/tests/abi.rs
+++ b/gstreamer-mpegts/sys/tests/abi.rs
@@ -1,10 +1,7 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
-extern crate gstreamer_mpegts_sys;
-extern crate shell_words;
-extern crate tempfile;
 use gstreamer_mpegts_sys::*;
 use std::env;
 use std::error::Error;
diff --git a/gstreamer-mpegts/sys/tests/constant.c b/gstreamer-mpegts/sys/tests/constant.c
index 727db60a1..63be6f6a4 100644
--- a/gstreamer-mpegts/sys/tests/constant.c
+++ b/gstreamer-mpegts/sys/tests/constant.c
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-mpegts/sys/tests/layout.c b/gstreamer-mpegts/sys/tests/layout.c
index 2a4e57910..73f80e89d 100644
--- a/gstreamer-mpegts/sys/tests/layout.c
+++ b/gstreamer-mpegts/sys/tests/layout.c
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-net/sys/Cargo.toml b/gstreamer-net/sys/Cargo.toml
index 1242126d1..69b4556cd 100644
--- a/gstreamer-net/sys/Cargo.toml
+++ b/gstreamer-net/sys/Cargo.toml
@@ -10,9 +10,6 @@ git = "https://github.com/gtk-rs/gtk-rs"
 [dependencies.glib-sys]
 git = "https://github.com/gtk-rs/gtk-rs"
 
-[dependencies.gobject-sys]
-git = "https://github.com/gtk-rs/gtk-rs"
-
 [dependencies.gstreamer-sys]
 path = "../../gstreamer/sys"
 
@@ -48,6 +45,7 @@ name = "gstreamer-net-sys"
 readme = "README.md"
 repository = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs"
 version = "0.17.0"
+edition = "2018"
 [package.metadata.docs.rs]
 features = ["dox"]
 [package.metadata.system-deps.gstreamer_net_1_0]
diff --git a/gstreamer-net/sys/Gir.toml b/gstreamer-net/sys/Gir.toml
index d3925323d..2da100bac 100644
--- a/gstreamer-net/sys/Gir.toml
+++ b/gstreamer-net/sys/Gir.toml
@@ -20,7 +20,6 @@ extra_versions = [
 
 external_libraries = [
     "GLib",
-    "GObject",
     "Gio",
 ]
 
diff --git a/gstreamer-net/sys/build.rs b/gstreamer-net/sys/build.rs
index ff28f9366..c69299ced 100644
--- a/gstreamer-net/sys/build.rs
+++ b/gstreamer-net/sys/build.rs
@@ -1,10 +1,7 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
-#[cfg(not(feature = "dox"))]
-extern crate system_deps;
-
 #[cfg(not(feature = "dox"))]
 use std::process;
 
diff --git a/gstreamer-net/sys/src/lib.rs b/gstreamer-net/sys/src/lib.rs
index 968998cb3..1ebe7aa91 100644
--- a/gstreamer-net/sys/src/lib.rs
+++ b/gstreamer-net/sys/src/lib.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 8865faed)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]
@@ -10,11 +10,9 @@
 )]
 #![cfg_attr(feature = "dox", feature(doc_cfg))]
 
-extern crate gio_sys as gio;
-extern crate glib_sys as glib;
-extern crate gobject_sys as gobject;
-extern crate gstreamer_sys as gst;
-extern crate libc;
+use gio_sys as gio;
+use glib_sys as glib;
+use gstreamer_sys as gst;
 
 #[allow(unused_imports)]
 use libc::{
diff --git a/gstreamer-net/sys/tests/abi.rs b/gstreamer-net/sys/tests/abi.rs
index 285fcda39..7901e4377 100644
--- a/gstreamer-net/sys/tests/abi.rs
+++ b/gstreamer-net/sys/tests/abi.rs
@@ -1,10 +1,7 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
-extern crate gstreamer_net_sys;
-extern crate shell_words;
-extern crate tempfile;
 use gstreamer_net_sys::*;
 use std::env;
 use std::error::Error;
diff --git a/gstreamer-net/sys/tests/constant.c b/gstreamer-net/sys/tests/constant.c
index 727db60a1..63be6f6a4 100644
--- a/gstreamer-net/sys/tests/constant.c
+++ b/gstreamer-net/sys/tests/constant.c
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-net/sys/tests/layout.c b/gstreamer-net/sys/tests/layout.c
index 2a4e57910..73f80e89d 100644
--- a/gstreamer-net/sys/tests/layout.c
+++ b/gstreamer-net/sys/tests/layout.c
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-pbutils/sys/Cargo.toml b/gstreamer-pbutils/sys/Cargo.toml
index f30454b6c..a07c44772 100644
--- a/gstreamer-pbutils/sys/Cargo.toml
+++ b/gstreamer-pbutils/sys/Cargo.toml
@@ -52,6 +52,7 @@ name = "gstreamer-pbutils-sys"
 readme = "README.md"
 repository = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs"
 version = "0.17.0"
+edition = "2018"
 [package.metadata.docs.rs]
 features = ["dox"]
 [package.metadata.system-deps.gstreamer_pbutils_1_0]
diff --git a/gstreamer-pbutils/sys/build.rs b/gstreamer-pbutils/sys/build.rs
index ff28f9366..c69299ced 100644
--- a/gstreamer-pbutils/sys/build.rs
+++ b/gstreamer-pbutils/sys/build.rs
@@ -1,10 +1,7 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
-#[cfg(not(feature = "dox"))]
-extern crate system_deps;
-
 #[cfg(not(feature = "dox"))]
 use std::process;
 
diff --git a/gstreamer-pbutils/sys/src/lib.rs b/gstreamer-pbutils/sys/src/lib.rs
index c5196fa88..da2ea6b33 100644
--- a/gstreamer-pbutils/sys/src/lib.rs
+++ b/gstreamer-pbutils/sys/src/lib.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]
@@ -10,12 +10,11 @@
 )]
 #![cfg_attr(feature = "dox", feature(doc_cfg))]
 
-extern crate glib_sys as glib;
-extern crate gobject_sys as gobject;
-extern crate gstreamer_audio_sys as gst_audio;
-extern crate gstreamer_sys as gst;
-extern crate gstreamer_video_sys as gst_video;
-extern crate libc;
+use glib_sys as glib;
+use gobject_sys as gobject;
+use gstreamer_audio_sys as gst_audio;
+use gstreamer_sys as gst;
+use gstreamer_video_sys as gst_video;
 
 #[allow(unused_imports)]
 use libc::{
diff --git a/gstreamer-pbutils/sys/tests/abi.rs b/gstreamer-pbutils/sys/tests/abi.rs
index c0a804674..74ae955a9 100644
--- a/gstreamer-pbutils/sys/tests/abi.rs
+++ b/gstreamer-pbutils/sys/tests/abi.rs
@@ -1,10 +1,7 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
-extern crate gstreamer_pbutils_sys;
-extern crate shell_words;
-extern crate tempfile;
 use gstreamer_pbutils_sys::*;
 use std::env;
 use std::error::Error;
diff --git a/gstreamer-pbutils/sys/tests/constant.c b/gstreamer-pbutils/sys/tests/constant.c
index 727db60a1..63be6f6a4 100644
--- a/gstreamer-pbutils/sys/tests/constant.c
+++ b/gstreamer-pbutils/sys/tests/constant.c
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-pbutils/sys/tests/layout.c b/gstreamer-pbutils/sys/tests/layout.c
index 2a4e57910..73f80e89d 100644
--- a/gstreamer-pbutils/sys/tests/layout.c
+++ b/gstreamer-pbutils/sys/tests/layout.c
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-player/sys/Cargo.toml b/gstreamer-player/sys/Cargo.toml
index 634ea87d8..70891983b 100644
--- a/gstreamer-player/sys/Cargo.toml
+++ b/gstreamer-player/sys/Cargo.toml
@@ -44,6 +44,7 @@ name = "gstreamer-player-sys"
 readme = "README.md"
 repository = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs"
 version = "0.17.0"
+edition = "2018"
 [package.metadata.docs.rs]
 features = ["dox"]
 [package.metadata.system-deps.gstreamer_player_1_0]
diff --git a/gstreamer-player/sys/build.rs b/gstreamer-player/sys/build.rs
index ff28f9366..c69299ced 100644
--- a/gstreamer-player/sys/build.rs
+++ b/gstreamer-player/sys/build.rs
@@ -1,10 +1,7 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
-#[cfg(not(feature = "dox"))]
-extern crate system_deps;
-
 #[cfg(not(feature = "dox"))]
 use std::process;
 
diff --git a/gstreamer-player/sys/src/lib.rs b/gstreamer-player/sys/src/lib.rs
index 7cd5727d4..c89fddbc7 100644
--- a/gstreamer-player/sys/src/lib.rs
+++ b/gstreamer-player/sys/src/lib.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]
@@ -10,11 +10,10 @@
 )]
 #![cfg_attr(feature = "dox", feature(doc_cfg))]
 
-extern crate glib_sys as glib;
-extern crate gobject_sys as gobject;
-extern crate gstreamer_sys as gst;
-extern crate gstreamer_video_sys as gst_video;
-extern crate libc;
+use glib_sys as glib;
+use gobject_sys as gobject;
+use gstreamer_sys as gst;
+use gstreamer_video_sys as gst_video;
 
 #[allow(unused_imports)]
 use libc::{
diff --git a/gstreamer-player/sys/tests/abi.rs b/gstreamer-player/sys/tests/abi.rs
index 9dd55f48e..3344b2dfb 100644
--- a/gstreamer-player/sys/tests/abi.rs
+++ b/gstreamer-player/sys/tests/abi.rs
@@ -1,10 +1,7 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
-extern crate gstreamer_player_sys;
-extern crate shell_words;
-extern crate tempfile;
 use gstreamer_player_sys::*;
 use std::env;
 use std::error::Error;
diff --git a/gstreamer-player/sys/tests/constant.c b/gstreamer-player/sys/tests/constant.c
index 727db60a1..63be6f6a4 100644
--- a/gstreamer-player/sys/tests/constant.c
+++ b/gstreamer-player/sys/tests/constant.c
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-player/sys/tests/layout.c b/gstreamer-player/sys/tests/layout.c
index 2a4e57910..73f80e89d 100644
--- a/gstreamer-player/sys/tests/layout.c
+++ b/gstreamer-player/sys/tests/layout.c
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-rtp/sys/Cargo.toml b/gstreamer-rtp/sys/Cargo.toml
index bcd8cea1d..b9a73f7bb 100644
--- a/gstreamer-rtp/sys/Cargo.toml
+++ b/gstreamer-rtp/sys/Cargo.toml
@@ -7,9 +7,6 @@ libc = "0.2"
 [dependencies.glib-sys]
 git = "https://github.com/gtk-rs/gtk-rs"
 
-[dependencies.gobject-sys]
-git = "https://github.com/gtk-rs/gtk-rs"
-
 [dependencies.gstreamer-base-sys]
 path = "../../gstreamer-base/sys"
 
@@ -50,6 +47,7 @@ name = "gstreamer-rtp-sys"
 readme = "README.md"
 repository = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs"
 version = "0.17.0"
+edition = "2018"
 [package.metadata.docs.rs]
 features = ["dox"]
 [package.metadata.system-deps.gstreamer_rtp_1_0]
diff --git a/gstreamer-rtp/sys/Gir.toml b/gstreamer-rtp/sys/Gir.toml
index 0aa961724..d8920d083 100644
--- a/gstreamer-rtp/sys/Gir.toml
+++ b/gstreamer-rtp/sys/Gir.toml
@@ -20,7 +20,6 @@ extra_versions = [
 
 external_libraries = [
     "GLib",
-    "GObject"
 ]
 
 [external_libraries]
diff --git a/gstreamer-rtp/sys/build.rs b/gstreamer-rtp/sys/build.rs
index ff28f9366..c69299ced 100644
--- a/gstreamer-rtp/sys/build.rs
+++ b/gstreamer-rtp/sys/build.rs
@@ -1,10 +1,7 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
-#[cfg(not(feature = "dox"))]
-extern crate system_deps;
-
 #[cfg(not(feature = "dox"))]
 use std::process;
 
diff --git a/gstreamer-rtp/sys/src/lib.rs b/gstreamer-rtp/sys/src/lib.rs
index 836fd9189..c6fa2069f 100644
--- a/gstreamer-rtp/sys/src/lib.rs
+++ b/gstreamer-rtp/sys/src/lib.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]
@@ -10,11 +10,9 @@
 )]
 #![cfg_attr(feature = "dox", feature(doc_cfg))]
 
-extern crate glib_sys as glib;
-extern crate gobject_sys as gobject;
-extern crate gstreamer_base_sys as gst_base;
-extern crate gstreamer_sys as gst;
-extern crate libc;
+use glib_sys as glib;
+use gstreamer_base_sys as gst_base;
+use gstreamer_sys as gst;
 
 #[allow(unused_imports)]
 use libc::{
diff --git a/gstreamer-rtp/sys/tests/abi.rs b/gstreamer-rtp/sys/tests/abi.rs
index a34bdc58a..5d3c20591 100644
--- a/gstreamer-rtp/sys/tests/abi.rs
+++ b/gstreamer-rtp/sys/tests/abi.rs
@@ -1,10 +1,7 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
-extern crate gstreamer_rtp_sys;
-extern crate shell_words;
-extern crate tempfile;
 use gstreamer_rtp_sys::*;
 use std::env;
 use std::error::Error;
diff --git a/gstreamer-rtp/sys/tests/constant.c b/gstreamer-rtp/sys/tests/constant.c
index 727db60a1..63be6f6a4 100644
--- a/gstreamer-rtp/sys/tests/constant.c
+++ b/gstreamer-rtp/sys/tests/constant.c
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-rtp/sys/tests/layout.c b/gstreamer-rtp/sys/tests/layout.c
index 2a4e57910..73f80e89d 100644
--- a/gstreamer-rtp/sys/tests/layout.c
+++ b/gstreamer-rtp/sys/tests/layout.c
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-rtsp-server/sys/Cargo.toml b/gstreamer-rtsp-server/sys/Cargo.toml
index 472d210e6..9fcc923a9 100644
--- a/gstreamer-rtsp-server/sys/Cargo.toml
+++ b/gstreamer-rtsp-server/sys/Cargo.toml
@@ -57,6 +57,7 @@ name = "gstreamer-rtsp-server-sys"
 readme = "README.md"
 repository = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs"
 version = "0.17.0"
+edition = "2018"
 [package.metadata.docs.rs]
 features = ["dox"]
 [package.metadata.system-deps.gstreamer_rtsp_server_1_0]
diff --git a/gstreamer-rtsp-server/sys/build.rs b/gstreamer-rtsp-server/sys/build.rs
index ff28f9366..c69299ced 100644
--- a/gstreamer-rtsp-server/sys/build.rs
+++ b/gstreamer-rtsp-server/sys/build.rs
@@ -1,10 +1,7 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
-#[cfg(not(feature = "dox"))]
-extern crate system_deps;
-
 #[cfg(not(feature = "dox"))]
 use std::process;
 
diff --git a/gstreamer-rtsp-server/sys/src/lib.rs b/gstreamer-rtsp-server/sys/src/lib.rs
index b0a7a2295..418053797 100644
--- a/gstreamer-rtsp-server/sys/src/lib.rs
+++ b/gstreamer-rtsp-server/sys/src/lib.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]
@@ -10,14 +10,13 @@
 )]
 #![cfg_attr(feature = "dox", feature(doc_cfg))]
 
-extern crate gio_sys as gio;
-extern crate glib_sys as glib;
-extern crate gobject_sys as gobject;
-extern crate gstreamer_net_sys as gst_net;
-extern crate gstreamer_rtsp_sys as gst_rtsp;
-extern crate gstreamer_sdp_sys as gst_sdp;
-extern crate gstreamer_sys as gst;
-extern crate libc;
+use gio_sys as gio;
+use glib_sys as glib;
+use gobject_sys as gobject;
+use gstreamer_net_sys as gst_net;
+use gstreamer_rtsp_sys as gst_rtsp;
+use gstreamer_sdp_sys as gst_sdp;
+use gstreamer_sys as gst;
 
 #[allow(unused_imports)]
 use libc::{
diff --git a/gstreamer-rtsp-server/sys/tests/abi.rs b/gstreamer-rtsp-server/sys/tests/abi.rs
index 28367bd7e..fcc1a4b76 100644
--- a/gstreamer-rtsp-server/sys/tests/abi.rs
+++ b/gstreamer-rtsp-server/sys/tests/abi.rs
@@ -1,10 +1,7 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
-extern crate gstreamer_rtsp_server_sys;
-extern crate shell_words;
-extern crate tempfile;
 use gstreamer_rtsp_server_sys::*;
 use std::env;
 use std::error::Error;
diff --git a/gstreamer-rtsp-server/sys/tests/constant.c b/gstreamer-rtsp-server/sys/tests/constant.c
index 727db60a1..63be6f6a4 100644
--- a/gstreamer-rtsp-server/sys/tests/constant.c
+++ b/gstreamer-rtsp-server/sys/tests/constant.c
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-rtsp-server/sys/tests/layout.c b/gstreamer-rtsp-server/sys/tests/layout.c
index 2a4e57910..73f80e89d 100644
--- a/gstreamer-rtsp-server/sys/tests/layout.c
+++ b/gstreamer-rtsp-server/sys/tests/layout.c
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-rtsp/sys/Cargo.toml b/gstreamer-rtsp/sys/Cargo.toml
index cb104ddd6..90b47571d 100644
--- a/gstreamer-rtsp/sys/Cargo.toml
+++ b/gstreamer-rtsp/sys/Cargo.toml
@@ -52,6 +52,7 @@ name = "gstreamer-rtsp-sys"
 readme = "README.md"
 repository = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs"
 version = "0.17.0"
+edition = "2018"
 [package.metadata.docs.rs]
 features = ["dox"]
 [package.metadata.system-deps.gstreamer_rtsp_1_0]
diff --git a/gstreamer-rtsp/sys/build.rs b/gstreamer-rtsp/sys/build.rs
index ff28f9366..c69299ced 100644
--- a/gstreamer-rtsp/sys/build.rs
+++ b/gstreamer-rtsp/sys/build.rs
@@ -1,10 +1,7 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
-#[cfg(not(feature = "dox"))]
-extern crate system_deps;
-
 #[cfg(not(feature = "dox"))]
 use std::process;
 
diff --git a/gstreamer-rtsp/sys/src/lib.rs b/gstreamer-rtsp/sys/src/lib.rs
index b16a081b4..e14258050 100644
--- a/gstreamer-rtsp/sys/src/lib.rs
+++ b/gstreamer-rtsp/sys/src/lib.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]
@@ -10,12 +10,11 @@
 )]
 #![cfg_attr(feature = "dox", feature(doc_cfg))]
 
-extern crate gio_sys as gio;
-extern crate glib_sys as glib;
-extern crate gobject_sys as gobject;
-extern crate gstreamer_sdp_sys as gst_sdp;
-extern crate gstreamer_sys as gst;
-extern crate libc;
+use gio_sys as gio;
+use glib_sys as glib;
+use gobject_sys as gobject;
+use gstreamer_sdp_sys as gst_sdp;
+use gstreamer_sys as gst;
 
 #[allow(unused_imports)]
 use libc::{
diff --git a/gstreamer-rtsp/sys/tests/abi.rs b/gstreamer-rtsp/sys/tests/abi.rs
index 2401f0274..9db517bea 100644
--- a/gstreamer-rtsp/sys/tests/abi.rs
+++ b/gstreamer-rtsp/sys/tests/abi.rs
@@ -1,10 +1,7 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
-extern crate gstreamer_rtsp_sys;
-extern crate shell_words;
-extern crate tempfile;
 use gstreamer_rtsp_sys::*;
 use std::env;
 use std::error::Error;
diff --git a/gstreamer-rtsp/sys/tests/constant.c b/gstreamer-rtsp/sys/tests/constant.c
index 727db60a1..63be6f6a4 100644
--- a/gstreamer-rtsp/sys/tests/constant.c
+++ b/gstreamer-rtsp/sys/tests/constant.c
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-rtsp/sys/tests/layout.c b/gstreamer-rtsp/sys/tests/layout.c
index 2a4e57910..73f80e89d 100644
--- a/gstreamer-rtsp/sys/tests/layout.c
+++ b/gstreamer-rtsp/sys/tests/layout.c
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-sdp/sys/Cargo.toml b/gstreamer-sdp/sys/Cargo.toml
index 3d4894115..556fae8e5 100644
--- a/gstreamer-sdp/sys/Cargo.toml
+++ b/gstreamer-sdp/sys/Cargo.toml
@@ -7,9 +7,6 @@ libc = "0.2"
 [dependencies.glib-sys]
 git = "https://github.com/gtk-rs/gtk-rs"
 
-[dependencies.gobject-sys]
-git = "https://github.com/gtk-rs/gtk-rs"
-
 [dependencies.gstreamer-sys]
 path = "../../gstreamer/sys"
 
@@ -46,6 +43,7 @@ name = "gstreamer-sdp-sys"
 readme = "README.md"
 repository = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs"
 version = "0.17.0"
+edition = "2018"
 [package.metadata.docs.rs]
 features = ["dox"]
 [package.metadata.system-deps.gstreamer_sdp_1_0]
diff --git a/gstreamer-sdp/sys/Gir.toml b/gstreamer-sdp/sys/Gir.toml
index 84e9ed79a..9d482e982 100644
--- a/gstreamer-sdp/sys/Gir.toml
+++ b/gstreamer-sdp/sys/Gir.toml
@@ -20,7 +20,6 @@ extra_versions = [
 
 external_libraries = [
     "GLib",
-    "GObject"
 ]
 
 [external_libraries]
diff --git a/gstreamer-sdp/sys/build.rs b/gstreamer-sdp/sys/build.rs
index ff28f9366..c69299ced 100644
--- a/gstreamer-sdp/sys/build.rs
+++ b/gstreamer-sdp/sys/build.rs
@@ -1,10 +1,7 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
-#[cfg(not(feature = "dox"))]
-extern crate system_deps;
-
 #[cfg(not(feature = "dox"))]
 use std::process;
 
diff --git a/gstreamer-sdp/sys/src/lib.rs b/gstreamer-sdp/sys/src/lib.rs
index 24627b811..cb89f0d2d 100644
--- a/gstreamer-sdp/sys/src/lib.rs
+++ b/gstreamer-sdp/sys/src/lib.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 8865faed)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]
@@ -10,10 +10,8 @@
 )]
 #![cfg_attr(feature = "dox", feature(doc_cfg))]
 
-extern crate glib_sys as glib;
-extern crate gobject_sys as gobject;
-extern crate gstreamer_sys as gst;
-extern crate libc;
+use glib_sys as glib;
+use gstreamer_sys as gst;
 
 #[allow(unused_imports)]
 use libc::{
diff --git a/gstreamer-sdp/sys/tests/abi.rs b/gstreamer-sdp/sys/tests/abi.rs
index 25de8b220..d49dab231 100644
--- a/gstreamer-sdp/sys/tests/abi.rs
+++ b/gstreamer-sdp/sys/tests/abi.rs
@@ -1,10 +1,7 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
-extern crate gstreamer_sdp_sys;
-extern crate shell_words;
-extern crate tempfile;
 use gstreamer_sdp_sys::*;
 use std::env;
 use std::error::Error;
diff --git a/gstreamer-sdp/sys/tests/constant.c b/gstreamer-sdp/sys/tests/constant.c
index 727db60a1..63be6f6a4 100644
--- a/gstreamer-sdp/sys/tests/constant.c
+++ b/gstreamer-sdp/sys/tests/constant.c
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-sdp/sys/tests/layout.c b/gstreamer-sdp/sys/tests/layout.c
index 2a4e57910..73f80e89d 100644
--- a/gstreamer-sdp/sys/tests/layout.c
+++ b/gstreamer-sdp/sys/tests/layout.c
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-tag/sys/Cargo.toml b/gstreamer-tag/sys/Cargo.toml
index 68749c581..99c053bfb 100644
--- a/gstreamer-tag/sys/Cargo.toml
+++ b/gstreamer-tag/sys/Cargo.toml
@@ -48,6 +48,7 @@ name = "gstreamer-tag-sys"
 readme = "README.md"
 repository = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs"
 version = "0.17.0"
+edition = "2018"
 [package.metadata.docs.rs]
 features = ["dox"]
 [package.metadata.system-deps.gstreamer_tag_1_0]
diff --git a/gstreamer-tag/sys/build.rs b/gstreamer-tag/sys/build.rs
index ff28f9366..c69299ced 100644
--- a/gstreamer-tag/sys/build.rs
+++ b/gstreamer-tag/sys/build.rs
@@ -1,10 +1,7 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
-#[cfg(not(feature = "dox"))]
-extern crate system_deps;
-
 #[cfg(not(feature = "dox"))]
 use std::process;
 
diff --git a/gstreamer-tag/sys/src/lib.rs b/gstreamer-tag/sys/src/lib.rs
index adc4ed7a8..4bf55cc39 100644
--- a/gstreamer-tag/sys/src/lib.rs
+++ b/gstreamer-tag/sys/src/lib.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]
@@ -10,11 +10,10 @@
 )]
 #![cfg_attr(feature = "dox", feature(doc_cfg))]
 
-extern crate glib_sys as glib;
-extern crate gobject_sys as gobject;
-extern crate gstreamer_base_sys as gst_base;
-extern crate gstreamer_sys as gst;
-extern crate libc;
+use glib_sys as glib;
+use gobject_sys as gobject;
+use gstreamer_base_sys as gst_base;
+use gstreamer_sys as gst;
 
 #[allow(unused_imports)]
 use libc::{
diff --git a/gstreamer-tag/sys/tests/abi.rs b/gstreamer-tag/sys/tests/abi.rs
index 465c3cdfb..2b9661592 100644
--- a/gstreamer-tag/sys/tests/abi.rs
+++ b/gstreamer-tag/sys/tests/abi.rs
@@ -1,10 +1,7 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
-extern crate gstreamer_tag_sys;
-extern crate shell_words;
-extern crate tempfile;
 use gstreamer_tag_sys::*;
 use std::env;
 use std::error::Error;
diff --git a/gstreamer-tag/sys/tests/constant.c b/gstreamer-tag/sys/tests/constant.c
index 727db60a1..63be6f6a4 100644
--- a/gstreamer-tag/sys/tests/constant.c
+++ b/gstreamer-tag/sys/tests/constant.c
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-tag/sys/tests/layout.c b/gstreamer-tag/sys/tests/layout.c
index 2a4e57910..73f80e89d 100644
--- a/gstreamer-tag/sys/tests/layout.c
+++ b/gstreamer-tag/sys/tests/layout.c
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-video/sys/Cargo.toml b/gstreamer-video/sys/Cargo.toml
index 8873b1278..91ec4ca14 100644
--- a/gstreamer-video/sys/Cargo.toml
+++ b/gstreamer-video/sys/Cargo.toml
@@ -50,6 +50,7 @@ name = "gstreamer-video-sys"
 readme = "README.md"
 repository = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs"
 version = "0.17.0"
+edition = "2018"
 [package.metadata.docs.rs]
 features = ["dox"]
 [package.metadata.system-deps.gstreamer_video_1_0]
diff --git a/gstreamer-video/sys/build.rs b/gstreamer-video/sys/build.rs
index ff28f9366..c69299ced 100644
--- a/gstreamer-video/sys/build.rs
+++ b/gstreamer-video/sys/build.rs
@@ -1,10 +1,7 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
-#[cfg(not(feature = "dox"))]
-extern crate system_deps;
-
 #[cfg(not(feature = "dox"))]
 use std::process;
 
diff --git a/gstreamer-video/sys/src/lib.rs b/gstreamer-video/sys/src/lib.rs
index db949eb2b..a47a1462d 100644
--- a/gstreamer-video/sys/src/lib.rs
+++ b/gstreamer-video/sys/src/lib.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]
@@ -10,11 +10,10 @@
 )]
 #![cfg_attr(feature = "dox", feature(doc_cfg))]
 
-extern crate glib_sys as glib;
-extern crate gobject_sys as gobject;
-extern crate gstreamer_base_sys as gst_base;
-extern crate gstreamer_sys as gst;
-extern crate libc;
+use glib_sys as glib;
+use gobject_sys as gobject;
+use gstreamer_base_sys as gst_base;
+use gstreamer_sys as gst;
 
 #[allow(unused_imports)]
 use libc::{
diff --git a/gstreamer-video/sys/tests/abi.rs b/gstreamer-video/sys/tests/abi.rs
index 63b10b954..b16cf75f0 100644
--- a/gstreamer-video/sys/tests/abi.rs
+++ b/gstreamer-video/sys/tests/abi.rs
@@ -1,10 +1,7 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
-extern crate gstreamer_video_sys;
-extern crate shell_words;
-extern crate tempfile;
 use gstreamer_video_sys::*;
 use std::env;
 use std::error::Error;
diff --git a/gstreamer-video/sys/tests/constant.c b/gstreamer-video/sys/tests/constant.c
index 727db60a1..63be6f6a4 100644
--- a/gstreamer-video/sys/tests/constant.c
+++ b/gstreamer-video/sys/tests/constant.c
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-video/sys/tests/layout.c b/gstreamer-video/sys/tests/layout.c
index 2a4e57910..73f80e89d 100644
--- a/gstreamer-video/sys/tests/layout.c
+++ b/gstreamer-video/sys/tests/layout.c
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-webrtc/sys/Cargo.toml b/gstreamer-webrtc/sys/Cargo.toml
index 62a40960f..93c1b9b29 100644
--- a/gstreamer-webrtc/sys/Cargo.toml
+++ b/gstreamer-webrtc/sys/Cargo.toml
@@ -44,6 +44,7 @@ name = "gstreamer-webrtc-sys"
 readme = "README.md"
 repository = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs"
 version = "0.17.0"
+edition = "2018"
 [package.metadata.docs.rs]
 features = ["dox"]
 [package.metadata.system-deps.gstreamer_webrtc_1_0]
diff --git a/gstreamer-webrtc/sys/build.rs b/gstreamer-webrtc/sys/build.rs
index ff28f9366..c69299ced 100644
--- a/gstreamer-webrtc/sys/build.rs
+++ b/gstreamer-webrtc/sys/build.rs
@@ -1,10 +1,7 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
-#[cfg(not(feature = "dox"))]
-extern crate system_deps;
-
 #[cfg(not(feature = "dox"))]
 use std::process;
 
diff --git a/gstreamer-webrtc/sys/src/lib.rs b/gstreamer-webrtc/sys/src/lib.rs
index af5f62ac3..36e9eaa14 100644
--- a/gstreamer-webrtc/sys/src/lib.rs
+++ b/gstreamer-webrtc/sys/src/lib.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]
@@ -10,11 +10,10 @@
 )]
 #![cfg_attr(feature = "dox", feature(doc_cfg))]
 
-extern crate glib_sys as glib;
-extern crate gobject_sys as gobject;
-extern crate gstreamer_sdp_sys as gst_sdp;
-extern crate gstreamer_sys as gst;
-extern crate libc;
+use glib_sys as glib;
+use gobject_sys as gobject;
+use gstreamer_sdp_sys as gst_sdp;
+use gstreamer_sys as gst;
 
 #[allow(unused_imports)]
 use libc::{
diff --git a/gstreamer-webrtc/sys/tests/abi.rs b/gstreamer-webrtc/sys/tests/abi.rs
index b5b5bd109..ebc44bc5c 100644
--- a/gstreamer-webrtc/sys/tests/abi.rs
+++ b/gstreamer-webrtc/sys/tests/abi.rs
@@ -1,10 +1,7 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
-extern crate gstreamer_webrtc_sys;
-extern crate shell_words;
-extern crate tempfile;
 use gstreamer_webrtc_sys::*;
 use std::env;
 use std::error::Error;
diff --git a/gstreamer-webrtc/sys/tests/constant.c b/gstreamer-webrtc/sys/tests/constant.c
index 727db60a1..63be6f6a4 100644
--- a/gstreamer-webrtc/sys/tests/constant.c
+++ b/gstreamer-webrtc/sys/tests/constant.c
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer-webrtc/sys/tests/layout.c b/gstreamer-webrtc/sys/tests/layout.c
index 2a4e57910..73f80e89d 100644
--- a/gstreamer-webrtc/sys/tests/layout.c
+++ b/gstreamer-webrtc/sys/tests/layout.c
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer/sys/Cargo.toml b/gstreamer/sys/Cargo.toml
index de4f43257..71427b5b3 100644
--- a/gstreamer/sys/Cargo.toml
+++ b/gstreamer/sys/Cargo.toml
@@ -45,6 +45,7 @@ name = "gstreamer-sys"
 readme = "README.md"
 repository = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs"
 version = "0.17.0"
+edition = "2018"
 [package.metadata.docs.rs]
 features = ["dox"]
 [package.metadata.system-deps.gstreamer_1_0]
diff --git a/gstreamer/sys/build.rs b/gstreamer/sys/build.rs
index ff28f9366..c69299ced 100644
--- a/gstreamer/sys/build.rs
+++ b/gstreamer/sys/build.rs
@@ -1,10 +1,7 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
-#[cfg(not(feature = "dox"))]
-extern crate system_deps;
-
 #[cfg(not(feature = "dox"))]
 use std::process;
 
diff --git a/gstreamer/sys/src/lib.rs b/gstreamer/sys/src/lib.rs
index acfde34c9..eabd98b5d 100644
--- a/gstreamer/sys/src/lib.rs
+++ b/gstreamer/sys/src/lib.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]
@@ -10,9 +10,8 @@
 )]
 #![cfg_attr(feature = "dox", feature(doc_cfg))]
 
-extern crate glib_sys as glib;
-extern crate gobject_sys as gobject;
-extern crate libc;
+use glib_sys as glib;
+use gobject_sys as gobject;
 
 #[allow(unused_imports)]
 use libc::{
@@ -4790,7 +4789,7 @@ extern "C" {
         format: GstFormat,
         minsize: i64,
         maxsize: i64,
-        async: gboolean,
+        async_: gboolean,
     ) -> *mut GstEvent;
     pub fn gst_event_new_caps(caps: *mut GstCaps) -> *mut GstEvent;
     pub fn gst_event_new_custom(type_: GstEventType, structure: *mut GstStructure)
@@ -4874,7 +4873,7 @@ extern "C" {
         format: *mut GstFormat,
         minsize: *mut i64,
         maxsize: *mut i64,
-        async: *mut gboolean,
+        async_: *mut gboolean,
     );
     pub fn gst_event_parse_caps(event: *mut GstEvent, caps: *mut *mut GstCaps);
     pub fn gst_event_parse_flush_stop(event: *mut GstEvent, reset_time: *mut gboolean);
diff --git a/gstreamer/sys/tests/abi.rs b/gstreamer/sys/tests/abi.rs
index 9b4d093a9..0567465ce 100644
--- a/gstreamer/sys/tests/abi.rs
+++ b/gstreamer/sys/tests/abi.rs
@@ -1,10 +1,7 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
-extern crate gstreamer_sys;
-extern crate shell_words;
-extern crate tempfile;
 use gstreamer_sys::*;
 use std::env;
 use std::error::Error;
diff --git a/gstreamer/sys/tests/constant.c b/gstreamer/sys/tests/constant.c
index 727db60a1..63be6f6a4 100644
--- a/gstreamer/sys/tests/constant.c
+++ b/gstreamer/sys/tests/constant.c
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
 #include "manual.h"
diff --git a/gstreamer/sys/tests/layout.c b/gstreamer/sys/tests/layout.c
index 2a4e57910..73f80e89d 100644
--- a/gstreamer/sys/tests/layout.c
+++ b/gstreamer/sys/tests/layout.c
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ 062b3d6)
-// from gir-files (https://github.com/gtk-rs/gir-files @ b84cead5)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 694b4b8)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 58bda97d)
 // DO NOT EDIT
 
 #include "manual.h"