diff --git a/gstreamer-allocators/Cargo.toml b/gstreamer-allocators/Cargo.toml
index f9dfab8a9..4693dc6a0 100644
--- a/gstreamer-allocators/Cargo.toml
+++ b/gstreamer-allocators/Cargo.toml
@@ -30,7 +30,7 @@ v1_16 = ["gst/v1_16", "ffi/v1_16"]
 v1_18 = ["gst/v1_18", "ffi/v1_18", "v1_16"]
 v1_20 = ["gst/v1_20", "ffi/v1_20", "v1_18"]
 v1_22 = ["gst/v1_22", "ffi/v1_22", "v1_20"]
-dox = ["v1_22", "ffi/dox", "glib/dox", "gst/dox"]
+dox = ["ffi/dox", "glib/dox", "gst/dox"]
 
 [package.metadata.docs.rs]
 features = ["dox"]
diff --git a/gstreamer-app/Cargo.toml b/gstreamer-app/Cargo.toml
index c1243ba30..c84fd6bce 100644
--- a/gstreamer-app/Cargo.toml
+++ b/gstreamer-app/Cargo.toml
@@ -35,7 +35,7 @@ v1_16 = ["gst/v1_16", "gst-base/v1_16", "ffi/v1_16"]
 v1_18 = ["gst/v1_18", "gst-base/v1_18", "ffi/v1_18", "v1_16"]
 v1_20 = ["gst/v1_20", "gst-base/v1_20", "ffi/v1_20", "v1_18"]
 v1_22 = ["gst/v1_22", "gst-base/v1_22", "ffi/v1_22", "v1_20"]
-dox = ["v1_22", "ffi/dox", "glib/dox", "gst/dox", "gst-base/dox"]
+dox = ["ffi/dox", "glib/dox", "gst/dox", "gst-base/dox"]
 
 [package.metadata.docs.rs]
 features = ["dox"]
diff --git a/gstreamer-audio/Cargo.toml b/gstreamer-audio/Cargo.toml
index c211371cc..4fca5d1b8 100644
--- a/gstreamer-audio/Cargo.toml
+++ b/gstreamer-audio/Cargo.toml
@@ -35,7 +35,7 @@ v1_16 = ["gst/v1_16", "gst-base/v1_16", "ffi/v1_16"]
 v1_18 = ["gst/v1_18", "gst-base/v1_18", "ffi/v1_18", "v1_16"]
 v1_20 = ["gst/v1_20", "gst-base/v1_20", "ffi/v1_20", "v1_18"]
 v1_22 = ["gst/v1_22", "gst-base/v1_22", "ffi/v1_22", "v1_20"]
-dox = ["v1_22", "ffi/dox", "glib/dox", "gst/dox", "gst-base/dox", "serde"]
+dox = ["ffi/dox", "glib/dox", "gst/dox", "gst-base/dox", "serde"]
 serde = ["dep:serde", "gst/serde"]
 
 [package.metadata.docs.rs]
diff --git a/gstreamer-base/Cargo.toml b/gstreamer-base/Cargo.toml
index 8e6490c0d..3b23c7f31 100644
--- a/gstreamer-base/Cargo.toml
+++ b/gstreamer-base/Cargo.toml
@@ -32,7 +32,7 @@ v1_16 = ["gst/v1_16", "ffi/v1_16", "v1_14_1"]
 v1_18 = ["gst/v1_18", "ffi/v1_18", "v1_16"]
 v1_20 = ["gst/v1_20", "ffi/v1_20", "v1_18"]
 v1_22 = ["gst/v1_22", "ffi/v1_22", "v1_20"]
-dox = ["v1_22", "ffi/dox", "glib/dox", "gst/dox"]
+dox = ["ffi/dox", "glib/dox", "gst/dox"]
 
 [package.metadata.docs.rs]
 features = ["dox"]
diff --git a/gstreamer-check/Cargo.toml b/gstreamer-check/Cargo.toml
index 6ac33febb..d50d8800e 100644
--- a/gstreamer-check/Cargo.toml
+++ b/gstreamer-check/Cargo.toml
@@ -28,7 +28,7 @@ v1_16 = ["gst/v1_16", "ffi/v1_16"]
 v1_18 = ["gst/v1_18", "ffi/v1_18", "v1_16"]
 v1_20 = ["gst/v1_20", "ffi/v1_20", "v1_18"]
 v1_22 = ["gst/v1_22", "ffi/v1_22", "v1_20"]
