docs: Use unified headers for includedocfixes

2 files changed, 101 insertions, 92 deletions

diff --git a/docs/libs/gst-plugins-base-libs-sections.txt b/docs/libs/gst-plugins-base-libs-sections.txt
index e235d4174..8a3e5986d 100644
--- a/docs/libs/gst-plugins-base-libs-sections.txt
+++ b/docs/libs/gst-plugins-base-libs-sections.txt
@@ -3,7 +3,7 @@
 <SECTION>
 <FILE>gstdmabuf</FILE>
 <TITLE>dmabuf</TITLE>
-<INCLUDE>gst/allocators/gstdmabuf.h</INCLUDE>
+<INCLUDE>gst/allocators/allocators.h</INCLUDE>
 GST_CAPS_FEATURE_MEMORY_DMABUF
 gst_dmabuf_allocator_new
 gst_dmabuf_allocator_alloc
@@ -26,7 +26,7 @@ GST_TYPE_DMABUF_ALLOCATOR
 <SECTION>
 <FILE>gstfdmemory</FILE>
 <TITLE>fdmemory</TITLE>
-<INCLUDE>gst/allocators/gstfdmemory.h</INCLUDE>
+<INCLUDE>gst/allocators/allocators.h</INCLUDE>
 GstFdMemoryFlags
 gst_fd_allocator_alloc
 gst_fd_allocator_new
@@ -71,7 +71,7 @@ gst_phys_memory_allocator_get_type
 <SECTION>
 <FILE>gstappsrc</FILE>
 <TITLE>appsrc</TITLE>
-<INCLUDE>gst/app/gstappsrc.h</INCLUDE>
+<INCLUDE>gst/app/app.h</INCLUDE>
 GstAppStreamType
 gst_app_src_set_caps
 gst_app_src_get_caps
@@ -113,7 +113,7 @@ GstAppSrcPrivate
 <SECTION>
 <FILE>gstappsink</FILE>
 <TITLE>appsink</TITLE>
-<INCLUDE>gst/app/gstappsink.h</INCLUDE>
+<INCLUDE>gst/app/app.h</INCLUDE>
 gst_app_sink_set_caps
 gst_app_sink_get_caps
 gst_app_sink_is_eos
@@ -307,7 +307,7 @@ DeinterleaveFunc
 
 <SECTION>
 <FILE>gstaudiometa</FILE>
-<INCLUDE>gst/audio/gstaudiometa.h</INCLUDE>
+<INCLUDE>gst/audio/audio.h</INCLUDE>
 GstAudioDownmixMeta
 gst_buffer_add_audio_downmix_meta
 gst_buffer_get_audio_downmix_meta
@@ -329,7 +329,7 @@ gst_audio_downmix_meta_get_info
 
 <SECTION>
 <FILE>gstaudioclock</FILE>
-<INCLUDE>gst/audio/gstaudioclock.h</INCLUDE>
+<INCLUDE>gst/audio/audio.h</INCLUDE>
 GstAudioClock
 GstAudioClockGetTimeFunc
 gst_audio_clock_new
@@ -350,7 +350,7 @@ GST_AUDIO_CLOCK_CAST
 
 <SECTION>
 <FILE>gstaudiocdsrc</FILE>
-<INCLUDE>gst/audio/gstaudiocdsrc.h</INCLUDE>
+<INCLUDE>gst/audio/audio.h</INCLUDE>
 GstAudioCdSrc
 GstAudioCdSrcClass
 GstAudioCdSrcTrack
@@ -371,7 +371,7 @@ gst_audio_cd_src_get_type
 
 <SECTION>
 <FILE>gstaudiodecoder</FILE>
-<INCLUDE>gst/audio/gstaudiodecoder.h</INCLUDE>
+<INCLUDE>gst/audio/audio.h</INCLUDE>
 GstAudioDecoder
 GstAudioDecoderClass
 GST_AUDIO_DECODER_ERROR
@@ -428,7 +428,7 @@ GST_AUDIO_DECODER_CAST
 
 <SECTION>
 <FILE>gstaudioencoder</FILE>
-<INCLUDE>gst/audio/gstaudioencoder.h</INCLUDE>
+<INCLUDE>gst/audio/audio.h</INCLUDE>
 GstAudioEncoder
 GstAudioEncoderClass
 GST_AUDIO_ENCODER_SINK_NAME
@@ -485,7 +485,7 @@ GstAudioEncoderPrivate
 
 <SECTION>
 <FILE>gstaudiofilter</FILE>
-<INCLUDE>gst/audio/gstaudiofilter.h</INCLUDE>
+<INCLUDE>gst/audio/audio.h</INCLUDE>
 GstAudioFilter
 GstAudioFilterClass
 gst_audio_filter_class_add_pad_templates
@@ -510,7 +510,7 @@ GST_AUDIO_FILTER_RATE
 
 <SECTION>
 <FILE>gstaudiosink</FILE>
-<INCLUDE>gst/audio/gstaudiosink.h</INCLUDE>
+<INCLUDE>gst/audio/audio.h</INCLUDE>
 GstAudioSink
 GstAudioSinkClass
 <SUBSECTION Standard>
@@ -525,7 +525,7 @@ GST_AUDIO_SINK_GET_CLASS
 
 <SECTION>
 <FILE>gstaudiosrc</FILE>
-<INCLUDE>gst/audio/gstaudiosrc.h</INCLUDE>
+<INCLUDE>gst/audio/audio.h</INCLUDE>
 GstAudioSrc
 GstAudioSrcClass
 <SUBSECTION Standard>
