diff --git a/gstreamer-app-sys/Cargo.toml b/gstreamer-app-sys/Cargo.toml
index 08742f681..67e16ba7a 100644
--- a/gstreamer-app-sys/Cargo.toml
+++ b/gstreamer-app-sys/Cargo.toml
@@ -2,7 +2,7 @@
 pkg-config = "0.3.7"
 
 [dependencies]
-bitflags = "0.8"
+bitflags = "0.9"
 libc = "0.2"
 glib-sys = { version = "0.3.4", git = "https://github.com/gtk-rs/sys" }
 gobject-sys = { version = "0.3.4", git = "https://github.com/gtk-rs/sys" }
diff --git a/gstreamer-app-sys/build.rs b/gstreamer-app-sys/build.rs
index 348e6f064..d07412f91 100644
--- a/gstreamer-app-sys/build.rs
+++ b/gstreamer-app-sys/build.rs
@@ -34,7 +34,7 @@ fn find() -> Result<(), Error> {
         return Ok(())
     }
 
-    let target = env::var("TARGET").unwrap();
+    let target = env::var("TARGET").expect("TARGET environment variable doesn't exist");
     let hardcode_shared_libs = target.contains("windows");
 
     let mut config = Config::new();
@@ -49,7 +49,8 @@ fn find() -> Result<(), Error> {
                     println!("cargo:rustc-link-lib=dylib={}", lib_);
                 }
                 for path in library.link_paths.iter() {
-                    println!("cargo:rustc-link-search=native={}", path.to_str().unwrap());
+                    println!("cargo:rustc-link-search=native={}",
+                             path.to_str().expect("library path doesn't exist"));
                 }
             }
             Ok(())
diff --git a/gstreamer-app-sys/src/lib.rs b/gstreamer-app-sys/src/lib.rs
index e675af846..0cae1fa7a 100644
--- a/gstreamer-app-sys/src/lib.rs
+++ b/gstreamer-app-sys/src/lib.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (f493ea3) from gir-files (???)
+// This file was generated by gir (d121f7e+) from gir-files (???)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals)]
diff --git a/gstreamer-audio-sys/Cargo.toml b/gstreamer-audio-sys/Cargo.toml
index 43c318e10..1eba1c468 100644
--- a/gstreamer-audio-sys/Cargo.toml
+++ b/gstreamer-audio-sys/Cargo.toml
@@ -2,7 +2,7 @@
 pkg-config = "0.3.7"
 
 [dependencies]
-bitflags = "0.8"
+bitflags = "0.9"
 libc = "0.2"
 glib-sys = { version = "0.3.4", git = "https://github.com/gtk-rs/sys" }
 gobject-sys = { version = "0.3.4", git = "https://github.com/gtk-rs/sys" }
diff --git a/gstreamer-audio-sys/build.rs b/gstreamer-audio-sys/build.rs
index 5a879ca27..c27a495e3 100644
--- a/gstreamer-audio-sys/build.rs
+++ b/gstreamer-audio-sys/build.rs
@@ -36,7 +36,7 @@ fn find() -> Result<(), Error> {
         return Ok(())
     }
 
-    let target = env::var("TARGET").unwrap();
+    let target = env::var("TARGET").expect("TARGET environment variable doesn't exist");
     let hardcode_shared_libs = target.contains("windows");
 
     let mut config = Config::new();
@@ -51,7 +51,8 @@ fn find() -> Result<(), Error> {
                     println!("cargo:rustc-link-lib=dylib={}", lib_);
                 }
                 for path in library.link_paths.iter() {
-                    println!("cargo:rustc-link-search=native={}", path.to_str().unwrap());
+                    println!("cargo:rustc-link-search=native={}",
+                             path.to_str().expect("library path doesn't exist"));
                 }
             }
             Ok(())