-dox = ["v1_22", "ffi/dox", "glib/dox", "gst/dox"]
+dox = ["ffi/dox", "glib/dox", "gst/dox"]
 
 [package.metadata.docs.rs]
 features = ["dox"]
diff --git a/gstreamer-controller/Cargo.toml b/gstreamer-controller/Cargo.toml
index 838a2201c..4a3b6ff37 100644
--- a/gstreamer-controller/Cargo.toml
+++ b/gstreamer-controller/Cargo.toml
@@ -29,7 +29,7 @@ v1_16 = ["gst/v1_16", "ffi/v1_16"]
 v1_18 = ["gst/v1_18", "ffi/v1_18", "v1_16"]
 v1_20 = ["gst/v1_20", "ffi/v1_20", "v1_18"]
 v1_22 = ["gst/v1_22", "ffi/v1_22", "v1_20"]
-dox = ["v1_22", "ffi/dox", "glib/dox", "gst/dox"]
+dox = ["ffi/dox", "glib/dox", "gst/dox"]
 
 [package.metadata.docs.rs]
 features = ["dox"]
diff --git a/gstreamer-editing-services/Cargo.toml b/gstreamer-editing-services/Cargo.toml
index c25bd91c6..4873815d9 100644
--- a/gstreamer-editing-services/Cargo.toml
+++ b/gstreamer-editing-services/Cargo.toml
@@ -33,7 +33,7 @@ v1_16 = ["gst/v1_16", "gst-base/v1_16", "gst-pbutils/v1_16", "ffi/v1_16"]
 v1_18 = ["gst/v1_18", "gst-base/v1_18", "gst-pbutils/v1_18", "ffi/v1_18", "v1_16"]
 v1_20 = ["gst/v1_20", "gst-base/v1_20", "gst-pbutils/v1_20", "ffi/v1_20", "v1_18"]
 v1_22 = ["gst/v1_22", "gst-base/v1_22", "gst-pbutils/v1_22", "ffi/v1_22", "v1_20"]
-dox = ["v1_22", "ffi/dox", "glib/dox", "gio/dox", "gst/dox", "gst-base/dox", "gst-pbutils/dox", "serde"]
+dox = ["ffi/dox", "glib/dox", "gio/dox", "gst/dox", "gst-base/dox", "gst-pbutils/dox", "serde"]
 serde = ["dep:serde", "gst/serde", "gst-pbutils/serde"]
 
 [package.metadata.docs.rs]
diff --git a/gstreamer-gl/Cargo.toml b/gstreamer-gl/Cargo.toml
index fd1a5cf4e..f375410ab 100644
--- a/gstreamer-gl/Cargo.toml
+++ b/gstreamer-gl/Cargo.toml
@@ -38,7 +38,7 @@ v1_16 = ["gst/v1_16", "gst-base/v1_16", "gst-video/v1_16", "ffi/v1_16"]
 v1_18 = ["gst/v1_18", "gst-base/v1_18", "gst-video/v1_18", "ffi/v1_18", "v1_16"]
 v1_20 = ["gst/v1_20", "gst-base/v1_20", "gst-video/v1_20", "ffi/v1_20", "v1_18"]
 v1_22 = ["gst/v1_22", "gst-base/v1_22", "gst-video/v1_22", "ffi/v1_22", "v1_20"]
-dox = ["v1_22", "ffi/dox", "glib/dox", "gst/dox", "gst-base/dox", "gst-video/dox", "serde"]
+dox = ["ffi/dox", "glib/dox", "gst/dox", "gst-base/dox", "gst-video/dox", "serde"]
 serde = ["dep:serde", "gst/serde", "gst-video/serde"]
 
 [package.metadata.docs.rs]
diff --git a/gstreamer-gl/egl/Cargo.toml b/gstreamer-gl/egl/Cargo.toml
index 28b578f70..947bf0faa 100644
--- a/gstreamer-gl/egl/Cargo.toml
+++ b/gstreamer-gl/egl/Cargo.toml
@@ -29,7 +29,7 @@ gir-format-check = "0.1"
 
 [features]
 default = []
