diff --git a/gstreamer/src/event.rs b/gstreamer/src/event.rs
index c1f1c5ad4..e2731cba9 100644
--- a/gstreamer/src/event.rs
+++ b/gstreamer/src/event.rs
@@ -286,6 +286,7 @@ pub trait StickyEventType {
 }
 
 #[derive(Debug)]
+#[non_exhaustive]
 pub enum EventView<T> {
     FlushStart(FlushStart<T>),
     FlushStop(FlushStop<T>),
@@ -319,7 +320,6 @@ pub enum EventView<T> {
     CustomBoth(CustomBoth<T>),
     CustomBothOob(CustomBothOob<T>),
     Other(Other<T>),
-    __NonExhaustive,
 }
 
 macro_rules! declare_concrete_event {
diff --git a/gstreamer/src/message.rs b/gstreamer/src/message.rs
index f85018b6a..292fd3367 100644
--- a/gstreamer/src/message.rs
+++ b/gstreamer/src/message.rs
@@ -168,6 +168,7 @@ impl fmt::Debug for MessageRef {
 }
 
 #[derive(Debug)]
+#[non_exhaustive]
 pub enum MessageView<'a> {
     Eos(Eos<'a>),
     Error(Error<'a>),
@@ -208,7 +209,6 @@ pub enum MessageView<'a> {
     Redirect(Redirect<'a>),
     DeviceChanged(DeviceChanged<'a>),
     Other,
-    __NonExhaustive,
 }
 
 macro_rules! declare_concrete_message(
diff --git a/gstreamer/src/query.rs b/gstreamer/src/query.rs
index e914ff7da..902474f27 100644
--- a/gstreamer/src/query.rs
+++ b/gstreamer/src/query.rs
@@ -138,6 +138,7 @@ unsafe impl<'a> AsMutPtr for &'a mut QueryRef {
 }
 
 #[derive(Debug)]
+#[non_exhaustive]
 pub enum QueryView<T> {
     Position(Position<T>),
     Duration(Duration<T>),
@@ -157,7 +158,6 @@ pub enum QueryView<T> {
     Context(Context<T>),
     Bitrate(Bitrate<T>),
     Other(Other<T>),
-    __NonExhaustive,
 }
 
 macro_rules! declare_concrete_query(