@@ -541,7 +541,7 @@ GST_AUDIO_BASE_SRC_CAST
 
 <SECTION>
 <FILE>gstaudiobasesink</FILE>
-<INCLUDE>gst/audio/gstaudiobasesink.h</INCLUDE>
+<INCLUDE>gst/audio/audio.h</INCLUDE>
 GstAudioBaseSink
 GstAudioBaseSinkClass
 GstAudioBaseSinkSlaveMethod
@@ -624,7 +624,7 @@ GstAudioAggregatorPadPrivate
 
 <SECTION>
 <FILE>gstaudiobasesrc</FILE>
-<INCLUDE>gst/audio/gstaudiobasesrc.h</INCLUDE>
+<INCLUDE>gst/audio/audio.h</INCLUDE>
 GstAudioBaseSrc
 GstAudioBaseSrcClass
 GstAudioBaseSrcSlaveMethod
@@ -729,7 +729,7 @@ GST_TYPE_AUDIO_NOISE_SHAPING_METHOD
 
 <SECTION>
 <FILE>gstaudioringbuffer</FILE>
-<INCLUDE>gst/audio/gstaudioringbuffer.h</INCLUDE>
+<INCLUDE>gst/audio/audio.h</INCLUDE>
 GstAudioRingBuffer
 GstAudioRingBufferClass
 GstAudioRingBufferSpec
@@ -802,7 +802,7 @@ gst_audio_ring_buffer_debug_spec_caps
 
 <SECTION>
 <FILE>gstaudioiec61937</FILE>
-<INCLUDE>gst/audio/gstaudioiec61937.h</INCLUDE>
+<INCLUDE>gst/audio/audio.h</INCLUDE>
 gst_audio_iec61937_frame_size
 gst_audio_iec61937_payload
 </SECTION>
@@ -811,14 +811,14 @@ gst_audio_iec61937_payload
 
 <SECTION>
 <FILE>gstfft</FILE>
-<INCLUDE>gst/fft/gstfft.h</INCLUDE>
+<INCLUDE>gst/fft/fft.h</INCLUDE>
 GstFFTWindow
 gst_fft_next_fast_length
 </SECTION>
 
 <SECTION>
 <FILE>gstffts16</FILE>
-<INCLUDE>gst/fft/gstffts16.h</INCLUDE>
+<INCLUDE>gst/fft/fft.h</INCLUDE>
 GstFFTS16
 GstFFTS16Complex
 gst_fft_s16_new
@@ -843,7 +843,7 @@ KISS_FFT_S16_SIN
 
 <SECTION>
 <FILE>gstffts32</FILE>
-<INCLUDE>gst/fft/gstffts32.h</INCLUDE>
+<INCLUDE>gst/fft/fft.h</INCLUDE>
 GstFFTS32
 GstFFTS32Complex
 gst_fft_s32_new
@@ -869,7 +869,7 @@ KISS_FFT_S32_SIN
 
 <SECTION>
 <FILE>gstfftf32</FILE>
-<INCLUDE>gst/fft/gstfftf32.h</INCLUDE>
+<INCLUDE>gst/fft/fft.h</INCLUDE>
 GstFFTF32
 GstFFTF32Complex
 gst_fft_f32_new
@@ -894,7 +894,7 @@ KISS_FFT_F32_SIN
 
 <SECTION>
 <FILE>gstfftf64</FILE>
-<INCLUDE>gst/fft/gstfftf64.h</INCLUDE>
+<INCLUDE>gst/fft/fft.h</INCLUDE>
 GstFFTF64
 GstFFTF64Complex
 gst_fft_f64_new
@@ -921,7 +921,7 @@ KISS_FFT_F64_SIN
 
 <SECTION>
 <FILE>gstcolorbalance</FILE>
-<INCLUDE>gst/video/colorbalance.h</INCLUDE>
+<INCLUDE>gst/video/video.h</INCLUDE>
 GstColorBalance
 GstColorBalanceInterface
 GstColorBalanceType
@@ -943,7 +943,7 @@ gst_color_balance_type_get_type
 
 <SECTION>
 <FILE>gstcolorbalancechannel</FILE>
-<INCLUDE>gst/video/colorbalancechannel.h</INCLUDE>
+<INCLUDE>gst/video/video.h</INCLUDE>
 GstColorBalanceChannel
 GstColorBalanceChannelClass
 <SUBSECTION Standard>
@@ -957,7 +957,7 @@ gst_color_balance_channel_get_type
 
 <SECTION>
 <FILE>gstnavigation</FILE>
-<INCLUDE>gst/video/navigation.h</INCLUDE>
+<INCLUDE>gst/video/video.h</INCLUDE>
 GstNavigation
 GstNavigationInterface
 GstNavigationCommand
@@ -1019,7 +1019,7 @@ gst_navigation_command_get_type
 
 <SECTION>
 <FILE>gststreamvolume</FILE>
-<INCLUDE>gst/audio/streamvolume.h</INCLUDE>
+<INCLUDE>gst/audio/audio.h</INCLUDE>
 GstStreamVolume
 GstStreamVolumeFormat
 
@@ -1044,7 +1044,7 @@ gst_stream_volume_get_type
 
 <SECTION>
 <FILE>gstvideodirection</FILE>
-<INCLUDE>gst/video/videodirection.h</INCLUDE>
+<INCLUDE>gst/video/video.h</INCLUDE>
 GstVideoDirection
 GstVideoDirectionInterface
 <SUBSECTION Standard>
@@ -1057,7 +1057,7 @@ gst_video_direction_get_type
 
 <SECTION>
 <FILE>gstvideoorientation</FILE>