-dox = ["v1_22", "ffi/dox", "glib/dox", "gst/dox", "gst-gl/dox"]
+dox = ["ffi/dox", "glib/dox", "gst/dox", "gst-gl/dox"]
 v1_16 = ["gst/v1_16", "gst-gl/v1_16", "ffi/v1_16"]
 v1_18 = ["gst/v1_18", "gst-gl/v1_18", "ffi/v1_18", "v1_16"]
 v1_20 = ["gst/v1_20", "gst-gl/v1_20", "ffi/v1_20", "v1_18"]
diff --git a/gstreamer-gl/wayland/Cargo.toml b/gstreamer-gl/wayland/Cargo.toml
index 15602f0af..5be64486e 100644
--- a/gstreamer-gl/wayland/Cargo.toml
+++ b/gstreamer-gl/wayland/Cargo.toml
@@ -29,7 +29,7 @@ gir-format-check = "0.1"
 
 [features]
 default = []
-dox = ["v1_22", "ffi/dox", "glib/dox", "gst/dox", "gst-gl/dox"]
+dox = ["ffi/dox", "glib/dox", "gst/dox", "gst-gl/dox"]
 v1_16 = ["gst/v1_16", "gst-gl/v1_16", "ffi/v1_16"]
 v1_18 = ["gst/v1_18", "gst-gl/v1_18", "ffi/v1_18", "v1_16"]
 v1_20 = ["gst/v1_20", "gst-gl/v1_20", "ffi/v1_20", "v1_18"]
diff --git a/gstreamer-gl/x11/Cargo.toml b/gstreamer-gl/x11/Cargo.toml
index 7e40749c8..d4d24d857 100644
--- a/gstreamer-gl/x11/Cargo.toml
+++ b/gstreamer-gl/x11/Cargo.toml
@@ -29,7 +29,7 @@ gir-format-check = "0.1"
 
 [features]
 default = []
-dox = ["v1_22", "ffi/dox", "glib/dox", "gst/dox", "gst-gl/dox"]
+dox = ["ffi/dox", "glib/dox", "gst/dox", "gst-gl/dox"]
 v1_16 = ["gst/v1_16", "gst-gl/v1_16", "ffi/v1_16"]
 v1_18 = ["gst/v1_18", "gst-gl/v1_18", "ffi/v1_18", "v1_16"]
 v1_20 = ["gst/v1_20", "gst-gl/v1_20", "ffi/v1_20", "v1_18"]
diff --git a/gstreamer-net/Cargo.toml b/gstreamer-net/Cargo.toml
index ce9566529..03156a9d1 100644
--- a/gstreamer-net/Cargo.toml
+++ b/gstreamer-net/Cargo.toml
@@ -28,7 +28,7 @@ v1_16 = ["gst/v1_16", "ffi/v1_16"]
 v1_18 = ["gst/v1_18", "ffi/v1_18", "v1_16"]
 v1_20 = ["gst/v1_20", "ffi/v1_20", "v1_18"]
 v1_22 = ["gst/v1_22", "ffi/v1_22", "v1_20"]
-dox = ["v1_22", "ffi/dox", "glib/dox", "gio/dox", "gst/dox"]
+dox = ["ffi/dox", "glib/dox", "gio/dox", "gst/dox"]
 
 [package.metadata.docs.rs]
 features = ["dox"]
diff --git a/gstreamer-pbutils/Cargo.toml b/gstreamer-pbutils/Cargo.toml
index 9d8d4f647..2d964b616 100644
--- a/gstreamer-pbutils/Cargo.toml
+++ b/gstreamer-pbutils/Cargo.toml
@@ -30,11 +30,11 @@ serde_json = "1.0"
 
 [features]
 default = []