diff --git a/gstreamer-audio-sys/src/lib.rs b/gstreamer-audio-sys/src/lib.rs
index 3cac57501..fbccafab6 100644
--- a/gstreamer-audio-sys/src/lib.rs
+++ b/gstreamer-audio-sys/src/lib.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (f493ea3) from gir-files (???)
+// This file was generated by gir (d121f7e+) from gir-files (???)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals)]
@@ -392,66 +392,66 @@ pub const GST_META_TAG_AUDIO_STR: *const c_char = b"audio\0" as *const u8 as *co
 // Flags
 bitflags! {
     #[repr(C)]
-    pub flags GstAudioChannelMixerFlags: c_uint {
-        const GST_AUDIO_CHANNEL_MIXER_FLAGS_NONE = 0,
-        const GST_AUDIO_CHANNEL_MIXER_FLAGS_NON_INTERLEAVED_IN = 1,
-        const GST_AUDIO_CHANNEL_MIXER_FLAGS_NON_INTERLEAVED_OUT = 2,
-        const GST_AUDIO_CHANNEL_MIXER_FLAGS_UNPOSITIONED_IN = 4,
-        const GST_AUDIO_CHANNEL_MIXER_FLAGS_UNPOSITIONED_OUT = 8,
+    pub struct GstAudioChannelMixerFlags: c_uint {
+        const GST_AUDIO_CHANNEL_MIXER_FLAGS_NONE = 0;
+        const GST_AUDIO_CHANNEL_MIXER_FLAGS_NON_INTERLEAVED_IN = 1;
+        const GST_AUDIO_CHANNEL_MIXER_FLAGS_NON_INTERLEAVED_OUT = 2;
+        const GST_AUDIO_CHANNEL_MIXER_FLAGS_UNPOSITIONED_IN = 4;
+        const GST_AUDIO_CHANNEL_MIXER_FLAGS_UNPOSITIONED_OUT = 8;
     }
 }
 
 bitflags! {
     #[repr(C)]
-    pub flags GstAudioConverterFlags: c_uint {
-        const GST_AUDIO_CONVERTER_FLAG_NONE = 0,
-        const GST_AUDIO_CONVERTER_FLAG_IN_WRITABLE = 1,
-        const GST_AUDIO_CONVERTER_FLAG_VARIABLE_RATE = 2,
+    pub struct GstAudioConverterFlags: c_uint {
+        const GST_AUDIO_CONVERTER_FLAG_NONE = 0;
+        const GST_AUDIO_CONVERTER_FLAG_IN_WRITABLE = 1;
+        const GST_AUDIO_CONVERTER_FLAG_VARIABLE_RATE = 2;
     }
 }
 
 bitflags! {
     #[repr(C)]
-    pub flags GstAudioFlags: c_uint {
-        const GST_AUDIO_FLAG_NONE = 0,
-        const GST_AUDIO_FLAG_UNPOSITIONED = 1,
+    pub struct GstAudioFlags: c_uint {
+        const GST_AUDIO_FLAG_NONE = 0;
+        const GST_AUDIO_FLAG_UNPOSITIONED = 1;
     }
 }
 
 bitflags! {
     #[repr(C)]
-    pub flags GstAudioFormatFlags: c_uint {
-        const GST_AUDIO_FORMAT_FLAG_INTEGER = 1,
-        const GST_AUDIO_FORMAT_FLAG_FLOAT = 2,
-        const GST_AUDIO_FORMAT_FLAG_SIGNED = 4,
-        const GST_AUDIO_FORMAT_FLAG_COMPLEX = 16,
-        const GST_AUDIO_FORMAT_FLAG_UNPACK = 32,
+    pub struct GstAudioFormatFlags: c_uint {
+        const GST_AUDIO_FORMAT_FLAG_INTEGER = 1;
+        const GST_AUDIO_FORMAT_FLAG_FLOAT = 2;
+        const GST_AUDIO_FORMAT_FLAG_SIGNED = 4;
+        const GST_AUDIO_FORMAT_FLAG_COMPLEX = 16;
+        const GST_AUDIO_FORMAT_FLAG_UNPACK = 32;
     }
 }
 
 bitflags! {
     #[repr(C)]
-    pub flags GstAudioPackFlags: c_uint {
-        const GST_AUDIO_PACK_FLAG_NONE = 0,
-        const GST_AUDIO_PACK_FLAG_TRUNCATE_RANGE = 1,
+    pub struct GstAudioPackFlags: c_uint {
+        const GST_AUDIO_PACK_FLAG_NONE = 0;
+        const GST_AUDIO_PACK_FLAG_TRUNCATE_RANGE = 1;
     }
 }
 
 bitflags! {
     #[repr(C)]
-    pub flags GstAudioQuantizeFlags: c_uint {
-        const GST_AUDIO_QUANTIZE_FLAG_NONE = 0,
-        const GST_AUDIO_QUANTIZE_FLAG_NON_INTERLEAVED = 1,
+    pub struct GstAudioQuantizeFlags: c_uint {
+        const GST_AUDIO_QUANTIZE_FLAG_NONE = 0;
+        const GST_AUDIO_QUANTIZE_FLAG_NON_INTERLEAVED = 1;
     }
 }
 
 bitflags! {
     #[repr(C)]
-    pub flags GstAudioResamplerFlags: c_uint {
-        const GST_AUDIO_RESAMPLER_FLAG_NONE = 0,
-        const GST_AUDIO_RESAMPLER_FLAG_NON_INTERLEAVED_IN = 1,
-        const GST_AUDIO_RESAMPLER_FLAG_NON_INTERLEAVED_OUT = 2,
-        const GST_AUDIO_RESAMPLER_FLAG_VARIABLE_RATE = 4,
+    pub struct GstAudioResamplerFlags: c_uint {
+        const GST_AUDIO_RESAMPLER_FLAG_NONE = 0;
+        const GST_AUDIO_RESAMPLER_FLAG_NON_INTERLEAVED_IN = 1;
+        const GST_AUDIO_RESAMPLER_FLAG_NON_INTERLEAVED_OUT = 2;
+        const GST_AUDIO_RESAMPLER_FLAG_VARIABLE_RATE = 4;
     }
 }
 
diff --git a/gstreamer-base-sys/Cargo.toml b/gstreamer-base-sys/Cargo.toml
index e709bde39..3970d1f91 100644
--- a/gstreamer-base-sys/Cargo.toml
+++ b/gstreamer-base-sys/Cargo.toml
@@ -2,7 +2,7 @@
 pkg-config = "0.3.7"
 
 [dependencies]
-bitflags = "0.8"
+bitflags = "0.9"
 libc = "0.2"
 glib-sys = { version = "0.3.4", git = "https://github.com/gtk-rs/sys" }
 gobject-sys = { version = "0.3.4", git = "https://github.com/gtk-rs/sys" }
diff --git a/gstreamer-base-sys/build.rs b/gstreamer-base-sys/build.rs
index a6cd10fe4..a7fd3d7ca 100644
--- a/gstreamer-base-sys/build.rs
+++ b/gstreamer-base-sys/build.rs
@@ -38,7 +38,7 @@ fn find() -> Result<(), Error> {
         return Ok(())
     }
 
-    let target = env::var("TARGET").unwrap();
+    let target = env::var("TARGET").expect("TARGET environment variable doesn't exist");
     let hardcode_shared_libs = target.contains("windows");
 
     let mut config = Config::new();
@@ -53,7 +53,8 @@ fn find() -> Result<(), Error> {
                     println!("cargo:rustc-link-lib=dylib={}", lib_);
                 }
                 for path in library.link_paths.iter() {
-                    println!("cargo:rustc-link-search=native={}", path.to_str().unwrap());
+                    println!("cargo:rustc-link-search=native={}",
+                             path.to_str().expect("library path doesn't exist"));
                 }
             }
             Ok(())
diff --git a/gstreamer-base-sys/src/lib.rs b/gstreamer-base-sys/src/lib.rs
index 417381e92..a50557289 100644
--- a/gstreamer-base-sys/src/lib.rs
+++ b/gstreamer-base-sys/src/lib.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (f493ea3) from gir-files (???)
+// This file was generated by gir (d121f7e+) from gir-files (???)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals)]
@@ -26,33 +26,33 @@ pub const GST_BASE_TRANSFORM_SRC_NAME: *const c_char = b"src\0" as *const u8 as
 // Flags
 bitflags! {
     #[repr(C)]
-    pub flags GstBaseParseFrameFlags: c_uint {
-        const GST_BASE_PARSE_FRAME_FLAG_NONE = 0,
-        const GST_BASE_PARSE_FRAME_FLAG_NEW_FRAME = 1,
-        const GST_BASE_PARSE_FRAME_FLAG_NO_FRAME = 2,
-        const GST_BASE_PARSE_FRAME_FLAG_CLIP = 4,
-        const GST_BASE_PARSE_FRAME_FLAG_DROP = 8,
-        const GST_BASE_PARSE_FRAME_FLAG_QUEUE = 16,
+    pub struct GstBaseParseFrameFlags: c_uint {
+        const GST_BASE_PARSE_FRAME_FLAG_NONE = 0;
+        const GST_BASE_PARSE_FRAME_FLAG_NEW_FRAME = 1;
+        const GST_BASE_PARSE_FRAME_FLAG_NO_FRAME = 2;
+        const GST_BASE_PARSE_FRAME_FLAG_CLIP = 4;
+        const GST_BASE_PARSE_FRAME_FLAG_DROP = 8;
+        const GST_BASE_PARSE_FRAME_FLAG_QUEUE = 16;
     }
 }
 
 bitflags! {
     #[repr(C)]
-    pub flags GstBaseSrcFlags: c_uint {
-        const GST_BASE_SRC_FLAG_STARTING = 16384,
-        const GST_BASE_SRC_FLAG_STARTED = 32768,
-        const GST_BASE_SRC_FLAG_LAST = 1048576,
+    pub struct GstBaseSrcFlags: c_uint {
+        const GST_BASE_SRC_FLAG_STARTING = 16384;
+        const GST_BASE_SRC_FLAG_STARTED = 32768;
+        const GST_BASE_SRC_FLAG_LAST = 1048576;
     }
 }
 
 bitflags! {
     #[repr(C)]
-    pub flags GstCollectPadsStateFlags: c_uint {
-        const GST_COLLECT_PADS_STATE_EOS = 1,
-        const GST_COLLECT_PADS_STATE_FLUSHING = 2,
-        const GST_COLLECT_PADS_STATE_NEW_SEGMENT = 4,
-        const GST_COLLECT_PADS_STATE_WAITING = 8,
-        const GST_COLLECT_PADS_STATE_LOCKED = 16,
+    pub struct GstCollectPadsStateFlags: c_uint {
+        const GST_COLLECT_PADS_STATE_EOS = 1;
+        const GST_COLLECT_PADS_STATE_FLUSHING = 2;
+        const GST_COLLECT_PADS_STATE_NEW_SEGMENT = 4;
+        const GST_COLLECT_PADS_STATE_WAITING = 8;
+        const GST_COLLECT_PADS_STATE_LOCKED = 16;
     }
 }
 
diff --git a/gstreamer-pbutils-sys/Cargo.toml b/gstreamer-pbutils-sys/Cargo.toml
index d8a7d9b61..ff0be4964 100644
--- a/gstreamer-pbutils-sys/Cargo.toml
+++ b/gstreamer-pbutils-sys/Cargo.toml
@@ -2,7 +2,7 @@
 pkg-config = "0.3.7"
 
 [dependencies]
-bitflags = "0.8"
+bitflags = "0.9"
 libc = "0.2"
 glib-sys = { version = "0.3.4", git = "https://github.com/gtk-rs/sys" }
 gobject-sys = { version = "0.3.4", git = "https://github.com/gtk-rs/sys" }
diff --git a/gstreamer-pbutils-sys/build.rs b/gstreamer-pbutils-sys/build.rs
index 40967ceab..8d9724487 100644
--- a/gstreamer-pbutils-sys/build.rs
+++ b/gstreamer-pbutils-sys/build.rs
@@ -32,7 +32,7 @@ fn find() -> Result<(), Error> {
         return Ok(())
     }
 
-    let target = env::var("TARGET").unwrap();
+    let target = env::var("TARGET").expect("TARGET environment variable doesn't exist");
     let hardcode_shared_libs = target.contains("windows");
 
     let mut config = Config::new();
@@ -47,7 +47,8 @@ fn find() -> Result<(), Error> {
                     println!("cargo:rustc-link-lib=dylib={}", lib_);
                 }
                 for path in library.link_paths.iter() {
-                    println!("cargo:rustc-link-search=native={}", path.to_str().unwrap());
+                    println!("cargo:rustc-link-search=native={}",
+                             path.to_str().expect("library path doesn't exist"));
                 }
             }
             Ok(())
diff --git a/gstreamer-pbutils-sys/src/lib.rs b/gstreamer-pbutils-sys/src/lib.rs
index bb6dba729..5e10c4b66 100644
--- a/gstreamer-pbutils-sys/src/lib.rs
+++ b/gstreamer-pbutils-sys/src/lib.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (f493ea3) from gir-files (???)
+// This file was generated by gir (d121f7e+) from gir-files (???)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals)]
@@ -113,12 +113,12 @@ pub const GST_PLUGINS_BASE_VERSION_NANO: c_int = 0;
 // Flags
 bitflags! {
     #[repr(C)]
-    pub flags GstDiscovererSerializeFlags: c_uint {
-        const GST_DISCOVERER_SERIALIZE_BASIC = 0,
-        const GST_DISCOVERER_SERIALIZE_CAPS = 1,
-        const GST_DISCOVERER_SERIALIZE_TAGS = 2,
-        const GST_DISCOVERER_SERIALIZE_MISC = 4,
-        const GST_DISCOVERER_SERIALIZE_ALL = 7,
+    pub struct GstDiscovererSerializeFlags: c_uint {
+        const GST_DISCOVERER_SERIALIZE_BASIC = 0;
+        const GST_DISCOVERER_SERIALIZE_CAPS = 1;
+        const GST_DISCOVERER_SERIALIZE_TAGS = 2;
+        const GST_DISCOVERER_SERIALIZE_MISC = 4;
+        const GST_DISCOVERER_SERIALIZE_ALL = 7;
     }
 }
 
diff --git a/gstreamer-sys/Cargo.toml b/gstreamer-sys/Cargo.toml
index ccc07b6cf..39c960dda 100644
--- a/gstreamer-sys/Cargo.toml
+++ b/gstreamer-sys/Cargo.toml
@@ -2,7 +2,7 @@
 pkg-config = "0.3.7"
 
 [dependencies]
-bitflags = "0.8"
+bitflags = "0.9"
 libc = "0.2"
 glib-sys = { version = "0.3.4", git = "https://github.com/gtk-rs/sys" }
 gobject-sys = { version = "0.3.4", git = "https://github.com/gtk-rs/sys" }
diff --git a/gstreamer-sys/build.rs b/gstreamer-sys/build.rs
index 001ff65b7..411a35faa 100644
--- a/gstreamer-sys/build.rs
+++ b/gstreamer-sys/build.rs
@@ -42,7 +42,7 @@ fn find() -> Result<(), Error> {
         return Ok(())
     }
 
-    let target = env::var("TARGET").unwrap();
+    let target = env::var("TARGET").expect("TARGET environment variable doesn't exist");
     let hardcode_shared_libs = target.contains("windows");
 
     let mut config = Config::new();
@@ -57,7 +57,8 @@ fn find() -> Result<(), Error> {
                     println!("cargo:rustc-link-lib=dylib={}", lib_);
                 }
                 for path in library.link_paths.iter() {
-                    println!("cargo:rustc-link-search=native={}", path.to_str().unwrap());
+                    println!("cargo:rustc-link-search=native={}",
+                             path.to_str().expect("library path doesn't exist"));
                 }
             }
             Ok(())
diff --git a/gstreamer-sys/src/lib.rs b/gstreamer-sys/src/lib.rs
index f23703890..ddeb97986 100644
--- a/gstreamer-sys/src/lib.rs
+++ b/gstreamer-sys/src/lib.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (f493ea3) from gir-files (???)
+// This file was generated by gir (d121f7e+) from gir-files (???)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals)]
@@ -1045,424 +1045,424 @@ pub const GST_VERSION_NANO: c_int = 0;
 // Flags
 bitflags! {
     #[repr(C)]
-    pub flags GstAllocatorFlags: c_uint {
-        const GST_ALLOCATOR_FLAG_CUSTOM_ALLOC = 16,
-        const GST_ALLOCATOR_FLAG_LAST = 1048576,
+    pub struct GstAllocatorFlags: c_uint {
+        const GST_ALLOCATOR_FLAG_CUSTOM_ALLOC = 16;
+        const GST_ALLOCATOR_FLAG_LAST = 1048576;
     }
 }
 
 bitflags! {
     #[repr(C)]
-    pub flags GstBinFlags: c_uint {
-        const GST_BIN_FLAG_NO_RESYNC = 16384,
-        const GST_BIN_FLAG_STREAMS_AWARE = 32768,
-        const GST_BIN_FLAG_LAST = 524288,
+    pub struct GstBinFlags: c_uint {
+        const GST_BIN_FLAG_NO_RESYNC = 16384;
+        const GST_BIN_FLAG_STREAMS_AWARE = 32768;
+        const GST_BIN_FLAG_LAST = 524288;
     }
 }
 
 bitflags! {
     #[repr(C)]
-    pub flags GstBufferCopyFlags: c_uint {
-        const GST_BUFFER_COPY_NONE = 0,
-        const GST_BUFFER_COPY_FLAGS = 1,
-        const GST_BUFFER_COPY_TIMESTAMPS = 2,
-        const GST_BUFFER_COPY_META = 4,
-        const GST_BUFFER_COPY_MEMORY = 8,
-        const GST_BUFFER_COPY_MERGE = 16,
-        const GST_BUFFER_COPY_DEEP = 32,
+    pub struct GstBufferCopyFlags: c_uint {
+        const GST_BUFFER_COPY_NONE = 0;
+        const GST_BUFFER_COPY_FLAGS = 1;
+        const GST_BUFFER_COPY_TIMESTAMPS = 2;
+        const GST_BUFFER_COPY_META = 4;
+        const GST_BUFFER_COPY_MEMORY = 8;
+        const GST_BUFFER_COPY_MERGE = 16;
+        const GST_BUFFER_COPY_DEEP = 32;
     }
 }
 
 bitflags! {
     #[repr(C)]
-    pub flags GstBufferFlags: c_uint {
-        const GST_BUFFER_FLAG_LIVE = 16,
-        const GST_BUFFER_FLAG_DECODE_ONLY = 32,
-        const GST_BUFFER_FLAG_DISCONT = 64,
-        const GST_BUFFER_FLAG_RESYNC = 128,
-        const GST_BUFFER_FLAG_CORRUPTED = 256,
-        const GST_BUFFER_FLAG_MARKER = 512,
-        const GST_BUFFER_FLAG_HEADER = 1024,
-        const GST_BUFFER_FLAG_GAP = 2048,
-        const GST_BUFFER_FLAG_DROPPABLE = 4096,
-        const GST_BUFFER_FLAG_DELTA_UNIT = 8192,
-        const GST_BUFFER_FLAG_TAG_MEMORY = 16384,
-        const GST_BUFFER_FLAG_SYNC_AFTER = 32768,
-        const GST_BUFFER_FLAG_LAST = 1048576,
+    pub struct GstBufferFlags: c_uint {
+        const GST_BUFFER_FLAG_LIVE = 16;
+        const GST_BUFFER_FLAG_DECODE_ONLY = 32;
+        const GST_BUFFER_FLAG_DISCONT = 64;
+        const GST_BUFFER_FLAG_RESYNC = 128;
+        const GST_BUFFER_FLAG_CORRUPTED = 256;
+        const GST_BUFFER_FLAG_MARKER = 512;
+        const GST_BUFFER_FLAG_HEADER = 1024;
+        const GST_BUFFER_FLAG_GAP = 2048;
+        const GST_BUFFER_FLAG_DROPPABLE = 4096;
+        const GST_BUFFER_FLAG_DELTA_UNIT = 8192;
+        const GST_BUFFER_FLAG_TAG_MEMORY = 16384;
+        const GST_BUFFER_FLAG_SYNC_AFTER = 32768;
+        const GST_BUFFER_FLAG_LAST = 1048576;
     }
 }
 
 bitflags! {
     #[repr(C)]
-    pub flags GstBufferPoolAcquireFlags: c_uint {
-        const GST_BUFFER_POOL_ACQUIRE_FLAG_NONE = 0,
-        const GST_BUFFER_POOL_ACQUIRE_FLAG_KEY_UNIT = 1,
-        const GST_BUFFER_POOL_ACQUIRE_FLAG_DONTWAIT = 2,
-        const GST_BUFFER_POOL_ACQUIRE_FLAG_DISCONT = 4,
-        const GST_BUFFER_POOL_ACQUIRE_FLAG_LAST = 65536,
+    pub struct GstBufferPoolAcquireFlags: c_uint {
+        const GST_BUFFER_POOL_ACQUIRE_FLAG_NONE = 0;
+        const GST_BUFFER_POOL_ACQUIRE_FLAG_KEY_UNIT = 1;
+        const GST_BUFFER_POOL_ACQUIRE_FLAG_DONTWAIT = 2;
+        const GST_BUFFER_POOL_ACQUIRE_FLAG_DISCONT = 4;
+        const GST_BUFFER_POOL_ACQUIRE_FLAG_LAST = 65536;
     }
 }
 
 bitflags! {
     #[repr(C)]
-    pub flags GstBusFlags: c_uint {
-        const GST_BUS_FLUSHING = 16,
-        const GST_BUS_FLAG_LAST = 32,
+    pub struct GstBusFlags: c_uint {
+        const GST_BUS_FLUSHING = 16;
+        const GST_BUS_FLAG_LAST = 32;
     }
 }
 
 bitflags! {
     #[repr(C)]
-    pub flags GstCapsFlags: c_uint {
-        const GST_CAPS_FLAG_ANY = 16,
+    pub struct GstCapsFlags: c_uint {
+        const GST_CAPS_FLAG_ANY = 16;
     }
 }
 
 bitflags! {
     #[repr(C)]
-    pub flags GstClockFlags: c_uint {
-        const GST_CLOCK_FLAG_CAN_DO_SINGLE_SYNC = 16,
-        const GST_CLOCK_FLAG_CAN_DO_SINGLE_ASYNC = 32,
-        const GST_CLOCK_FLAG_CAN_DO_PERIODIC_SYNC = 64,
-        const GST_CLOCK_FLAG_CAN_DO_PERIODIC_ASYNC = 128,
-        const GST_CLOCK_FLAG_CAN_SET_RESOLUTION = 256,
-        const GST_CLOCK_FLAG_CAN_SET_MASTER = 512,
-        const GST_CLOCK_FLAG_NEEDS_STARTUP_SYNC = 1024,
-        const GST_CLOCK_FLAG_LAST = 4096,
+    pub struct GstClockFlags: c_uint {
+        const GST_CLOCK_FLAG_CAN_DO_SINGLE_SYNC = 16;
+        const GST_CLOCK_FLAG_CAN_DO_SINGLE_ASYNC = 32;
+        const GST_CLOCK_FLAG_CAN_DO_PERIODIC_SYNC = 64;
+        const GST_CLOCK_FLAG_CAN_DO_PERIODIC_ASYNC = 128;
+        const GST_CLOCK_FLAG_CAN_SET_RESOLUTION = 256;
+        const GST_CLOCK_FLAG_CAN_SET_MASTER = 512;
+        const GST_CLOCK_FLAG_NEEDS_STARTUP_SYNC = 1024;
+        const GST_CLOCK_FLAG_LAST = 4096;
     }
 }
 
 bitflags! {
     #[repr(C)]
-    pub flags GstDebugGraphDetails: c_uint {
-        const GST_DEBUG_GRAPH_SHOW_MEDIA_TYPE = 1,
-        const GST_DEBUG_GRAPH_SHOW_CAPS_DETAILS = 2,
-        const GST_DEBUG_GRAPH_SHOW_NON_DEFAULT_PARAMS = 4,
-        const GST_DEBUG_GRAPH_SHOW_STATES = 8,
-        const GST_DEBUG_GRAPH_SHOW_FULL_PARAMS = 16,
-        const GST_DEBUG_GRAPH_SHOW_ALL = 15,
-        const GST_DEBUG_GRAPH_SHOW_VERBOSE = 4294967295,
+    pub struct GstDebugGraphDetails: c_uint {
+        const GST_DEBUG_GRAPH_SHOW_MEDIA_TYPE = 1;
+        const GST_DEBUG_GRAPH_SHOW_CAPS_DETAILS = 2;
+        const GST_DEBUG_GRAPH_SHOW_NON_DEFAULT_PARAMS = 4;
+        const GST_DEBUG_GRAPH_SHOW_STATES = 8;
+        const GST_DEBUG_GRAPH_SHOW_FULL_PARAMS = 16;
+        const GST_DEBUG_GRAPH_SHOW_ALL = 15;
+        const GST_DEBUG_GRAPH_SHOW_VERBOSE = 4294967295;
     }
 }
 
 bitflags! {
     #[repr(C)]
-    pub flags GstElementFlags: c_uint {
-        const GST_ELEMENT_FLAG_LOCKED_STATE = 16,
-        const GST_ELEMENT_FLAG_SINK = 32,
-        const GST_ELEMENT_FLAG_SOURCE = 64,
-        const GST_ELEMENT_FLAG_PROVIDE_CLOCK = 128,
-        const GST_ELEMENT_FLAG_REQUIRE_CLOCK = 256,
-        const GST_ELEMENT_FLAG_INDEXABLE = 512,
-        const GST_ELEMENT_FLAG_LAST = 16384,
+    pub struct GstElementFlags: c_uint {
+        const GST_ELEMENT_FLAG_LOCKED_STATE = 16;
+        const GST_ELEMENT_FLAG_SINK = 32;
+        const GST_ELEMENT_FLAG_SOURCE = 64;
+        const GST_ELEMENT_FLAG_PROVIDE_CLOCK = 128;
+        const GST_ELEMENT_FLAG_REQUIRE_CLOCK = 256;
+        const GST_ELEMENT_FLAG_INDEXABLE = 512;
+        const GST_ELEMENT_FLAG_LAST = 16384;
     }
 }
 
 bitflags! {
     #[repr(C)]
-    pub flags GstEventTypeFlags: c_uint {
-        const GST_EVENT_TYPE_UPSTREAM = 1,
-        const GST_EVENT_TYPE_DOWNSTREAM = 2,
-        const GST_EVENT_TYPE_SERIALIZED = 4,
-        const GST_EVENT_TYPE_STICKY = 8,
-        const GST_EVENT_TYPE_STICKY_MULTI = 16,
+    pub struct GstEventTypeFlags: c_uint {
+        const GST_EVENT_TYPE_UPSTREAM = 1;
+        const GST_EVENT_TYPE_DOWNSTREAM = 2;
+        const GST_EVENT_TYPE_SERIALIZED = 4;
+        const GST_EVENT_TYPE_STICKY = 8;
+        const GST_EVENT_TYPE_STICKY_MULTI = 16;
     }
 }
 
 bitflags! {
     #[repr(C)]
-    pub flags GstLockFlags: c_uint {
-        const GST_LOCK_FLAG_READ = 1,
-        const GST_LOCK_FLAG_WRITE = 2,
-        const GST_LOCK_FLAG_EXCLUSIVE = 4,
-        const GST_LOCK_FLAG_LAST = 256,
+    pub struct GstLockFlags: c_uint {
+        const GST_LOCK_FLAG_READ = 1;
+        const GST_LOCK_FLAG_WRITE = 2;
+        const GST_LOCK_FLAG_EXCLUSIVE = 4;
+        const GST_LOCK_FLAG_LAST = 256;
     }
 }
 
 bitflags! {
     #[repr(C)]
-    pub flags GstMapFlags: c_uint {
-        const GST_MAP_READ = 1,
-        const GST_MAP_WRITE = 2,
-        const GST_MAP_FLAG_LAST = 65536,
+    pub struct GstMapFlags: c_uint {
+        const GST_MAP_READ = 1;
+        const GST_MAP_WRITE = 2;
+        const GST_MAP_FLAG_LAST = 65536;
     }
 }
 
 bitflags! {
     #[repr(C)]
-    pub flags GstMemoryFlags: c_uint {
-        const GST_MEMORY_FLAG_READONLY = 2,
-        const GST_MEMORY_FLAG_NO_SHARE = 16,
-        const GST_MEMORY_FLAG_ZERO_PREFIXED = 32,
-        const GST_MEMORY_FLAG_ZERO_PADDED = 64,
-        const GST_MEMORY_FLAG_PHYSICALLY_CONTIGUOUS = 128,
-        const GST_MEMORY_FLAG_NOT_MAPPABLE = 256,
-        const GST_MEMORY_FLAG_LAST = 1048576,
+    pub struct GstMemoryFlags: c_uint {
+        const GST_MEMORY_FLAG_READONLY = 2;
+        const GST_MEMORY_FLAG_NO_SHARE = 16;
+        const GST_MEMORY_FLAG_ZERO_PREFIXED = 32;
+        const GST_MEMORY_FLAG_ZERO_PADDED = 64;
+        const GST_MEMORY_FLAG_PHYSICALLY_CONTIGUOUS = 128;
+        const GST_MEMORY_FLAG_NOT_MAPPABLE = 256;
+        const GST_MEMORY_FLAG_LAST = 1048576;
     }
 }
 
 bitflags! {
     #[repr(C)]
-    pub flags GstMessageType: c_uint {
-        const GST_MESSAGE_UNKNOWN = 0,
-        const GST_MESSAGE_EOS = 1,
-        const GST_MESSAGE_ERROR = 2,
-        const GST_MESSAGE_WARNING = 4,
-        const GST_MESSAGE_INFO = 8,
-        const GST_MESSAGE_TAG = 16,
-        const GST_MESSAGE_BUFFERING = 32,
-        const GST_MESSAGE_STATE_CHANGED = 64,
-        const GST_MESSAGE_STATE_DIRTY = 128,
-        const GST_MESSAGE_STEP_DONE = 256,
-        const GST_MESSAGE_CLOCK_PROVIDE = 512,
-        const GST_MESSAGE_CLOCK_LOST = 1024,
-        const GST_MESSAGE_NEW_CLOCK = 2048,
-        const GST_MESSAGE_STRUCTURE_CHANGE = 4096,
-        const GST_MESSAGE_STREAM_STATUS = 8192,
-        const GST_MESSAGE_APPLICATION = 16384,
-        const GST_MESSAGE_ELEMENT = 32768,
-        const GST_MESSAGE_SEGMENT_START = 65536,
-        const GST_MESSAGE_SEGMENT_DONE = 131072,
-        const GST_MESSAGE_DURATION_CHANGED = 262144,
-        const GST_MESSAGE_LATENCY = 524288,
-        const GST_MESSAGE_ASYNC_START = 1048576,
-        const GST_MESSAGE_ASYNC_DONE = 2097152,
-        const GST_MESSAGE_REQUEST_STATE = 4194304,
-        const GST_MESSAGE_STEP_START = 8388608,
-        const GST_MESSAGE_QOS = 16777216,
-        const GST_MESSAGE_PROGRESS = 33554432,
-        const GST_MESSAGE_TOC = 67108864,
-        const GST_MESSAGE_RESET_TIME = 134217728,
-        const GST_MESSAGE_STREAM_START = 268435456,
-        const GST_MESSAGE_NEED_CONTEXT = 536870912,
-        const GST_MESSAGE_HAVE_CONTEXT = 1073741824,
-        const GST_MESSAGE_EXTENDED = 2147483648,
-        const GST_MESSAGE_DEVICE_ADDED = 2147483649,
-        const GST_MESSAGE_DEVICE_REMOVED = 2147483650,
-        const GST_MESSAGE_PROPERTY_NOTIFY = 2147483651,
-        const GST_MESSAGE_STREAM_COLLECTION = 2147483652,
-        const GST_MESSAGE_STREAMS_SELECTED = 2147483653,
-        const GST_MESSAGE_REDIRECT = 2147483654,
-        const GST_MESSAGE_ANY = 4294967295,
+    pub struct GstMessageType: c_uint {
+        const GST_MESSAGE_UNKNOWN = 0;
+        const GST_MESSAGE_EOS = 1;
+        const GST_MESSAGE_ERROR = 2;
+        const GST_MESSAGE_WARNING = 4;
+        const GST_MESSAGE_INFO = 8;
+        const GST_MESSAGE_TAG = 16;
+        const GST_MESSAGE_BUFFERING = 32;
+        const GST_MESSAGE_STATE_CHANGED = 64;
+        const GST_MESSAGE_STATE_DIRTY = 128;
+        const GST_MESSAGE_STEP_DONE = 256;
+        const GST_MESSAGE_CLOCK_PROVIDE = 512;
+        const GST_MESSAGE_CLOCK_LOST = 1024;
+        const GST_MESSAGE_NEW_CLOCK = 2048;
+        const GST_MESSAGE_STRUCTURE_CHANGE = 4096;
+        const GST_MESSAGE_STREAM_STATUS = 8192;
+        const GST_MESSAGE_APPLICATION = 16384;
+        const GST_MESSAGE_ELEMENT = 32768;
+        const GST_MESSAGE_SEGMENT_START = 65536;
+        const GST_MESSAGE_SEGMENT_DONE = 131072;
+        const GST_MESSAGE_DURATION_CHANGED = 262144;
+        const GST_MESSAGE_LATENCY = 524288;
+        const GST_MESSAGE_ASYNC_START = 1048576;
+        const GST_MESSAGE_ASYNC_DONE = 2097152;
+        const GST_MESSAGE_REQUEST_STATE = 4194304;
+        const GST_MESSAGE_STEP_START = 8388608;
+        const GST_MESSAGE_QOS = 16777216;
+        const GST_MESSAGE_PROGRESS = 33554432;
+        const GST_MESSAGE_TOC = 67108864;
+        const GST_MESSAGE_RESET_TIME = 134217728;
+        const GST_MESSAGE_STREAM_START = 268435456;
+        const GST_MESSAGE_NEED_CONTEXT = 536870912;
+        const GST_MESSAGE_HAVE_CONTEXT = 1073741824;
+        const GST_MESSAGE_EXTENDED = 2147483648;
+        const GST_MESSAGE_DEVICE_ADDED = 2147483649;
+        const GST_MESSAGE_DEVICE_REMOVED = 2147483650;
+        const GST_MESSAGE_PROPERTY_NOTIFY = 2147483651;
+        const GST_MESSAGE_STREAM_COLLECTION = 2147483652;
+        const GST_MESSAGE_STREAMS_SELECTED = 2147483653;
+        const GST_MESSAGE_REDIRECT = 2147483654;
+        const GST_MESSAGE_ANY = 4294967295;
     }
 }
 
 bitflags! {
     #[repr(C)]
-    pub flags GstMetaFlags: c_uint {
-        const GST_META_FLAG_NONE = 0,
-        const GST_META_FLAG_READONLY = 1,
-        const GST_META_FLAG_POOLED = 2,
-        const GST_META_FLAG_LOCKED = 4,
-        const GST_META_FLAG_LAST = 65536,
+    pub struct GstMetaFlags: c_uint {
+        const GST_META_FLAG_NONE = 0;
+        const GST_META_FLAG_READONLY = 1;
+        const GST_META_FLAG_POOLED = 2;
+        const GST_META_FLAG_LOCKED = 4;
+        const GST_META_FLAG_LAST = 65536;
     }
 }
 
 bitflags! {
     #[repr(C)]
-    pub flags GstMiniObjectFlags: c_uint {
-        const GST_MINI_OBJECT_FLAG_LOCKABLE = 1,
-        const GST_MINI_OBJECT_FLAG_LOCK_READONLY = 2,
-        const GST_MINI_OBJECT_FLAG_MAY_BE_LEAKED = 4,
-        const GST_MINI_OBJECT_FLAG_LAST = 16,
+    pub struct GstMiniObjectFlags: c_uint {
+        const GST_MINI_OBJECT_FLAG_LOCKABLE = 1;
+        const GST_MINI_OBJECT_FLAG_LOCK_READONLY = 2;
+        const GST_MINI_OBJECT_FLAG_MAY_BE_LEAKED = 4;
+        const GST_MINI_OBJECT_FLAG_LAST = 16;
     }
 }
 
 bitflags! {
     #[repr(C)]
-    pub flags GstObjectFlags: c_uint {
-        const GST_OBJECT_FLAG_MAY_BE_LEAKED = 1,
-        const GST_OBJECT_FLAG_LAST = 16,
+    pub struct GstObjectFlags: c_uint {
+        const GST_OBJECT_FLAG_MAY_BE_LEAKED = 1;
+        const GST_OBJECT_FLAG_LAST = 16;
     }
 }
 
 bitflags! {
     #[repr(C)]
-    pub flags GstPadFlags: c_uint {
-        const GST_PAD_FLAG_BLOCKED = 16,
-        const GST_PAD_FLAG_FLUSHING = 32,
-        const GST_PAD_FLAG_EOS = 64,
-        const GST_PAD_FLAG_BLOCKING = 128,
-        const GST_PAD_FLAG_NEED_PARENT = 256,
-        const GST_PAD_FLAG_NEED_RECONFIGURE = 512,
-        const GST_PAD_FLAG_PENDING_EVENTS = 1024,
-        const GST_PAD_FLAG_FIXED_CAPS = 2048,
-        const GST_PAD_FLAG_PROXY_CAPS = 4096,
-        const GST_PAD_FLAG_PROXY_ALLOCATION = 8192,
-        const GST_PAD_FLAG_PROXY_SCHEDULING = 16384,
-        const GST_PAD_FLAG_ACCEPT_INTERSECT = 32768,
-        const GST_PAD_FLAG_ACCEPT_TEMPLATE = 65536,
-        const GST_PAD_FLAG_LAST = 1048576,
+    pub struct GstPadFlags: c_uint {
+        const GST_PAD_FLAG_BLOCKED = 16;
+        const GST_PAD_FLAG_FLUSHING = 32;
+        const GST_PAD_FLAG_EOS = 64;
+        const GST_PAD_FLAG_BLOCKING = 128;
+        const GST_PAD_FLAG_NEED_PARENT = 256;
+        const GST_PAD_FLAG_NEED_RECONFIGURE = 512;
+        const GST_PAD_FLAG_PENDING_EVENTS = 1024;
+        const GST_PAD_FLAG_FIXED_CAPS = 2048;
+        const GST_PAD_FLAG_PROXY_CAPS = 4096;
+        const GST_PAD_FLAG_PROXY_ALLOCATION = 8192;
+        const GST_PAD_FLAG_PROXY_SCHEDULING = 16384;
+        const GST_PAD_FLAG_ACCEPT_INTERSECT = 32768;
+        const GST_PAD_FLAG_ACCEPT_TEMPLATE = 65536;
+        const GST_PAD_FLAG_LAST = 1048576;
     }
 }
 
 bitflags! {
     #[repr(C)]
-    pub flags GstPadLinkCheck: c_uint {
-        const GST_PAD_LINK_CHECK_NOTHING = 0,
-        const GST_PAD_LINK_CHECK_HIERARCHY = 1,
-        const GST_PAD_LINK_CHECK_TEMPLATE_CAPS = 2,
-        const GST_PAD_LINK_CHECK_CAPS = 4,
-        const GST_PAD_LINK_CHECK_NO_RECONFIGURE = 8,
-        const GST_PAD_LINK_CHECK_DEFAULT = 5,
+    pub struct GstPadLinkCheck: c_uint {
+        const GST_PAD_LINK_CHECK_NOTHING = 0;
+        const GST_PAD_LINK_CHECK_HIERARCHY = 1;
+        const GST_PAD_LINK_CHECK_TEMPLATE_CAPS = 2;
+        const GST_PAD_LINK_CHECK_CAPS = 4;
+        const GST_PAD_LINK_CHECK_NO_RECONFIGURE = 8;
+        const GST_PAD_LINK_CHECK_DEFAULT = 5;
     }
 }
 
 bitflags! {
     #[repr(C)]
-    pub flags GstPadProbeType: c_uint {
-        const GST_PAD_PROBE_TYPE_INVALID = 0,
-        const GST_PAD_PROBE_TYPE_IDLE = 1,
-        const GST_PAD_PROBE_TYPE_BLOCK = 2,
-        const GST_PAD_PROBE_TYPE_BUFFER = 16,
-        const GST_PAD_PROBE_TYPE_BUFFER_LIST = 32,
-        const GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM = 64,
-        const GST_PAD_PROBE_TYPE_EVENT_UPSTREAM = 128,
-        const GST_PAD_PROBE_TYPE_EVENT_FLUSH = 256,
-        const GST_PAD_PROBE_TYPE_QUERY_DOWNSTREAM = 512,
-        const GST_PAD_PROBE_TYPE_QUERY_UPSTREAM = 1024,
-        const GST_PAD_PROBE_TYPE_PUSH = 4096,
-        const GST_PAD_PROBE_TYPE_PULL = 8192,
-        const GST_PAD_PROBE_TYPE_BLOCKING = 3,
-        const GST_PAD_PROBE_TYPE_DATA_DOWNSTREAM = 112,
-        const GST_PAD_PROBE_TYPE_DATA_UPSTREAM = 128,
-        const GST_PAD_PROBE_TYPE_DATA_BOTH = 240,
-        const GST_PAD_PROBE_TYPE_BLOCK_DOWNSTREAM = 114,
-        const GST_PAD_PROBE_TYPE_BLOCK_UPSTREAM = 130,
-        const GST_PAD_PROBE_TYPE_EVENT_BOTH = 192,
-        const GST_PAD_PROBE_TYPE_QUERY_BOTH = 1536,
-        const GST_PAD_PROBE_TYPE_ALL_BOTH = 1776,
-        const GST_PAD_PROBE_TYPE_SCHEDULING = 12288,
+    pub struct GstPadProbeType: c_uint {
+        const GST_PAD_PROBE_TYPE_INVALID = 0;
+        const GST_PAD_PROBE_TYPE_IDLE = 1;
+        const GST_PAD_PROBE_TYPE_BLOCK = 2;
+        const GST_PAD_PROBE_TYPE_BUFFER = 16;
+        const GST_PAD_PROBE_TYPE_BUFFER_LIST = 32;
+        const GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM = 64;
+        const GST_PAD_PROBE_TYPE_EVENT_UPSTREAM = 128;
+        const GST_PAD_PROBE_TYPE_EVENT_FLUSH = 256;
+        const GST_PAD_PROBE_TYPE_QUERY_DOWNSTREAM = 512;
+        const GST_PAD_PROBE_TYPE_QUERY_UPSTREAM = 1024;
+        const GST_PAD_PROBE_TYPE_PUSH = 4096;
+        const GST_PAD_PROBE_TYPE_PULL = 8192;
+        const GST_PAD_PROBE_TYPE_BLOCKING = 3;
+        const GST_PAD_PROBE_TYPE_DATA_DOWNSTREAM = 112;
+        const GST_PAD_PROBE_TYPE_DATA_UPSTREAM = 128;
+        const GST_PAD_PROBE_TYPE_DATA_BOTH = 240;
+        const GST_PAD_PROBE_TYPE_BLOCK_DOWNSTREAM = 114;
+        const GST_PAD_PROBE_TYPE_BLOCK_UPSTREAM = 130;
+        const GST_PAD_PROBE_TYPE_EVENT_BOTH = 192;
+        const GST_PAD_PROBE_TYPE_QUERY_BOTH = 1536;
+        const GST_PAD_PROBE_TYPE_ALL_BOTH = 1776;
+        const GST_PAD_PROBE_TYPE_SCHEDULING = 12288;
     }
 }
 
 bitflags! {
     #[repr(C)]
-    pub flags GstPadTemplateFlags: c_uint {
-        const GST_PAD_TEMPLATE_FLAG_LAST = 256,
+    pub struct GstPadTemplateFlags: c_uint {
+        const GST_PAD_TEMPLATE_FLAG_LAST = 256;
     }
 }
 
 bitflags! {
     #[repr(C)]
-    pub flags GstParseFlags: c_uint {
-        const GST_PARSE_FLAG_NONE = 0,
-        const GST_PARSE_FLAG_FATAL_ERRORS = 1,
-        const GST_PARSE_FLAG_NO_SINGLE_ELEMENT_BINS = 2,
-        const GST_PARSE_FLAG_PLACE_IN_BIN = 4,
+    pub struct GstParseFlags: c_uint {
+        const GST_PARSE_FLAG_NONE = 0;
+        const GST_PARSE_FLAG_FATAL_ERRORS = 1;
+        const GST_PARSE_FLAG_NO_SINGLE_ELEMENT_BINS = 2;
+        const GST_PARSE_FLAG_PLACE_IN_BIN = 4;
     }
 }
 
 bitflags! {
     #[repr(C)]
-    pub flags GstPipelineFlags: c_uint {
-        const GST_PIPELINE_FLAG_FIXED_CLOCK = 524288,
-        const GST_PIPELINE_FLAG_LAST = 8388608,
+    pub struct GstPipelineFlags: c_uint {
+        const GST_PIPELINE_FLAG_FIXED_CLOCK = 524288;
+        const GST_PIPELINE_FLAG_LAST = 8388608;
     }
 }
 
 bitflags! {
     #[repr(C)]
-    pub flags GstPluginDependencyFlags: c_uint {
-        const GST_PLUGIN_DEPENDENCY_FLAG_NONE = 0,
-        const GST_PLUGIN_DEPENDENCY_FLAG_RECURSE = 1,
-        const GST_PLUGIN_DEPENDENCY_FLAG_PATHS_ARE_DEFAULT_ONLY = 2,
-        const GST_PLUGIN_DEPENDENCY_FLAG_FILE_NAME_IS_SUFFIX = 4,
-        const GST_PLUGIN_DEPENDENCY_FLAG_FILE_NAME_IS_PREFIX = 8,
+    pub struct GstPluginDependencyFlags: c_uint {
+        const GST_PLUGIN_DEPENDENCY_FLAG_NONE = 0;
+        const GST_PLUGIN_DEPENDENCY_FLAG_RECURSE = 1;
+        const GST_PLUGIN_DEPENDENCY_FLAG_PATHS_ARE_DEFAULT_ONLY = 2;
+        const GST_PLUGIN_DEPENDENCY_FLAG_FILE_NAME_IS_SUFFIX = 4;
+        const GST_PLUGIN_DEPENDENCY_FLAG_FILE_NAME_IS_PREFIX = 8;
     }
 }
 
 bitflags! {
     #[repr(C)]
-    pub flags GstPluginFlags: c_uint {
-        const GST_PLUGIN_FLAG_CACHED = 16,
-        const GST_PLUGIN_FLAG_BLACKLISTED = 32,
+    pub struct GstPluginFlags: c_uint {
+        const GST_PLUGIN_FLAG_CACHED = 16;
+        const GST_PLUGIN_FLAG_BLACKLISTED = 32;
     }
 }
 
 bitflags! {
     #[repr(C)]
-    pub flags GstQueryTypeFlags: c_uint {
-        const GST_QUERY_TYPE_UPSTREAM = 1,
-        const GST_QUERY_TYPE_DOWNSTREAM = 2,
-        const GST_QUERY_TYPE_SERIALIZED = 4,
+    pub struct GstQueryTypeFlags: c_uint {
+        const GST_QUERY_TYPE_UPSTREAM = 1;
+        const GST_QUERY_TYPE_DOWNSTREAM = 2;
+        const GST_QUERY_TYPE_SERIALIZED = 4;
     }
 }
 
 bitflags! {
     #[repr(C)]
-    pub flags GstSchedulingFlags: c_uint {
-        const GST_SCHEDULING_FLAG_SEEKABLE = 1,
-        const GST_SCHEDULING_FLAG_SEQUENTIAL = 2,
-        const GST_SCHEDULING_FLAG_BANDWIDTH_LIMITED = 4,
+    pub struct GstSchedulingFlags: c_uint {
+        const GST_SCHEDULING_FLAG_SEEKABLE = 1;
+        const GST_SCHEDULING_FLAG_SEQUENTIAL = 2;
+        const GST_SCHEDULING_FLAG_BANDWIDTH_LIMITED = 4;
     }
 }
 
 bitflags! {
     #[repr(C)]
-    pub flags GstSeekFlags: c_uint {
-        const GST_SEEK_FLAG_NONE = 0,
-        const GST_SEEK_FLAG_FLUSH = 1,
-        const GST_SEEK_FLAG_ACCURATE = 2,
-        const GST_SEEK_FLAG_KEY_UNIT = 4,
-        const GST_SEEK_FLAG_SEGMENT = 8,
-        const GST_SEEK_FLAG_TRICKMODE = 16,
-        const GST_SEEK_FLAG_SKIP = 16,
-        const GST_SEEK_FLAG_SNAP_BEFORE = 32,
-        const GST_SEEK_FLAG_SNAP_AFTER = 64,
-        const GST_SEEK_FLAG_SNAP_NEAREST = 96,
-        const GST_SEEK_FLAG_TRICKMODE_KEY_UNITS = 128,
-        const GST_SEEK_FLAG_TRICKMODE_NO_AUDIO = 256,
+    pub struct GstSeekFlags: c_uint {
+        const GST_SEEK_FLAG_NONE = 0;
+        const GST_SEEK_FLAG_FLUSH = 1;
+        const GST_SEEK_FLAG_ACCURATE = 2;
+        const GST_SEEK_FLAG_KEY_UNIT = 4;
+        const GST_SEEK_FLAG_SEGMENT = 8;
+        const GST_SEEK_FLAG_TRICKMODE = 16;
+        const GST_SEEK_FLAG_SKIP = 16;
+        const GST_SEEK_FLAG_SNAP_BEFORE = 32;
+        const GST_SEEK_FLAG_SNAP_AFTER = 64;
+        const GST_SEEK_FLAG_SNAP_NEAREST = 96;
+        const GST_SEEK_FLAG_TRICKMODE_KEY_UNITS = 128;
+        const GST_SEEK_FLAG_TRICKMODE_NO_AUDIO = 256;
     }
 }
 
 bitflags! {
     #[repr(C)]
-    pub flags GstSegmentFlags: c_uint {
-        const GST_SEGMENT_FLAG_NONE = 0,
-        const GST_SEGMENT_FLAG_RESET = 1,
-        const GST_SEGMENT_FLAG_TRICKMODE = 16,
-        const GST_SEGMENT_FLAG_SKIP = 16,
-        const GST_SEGMENT_FLAG_SEGMENT = 8,
-        const GST_SEGMENT_FLAG_TRICKMODE_KEY_UNITS = 128,
-        const GST_SEGMENT_FLAG_TRICKMODE_NO_AUDIO = 256,
+    pub struct GstSegmentFlags: c_uint {
+        const GST_SEGMENT_FLAG_NONE = 0;
+        const GST_SEGMENT_FLAG_RESET = 1;
+        const GST_SEGMENT_FLAG_TRICKMODE = 16;
+        const GST_SEGMENT_FLAG_SKIP = 16;
+        const GST_SEGMENT_FLAG_SEGMENT = 8;
+        const GST_SEGMENT_FLAG_TRICKMODE_KEY_UNITS = 128;
+        const GST_SEGMENT_FLAG_TRICKMODE_NO_AUDIO = 256;
     }
 }
 
 bitflags! {
     #[repr(C)]
-    pub flags GstStackTraceFlags: c_uint {
-        const GST_STACK_TRACE_SHOW_FULL = 1,
+    pub struct GstStackTraceFlags: c_uint {
+        const GST_STACK_TRACE_SHOW_FULL = 1;
     }
 }
 
 bitflags! {
     #[repr(C)]
-    pub flags GstStreamFlags: c_uint {
-        const GST_STREAM_FLAG_NONE = 0,
-        const GST_STREAM_FLAG_SPARSE = 1,
-        const GST_STREAM_FLAG_SELECT = 2,
-        const GST_STREAM_FLAG_UNSELECT = 4,
+    pub struct GstStreamFlags: c_uint {
+        const GST_STREAM_FLAG_NONE = 0;
+        const GST_STREAM_FLAG_SPARSE = 1;
+        const GST_STREAM_FLAG_SELECT = 2;
+        const GST_STREAM_FLAG_UNSELECT = 4;
     }
 }
 
 bitflags! {
     #[repr(C)]
-    pub flags GstStreamType: c_uint {
-        const GST_STREAM_TYPE_UNKNOWN = 1,
-        const GST_STREAM_TYPE_AUDIO = 2,
-        const GST_STREAM_TYPE_VIDEO = 4,
-        const GST_STREAM_TYPE_CONTAINER = 8,
-        const GST_STREAM_TYPE_TEXT = 16,
+    pub struct GstStreamType: c_uint {
+        const GST_STREAM_TYPE_UNKNOWN = 1;
+        const GST_STREAM_TYPE_AUDIO = 2;
+        const GST_STREAM_TYPE_VIDEO = 4;
+        const GST_STREAM_TYPE_CONTAINER = 8;
+        const GST_STREAM_TYPE_TEXT = 16;
     }
 }
 
 bitflags! {
     #[repr(C)]
-    pub flags GstTracerValueFlags: c_uint {
-        const GST_TRACER_VALUE_FLAGS_NONE = 0,
-        const GST_TRACER_VALUE_FLAGS_OPTIONAL = 1,
-        const GST_TRACER_VALUE_FLAGS_AGGREGATED = 2,
+    pub struct GstTracerValueFlags: c_uint {
+        const GST_TRACER_VALUE_FLAGS_NONE = 0;
+        const GST_TRACER_VALUE_FLAGS_OPTIONAL = 1;
+        const GST_TRACER_VALUE_FLAGS_AGGREGATED = 2;
     }
 }
 
diff --git a/gstreamer-tag-sys/Cargo.toml b/gstreamer-tag-sys/Cargo.toml
index ba94f0d0f..b7842903f 100644
--- a/gstreamer-tag-sys/Cargo.toml
+++ b/gstreamer-tag-sys/Cargo.toml
@@ -2,7 +2,7 @@
 pkg-config = "0.3.7"
 
 [dependencies]
-bitflags = "0.8"
+bitflags = "0.9"
 libc = "0.2"
 glib-sys = { version = "0.3.4", git = "https://github.com/gtk-rs/sys" }
 gobject-sys = { version = "0.3.4", git = "https://github.com/gtk-rs/sys" }
diff --git a/gstreamer-tag-sys/build.rs b/gstreamer-tag-sys/build.rs
index d0a51f5c1..2e23a3b38 100644
--- a/gstreamer-tag-sys/build.rs
+++ b/gstreamer-tag-sys/build.rs
@@ -30,7 +30,7 @@ fn find() -> Result<(), Error> {
         return Ok(())
     }
 
-    let target = env::var("TARGET").unwrap();
+    let target = env::var("TARGET").expect("TARGET environment variable doesn't exist");
     let hardcode_shared_libs = target.contains("windows");
 
     let mut config = Config::new();
@@ -45,7 +45,8 @@ fn find() -> Result<(), Error> {
                     println!("cargo:rustc-link-lib=dylib={}", lib_);
                 }
                 for path in library.link_paths.iter() {
-                    println!("cargo:rustc-link-search=native={}", path.to_str().unwrap());
+                    println!("cargo:rustc-link-search=native={}",
+                             path.to_str().expect("library path doesn't exist"));
                 }
             }
             Ok(())
diff --git a/gstreamer-tag-sys/src/lib.rs b/gstreamer-tag-sys/src/lib.rs
index 1a75b2915..038f52a80 100644
--- a/gstreamer-tag-sys/src/lib.rs
+++ b/gstreamer-tag-sys/src/lib.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (f493ea3) from gir-files (???)
+// This file was generated by gir (d121f7e+) from gir-files (???)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals)]
@@ -115,21 +115,21 @@ pub const GST_TAG_MUSICBRAINZ_TRMID: *const c_char = b"musicbrainz-trmid\0" as *
 // Flags
 bitflags! {
     #[repr(C)]
-    pub flags GstTagLicenseFlags: c_uint {
-        const GST_TAG_LICENSE_PERMITS_REPRODUCTION = 1,
-        const GST_TAG_LICENSE_PERMITS_DISTRIBUTION = 2,
-        const GST_TAG_LICENSE_PERMITS_DERIVATIVE_WORKS = 4,
-        const GST_TAG_LICENSE_PERMITS_SHARING = 8,
-        const GST_TAG_LICENSE_REQUIRES_NOTICE = 256,
-        const GST_TAG_LICENSE_REQUIRES_ATTRIBUTION = 512,
-        const GST_TAG_LICENSE_REQUIRES_SHARE_ALIKE = 1024,
-        const GST_TAG_LICENSE_REQUIRES_SOURCE_CODE = 2048,
-        const GST_TAG_LICENSE_REQUIRES_COPYLEFT = 4096,
-        const GST_TAG_LICENSE_REQUIRES_LESSER_COPYLEFT = 8192,
-        const GST_TAG_LICENSE_PROHIBITS_COMMERCIAL_USE = 65536,
-        const GST_TAG_LICENSE_PROHIBITS_HIGH_INCOME_NATION_USE = 131072,
-        const GST_TAG_LICENSE_CREATIVE_COMMONS_LICENSE = 16777216,
-        const GST_TAG_LICENSE_FREE_SOFTWARE_FOUNDATION_LICENSE = 33554432,
+    pub struct GstTagLicenseFlags: c_uint {
+        const GST_TAG_LICENSE_PERMITS_REPRODUCTION = 1;
+        const GST_TAG_LICENSE_PERMITS_DISTRIBUTION = 2;
+        const GST_TAG_LICENSE_PERMITS_DERIVATIVE_WORKS = 4;
+        const GST_TAG_LICENSE_PERMITS_SHARING = 8;
+        const GST_TAG_LICENSE_REQUIRES_NOTICE = 256;
+        const GST_TAG_LICENSE_REQUIRES_ATTRIBUTION = 512;
+        const GST_TAG_LICENSE_REQUIRES_SHARE_ALIKE = 1024;
+        const GST_TAG_LICENSE_REQUIRES_SOURCE_CODE = 2048;
+        const GST_TAG_LICENSE_REQUIRES_COPYLEFT = 4096;
+        const GST_TAG_LICENSE_REQUIRES_LESSER_COPYLEFT = 8192;
+        const GST_TAG_LICENSE_PROHIBITS_COMMERCIAL_USE = 65536;
+        const GST_TAG_LICENSE_PROHIBITS_HIGH_INCOME_NATION_USE = 131072;
+        const GST_TAG_LICENSE_CREATIVE_COMMONS_LICENSE = 16777216;
+        const GST_TAG_LICENSE_FREE_SOFTWARE_FOUNDATION_LICENSE = 33554432;
     }
 }
 
diff --git a/gstreamer-video-sys/Cargo.toml b/gstreamer-video-sys/Cargo.toml
index 3845a9fd7..f0e57ac18 100644
--- a/gstreamer-video-sys/Cargo.toml
+++ b/gstreamer-video-sys/Cargo.toml
@@ -2,7 +2,7 @@
 pkg-config = "0.3.7"
 
 [dependencies]
-bitflags = "0.8"
+bitflags = "0.9"
 libc = "0.2"
 glib-sys = { version = "0.3.4", git = "https://github.com/gtk-rs/sys" }
 gobject-sys = { version = "0.3.4", git = "https://github.com/gtk-rs/sys" }
diff --git a/gstreamer-video-sys/build.rs b/gstreamer-video-sys/build.rs
index 7e0280a6b..b1464a17a 100644
--- a/gstreamer-video-sys/build.rs
+++ b/gstreamer-video-sys/build.rs
@@ -42,7 +42,7 @@ fn find() -> Result<(), Error> {
         return Ok(())
     }
 
-    let target = env::var("TARGET").unwrap();
+    let target = env::var("TARGET").expect("TARGET environment variable doesn't exist");
     let hardcode_shared_libs = target.contains("windows");
 
     let mut config = Config::new();
@@ -57,7 +57,8 @@ fn find() -> Result<(), Error> {
                     println!("cargo:rustc-link-lib=dylib={}", lib_);
                 }
                 for path in library.link_paths.iter() {
-                    println!("cargo:rustc-link-search=native={}", path.to_str().unwrap());
+                    println!("cargo:rustc-link-search=native={}",
+                             path.to_str().expect("library path doesn't exist"));
                 }
             }
             Ok(())
diff --git a/gstreamer-video-sys/src/lib.rs b/gstreamer-video-sys/src/lib.rs
index 913175de6..ca5f03042 100644
--- a/gstreamer-video-sys/src/lib.rs
+++ b/gstreamer-video-sys/src/lib.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (f493ea3) from gir-files (???)
+// This file was generated by gir (d121f7e+) from gir-files (???)
 // DO NOT EDIT
 
 #![allow(non_camel_case_types, non_upper_case_globals)]
@@ -685,149 +685,149 @@ pub const GST_VIDEO_TILE_Y_TILES_SHIFT: c_int = 16;
 // Flags
 bitflags! {
     #[repr(C)]
-    pub flags GstVideoBufferFlags: c_uint {
-        const GST_VIDEO_BUFFER_FLAG_INTERLACED = 1048576,
-        const GST_VIDEO_BUFFER_FLAG_TFF = 2097152,
-        const GST_VIDEO_BUFFER_FLAG_RFF = 4194304,
-        const GST_VIDEO_BUFFER_FLAG_ONEFIELD = 8388608,
-        const GST_VIDEO_BUFFER_FLAG_MULTIPLE_VIEW = 16777216,
-        const GST_VIDEO_BUFFER_FLAG_FIRST_IN_BUNDLE = 33554432,
-        const GST_VIDEO_BUFFER_FLAG_LAST = 268435456,
+    pub struct GstVideoBufferFlags: c_uint {
+        const GST_VIDEO_BUFFER_FLAG_INTERLACED = 1048576;
+        const GST_VIDEO_BUFFER_FLAG_TFF = 2097152;
+        const GST_VIDEO_BUFFER_FLAG_RFF = 4194304;
+        const GST_VIDEO_BUFFER_FLAG_ONEFIELD = 8388608;
+        const GST_VIDEO_BUFFER_FLAG_MULTIPLE_VIEW = 16777216;
+        const GST_VIDEO_BUFFER_FLAG_FIRST_IN_BUNDLE = 33554432;
+        const GST_VIDEO_BUFFER_FLAG_LAST = 268435456;
     }
 }
 
 bitflags! {
     #[repr(C)]
-    pub flags GstVideoChromaFlags: c_uint {
-        const GST_VIDEO_CHROMA_FLAG_NONE = 0,
-        const GST_VIDEO_CHROMA_FLAG_INTERLACED = 1,
+    pub struct GstVideoChromaFlags: c_uint {
+        const GST_VIDEO_CHROMA_FLAG_NONE = 0;
+        const GST_VIDEO_CHROMA_FLAG_INTERLACED = 1;
     }
 }
 
 bitflags! {
     #[repr(C)]
-    pub flags GstVideoChromaSite: c_uint {
-        const GST_VIDEO_CHROMA_SITE_UNKNOWN = 0,
-        const GST_VIDEO_CHROMA_SITE_NONE = 1,
-        const GST_VIDEO_CHROMA_SITE_H_COSITED = 2,
-        const GST_VIDEO_CHROMA_SITE_V_COSITED = 4,
-        const GST_VIDEO_CHROMA_SITE_ALT_LINE = 8,
-        const GST_VIDEO_CHROMA_SITE_COSITED = 6,
-        const GST_VIDEO_CHROMA_SITE_JPEG = 1,
-        const GST_VIDEO_CHROMA_SITE_MPEG2 = 2,
-        const GST_VIDEO_CHROMA_SITE_DV = 14,
+    pub struct GstVideoChromaSite: c_uint {
+        const GST_VIDEO_CHROMA_SITE_UNKNOWN = 0;
+        const GST_VIDEO_CHROMA_SITE_NONE = 1;
+        const GST_VIDEO_CHROMA_SITE_H_COSITED = 2;
+        const GST_VIDEO_CHROMA_SITE_V_COSITED = 4;
+        const GST_VIDEO_CHROMA_SITE_ALT_LINE = 8;
+        const GST_VIDEO_CHROMA_SITE_COSITED = 6;
+        const GST_VIDEO_CHROMA_SITE_JPEG = 1;
+        const GST_VIDEO_CHROMA_SITE_MPEG2 = 2;
+        const GST_VIDEO_CHROMA_SITE_DV = 14;
     }
 }
 
 bitflags! {
     #[repr(C)]
-    pub flags GstVideoCodecFrameFlags: c_uint {
-        const GST_VIDEO_CODEC_FRAME_FLAG_DECODE_ONLY = 1,
-        const GST_VIDEO_CODEC_FRAME_FLAG_SYNC_POINT = 2,
-        const GST_VIDEO_CODEC_FRAME_FLAG_FORCE_KEYFRAME = 4,
-        const GST_VIDEO_CODEC_FRAME_FLAG_FORCE_KEYFRAME_HEADERS = 8,
+    pub struct GstVideoCodecFrameFlags: c_uint {
+        const GST_VIDEO_CODEC_FRAME_FLAG_DECODE_ONLY = 1;
+        const GST_VIDEO_CODEC_FRAME_FLAG_SYNC_POINT = 2;
+        const GST_VIDEO_CODEC_FRAME_FLAG_FORCE_KEYFRAME = 4;
+        const GST_VIDEO_CODEC_FRAME_FLAG_FORCE_KEYFRAME_HEADERS = 8;
     }
 }
 
 bitflags! {
     #[repr(C)]
-    pub flags GstVideoDitherFlags: c_uint {
-        const GST_VIDEO_DITHER_FLAG_NONE = 0,
-        const GST_VIDEO_DITHER_FLAG_INTERLACED = 1,
-        const GST_VIDEO_DITHER_FLAG_QUANTIZE = 2,
+    pub struct GstVideoDitherFlags: c_uint {
+        const GST_VIDEO_DITHER_FLAG_NONE = 0;
+        const GST_VIDEO_DITHER_FLAG_INTERLACED = 1;
+        const GST_VIDEO_DITHER_FLAG_QUANTIZE = 2;
     }
 }
 
 bitflags! {
     #[repr(C)]
-    pub flags GstVideoFlags: c_uint {
-        const GST_VIDEO_FLAG_NONE = 0,
-        const GST_VIDEO_FLAG_VARIABLE_FPS = 1,
-        const GST_VIDEO_FLAG_PREMULTIPLIED_ALPHA = 2,
+    pub struct GstVideoFlags: c_uint {
+        const GST_VIDEO_FLAG_NONE = 0;
+        const GST_VIDEO_FLAG_VARIABLE_FPS = 1;
+        const GST_VIDEO_FLAG_PREMULTIPLIED_ALPHA = 2;
     }
 }
 
 bitflags! {
     #[repr(C)]
-    pub flags GstVideoFormatFlags: c_uint {
-        const GST_VIDEO_FORMAT_FLAG_YUV = 1,
-        const GST_VIDEO_FORMAT_FLAG_RGB = 2,
-        const GST_VIDEO_FORMAT_FLAG_GRAY = 4,
-        const GST_VIDEO_FORMAT_FLAG_ALPHA = 8,
-        const GST_VIDEO_FORMAT_FLAG_LE = 16,
-        const GST_VIDEO_FORMAT_FLAG_PALETTE = 32,
-        const GST_VIDEO_FORMAT_FLAG_COMPLEX = 64,
-        const GST_VIDEO_FORMAT_FLAG_UNPACK = 128,
-        const GST_VIDEO_FORMAT_FLAG_TILED = 256,
+    pub struct GstVideoFormatFlags: c_uint {
+        const GST_VIDEO_FORMAT_FLAG_YUV = 1;
+        const GST_VIDEO_FORMAT_FLAG_RGB = 2;
+        const GST_VIDEO_FORMAT_FLAG_GRAY = 4;
+        const GST_VIDEO_FORMAT_FLAG_ALPHA = 8;
+        const GST_VIDEO_FORMAT_FLAG_LE = 16;
+        const GST_VIDEO_FORMAT_FLAG_PALETTE = 32;
+        const GST_VIDEO_FORMAT_FLAG_COMPLEX = 64;
+        const GST_VIDEO_FORMAT_FLAG_UNPACK = 128;
+        const GST_VIDEO_FORMAT_FLAG_TILED = 256;
     }
 }
 
 bitflags! {
     #[repr(C)]
-    pub flags GstVideoFrameFlags: c_uint {
-        const GST_VIDEO_FRAME_FLAG_NONE = 0,
-        const GST_VIDEO_FRAME_FLAG_INTERLACED = 1,
-        const GST_VIDEO_FRAME_FLAG_TFF = 2,
-        const GST_VIDEO_FRAME_FLAG_RFF = 4,
-        const GST_VIDEO_FRAME_FLAG_ONEFIELD = 8,
-        const GST_VIDEO_FRAME_FLAG_MULTIPLE_VIEW = 16,
-        const GST_VIDEO_FRAME_FLAG_FIRST_IN_BUNDLE = 32,
+    pub struct GstVideoFrameFlags: c_uint {
+        const GST_VIDEO_FRAME_FLAG_NONE = 0;
+        const GST_VIDEO_FRAME_FLAG_INTERLACED = 1;
+        const GST_VIDEO_FRAME_FLAG_TFF = 2;
+        const GST_VIDEO_FRAME_FLAG_RFF = 4;
+        const GST_VIDEO_FRAME_FLAG_ONEFIELD = 8;
+        const GST_VIDEO_FRAME_FLAG_MULTIPLE_VIEW = 16;
+        const GST_VIDEO_FRAME_FLAG_FIRST_IN_BUNDLE = 32;
     }
 }
 
 bitflags! {
     #[repr(C)]
-    pub flags GstVideoFrameMapFlags: c_uint {
-        const GST_VIDEO_FRAME_MAP_FLAG_NO_REF = 65536,
-        const GST_VIDEO_FRAME_MAP_FLAG_LAST = 16777216,
+    pub struct GstVideoFrameMapFlags: c_uint {
+        const GST_VIDEO_FRAME_MAP_FLAG_NO_REF = 65536;
+        const GST_VIDEO_FRAME_MAP_FLAG_LAST = 16777216;
     }
 }
 
 bitflags! {
     #[repr(C)]
-    pub flags GstVideoMultiviewFlags: c_uint {
-        const GST_VIDEO_MULTIVIEW_FLAGS_NONE = 0,
-        const GST_VIDEO_MULTIVIEW_FLAGS_RIGHT_VIEW_FIRST = 1,
-        const GST_VIDEO_MULTIVIEW_FLAGS_LEFT_FLIPPED = 2,
-        const GST_VIDEO_MULTIVIEW_FLAGS_LEFT_FLOPPED = 4,
-        const GST_VIDEO_MULTIVIEW_FLAGS_RIGHT_FLIPPED = 8,
-        const GST_VIDEO_MULTIVIEW_FLAGS_RIGHT_FLOPPED = 16,
-        const GST_VIDEO_MULTIVIEW_FLAGS_HALF_ASPECT = 16384,
-        const GST_VIDEO_MULTIVIEW_FLAGS_MIXED_MONO = 32768,
+    pub struct GstVideoMultiviewFlags: c_uint {
+        const GST_VIDEO_MULTIVIEW_FLAGS_NONE = 0;
+        const GST_VIDEO_MULTIVIEW_FLAGS_RIGHT_VIEW_FIRST = 1;
+        const GST_VIDEO_MULTIVIEW_FLAGS_LEFT_FLIPPED = 2;
+        const GST_VIDEO_MULTIVIEW_FLAGS_LEFT_FLOPPED = 4;
+        const GST_VIDEO_MULTIVIEW_FLAGS_RIGHT_FLIPPED = 8;
+        const GST_VIDEO_MULTIVIEW_FLAGS_RIGHT_FLOPPED = 16;
+        const GST_VIDEO_MULTIVIEW_FLAGS_HALF_ASPECT = 16384;
+        const GST_VIDEO_MULTIVIEW_FLAGS_MIXED_MONO = 32768;
     }
 }
 
 bitflags! {
     #[repr(C)]
-    pub flags GstVideoPackFlags: c_uint {
-        const GST_VIDEO_PACK_FLAG_NONE = 0,
-        const GST_VIDEO_PACK_FLAG_TRUNCATE_RANGE = 1,
-        const GST_VIDEO_PACK_FLAG_INTERLACED = 2,
+    pub struct GstVideoPackFlags: c_uint {
+        const GST_VIDEO_PACK_FLAG_NONE = 0;
+        const GST_VIDEO_PACK_FLAG_TRUNCATE_RANGE = 1;
+        const GST_VIDEO_PACK_FLAG_INTERLACED = 2;
     }
 }
 
 bitflags! {
     #[repr(C)]
-    pub flags GstVideoResamplerFlags: c_uint {
-        const GST_VIDEO_RESAMPLER_FLAG_NONE = 0,
-        const GST_VIDEO_RESAMPLER_FLAG_HALF_TAPS = 1,
+    pub struct GstVideoResamplerFlags: c_uint {
+        const GST_VIDEO_RESAMPLER_FLAG_NONE = 0;
+        const GST_VIDEO_RESAMPLER_FLAG_HALF_TAPS = 1;
     }
 }
 
 bitflags! {
     #[repr(C)]
-    pub flags GstVideoScalerFlags: c_uint {
-        const GST_VIDEO_SCALER_FLAG_NONE = 0,
-        const GST_VIDEO_SCALER_FLAG_INTERLACED = 1,
+    pub struct GstVideoScalerFlags: c_uint {
+        const GST_VIDEO_SCALER_FLAG_NONE = 0;
+        const GST_VIDEO_SCALER_FLAG_INTERLACED = 1;
     }
 }
 
 bitflags! {
     #[repr(C)]
-    pub flags GstVideoTimeCodeFlags: c_uint {
-        const GST_VIDEO_TIME_CODE_FLAGS_NONE = 0,
-        const GST_VIDEO_TIME_CODE_FLAGS_DROP_FRAME = 1,
-        const GST_VIDEO_TIME_CODE_FLAGS_INTERLACED = 2,
+    pub struct GstVideoTimeCodeFlags: c_uint {
+        const GST_VIDEO_TIME_CODE_FLAGS_NONE = 0;
+        const GST_VIDEO_TIME_CODE_FLAGS_DROP_FRAME = 1;
+        const GST_VIDEO_TIME_CODE_FLAGS_INTERLACED = 2;
     }
 }