-<INCLUDE>gst/video/videoorientation.h</INCLUDE>
+<INCLUDE>gst/video/video.h</INCLUDE>
 GstVideoOrientation
 GstVideoOrientationInterface
 gst_video_orientation_get_hcenter
@@ -1078,7 +1078,7 @@ gst_video_orientation_get_type
 
 <SECTION>
 <FILE>gstvideooverlay</FILE>
-<INCLUDE>gst/video/videooverlay.h</INCLUDE>
+<INCLUDE>gst/video/video.h</INCLUDE>
 GstVideoOverlay
 GstVideoOverlayInterface
 gst_video_overlay_got_window_handle
@@ -1105,7 +1105,7 @@ gst_video_overlay_get_type
 
 <SECTION>
 <FILE>gstriff</FILE>
-<INCLUDE>gst/riff/riff-media.h</INCLUDE>
+<INCLUDE>gst/riff/riff.h</INCLUDE>
 gst_riff_create_audio_caps
 gst_riff_create_audio_template_caps
 gst_riff_create_iavs_caps
@@ -1332,7 +1332,7 @@ gst_riff_strh
 
 <SECTION>
 <FILE>gstrtpbaseaudiopayload</FILE>
-<INCLUDE>gst/rtp/gstrtpbaseaudiopayload.h</INCLUDE>
+<INCLUDE>gst/rtp/rtp.h</INCLUDE>
 GstRTPBaseAudioPayload
 GstRTPBaseAudioPayloadClass
 
@@ -1357,7 +1357,7 @@ GstRTPBaseAudioPayloadPrivate
 
 <SECTION>
 <FILE>gstrtpbasedepayload</FILE>
-<INCLUDE>gst/rtp/gstrtpbasedepayload.h</INCLUDE>
+<INCLUDE>gst/rtp/rtp.h</INCLUDE>
 GstRTPBaseDepayload
 GstRTPBaseDepayloadClass
 
@@ -1389,7 +1389,7 @@ QUEUE_UNLOCK
 
 <SECTION>
 <FILE>gstrtpbasepayload</FILE>
-<INCLUDE>gst/rtp/gstrtpbasepayload.h</INCLUDE>
+<INCLUDE>gst/rtp/rtp.h</INCLUDE>
 GstRTPBasePayload
 GstRTPBasePayloadClass
 
@@ -1415,7 +1415,7 @@ gst_rtp_base_payload_get_type
 
 <SECTION>
 <FILE>gstrtcpbuffer</FILE>
-<INCLUDE>gst/rtp/gstrtcpbuffer.h</INCLUDE>
+<INCLUDE>gst/rtp/rtp.h</INCLUDE>
 
 GST_RTCP_VERSION
 
@@ -1535,7 +1535,7 @@ gst_rtcpsdes_type_get_type
 
 <SECTION>
 <FILE>gstrtppayloads</FILE>
-<INCLUDE>gst/rtp/gstrtppayload.h</INCLUDE>
+<INCLUDE>gst/rtp/rtp.h</INCLUDE>
 GstRTPPayload
 GST_RTP_PAYLOAD_IS_DYNAMIC
 
@@ -1586,7 +1586,7 @@ gst_rtp_payload_get_type
 
 <SECTION>
 <FILE>gstrtpbuffer</FILE>
-<INCLUDE>gst/rtp/gstrtpbuffer.h</INCLUDE>
+<INCLUDE>gst/rtp/rtp.h</INCLUDE>
 
 GST_RTP_VERSION
 
@@ -1668,7 +1668,7 @@ gst_rtp_buffer_map_flags_get_type
 
 <SECTION>
 <FILE>gstrtphdrext</FILE>
-<INCLUDE>gst/rtp/gstrtphdrext.h</INCLUDE>
+<INCLUDE>gst/rtp/rtp.h</INCLUDE>
 GST_RTP_HDREXT_BASE
 GST_RTP_HDREXT_NTP_56
 GST_RTP_HDREXT_NTP_56_SIZE
@@ -1692,7 +1692,7 @@ gst_rtp_profile_get_type
 # rtsp
 <SECTION>
 <FILE>gstrtspdefs</FILE>
-<INCLUDE>gst/rtsp/gstrtspdefs.h</INCLUDE>
+<INCLUDE>gst/rtsp/rtsp.h</INCLUDE>
 GST_RTSP_CHECK
 GST_RTSP_AUTH_MAX
 GstRTSPEvent
@@ -1740,7 +1740,7 @@ gst_rtsp_header_field_get_type
 
 <SECTION>
 <FILE>gstrtsptransport</FILE>
-<INCLUDE>gst/rtsp/gstrtsptransport.h</INCLUDE>
+<INCLUDE>gst/rtsp/rtsp.h</INCLUDE>
 GstRTSPTransMode
 GstRTSPProfile
 GstRTSPRange
@@ -1764,7 +1764,7 @@ gst_rtsp_trans_mode_get_type
 
 <SECTION>
 <FILE>gstrtspconnection</FILE>
-<INCLUDE>gst/rtsp/gstrtspconnection.h</INCLUDE>
+<INCLUDE>gst/rtsp/rtsp.h</INCLUDE>
 GstRTSPConnection
 gst_rtsp_connection_create
 gst_rtsp_connection_create_from_socket
@@ -1840,7 +1840,7 @@ gst_rtsp_watch_wait_backlog
 
 <SECTION>
 <FILE>gstrtspextension</FILE>
-<INCLUDE>gst/rtsp/gstrtspextension.h</INCLUDE>
+<INCLUDE>gst/rtsp/rtsp.h</INCLUDE>
 GstRTSPExtension
 GstRTSPExtensionInterface
 <SUBSECTION Standard>