-v1_16 = ["gst/v1_16", "ffi/v1_16"]
-v1_18 = ["gst/v1_18", "ffi/v1_18", "v1_16"]
-v1_20 = ["gst/v1_20", "ffi/v1_20", "v1_18"]
-v1_22 = ["gst/v1_22", "ffi/v1_22", "v1_20"]
-dox = ["v1_22", "ffi/dox", "glib/dox", "gst/dox", "serde"]
+v1_16 = ["gst/v1_16", "gst-audio/v1_16", "gst-video/v1_16", "ffi/v1_16"]
+v1_18 = ["gst/v1_18", "gst-audio/v1_18", "gst-video/v1_18", "ffi/v1_18", "v1_16"]
+v1_20 = ["gst/v1_20", "gst-audio/v1_20", "gst-video/v1_20", "ffi/v1_20", "v1_18"]
+v1_22 = ["gst/v1_22", "gst-audio/v1_22", "gst-video/v1_22", "ffi/v1_22", "v1_20"]
+dox = ["ffi/dox", "glib/dox", "gst/dox", "gst-audio/dox", "gst-video/dox", "serde"]
 serde = ["dep:serde", "gst/serde"]
 
 [package.metadata.docs.rs]
diff --git a/gstreamer-pbutils/src/encoding_profile.rs b/gstreamer-pbutils/src/encoding_profile.rs
index 9ac791671..2b376497e 100644
--- a/gstreamer-pbutils/src/encoding_profile.rs
+++ b/gstreamer-pbutils/src/encoding_profile.rs
@@ -8,7 +8,7 @@ use crate::auto::EncodingContainerProfile;
 use crate::auto::EncodingProfile;
 use crate::auto::EncodingVideoProfile;
 