@@ -1863,7 +1863,7 @@ gst_rtsp_extension_get_type
 
 <SECTION>
 <FILE>gstrtspmessage</FILE>
-<INCLUDE>gst/rtsp/gstrtspmessage.h</INCLUDE>
+<INCLUDE>gst/rtsp/rtsp.h</INCLUDE>
 GstRTSPMsgType
 GstRTSPMessage
 gst_rtsp_message_new
@@ -1918,7 +1918,7 @@ gst_rtsp_msg_type_get_type
 
 <SECTION>
 <FILE>gstrtspurl</FILE>
-<INCLUDE>gst/rtsp/gstrtspurl.h</INCLUDE>
+<INCLUDE>gst/rtsp/rtsp.h</INCLUDE>
 GST_RTSP_DEFAULT_PORT
 GstRTSPUrl
 gst_rtsp_url_parse
@@ -1934,7 +1934,7 @@ gst_rtsp_url_get_type
 
 <SECTION>
 <FILE>gstrtsprange</FILE>
-<INCLUDE>gst/rtsp/gstrtsprange.h</INCLUDE>
+<INCLUDE>gst/rtsp/rtsp.h</INCLUDE>
 GstRTSPRangeUnit
 GstRTSPTimeRange
 GstRTSPTime
@@ -1955,7 +1955,7 @@ gst_rtsp_time_type_get_type
 # sdp
 <SECTION>
 <FILE>gstsdpmessage</FILE>
-<INCLUDE>gst/sdp/gstsdpmessage.h</INCLUDE>
+<INCLUDE>gst/sdp/sdp.h</INCLUDE>
 GstSDPResult
 
 GstSDPOrigin
@@ -2121,7 +2121,7 @@ gst_sdp_message_get_type
 
 <SECTION>
 <FILE>gstmikey</FILE>
-<INCLUDE>gst/sdp/gstmikey.h</INCLUDE>
+<INCLUDE>gst/sdp/sdp.h</INCLUDE>
 <SUBSECTION Messages>
 GST_MIKEY_VERSION
 GstMIKEYType
@@ -2327,7 +2327,7 @@ gst_tag_list_from_exif_buffer_with_tiff_header
 
 <SECTION>
 <FILE>gsttagdemux</FILE>
-<INCLUDE>gst/tag/gsttagdemux.h</INCLUDE>
+<INCLUDE>gst/tag/tag.h</INCLUDE>
 GstTagDemux
 GstTagDemuxClass
 GstTagDemuxResult
@@ -2345,7 +2345,7 @@ gst_tag_demux_result_get_type
 
 <SECTION>
 <FILE>gsttagmux</FILE>
-<INCLUDE>gst/tag/gsttagmux.h</INCLUDE>
+<INCLUDE>gst/tag/tag.h</INCLUDE>
 GstTagMux
 GstTagMuxClass
 <SUBSECTION Standard>
@@ -2388,6 +2388,7 @@ gst_tag_license_flags_get_type
 
 <SECTION>
 <FILE>gsttagxmpwriter</FILE>
+<INCLUDE>gst/tag/tag.h</INCLUDE>
 gst_tag_xmp_writer_add_all_schemas
 gst_tag_xmp_writer_add_schema
 gst_tag_xmp_writer_has_schema
@@ -2417,7 +2418,7 @@ gst_pb_utils_init
 
 <SECTION>
 <FILE>gstpluginsbaseversion</FILE>
-<INCLUDE>gst/pbutils/gstpluginsbaseversion.h</INCLUDE>
+<INCLUDE>gst/pbutils/pbutils.h</INCLUDE>
 <SUBSECTION>
 GST_PLUGINS_BASE_VERSION_MAJOR
 GST_PLUGINS_BASE_VERSION_MINOR
@@ -2430,7 +2431,7 @@ gst_plugins_base_version_string
 
 <SECTION>
 <FILE>gstpbutilsmissingplugins</FILE>
-<INCLUDE>gst/pbutils/missing-plugins.h</INCLUDE>
+<INCLUDE>gst/pbutils/pbutils.h</INCLUDE>
 <SUBSECTION>
 gst_missing_plugin_message_get_installer_detail
 gst_missing_plugin_message_get_description
@@ -2451,7 +2452,7 @@ gst_missing_encoder_installer_detail_new
 
 <SECTION>
 <FILE>gstpbutilsinstallplugins</FILE>
-<INCLUDE>gst/pbutils/install-plugins.h</INCLUDE>
+<INCLUDE>gst/pbutils/pbutils.h</INCLUDE>
 <SUBSECTION>
 GstInstallPluginsReturn
 GstInstallPluginsResultFunc
@@ -2478,7 +2479,7 @@ gst_install_plugins_return_get_type
 
 <SECTION>
 <FILE>gstpbutilsdescriptions</FILE>
-<INCLUDE>gst/pbutils/descriptions.h</INCLUDE>
+<INCLUDE>gst/pbutils/pbutils.h</INCLUDE>
 <SUBSECTION>
 gst_pb_utils_get_source_description
 gst_pb_utils_get_sink_description
@@ -2492,7 +2493,7 @@ gst_pb_utils_get_codec_description
 
 <SECTION>
 <FILE>gstpbutilscodecutils</FILE>
-<INCLUDE>gst/pbutils/codec-utils.h</INCLUDE>
+<INCLUDE>gst/pbutils/pbutils.h</INCLUDE>
 <SUBSECTION>
 gst_codec_utils_aac_get_sample_rate_from_index
 gst_codec_utils_aac_get_index_from_sample_rate
@@ -2526,7 +2527,7 @@ gst_codec_utils_opus_parse_header
 
 <SECTION>
 <FILE>encoding-profile</FILE>
-<INCLUDE>gst/pbutils/encoding-profile.h</INCLUDE>
+<INCLUDE>gst/pbutils/pbutils.h</INCLUDE>
 GstEncodingProfile
 gst_encoding_profile_unref
 gst_encoding_profile_ref
@@ -2624,6 +2625,7 @@ GstEncodingTargetClass
 <SECTION>
 <FILE>gstaudiovisualizer</FILE>
 <TITLE>GstAudioVisualizer</TITLE>
+<INCLUDE>gst/pbutils/pbutils.h</INCLUDE>
 GstAudioVisualizer
 GstAudioVisualizerClass
 GstAudioVisualizerShader
@@ -3057,7 +3059,7 @@ GST_TYPE_NAVIGATION_EVENT_TYPE
 <SECTION>
 <FILE>gstvideopool</FILE>
 <TITLE>GstVideoPool</TITLE>
-<INCLUDE>gst/video/gstvideopool.h</INCLUDE>
+<INCLUDE>gst/video/video.h</INCLUDE>
 GstVideoBufferPool
 GstVideoBufferPoolClass
 gst_video_buffer_pool_new
@@ -3076,7 +3078,7 @@ gst_video_buffer_pool_get_type
 
 <SECTION>
 <FILE>gstvideometa</FILE>
-<INCLUDE>gst/video/gstvideometa.h</INCLUDE>
+<INCLUDE>gst/video/video.h</INCLUDE>
 <SUBSECTION videometa>
 GstVideoMeta
 GST_CAPS_FEATURE_META_GST_VIDEO_META
@@ -3148,7 +3150,7 @@ gst_video_region_of_interest_meta_get_info
 
 <SECTION>
 <FILE>gstvideoaffinetransformationmeta</FILE>
-<INCLUDE>gst/video/gstvideoaffinetransformationmeta.h</INCLUDE>
+<INCLUDE>gst/video/video.h</INCLUDE>
 GstVideoAffineTransformationGetMatrix
 GstVideoAffineTransformationMeta
 gst_buffer_add_video_affine_transformation_meta
@@ -3165,7 +3167,7 @@ GST_VIDEO_AFFINE_TRANSFORMATION_META_INFO
 
 <SECTION>
 <FILE>gstvideooverlaycomposition</FILE>
-<INCLUDE>gst/video/video-overlay-composition.h</INCLUDE>
+<INCLUDE>gst/video/video.h</INCLUDE>
 <SUBSECTION composition>
 
 GstVideoOverlayComposition
@@ -3230,7 +3232,7 @@ gst_video_overlay_rectangle_get_type
 
 <SECTION>
 <FILE>gstvideofilter</FILE>
-<INCLUDE>gst/video/gstvideofilter.h</INCLUDE>
+<INCLUDE>gst/video/video.h</INCLUDE>
 GstVideoFilter
 GstVideoFilterClass
 <SUBSECTION Standard>
@@ -3246,7 +3248,7 @@ GST_VIDEO_FILTER_CAST
 
 <SECTION>
 <FILE>gstvideosink</FILE>
-<INCLUDE>gst/video/gstvideosink.h</INCLUDE>
+<INCLUDE>gst/video/video.h</INCLUDE>
 GstVideoSink
 GstVideoSinkClass
 GstVideoRectangle
@@ -3269,6 +3271,7 @@ gst_video_sink_get_type
 <SECTION>
 <FILE>gstvideodecoder</FILE>
 <TITLE>GstVideoDecoder</TITLE>
+<INCLUDE>gst/video/video.h</INCLUDE>
 GST_VIDEO_DECODER_ERROR
 GST_VIDEO_DECODER_FLOW_NEED_DATA
 GST_VIDEO_DECODER_MAX_ERRORS
@@ -3329,6 +3332,7 @@ gst_video_decoder_get_type
 <SECTION>
 <FILE>gstvideoencoder</FILE>
 <TITLE>GstVideoEncoder</TITLE>
+<INCLUDE>gst/video/video.h</INCLUDE>
 GST_VIDEO_ENCODER_CAST
 GST_VIDEO_ENCODER_FLOW_DROPPED
 GST_VIDEO_ENCODER_FLOW_NEED_DATA
@@ -3375,7 +3379,7 @@ gst_video_encoder_get_type
 <SECTION>
 <FILE>gstvideodither</FILE>
 <TITLE>GstVideoDither</TITLE>
-<INCLUDE>gst/video/video-dither.h</INCLUDE>
+<INCLUDE>gst/video/video.h</INCLUDE>
 GstVideoDither
 GstVideoDitherFlags
 GstVideoDitherMethod
@@ -3390,7 +3394,7 @@ gst_video_dither_flags_get_type
 <SECTION>
 <FILE>gstvideochroma</FILE>
 <TITLE>GstVideoChroma</TITLE>
-<INCLUDE>gst/video/video-chroma.h</INCLUDE>
+<INCLUDE>gst/video/video.h</INCLUDE>
 GstVideoChromaSite
 gst_video_chroma_from_string
 gst_video_chroma_to_string
@@ -3412,7 +3416,7 @@ GST_TYPE_VIDEO_CHROMA_METHOD
 <SECTION>
 <FILE>gstvideoresampler</FILE>
 <TITLE>GstVideoResampler</TITLE>
-<INCLUDE>gst/video/video-resampler.h</INCLUDE>
+<INCLUDE>gst/video/video.h</INCLUDE>
 GstVideoResampler
 GstVideoResamplerFlags
 GstVideoResamplerMethod