-#[cfg(feature = "v1_20")]
+#[cfg(any(feature = "v1_20", feature = "dox"))]
 use crate::ElementProperties;
 
 pub trait EncodingProfileExtManual {
diff --git a/gstreamer-pbutils/src/lib.rs b/gstreamer-pbutils/src/lib.rs
index 647104275..cc09e736e 100644
--- a/gstreamer-pbutils/src/lib.rs
+++ b/gstreamer-pbutils/src/lib.rs
@@ -43,9 +43,9 @@ mod auto;
 pub use crate::auto::functions::*;
 pub use crate::auto::*;
 
-#[cfg(feature = "v1_20")]
+#[cfg(any(feature = "v1_20", feature = "dox"))]
 mod element_properties;
-#[cfg(feature = "v1_20")]
+#[cfg(any(feature = "v1_20", feature = "dox"))]
 pub use crate::element_properties::{ElementProperties, ElementPropertiesMapItem};
 
 #[cfg(feature = "serde")]
diff --git a/gstreamer-play/Cargo.toml b/gstreamer-play/Cargo.toml
index c6f1856af..f80bea3f4 100644
--- a/gstreamer-play/Cargo.toml
+++ b/gstreamer-play/Cargo.toml
@@ -27,7 +27,7 @@ gir-format-check = "0.1"
 
 [features]
 v1_22 = ["gst/v1_22", "gst-video/v1_22", "ffi/v1_22"]
-dox = ["v1_22", "ffi/dox", "glib/dox", "gst/dox", "gst-video/dox"]
+dox = ["ffi/dox", "glib/dox", "gst/dox", "gst-video/dox"]
 
 [package.metadata.docs.rs]
 features = ["dox"]
diff --git a/gstreamer-player/Cargo.toml b/gstreamer-player/Cargo.toml
index fe4e95e9b..673c0eb00 100644
--- a/gstreamer-player/Cargo.toml
+++ b/gstreamer-player/Cargo.toml
@@ -31,7 +31,7 @@ v1_16 = ["gst/v1_16", "gst-video/v1_16", "ffi/v1_16"]
 v1_18 = ["gst/v1_18", "gst-video/v1_18", "ffi/v1_18", "v1_16"]
 v1_20 = ["gst/v1_20", "gst-video/v1_20", "ffi/v1_20", "v1_18"]
 v1_22 = ["gst/v1_22", "gst-video/v1_22", "ffi/v1_22", "v1_20"]
-dox = ["v1_22", "ffi/dox", "glib/dox", "gst/dox", "gst-video/dox"]
+dox = ["ffi/dox", "glib/dox", "gst/dox", "gst-video/dox"]
 
 [package.metadata.docs.rs]
 features = ["dox"]
diff --git a/gstreamer-rtp/Cargo.toml b/gstreamer-rtp/Cargo.toml
index 2231b960c..4b80a476f 100644
--- a/gstreamer-rtp/Cargo.toml
+++ b/gstreamer-rtp/Cargo.toml
@@ -32,7 +32,7 @@ v1_16 = ["gst/v1_16", "ffi/v1_16"]
 v1_18 = ["gst/v1_18", "ffi/v1_18", "v1_16"]
 v1_20 = ["gst/v1_20", "ffi/v1_20", "v1_18"]
 v1_22 = ["gst/v1_22", "ffi/v1_22", "v1_20"]
-dox = ["v1_22", "ffi/dox", "glib/dox", "gst/dox", "serde"]
+dox = ["ffi/dox", "glib/dox", "gst/dox", "serde"]
 serde = ["dep:serde", "gst/serde"]
 
 [package.metadata.docs.rs]
diff --git a/gstreamer-rtsp-server/Cargo.toml b/gstreamer-rtsp-server/Cargo.toml
index 7b40e0cb0..cfa392925 100644
--- a/gstreamer-rtsp-server/Cargo.toml
+++ b/gstreamer-rtsp-server/Cargo.toml
@@ -36,7 +36,7 @@ v1_16 = ["gst/v1_16", "gst-sdp/v1_16", "gst-rtsp/v1_16", "gst-net/v1_16", "ffi/v
 v1_18 = ["gst/v1_18", "gst-sdp/v1_18", "gst-rtsp/v1_18", "gst-net/v1_18", "ffi/v1_18", "v1_16"]
 v1_20 = ["gst/v1_20", "gst-sdp/v1_20", "gst-rtsp/v1_20", "gst-net/v1_20", "ffi/v1_20", "v1_18"]
 v1_22 = ["gst/v1_22", "gst-sdp/v1_22", "gst-rtsp/v1_22", "gst-net/v1_22", "ffi/v1_22", "v1_20"]
-dox = ["v1_22", "ffi/dox", "glib/dox", "gio/dox", "gst/dox", "gst-sdp/dox", "gst-rtsp/dox", "gst-net/dox", "serde"]
+dox = ["ffi/dox", "glib/dox", "gio/dox", "gst/dox", "gst-sdp/dox", "gst-rtsp/dox", "gst-net/dox", "serde"]
 serde = ["dep:serde", "gst/serde", "gst-rtsp/serde"]
 
 [package.metadata.docs.rs]
diff --git a/gstreamer-rtsp/Cargo.toml b/gstreamer-rtsp/Cargo.toml
index 3136601ad..01db83099 100644
--- a/gstreamer-rtsp/Cargo.toml
+++ b/gstreamer-rtsp/Cargo.toml
@@ -32,7 +32,7 @@ v1_16 = ["gst/v1_16", "gst-sdp/v1_16", "ffi/v1_16"]
 v1_18 = ["gst/v1_18", "gst-sdp/v1_18", "ffi/v1_18", "v1_16"]
 v1_20 = ["gst/v1_20", "gst-sdp/v1_20", "ffi/v1_20", "v1_18"]
 v1_22 = ["gst/v1_22", "gst-sdp/v1_22", "ffi/v1_22", "v1_20"]
-dox = ["v1_22", "ffi/dox", "glib/dox", "gst/dox", "gst-sdp/dox", "serde"]
+dox = ["ffi/dox", "glib/dox", "gst/dox", "gst-sdp/dox", "serde"]
 serde = ["dep:serde", "gst/serde"]
 
 [package.metadata.docs.rs]
diff --git a/gstreamer-sdp/Cargo.toml b/gstreamer-sdp/Cargo.toml
index 96b192326..2fbe2babd 100644
--- a/gstreamer-sdp/Cargo.toml
+++ b/gstreamer-sdp/Cargo.toml
@@ -27,7 +27,7 @@ v1_16 = ["gst/v1_16", "ffi/v1_16"]
 v1_18 = ["gst/v1_18", "ffi/v1_18", "v1_16"]
 v1_20 = ["gst/v1_20", "ffi/v1_20", "v1_18"]
 v1_22 = ["gst/v1_22", "ffi/v1_22", "v1_20"]
-dox = ["v1_22", "ffi/dox", "glib/dox", "gst/dox"]
+dox = ["ffi/dox", "glib/dox", "gst/dox"]
 
 [package.metadata.docs.rs]
 features = ["dox"]
diff --git a/gstreamer-validate/sys/Gir.toml b/gstreamer-validate/sys/Gir.toml
index a3d7bf305..6d14a2867 100644
--- a/gstreamer-validate/sys/Gir.toml
+++ b/gstreamer-validate/sys/Gir.toml
@@ -9,5 +9,7 @@ external_libraries = [
     "GLib",
     "Gio",
     "GObject",
-    "GStreamer",
 ]
+
+[external_libraries]
+gstreamer="Gst"
diff --git a/gstreamer-video/Cargo.toml b/gstreamer-video/Cargo.toml
index 4b315b2d0..115fa49c6 100644
--- a/gstreamer-video/Cargo.toml
+++ b/gstreamer-video/Cargo.toml
@@ -36,7 +36,7 @@ v1_16 = ["gst/v1_16", "gst-base/v1_16", "ffi/v1_16"]
 v1_18 = ["gst/v1_18", "gst-base/v1_18", "ffi/v1_18", "v1_16"]
 v1_20 = ["gst/v1_20", "gst-base/v1_20", "ffi/v1_20", "v1_18"]
 v1_22 = ["gst/v1_22", "gst-base/v1_22", "ffi/v1_22", "v1_20"]
-dox = ["v1_22", "ffi/dox", "glib/dox", "gst/dox", "gst-base/dox", "serde"]
+dox = ["ffi/dox", "glib/dox", "gst/dox", "gst-base/dox", "serde"]
 serde = ["dep:serde", "gst/serde"]
 
 [package.metadata.docs.rs]
diff --git a/gstreamer-video/src/subclass/navigation.rs b/gstreamer-video/src/subclass/navigation.rs
index bcb1dfe6b..73b117d76 100644
--- a/gstreamer-video/src/subclass/navigation.rs
+++ b/gstreamer-video/src/subclass/navigation.rs
@@ -78,7 +78,7 @@ impl<T: NavigationImpl> NavigationImplExt for T {
 }
 
 unsafe impl<T: NavigationImpl> IsImplementable<T> for Navigation {
-    #[cfg(not(feature = "v1_22"))]
+    #[cfg(not(any(feature = "v1_22", feature = "dox")))]
     fn interface_init(iface: &mut glib::Interface<Self>) {
         let iface = iface.as_mut();
 
diff --git a/gstreamer-webrtc/Cargo.toml b/gstreamer-webrtc/Cargo.toml
index 8e9f73eb7..98c8306fa 100644
--- a/gstreamer-webrtc/Cargo.toml
+++ b/gstreamer-webrtc/Cargo.toml
@@ -30,7 +30,7 @@ v1_16 = ["gst/v1_16", "gst-sdp/v1_16", "ffi/v1_16", "v1_14_1"]
 v1_18 = ["gst/v1_18", "gst-sdp/v1_18", "ffi/v1_18", "v1_16"]
 v1_20 = ["gst/v1_20", "gst-sdp/v1_20", "ffi/v1_20", "v1_18"]
 v1_22 = ["gst/v1_22", "gst-sdp/v1_22", "ffi/v1_22", "v1_20"]
-dox = ["v1_22", "ffi/dox", "glib/dox", "gst/dox", "gst-sdp/dox"]
+dox = ["ffi/dox", "glib/dox", "gst/dox", "gst-sdp/dox"]
 
 [package.metadata.docs.rs]
 features = ["dox"]
diff --git a/gstreamer/Cargo.toml b/gstreamer/Cargo.toml
index f288a9b46..f24802cf2 100644
--- a/gstreamer/Cargo.toml
+++ b/gstreamer/Cargo.toml
@@ -45,7 +45,7 @@ v1_16 = ["ffi/v1_16"]
 v1_18 = ["ffi/v1_18", "v1_16"]
 v1_20 = ["ffi/v1_20", "v1_18"]
 v1_22 = ["ffi/v1_22", "v1_20"]
-dox = ["v1_22", "ffi/dox", "glib/dox", "serde"]
+dox = ["ffi/dox", "glib/dox", "serde"]
 serde = ["num-rational/serde", "dep:serde", "serde_bytes"]
 
 [package.metadata.docs.rs]