@@ -3434,7 +3438,7 @@ GST_TYPE_VIDEO_RESAMPLER_METHOD
 <SECTION>
 <FILE>gstvideoscaler</FILE>
 <TITLE>GstVideoScaler</TITLE>
-<INCLUDE>gst/video/video-scaler.h</INCLUDE>
+<INCLUDE>gst/video/video.h</INCLUDE>
 GstVideoScaler
 GstVideoScalerFlags
 GST_VIDEO_SCALER_OPT_DITHER_METHOD
@@ -3453,6 +3457,7 @@ gst_video_scaler_flags_get_type
 
 <SECTION>
 <FILE>gstvideoutils</FILE>
+<INCLUDE>gst/video/video.h</INCLUDE>
 GstVideoCodecFrame
 GstVideoCodecFrameFlags
 GST_VIDEO_CODEC_FRAME_FLAGS
@@ -3717,6 +3722,7 @@ GL_DO_NOT_WARN_IF_MULTI_GL_VERSION_HEADERS_INCLUDED
 <SECTION>
 <FILE>gstglbuffer</FILE>
 <TITLE>GstGLBuffer</TITLE>
+<INCLUDE>gst/gl/gl.h</INCLUDE>
 GstGLBuffer
 gst_gl_buffer_init_once
 gst_is_gl_buffer
@@ -3744,6 +3750,7 @@ GST_TYPE_GL_BUFFER_ALLOCATOR
 <SECTION>
 <FILE>gstglbufferpool</FILE>
 <TITLE>GstGLBufferPool</TITLE>
+<INCLUDE>gst/gl/gl.h</INCLUDE>
 GstGLBufferPool
 GstGLBufferPoolClass
 gst_gl_buffer_pool_new
@@ -3762,6 +3769,7 @@ GST_TYPE_GL_BUFFER_POOL
 <SECTION>
 <FILE>gstglcolorconvert</FILE>
 <TITLE>GstGLColorConvert</TITLE>
+<INCLUDE>gst/gl/gl.h</INCLUDE>
 GST_GL_COLOR_CONVERT_FORMATS
 GST_GL_COLOR_CONVERT_VIDEO_CAPS
 GstGLColorConvert
@@ -3786,6 +3794,7 @@ GST_TYPE_GL_COLOR_CONVERT
 <SECTION>
 <FILE>gstglcontext</FILE>
 <TITLE>GstGLContext</TITLE>
+<INCLUDE>gst/gl/gl.h</INCLUDE>
 GST_GL_CONTEXT_ERROR
 GST_GL_CONTEXT_TYPE_CGL
 GST_GL_CONTEXT_TYPE_EAGL
@@ -3877,6 +3886,7 @@ gst_egl_get_error_string
 <SECTION>
 <FILE>gstgldisplay</FILE>
 <TITLE>GstGLDisplay</TITLE>
+<INCLUDE>gst/gl/gl.h</INCLUDE>
 GST_GL_DISPLAY_CONTEXT_TYPE
 GstGLDisplayType
 GstGLDisplay
@@ -3912,6 +3922,7 @@ gst_gl_display_get_gl_api_unlocked
 <SECTION>
 <FILE>gstgldisplaycocoa</FILE>
 <TITLE>GstGLDisplayCocoa</TITLE>
+<INCLUDE>gst/gl/cocoa/gstgldisplay_cocoa.h</INCLUDE>
 gst_gl_display_cocoa_new
 <SUBSECTION Standard>
 GstGLDisplayCocoa
@@ -3928,6 +3939,7 @@ GST_IS_GL_DISPLAY_COCOA_CLASS
 <SECTION>
 <FILE>gstgldisplayegl</FILE>
 <TITLE>GstGLDisplayEGL</TITLE>
+<INCLUDE>gst/gl/egl/gstgldisplay_egl.h</INCLUDE>
 gst_gl_display_egl_new
 gst_gl_display_egl_new_with_egl_display
 gst_gl_display_egl_from_gl_display
@@ -3947,6 +3959,7 @@ GST_IS_GL_DISPLAY_EGL_CLASS
 <SECTION>
 <FILE>gstgldisplaywayland</FILE>
 <TITLE>GstGLDisplayWayland</TITLE>
+<INCLUDE>gst/gl/wayland/gstgldisplay_wayland.h</INCLUDE>
 GstGLDisplayWayland
 gst_gl_display_wayland_new
 gst_gl_display_wayland_new_with_display
@@ -3963,6 +3976,7 @@ GST_IS_GL_DISPLAY_WAYLAND_CLASS
 <SECTION>
 <FILE>gstgldisplayx11</FILE>
 <TITLE>GstGLDisplayX11</TITLE>
+<INCLUDE>gst/gl/x11/gstgldisplay_x11.h</INCLUDE>
 GstGLDisplayX11
 gst_gl_display_x11_new
 gst_gl_display_x11_new_with_display
@@ -3980,6 +3994,7 @@ GST_IS_GL_DISPLAY_X11_CLASS
 <FILE>gstgldebug</FILE>
 GstGLAsyncDebugLogGetMessage
 <TITLE>OpenGL Debugging</TITLE>
+<INCLUDE>gst/gl/gl.h</INCLUDE>
 GstGLAsyncDebug
 gst_gl_async_debug_new
 gst_gl_async_debug_free
@@ -3998,6 +4013,7 @@ gst_gl_insert_debug_marker
 <SECTION>
 <FILE>gstglbasefilter</FILE>
 <TITLE>GstGLBaseFilter</TITLE>
+<INCLUDE>gst/gl/gl.h</INCLUDE>
 GstGLBaseFilter
 GstGLBaseFilterClass
 <SUBSECTION Standard>
@@ -4014,6 +4030,7 @@ GstGLBaseFilterPrivate
 <SECTION>
 <FILE>gsteglimage</FILE>
 <TITLE>GstEGLImage</TITLE>
+<INCLUDE>gst/gl/egl/gsteglimage.h</INCLUDE>
 GstEGLImage
 gst_egl_image_from_dmabuf
 gst_egl_image_from_texture
@@ -4034,6 +4051,7 @@ GST_IS_EGL_IMAGE
 <SECTION>
 <FILE>gstglfilter</FILE>
 <TITLE>GstGLFilter</TITLE>
+<INCLUDE>gst/gl/gl.h</INCLUDE>
 GstGLFilter
 GstGLFilterClass
 GstGLFilterRenderFunc
@@ -4055,6 +4073,7 @@ GST_GL_FILTER_GET_CLASS
 <SECTION>
 <FILE>gstglformat</FILE>
 <TITLE>OpenGL Formats</TITLE>
+<INCLUDE>gst/gl/gl.h</INCLUDE>
 GstGLTextureTarget
 GST_GL_TEXTURE_TARGET_2D_STR
 GST_GL_TEXTURE_TARGET_RECTANGLE_STR
@@ -4077,6 +4096,7 @@ gst_gl_texture_target_to_buffer_pool_option
 <SECTION>
 <FILE>gstglframebuffer</FILE>
 <TITLE>GstGLFramebuffer</TITLE>
+<INCLUDE>gst/gl/gl.h</INCLUDE>
 GstGLFramebuffer
 GstGLFramebufferClass
 gst_gl_framebuffer_new
@@ -4103,6 +4123,7 @@ GST_GL_FRAMEBUFFER_GET_CLASS
 
 <SECTION>
 <FILE>gstglbasememory</FILE>
+<INCLUDE>gst/gl/gl.h</INCLUDE>
 GstGLBaseMemoryAllocator
 GstGLBaseMemoryAllocatorClass
 GST_GL_BASE_MEMORY_ALLOCATOR_NAME
@@ -4156,6 +4177,7 @@ GST_TYPE_GL_BASE_MEMORY_ALLOCATOR
 <SECTION>
 <FILE>gstglmemory</FILE>
 <TITLE>GstGLMemory</TITLE>
+<INCLUDE>gst/gl/gl.h</INCLUDE>
 GST_GL_MEMORY_VIDEO_FORMATS_STR
 GST_CAPS_FEATURE_MEMORY_GL_MEMORY
 GstGLVideoAllocationParams
@@ -4201,6 +4223,7 @@ GST_TYPE_GL_MEMORY_ALLOCATOR
 
 <SECTION>
 <FILE>gstglmemoryegl</FILE>
+<INCLUDE>gst/gl/egl/gstglmemoryegl.h</INCLUDE>
 GstGLMemoryEGLAllocator
 GstGLMemoryEGLAllocatorClass
 GST_GL_MEMORY_EGL_ALLOCATOR_NAME
@@ -4224,6 +4247,7 @@ GST_TYPE_GL_MEMORY_EGL_ALLOCATOR
 
 <SECTION>
 <FILE>gstglmemorypbo</FILE>
+<INCLUDE>gst/gl/gl.h</INCLUDE>
 GstGLMemoryPBOAllocator
 GstGLMemoryPBOAllocatorClass
 GST_GL_MEMORY_PBO_ALLOCATOR_NAME
@@ -4249,6 +4273,7 @@ GST_TYPE_GL_MEMORY_PBO_ALLOCATOR
 <SECTION>
 <FILE>gstgloverlaycompositor</FILE>
 <TITLE>GstGLOverlayCompositor</TITLE>
+<INCLUDE>gst/gl/gl.h</INCLUDE>
 GstGLOverlayCompositor
 gst_gl_overlay_compositor_new
 gst_gl_overlay_compositor_add_caps
@@ -4268,6 +4293,7 @@ GST_IS_GL_OVERLAY_COMPOSITOR_CLASS
 <SECTION>
 <FILE>gstglquery</FILE>
 <TITLE>GstGLQuery</TITLE>
+<INCLUDE>gst/gl/gl.h</INCLUDE>
 GstGLQuery
 GstGLQueryType
 gst_gl_query_counter
@@ -4287,6 +4313,7 @@ gst_gl_query_unset
 <SECTION>
 <FILE>gstglrenderbuffer</FILE>
 <TITLE>GstGLRenderbuffer</TITLE>
+<INCLUDE>gst/gl/gl.h</INCLUDE>
 GstGLRenderbuffer
 GstGLRenderbufferAllocator
 GstGLRenderbufferAllocatorClass
@@ -4317,6 +4344,7 @@ GST_IS_GL_RENDERBUFFER_ALLOCATOR_CLASS
 <SECTION>
 <FILE>gstglshader</FILE>
 <TITLE>GstGLShader</TITLE>
+<INCLUDE>gst/gl/gl.h</INCLUDE>
 GstGLShader
 gst_gl_shader_new
 gst_gl_shader_new_default
@@ -4381,6 +4409,7 @@ GST_GL_SHADER_GET_CLASS
 <SECTION>
 <FILE>gstglsl</FILE>
 <TITLE>GstGLSL</TITLE>
+<INCLUDE>gst/gl/gl.h</INCLUDE>
 GST_GLSL_ERROR
 GstGLSLError
 GstGLSLProfile
@@ -4401,6 +4430,7 @@ gst_glsl_error_quark
 <SECTION>
 <FILE>gstglslstage</FILE>
 <TITLE>GstGLSLStage</TITLE>
+<INCLUDE>gst/gl/gl.h</INCLUDE>
 GstGLSLStage
 GstGLSLStageClass
 gst_glsl_stage_new
@@ -4428,6 +4458,7 @@ GST_GLSL_STAGE_GET_CLASS
 <SECTION>
 <FILE>gstglsyncmeta</FILE>
 <TITLE>GstGLSyncMeta</TITLE>
+<INCLUDE>gst/gl/gl.h</INCLUDE>
 GstGLSyncMeta
 gst_gl_sync_meta_get_info
 gst_buffer_add_gl_sync_meta
@@ -4446,6 +4477,7 @@ gst_gl_sync_meta_api_get_type
 <SECTION>
 <FILE>gstglupload</FILE>
 <TITLE>GstGLUpload</TITLE>
+<INCLUDE>gst/gl/gl.h</INCLUDE>
 GstGLUpload
 gst_gl_upload_new
 gst_gl_upload_set_context
@@ -4471,6 +4503,7 @@ GstGLUploadPrivate
 <SECTION>
 <FILE>gstglutils</FILE>
 <TITLE>OpenGL Miscellaneous Utilities</TITLE>
+<INCLUDE>gst/gl/gl.h</INCLUDE>
 gst_gl_handle_set_context
 gst_gl_handle_context_query
 gst_gl_ensure_element_data
@@ -4487,6 +4520,7 @@ gst_gl_element_propagate_display_context
 <SECTION>
 <FILE>gstglviewconvert</FILE>
 <TITLE>GstGLViewConvert</TITLE>
+<INCLUDE>gst/gl/gl.h</INCLUDE>
 GstGLStereoDownmix
 GstGLViewConvert
 GstGLViewConvertClass
@@ -4515,6 +4549,7 @@ GstGLViewConvertPrivate
 <SECTION>
 <FILE>gstglwindow</FILE>
 <TITLE>GstGLWindow</TITLE>
+<INCLUDE>gst/gl/gl.h</INCLUDE>
 GstGLWindowError
 gst_gl_window_error_quark
 GST_GL_WINDOW_ERROR
diff --git a/docs/libs/gst-plugins-base-libs.types b/docs/libs/gst-plugins-base-libs.types
index 976834c8a..49a6b6a6a 100644
--- a/docs/libs/gst-plugins-base-libs.types
+++ b/docs/libs/gst-plugins-base-libs.types
@@ -23,71 +23,45 @@ gst_audio_resampler_filter_mode_get_type
 gst_audio_resampler_flags_get_type
 gst_audio_resampler_method_get_type
 gst_audio_stream_align_get_type
-
-#include <gst/audio/gstaudioaggregator.h>
 gst_audio_aggregator_get_type
 gst_audio_aggregator_pad_get_type
 gst_audio_aggregator_convert_pad_get_type
-#include <gst/audio/gstaudiocdsrc.h>
 gst_audio_cd_src_get_type
-#include <gst/audio/gstaudioclock.h>
 gst_audio_clock_get_type
-#include <gst/audio/gstaudiodecoder.h>
 gst_audio_decoder_get_type
-#include <gst/audio/gstaudioencoder.h>
 gst_audio_encoder_get_type
-#include <gst/audio/gstaudiofilter.h>
 gst_audio_filter_get_type
-#include <gst/audio/gstaudiosink.h>
 gst_audio_sink_get_type
-#include <gst/audio/gstaudiosrc.h>
 gst_audio_src_get_type
-#include <gst/audio/gstaudiobasesink.h>
 gst_audio_base_sink_get_type
 gst_audio_base_sink_slave_method_get_type
 gst_audio_base_sink_discont_reason_get_type
-#include <gst/audio/gstaudiobasesrc.h>
 gst_audio_base_src_get_type
-#include <gst/audio/gstaudioringbuffer.h>
 gst_audio_ring_buffer_get_type
-
-#include <gst/video/navigation.h>
-gst_navigation_get_type
-#include <gst/audio/streamvolume.h>
 gst_stream_volume_get_type
 
-#include <gst/rtp/gstrtpbasedepayload.h>
+#include <gst/rtp/rtp.h>
 gst_rtp_base_depayload_get_type
-#include <gst/rtp/gstrtpbasepayload.h>
 gst_rtp_base_payload_get_type
-#include <gst/rtp/gstrtpbaseaudiopayload.h>
 gst_rtp_base_audio_payload_get_type
 
-
-#include <gst/video/gstvideofilter.h>
+#include <gst/video/video.h>
 gst_video_filter_get_type
-#include <gst/video/gstvideosink.h>
 gst_video_sink_get_type
-#include <gst/video/colorbalance.h>
 gst_color_balance_get_type
 gst_color_balance_channel_get_type
-#include <gst/video/videodirection.h>
 gst_video_direction_get_type
-#include <gst/video/videoorientation.h>
 gst_video_orientation_get_type
-#include <gst/video/videooverlay.h>
 gst_video_overlay_get_type
 gst_video_encoder_get_type
 gst_video_decoder_get_type
 gst_video_buffer_pool_get_type
+gst_navigation_get_type
 
 #include <gst/pbutils/pbutils.h>
 gst_discoverer_get_type
 gst_discoverer_serialize_flags_get_type
 gst_audio_visualizer_get_type
-
-#include <gst/pbutils/encoding-profile.h>
-#include <gst/pbutils/encoding-target.h>
 gst_encoding_profile_get_type
 gst_encoding_video_profile_get_type
 gst_encoding_video_profile_get_type