diff --git a/ext/aom/gstav1enc.c b/ext/aom/gstav1enc.c
index 2c7be2800b..d63087dbb6 100644
--- a/ext/aom/gstav1enc.c
+++ b/ext/aom/gstav1enc.c
@@ -397,6 +397,10 @@ gst_av1_enc_class_init (GstAV1EncClass * klass)
           "Partition into separate horizontal tile rows from image frame which "
           "can enable parallel encoding",
           0, 6, DEFAULT_TILE_ROWS, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+  gst_type_mark_as_plugin_api (GST_TYPE_END_USAGE_MODE);
+  gst_type_mark_as_plugin_api (GST_TYPE_RESIZE_MODE);
+  gst_type_mark_as_plugin_api (GST_TYPE_SUPERRES_MODE);
 }
 
 static void
diff --git a/ext/closedcaption/gstceaccoverlay.c b/ext/closedcaption/gstceaccoverlay.c
index 0d1b3b5976..9a4b19a3ab 100644
--- a/ext/closedcaption/gstceaccoverlay.c
+++ b/ext/closedcaption/gstceaccoverlay.c
@@ -285,6 +285,8 @@ gst_base_cea_cc_overlay_class_init (GstCeaCcOverlayClass * klass)
       "Chengjun Wang <cjun.wang@samsung.com>");
   gst_cea708_decoder_init_debug ();
 
+  gst_type_mark_as_plugin_api (GST_TYPE_CC_OVERLAY_WIN_H_POS);
+
 }
 
 static void
diff --git a/ext/colormanagement/gstlcms.c b/ext/colormanagement/gstlcms.c
index fc94697cc8..30c680a904 100644
--- a/ext/colormanagement/gstlcms.c
+++ b/ext/colormanagement/gstlcms.c
@@ -225,6 +225,9 @@ gst_lcms_class_init (GstLcmsClass * klass)
   vfilter_class->transform_frame_ip =
       GST_DEBUG_FUNCPTR (gst_lcms_transform_frame_ip);
   vfilter_class->transform_frame = GST_DEBUG_FUNCPTR (gst_lcms_transform_frame);
+
+  gst_type_mark_as_plugin_api (GST_TYPE_LCMS_INTENT);
+  gst_type_mark_as_plugin_api (GST_TYPE_LCMS_LOOKUP_METHOD);
 }
 
 static void
diff --git a/ext/curl/gstcurlhttpsrc.c b/ext/curl/gstcurlhttpsrc.c
index e5ad044fc0..5d0f3ddb5e 100644
--- a/ext/curl/gstcurlhttpsrc.c
+++ b/ext/curl/gstcurlhttpsrc.c
@@ -489,6 +489,8 @@ gst_curl_http_src_class_init (GstCurlHttpSrcClass * klass)
       "Source/Network",
       "Receiver data as a client over a network via HTTP using cURL",
       "Sam Hurst <samuelh@rd.bbc.co.uk>");
+
+  gst_type_mark_as_plugin_api (GST_TYPE_CURL_HTTP_VERSION);
 }
 
 static void
diff --git a/ext/curl/gstcurlsshsink.c b/ext/curl/gstcurlsshsink.c
index c05a49aa48..3f570b7a18 100644
--- a/ext/curl/gstcurlsshsink.c
+++ b/ext/curl/gstcurlsshsink.c
@@ -174,6 +174,8 @@ gst_curl_ssh_sink_class_init (GstCurlSshSinkClass * klass)
           "SSH accept unknown host",
           "Accept an unknown remote public host key",
           FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+  gst_type_mark_as_plugin_api (GST_TYPE_CURL_SSH_SINK_AUTH_TYPE);
 }
 
 static void
diff --git a/ext/dash/gstdashsink.c b/ext/dash/gstdashsink.c
index 8109238743..c54eb67c5c 100644
--- a/ext/dash/gstdashsink.c
+++ b/ext/dash/gstdashsink.c
@@ -444,6 +444,8 @@ gst_dash_sink_class_init (GstDashSinkClass * klass)
           "Provides the explicit duration of a period in milliseconds", 0,
           G_MAXUINT64, DEFAULT_MPD_PERIOD_DURATION,
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+  gst_type_mark_as_plugin_api (GST_TYPE_DASH_SINK_MUXER);
 }
 
 static gboolean
diff --git a/ext/dc1394/gstdc1394src.c b/ext/dc1394/gstdc1394src.c
index 123e9d9c93..e2ee81f0af 100644
--- a/ext/dc1394/gstdc1394src.c
+++ b/ext/dc1394/gstdc1394src.c
@@ -182,6 +182,8 @@ gst_dc1394_src_class_init (GstDC1394SrcClass * klass)
   basesrc_class->get_caps = GST_DEBUG_FUNCPTR (gst_dc1394_src_get_caps);
 
   pushsrc_class->create = GST_DEBUG_FUNCPTR (gst_dc1394_src_create);
+
+  gst_type_mark_as_plugin_api (GST_TYPE_DC1394_ISO_SPEED);
 }
 
 
diff --git a/ext/dtls/plugin.c b/ext/dtls/plugin.c
index e531eff0fd..7f78ca2946 100644
--- a/ext/dtls/plugin.c
+++ b/ext/dtls/plugin.c
@@ -38,6 +38,8 @@
 static gboolean
 plugin_init (GstPlugin * plugin)
 {
+  gst_type_mark_as_plugin_api (GST_DTLS_TYPE_CONNECTION_STATE);
+
   return gst_element_register (plugin, "dtlsenc", GST_RANK_NONE,
       GST_TYPE_DTLS_ENC)
       && gst_element_register (plugin, "dtlsdec", GST_RANK_NONE,
diff --git a/ext/mpeg2enc/gstmpeg2encoptions.cc b/ext/mpeg2enc/gstmpeg2encoptions.cc
index 5cfda38ba6..42df359f80 100644
--- a/ext/mpeg2enc/gstmpeg2encoptions.cc
+++ b/ext/mpeg2enc/gstmpeg2encoptions.cc
@@ -502,6 +502,14 @@ GstMpeg2EncOptions::initProperties (GObjectClass * klass)
           "streams.  Quite some players do not support this.",
           FALSE, (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
 #endif
+
+  gst_type_mark_as_plugin_api (GST_TYPE_MPEG2ENC_ASPECT);
+  gst_type_mark_as_plugin_api (GST_TYPE_MPEG2ENC_FORMAT);
+  gst_type_mark_as_plugin_api (GST_TYPE_MPEG2ENC_FRAMERATE);
+  gst_type_mark_as_plugin_api (GST_TYPE_MPEG2ENC_INTERLACE_MODE);
+  gst_type_mark_as_plugin_api (GST_TYPE_MPEG2ENC_VIDEO_NORM);
+  gst_type_mark_as_plugin_api (GST_TYPE_MPEG2ENC_PLAYBACK_FIELD_ORDER);
+  gst_type_mark_as_plugin_api (GST_TYPE_MPEG2ENC_QUANTISATION_MATRIX);
 }
 
 /*
diff --git a/ext/mplex/gstmplexjob.cc b/ext/mplex/gstmplexjob.cc
index a147430c8b..397ea96cfb 100644
--- a/ext/mplex/gstmplexjob.cc
+++ b/ext/mplex/gstmplexjob.cc
@@ -24,7 +24,7 @@
 #endif
 
 #include "gstmplexjob.hh"
-
+#include <gst/gst.h>
 
 enum
 {
@@ -161,6 +161,8 @@ GstMplexJob::initProperties (GObjectClass * klass)
           "Specify sector size in bytes for generic formats",
           256, 16384, 2048,
           (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  gst_type_mark_as_plugin_api (GST_TYPE_MPLEX_FORMAT);
 }
 
 /*
diff --git a/ext/opencv/gstcameracalibrate.cpp b/ext/opencv/gstcameracalibrate.cpp
index ccf7aff447..b28d014779 100644
--- a/ext/opencv/gstcameracalibrate.cpp
+++ b/ext/opencv/gstcameracalibrate.cpp
@@ -288,6 +288,8 @@ gst_camera_calibrate_class_init (GstCameraCalibrateClass * klass)
   gst_element_class_add_pad_template (element_class, templ);
   templ = gst_pad_template_new ("src", GST_PAD_SRC, GST_PAD_ALWAYS, caps);
   gst_element_class_add_pad_template (element_class, templ);
+
+  gst_type_mark_as_plugin_api (GST_TYPE_CAMERA_CALIBRATION_PATTERN);
 }
 
 /* initialize the new element
diff --git a/ext/opencv/gstcvsmooth.cpp b/ext/opencv/gstcvsmooth.cpp
index 0e22db69a5..a8dc585007 100644
--- a/ext/opencv/gstcvsmooth.cpp
+++ b/ext/opencv/gstcvsmooth.cpp
@@ -233,6 +233,8 @@ gst_cv_smooth_class_init (GstCvSmoothClass * klass)
   templ = gst_pad_template_new ("src", GST_PAD_SRC, GST_PAD_ALWAYS, caps);
   gst_element_class_add_pad_template (element_class, templ);
   gst_caps_unref (caps);
+
+  gst_type_mark_as_plugin_api (GST_TYPE_CV_SMOOTH_TYPE);
 }
 
 /* initialize the new element
diff --git a/ext/opencv/gstdewarp.cpp b/ext/opencv/gstdewarp.cpp
index 15860c26a2..c9aa04b1c7 100644
--- a/ext/opencv/gstdewarp.cpp
+++ b/ext/opencv/gstdewarp.cpp
@@ -256,6 +256,8 @@ gst_dewarp_class_init (GstDewarpClass * klass)
   gst_element_class_add_static_pad_template (element_class, &src_factory);
   gst_element_class_add_static_pad_template (element_class, &sink_factory);
 
+  gst_type_mark_as_plugin_api (GST_TYPE_DEWARP_DISPLAY_MODE);
+  gst_type_mark_as_plugin_api (GST_TYPE_DEWARP_INTERPOLATION_MODE);
 }
 
 static void
diff --git a/ext/opencv/gstdisparity.cpp b/ext/opencv/gstdisparity.cpp
index 212bcb829f..678be75004 100644
--- a/ext/opencv/gstdisparity.cpp
+++ b/ext/opencv/gstdisparity.cpp
@@ -232,6 +232,8 @@ gst_disparity_class_init (GstDisparityClass * klass)
 
   gst_element_class_add_static_pad_template (element_class, &src_factory);
   gst_element_class_add_static_pad_template (element_class, &sink_factory);
+
+  gst_type_mark_as_plugin_api (GST_TYPE_DISPARITY_METHOD);
 }
 
 /* initialize the new element
diff --git a/ext/opencv/gstfaceblur.cpp b/ext/opencv/gstfaceblur.cpp
index 0dd4df6bea..4451263742 100644
--- a/ext/opencv/gstfaceblur.cpp
+++ b/ext/opencv/gstfaceblur.cpp
@@ -231,6 +231,8 @@ gst_face_blur_class_init (GstFaceBlurClass * klass)
 
   gst_element_class_add_static_pad_template (element_class, &src_factory);
   gst_element_class_add_static_pad_template (element_class, &sink_factory);
+
+  gst_type_mark_as_plugin_api (GST_TYPE_OPENCV_FACE_BLUR_FLAGS);
 }
 
 /* initialize the new element
diff --git a/ext/opencv/gstfacedetect.cpp b/ext/opencv/gstfacedetect.cpp
index 0ef4c32d2c..59c35e4a41 100644
--- a/ext/opencv/gstfacedetect.cpp
+++ b/ext/opencv/gstfacedetect.cpp
@@ -356,6 +356,9 @@ gst_face_detect_class_init (GstFaceDetectClass * klass)
 
   gst_element_class_add_static_pad_template (element_class, &src_factory);
   gst_element_class_add_static_pad_template (element_class, &sink_factory);
+
+  gst_type_mark_as_plugin_api (GST_TYPE_OPENCV_FACE_DETECT_FLAGS);
+  gst_type_mark_as_plugin_api (GST_TYPE_FACE_DETECT_UPDATES);
 }
 
 /* initialize the new element
diff --git a/ext/opencv/gstretinex.cpp b/ext/opencv/gstretinex.cpp
index 48e8bfda5f..d6b8b8028b 100644
--- a/ext/opencv/gstretinex.cpp
+++ b/ext/opencv/gstretinex.cpp
@@ -167,6 +167,8 @@ gst_retinex_class_init (GstRetinexClass * klass)
 
   gst_element_class_add_static_pad_template (element_class, &src_factory);
   gst_element_class_add_static_pad_template (element_class, &sink_factory);
+
+  gst_type_mark_as_plugin_api (GST_TYPE_RETINEX_METHOD);
 }
 
 /* initialize the new element
diff --git a/ext/opencv/gstsegmentation.cpp b/ext/opencv/gstsegmentation.cpp
index b28409a8c4..463ea7517c 100644
--- a/ext/opencv/gstsegmentation.cpp
+++ b/ext/opencv/gstsegmentation.cpp
@@ -226,6 +226,7 @@ gst_segmentation_class_init (GstSegmentationClass * klass)
   gst_element_class_add_static_pad_template (element_class, &src_factory);
   gst_element_class_add_static_pad_template (element_class, &sink_factory);
 
+  gst_type_mark_as_plugin_api (GST_TYPE_SEGMENTATION_METHOD);
 }
 
 /* initialize the new element
diff --git a/ext/opencv/gstskindetect.cpp b/ext/opencv/gstskindetect.cpp
index 105e834955..c6f3c50b7d 100644
--- a/ext/opencv/gstskindetect.cpp
+++ b/ext/opencv/gstskindetect.cpp
@@ -164,6 +164,8 @@ gst_skin_detect_class_init (GstSkinDetectClass * klass)
   gst_element_class_add_static_pad_template (element_class, &sink_factory);
 
   gstopencvbasefilter_class->cv_set_caps = gst_skin_detect_set_caps;
+
+  gst_type_mark_as_plugin_api (GST_TYPE_SKIN_DETECT_METHOD);
 }
 
 /* initialize the new element
diff --git a/ext/openh264/gstopenh264enc.cpp b/ext/openh264/gstopenh264enc.cpp
index 7e9285b0ab..2276098b2e 100644
--- a/ext/openh264/gstopenh264enc.cpp
+++ b/ext/openh264/gstopenh264enc.cpp
@@ -365,6 +365,12 @@ gst_openh264enc_class_init (GstOpenh264EncClass * klass)
       g_param_spec_enum ("complexity", "Complexity / quality / speed tradeoff",
           "Complexity", GST_TYPE_OPENH264ENC_COMPLEXITY, DEFAULT_COMPLEXITY,
           (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+
+  gst_type_mark_as_plugin_api (GST_TYPE_OPENH264ENC_COMPLEXITY);
+  gst_type_mark_as_plugin_api (GST_TYPE_OPENH264ENC_DEBLOCKING_MODE);
+  gst_type_mark_as_plugin_api (GST_TYPE_OPENH264ENC_SLICE_MODE);
+  gst_type_mark_as_plugin_api (GST_TYPE_RC_MODES);
+  gst_type_mark_as_plugin_api (GST_TYPE_USAGE_TYPE);
 }
 
 static void
diff --git a/ext/openjpeg/gstopenjpegenc.c b/ext/openjpeg/gstopenjpegenc.c
index 1cf32fdbc2..8310149df8 100644
--- a/ext/openjpeg/gstopenjpegenc.c
+++ b/ext/openjpeg/gstopenjpegenc.c
@@ -218,6 +218,8 @@ gst_openjpeg_enc_class_init (GstOpenJPEGEncClass * klass)
 
   GST_DEBUG_CATEGORY_INIT (gst_openjpeg_enc_debug, "openjpegenc", 0,
       "OpenJPEG Encoder");
+
+  gst_type_mark_as_plugin_api (GST_OPENJPEG_ENC_TYPE_PROGRESSION_ORDER);
 }
 
 static void
diff --git a/ext/srtp/gstsrtp.c b/ext/srtp/gstsrtp.c
index b1ddd67549..cd211357b6 100644
--- a/ext/srtp/gstsrtp.c
+++ b/ext/srtp/gstsrtp.c
@@ -309,6 +309,9 @@ plugin_init (GstPlugin * plugin)
   if (!gst_srtp_dec_plugin_init (plugin))
     return FALSE;
 
+  gst_type_mark_as_plugin_api (GST_TYPE_SRTP_AUTH_TYPE);
+  gst_type_mark_as_plugin_api (GST_TYPE_SRTP_CIPHER_TYPE);
+
   return TRUE;
 }
 
diff --git a/ext/voamrwbenc/gstvoamrwbenc.c b/ext/voamrwbenc/gstvoamrwbenc.c
index dfb997f454..3d4c5eacc2 100644
--- a/ext/voamrwbenc/gstvoamrwbenc.c
+++ b/ext/voamrwbenc/gstvoamrwbenc.c
@@ -183,6 +183,8 @@ gst_voamrwbenc_class_init (GstVoAmrWbEncClass * klass)
 
   GST_DEBUG_CATEGORY_INIT (gst_voamrwbenc_debug, "voamrwbenc", 0,
       "voamrwb encoder");
+
+  gst_type_mark_as_plugin_api (GST_VOAMRWBENC_BANDMODE_TYPE);
 }
 
 static void
diff --git a/ext/webp/gstwebpenc.c b/ext/webp/gstwebpenc.c
index df769a855a..da4afc0239 100644
--- a/ext/webp/gstwebpenc.c
+++ b/ext/webp/gstwebpenc.c
@@ -157,6 +157,8 @@ gst_webp_enc_class_init (GstWebpEncClass * klass)
 
   GST_DEBUG_CATEGORY_INIT (webpenc_debug, "webpenc", 0,
       "WEBP encoding element");
+
+  gst_type_mark_as_plugin_api (GST_WEBP_ENC_PRESET_TYPE);
 }
 
 static void
diff --git a/ext/webrtc/gstwebrtcbin.c b/ext/webrtc/gstwebrtcbin.c
index 7920b19fdd..2485a06f48 100644
--- a/ext/webrtc/gstwebrtcbin.c
+++ b/ext/webrtc/gstwebrtcbin.c
@@ -6453,6 +6453,9 @@ gst_webrtc_bin_class_init (GstWebRTCBinClass * klass)
       G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
       G_CALLBACK (gst_webrtc_bin_create_data_channel), NULL, NULL,
       NULL, GST_TYPE_WEBRTC_DATA_CHANNEL, 2, G_TYPE_STRING, GST_TYPE_STRUCTURE);
+
+  gst_type_mark_as_plugin_api (GST_TYPE_WEBRTC_BIN_PAD);
+  gst_type_mark_as_plugin_api (GST_TYPE_WEBRTC_ICE);
 }
 
 static void
diff --git a/ext/webrtcdsp/gstwebrtcdsp.cpp b/ext/webrtcdsp/gstwebrtcdsp.cpp
index 4f097e0e58..d26bad8927 100644
--- a/ext/webrtcdsp/gstwebrtcdsp.cpp
+++ b/ext/webrtcdsp/gstwebrtcdsp.cpp
@@ -1113,6 +1113,10 @@ gst_webrtc_dsp_class_init (GstWebrtcDspClass * klass)
           (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
               G_PARAM_CONSTRUCT)));
 
+  gst_type_mark_as_plugin_api (GST_TYPE_WEBRTC_GAIN_CONTROL_MODE);
+  gst_type_mark_as_plugin_api (GST_TYPE_WEBRTC_NOISE_SUPPRESSION_LEVEL);
+  gst_type_mark_as_plugin_api (GST_TYPE_WEBRTC_ECHO_SUPPRESSION_LEVEL);
+  gst_type_mark_as_plugin_api (GST_TYPE_WEBRTC_VOICE_DETECTION_LIKELIHOOD);
 }
 
 static gboolean
diff --git a/ext/x265/gstx265enc.c b/ext/x265/gstx265enc.c
index 30c909abd4..5367a9a321 100644
--- a/ext/x265/gstx265enc.c
+++ b/ext/x265/gstx265enc.c
@@ -542,6 +542,10 @@ gst_x265_enc_class_init (GstX265EncClass * klass)
 
   gst_element_class_add_pad_template (element_class, sink_templ);
   gst_element_class_add_static_pad_template (element_class, &src_factory);
+
+  gst_type_mark_as_plugin_api (GST_X265_ENC_LOG_LEVEL_TYPE);
+  gst_type_mark_as_plugin_api (GST_X265_ENC_SPEED_PRESET_TYPE);
+  gst_type_mark_as_plugin_api (GST_X265_ENC_TUNE_TYPE);
 }
 
 /* initialize the new element
diff --git a/gst-libs/gst/audio/gstnonstreamaudiodecoder.c b/gst-libs/gst/audio/gstnonstreamaudiodecoder.c
index 8a63a1c1a1..a091d7c4c8 100644
--- a/gst-libs/gst/audio/gstnonstreamaudiodecoder.c
+++ b/gst-libs/gst/audio/gstnonstreamaudiodecoder.c
@@ -457,6 +457,9 @@ gst_nonstream_audio_decoder_class_init (GstNonstreamAudioDecoderClass * klass)
           GST_TYPE_NONSTREAM_AUDIO_DECODER_OUTPUT_MODE,
           DEFAULT_OUTPUT_MODE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)
       );
+
+  gst_type_mark_as_plugin_api (GST_TYPE_NONSTREAM_AUDIO_DECODER_OUTPUT_MODE);
+  gst_type_mark_as_plugin_api (GST_TYPE_NONSTREAM_AUDIO_DECODER_SUBSONG_MODE);
 }
 
 
diff --git a/gst/adpcmenc/adpcmenc.c b/gst/adpcmenc/adpcmenc.c
index 8391b0883e..0a603dfd90 100644
--- a/gst/adpcmenc/adpcmenc.c
+++ b/gst/adpcmenc/adpcmenc.c
@@ -463,6 +463,8 @@ adpcmenc_class_init (ADPCMEncClass * klass)
           MIN_ADPCM_BLOCK_SIZE, MAX_ADPCM_BLOCK_SIZE,
           DEFAULT_ADPCM_BLOCK_SIZE,
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+  gst_type_mark_as_plugin_api (GST_TYPE_ADPCMENC_LAYOUT);
 }
 
 static gboolean
diff --git a/gst/audiomixmatrix/gstaudiomixmatrix.c b/gst/audiomixmatrix/gstaudiomixmatrix.c
index 75f4a970a7..537cfb93bd 100644
--- a/gst/audiomixmatrix/gstaudiomixmatrix.c
+++ b/gst/audiomixmatrix/gstaudiomixmatrix.c
@@ -216,6 +216,8 @@ gst_audio_mix_matrix_class_init (GstAudioMixMatrixClass * klass)
 
   element_class->change_state =
       GST_DEBUG_FUNCPTR (gst_audio_mix_matrix_change_state);
+
+  gst_type_mark_as_plugin_api (GST_TYPE_AUDIO_MIX_MATRIX_MODE);
 }
 
 static void
diff --git a/gst/audiovisualizers/gstspacescope.c b/gst/audiovisualizers/gstspacescope.c
index 3e59609f32..146cff8051 100644
--- a/gst/audiovisualizers/gstspacescope.c
+++ b/gst/audiovisualizers/gstspacescope.c
@@ -148,6 +148,8 @@ gst_space_scope_class_init (GstSpaceScopeClass * g_class)
           "Drawing styles for the space scope display.",
           GST_TYPE_SPACE_SCOPE_STYLE, STYLE_DOTS,
           G_PARAM_CONSTRUCT | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+  gst_type_mark_as_plugin_api (GST_TYPE_SPACE_SCOPE_STYLE);
 }
 
 static void
diff --git a/gst/audiovisualizers/gstwavescope.c b/gst/audiovisualizers/gstwavescope.c
index c934daa4d2..917443ec4c 100644
--- a/gst/audiovisualizers/gstwavescope.c
+++ b/gst/audiovisualizers/gstwavescope.c
@@ -152,6 +152,8 @@ gst_wave_scope_class_init (GstWaveScopeClass * g_class)
       &gst_wave_scope_src_template);
   gst_element_class_add_static_pad_template (gstelement_class,
       &gst_wave_scope_sink_template);
+
+  gst_type_mark_as_plugin_api (GST_TYPE_WAVE_SCOPE_STYLE);
 }
 
 static void
diff --git a/gst/camerabin2/gstcamerabin2.c b/gst/camerabin2/gstcamerabin2.c
index 5dbf2d8504..e375ccf628 100644
--- a/gst/camerabin2/gstcamerabin2.c
+++ b/gst/camerabin2/gstcamerabin2.c
@@ -845,6 +845,9 @@ gst_camera_bin_class_init (GstCameraBin2Class * klass)
       G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
       G_STRUCT_OFFSET (GstCameraBin2Class, stop_capture),
       NULL, NULL, NULL, G_TYPE_NONE, 0);
+
+  gst_type_mark_as_plugin_api (GST_TYPE_CAM_FLAGS);
+  gst_type_mark_as_plugin_api (GST_TYPE_CAMERABIN_MODE);
 }
 
 static void
diff --git a/gst/coloreffects/gstcoloreffects.c b/gst/coloreffects/gstcoloreffects.c
index dc26f70dde..04a88f67a0 100644
--- a/gst/coloreffects/gstcoloreffects.c
+++ b/gst/coloreffects/gstcoloreffects.c
@@ -594,6 +594,8 @@ gst_color_effects_class_init (GstColorEffectsClass * klass)
       &gst_color_effects_sink_template);
   gst_element_class_add_static_pad_template (element_class,
       &gst_color_effects_src_template);
+
+  gst_type_mark_as_plugin_api (GST_TYPE_COLOR_EFFECTS_PRESET);
 }
 
 static void
diff --git a/gst/debugutils/gstchecksumsink.c b/gst/debugutils/gstchecksumsink.c
index 9c527e38d8..2521db63bb 100644
--- a/gst/debugutils/gstchecksumsink.c
+++ b/gst/debugutils/gstchecksumsink.c
@@ -100,6 +100,8 @@ gst_checksum_sink_class_init (GstChecksumSinkClass * klass)
   gst_element_class_set_static_metadata (element_class, "Checksum sink",
       "Debug/Sink", "Calculates a checksum for buffers",
       "David Schleef <ds@schleef.org>");
+
+  gst_type_mark_as_plugin_api (gst_checksum_sink_hash_get_type ());
 }
 
 static void
diff --git a/gst/debugutils/gstclockselect.c b/gst/debugutils/gstclockselect.c
index e0ccef9143..4181e635aa 100644
--- a/gst/debugutils/gstclockselect.c
+++ b/gst/debugutils/gstclockselect.c
@@ -117,6 +117,8 @@ gst_clock_select_class_init (GstClockSelectClass * klass)
 
   gstelement_class->provide_clock =
       GST_DEBUG_FUNCPTR (gst_clock_select_provide_clock);
+
+  gst_type_mark_as_plugin_api (GST_TYPE_CLOCK_SELECT_CLOCK_ID);
 }
 
 static void
diff --git a/gst/debugutils/gstcompare.c b/gst/debugutils/gstcompare.c
index 777a8d8e56..0834da62ac 100644
--- a/gst/debugutils/gstcompare.c
+++ b/gst/debugutils/gstcompare.c
@@ -176,6 +176,8 @@ gst_compare_class_init (GstCompareClass * klass)
   gst_element_class_set_static_metadata (gstelement_class, "Compare buffers",
       "Filter/Debug", "Compares incoming buffers",
       "Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>");
+
+  gst_type_mark_as_plugin_api (GST_COMPARE_METHOD_TYPE);
 }
 
 static void
diff --git a/gst/debugutils/gstfakevideosink.c b/gst/debugutils/gstfakevideosink.c
index 0f8f48efdd..c4948aa8be 100644
--- a/gst/debugutils/gstfakevideosink.c
+++ b/gst/debugutils/gstfakevideosink.c
@@ -315,4 +315,6 @@ gst_fake_video_sink_class_init (GstFakeVideoSinkClass * klass)
   gst_element_class_set_static_metadata (element_class, "Fake Video Sink",
       "Video/Sink", "Fake video display that allows zero-copy",
       "Nicolas Dufresne <nicolas.dufresne@collabora.com>");
+
+  gst_type_mark_as_plugin_api (GST_TYPE_FAKE_VIDEO_SINK_ALLOCATION_META_FLAGS);
 }
diff --git a/gst/fieldanalysis/gstfieldanalysis.c b/gst/fieldanalysis/gstfieldanalysis.c
index 12461cc735..d3f8022644 100644
--- a/gst/fieldanalysis/gstfieldanalysis.c
+++ b/gst/fieldanalysis/gstfieldanalysis.c
@@ -287,6 +287,9 @@ gst_field_analysis_class_init (GstFieldAnalysisClass * klass)
   gst_element_class_add_static_pad_template (gstelement_class, &src_factory);
   gst_element_class_add_static_pad_template (gstelement_class, &sink_factory);
 
+  gst_type_mark_as_plugin_api (GST_TYPE_FIELDANALYSIS_COMB_METHOD);
+  gst_type_mark_as_plugin_api (GST_TYPE_FIELDANALYSIS_FIELD_METRIC);
+  gst_type_mark_as_plugin_api (GST_TYPE_FIELDANALYSIS_FRAME_METRIC);
 }
 
 static gfloat same_parity_sad (GstFieldAnalysis * filter,
diff --git a/gst/geometrictransform/gstgeometrictransform.c b/gst/geometrictransform/gstgeometrictransform.c
index a6c00a8a7b..b3f9be5067 100644
--- a/gst/geometrictransform/gstgeometrictransform.c
+++ b/gst/geometrictransform/gstgeometrictransform.c
@@ -388,6 +388,8 @@ gst_geometric_transform_class_init (gpointer klass, gpointer class_data)
           "What to do with off edge pixels",
           GST_GT_OFF_EDGES_PIXELS_METHOD_TYPE, DEFAULT_OFF_EDGE_PIXELS,
           GST_PARAM_CONTROLLABLE | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+  gst_type_mark_as_plugin_api (GST_GT_OFF_EDGES_PIXELS_METHOD_TYPE);
 }
 
 static void
diff --git a/gst/geometrictransform/gstmirror.c b/gst/geometrictransform/gstmirror.c
index 31e0a69c12..53edb66989 100644
--- a/gst/geometrictransform/gstmirror.c
+++ b/gst/geometrictransform/gstmirror.c
@@ -226,6 +226,8 @@ gst_mirror_class_init (GstMirrorClass * klass)
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
   gstgt_class->map_func = mirror_map;
+
+  gst_type_mark_as_plugin_api (GST_TYPE_MIRROR_MODE);
 }
 
 static void
diff --git a/gst/interlace/gstinterlace.c b/gst/interlace/gstinterlace.c
index be51dbc5a4..4c654669bc 100644
--- a/gst/interlace/gstinterlace.c
+++ b/gst/interlace/gstinterlace.c
@@ -259,6 +259,8 @@ gst_interlace_class_init (GstInterlaceClass * klass)
       &gst_interlace_src_template);
 
   element_class->change_state = gst_interlace_change_state;
+
+  gst_type_mark_as_plugin_api (GST_INTERLACE_PATTERN);
 }
 
 static void
diff --git a/gst/mpegtsmux/gstbasetsmux.c b/gst/mpegtsmux/gstbasetsmux.c
index a68af99010..63eeb15a23 100644
--- a/gst/mpegtsmux/gstbasetsmux.c
+++ b/gst/mpegtsmux/gstbasetsmux.c
@@ -1990,6 +1990,8 @@ gst_base_ts_mux_class_init (GstBaseTsMuxClass * klass)
 
   gst_element_class_add_static_pad_template_with_gtype (gstelement_class,
       &gst_base_ts_mux_src_factory, GST_TYPE_AGGREGATOR_PAD);
+
+  gst_type_mark_as_plugin_api (GST_TYPE_BASE_TS_MUX_PAD);
 }
 
 static void
diff --git a/gst/mxf/mxfmux.c b/gst/mxf/mxfmux.c
index 4977c23407..eafc81965d 100644
--- a/gst/mxf/mxfmux.c
+++ b/gst/mxf/mxfmux.c
@@ -185,6 +185,8 @@ gst_mxf_mux_class_init (GstMXFMuxClass * klass)
       "Codec/Muxer",
       "Muxes video/audio streams into a MXF stream",
       "Sebastian Dröge <sebastian.droege@collabora.co.uk>");
+
+  gst_type_mark_as_plugin_api (GST_TYPE_MXF_MUX_PAD);
 }
 
 static void
diff --git a/gst/netsim/gstnetsim.c b/gst/netsim/gstnetsim.c
index 39368ed15d..af436e371d 100644
--- a/gst/netsim/gstnetsim.c
+++ b/gst/netsim/gstnetsim.c
@@ -756,6 +756,8 @@ gst_net_sim_class_init (GstNetSimClass * klass)
           G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS));
 
   GST_DEBUG_CATEGORY_INIT (netsim_debug, "netsim", 0, "Network simulator");
+
+  gst_type_mark_as_plugin_api (distribution_get_type ());
 }
 
 static gboolean
diff --git a/gst/rawparse/gstaudioparse.c b/gst/rawparse/gstaudioparse.c
index e542d46d1a..3f1c4ebd0b 100644
--- a/gst/rawparse/gstaudioparse.c
+++ b/gst/rawparse/gstaudioparse.c
@@ -184,6 +184,8 @@ gst_audio_parse_class_init (GstAudioParseClass * klass)
 
   GST_DEBUG_CATEGORY_INIT (gst_audio_parse_debug, "audioparse", 0,
       "audioparse element");
+
+  gst_type_mark_as_plugin_api (GST_AUDIO_PARSE_FORMAT);
 }
 
 static void
diff --git a/gst/rist/gstristsink.c b/gst/rist/gstristsink.c
index 69bda4f3d7..4440e98563 100644
--- a/gst/rist/gstristsink.c
+++ b/gst/rist/gstristsink.c
@@ -1422,4 +1422,6 @@ gst_rist_sink_class_init (GstRistSinkClass * klass)
           "Sequence Number Extension",
           "Add sequence number extension to packets.", FALSE,
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT));
+
+  gst_type_mark_as_plugin_api (gst_rist_bonding_method_get_type ());
 }
diff --git a/gst/rtmp2/gstrtmp2.c b/gst/rtmp2/gstrtmp2.c
index 22c6399cf3..999b265085 100644
--- a/gst/rtmp2/gstrtmp2.c
+++ b/gst/rtmp2/gstrtmp2.c
@@ -26,6 +26,8 @@
 #include "gstrtmp2src.h"
 #include "gstrtmp2sink.h"
 
+#include "rtmp/rtmpclient.h"
+
 static gboolean
 plugin_init (GstPlugin * plugin)
 {
@@ -34,6 +36,9 @@ plugin_init (GstPlugin * plugin)
   gst_element_register (plugin, "rtmp2sink", GST_RANK_PRIMARY + 1,
       GST_TYPE_RTMP2_SINK);
 
+  gst_type_mark_as_plugin_api (GST_TYPE_RTMP_SCHEME);
+  gst_type_mark_as_plugin_api (GST_TYPE_RTMP_AUTHMOD);
+
   return TRUE;
 }
 
diff --git a/gst/timecode/gstavwait.c b/gst/timecode/gstavwait.c
index aa9b215a35..59bf7f2c0b 100644
--- a/gst/timecode/gstavwait.c
+++ b/gst/timecode/gstavwait.c
@@ -230,6 +230,8 @@ gst_avwait_class_init (GstAvWaitClass * klass)
       &video_src_template);
   gst_element_class_add_static_pad_template (gstelement_class,
       &video_sink_template);
+
+  gst_type_mark_as_plugin_api (GST_TYPE_AVWAIT_MODE);
 }
 
 static void
diff --git a/gst/timecode/gsttimecodestamper.c b/gst/timecode/gsttimecodestamper.c
index 27dbf3a91c..4ac015f231 100644
--- a/gst/timecode/gsttimecodestamper.c
+++ b/gst/timecode/gsttimecodestamper.c
@@ -331,6 +331,9 @@ gst_timecodestamper_class_init (GstTimeCodeStamperClass * klass)
 
   trans_class->transform_ip =
       GST_DEBUG_FUNCPTR (gst_timecodestamper_transform_ip);
+
+  gst_type_mark_as_plugin_api (GST_TYPE_TIME_CODE_STAMPER_SOURCE);
+  gst_type_mark_as_plugin_api (GST_TYPE_TIME_CODE_STAMPER_SET);
 }
 
 static void
diff --git a/gst/yadif/gstyadif.c b/gst/yadif/gstyadif.c
index 0056f78459..e649154185 100644
--- a/gst/yadif/gstyadif.c
+++ b/gst/yadif/gstyadif.c
@@ -160,6 +160,7 @@ gst_yadif_class_init (GstYadifClass * klass)
           DEFAULT_MODE,
           G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS));
 
+  gst_type_mark_as_plugin_api (GST_TYPE_DEINTERLACE_MODES);
 }
 
 static void
diff --git a/sys/decklink/gstdecklink.cpp b/sys/decklink/gstdecklink.cpp
index e1f3642d41..1c67cb268a 100644
--- a/sys/decklink/gstdecklink.cpp
+++ b/sys/decklink/gstdecklink.cpp
@@ -2055,6 +2055,15 @@ plugin_init (GstPlugin * plugin)
   gst_device_provider_register (plugin, "decklinkdeviceprovider",
       GST_RANK_PRIMARY, GST_TYPE_DECKLINK_DEVICE_PROVIDER);
 
+  gst_type_mark_as_plugin_api (GST_TYPE_DECKLINK_AUDIO_CHANNELS);
+  gst_type_mark_as_plugin_api (GST_TYPE_DECKLINK_AUDIO_CONNECTION);
+  gst_type_mark_as_plugin_api (GST_TYPE_DECKLINK_DUPLEX_MODE);
+  gst_type_mark_as_plugin_api (GST_TYPE_DECKLINK_KEYER_MODE);
+  gst_type_mark_as_plugin_api (GST_TYPE_DECKLINK_MODE);
+  gst_type_mark_as_plugin_api (GST_TYPE_DECKLINK_TIMECODE_FORMAT);
+  gst_type_mark_as_plugin_api (GST_TYPE_DECKLINK_VIDEO_FORMAT);
+  gst_type_mark_as_plugin_api (GST_TYPE_DECKLINK_CONNECTION);
+
   return TRUE;
 }
 
diff --git a/sys/dvb/gstdvbsrc.c b/sys/dvb/gstdvbsrc.c
index 6379ac67e4..01da4966a2 100644
--- a/sys/dvb/gstdvbsrc.c
+++ b/sys/dvb/gstdvbsrc.c
@@ -1012,6 +1012,17 @@ gst_dvbsrc_class_init (GstDvbSrcClass * klass)
       G_STRUCT_OFFSET (GstDvbSrcClass, do_tune), NULL, NULL, NULL,
       G_TYPE_NONE, 0);
 
+  gst_type_mark_as_plugin_api (GST_TYPE_DVBSRC_BANDWIDTH);
+  gst_type_mark_as_plugin_api (GST_TYPE_DVBSRC_CODE_RATE);
+  gst_type_mark_as_plugin_api (GST_TYPE_DVBSRC_DELSYS);
+  gst_type_mark_as_plugin_api (GST_TYPE_DVBSRC_GUARD);
+  gst_type_mark_as_plugin_api (GST_TYPE_DVBSRC_HIERARCHY);
+  gst_type_mark_as_plugin_api (GST_TYPE_INTERLEAVING);
+  gst_type_mark_as_plugin_api (GST_TYPE_DVBSRC_INVERSION);
+  gst_type_mark_as_plugin_api (GST_TYPE_DVBSRC_MODULATION);
+  gst_type_mark_as_plugin_api (GST_TYPE_DVBSRC_PILOT);
+  gst_type_mark_as_plugin_api (GST_TYPE_DVBSRC_ROLLOFF);
+  gst_type_mark_as_plugin_api (GST_TYPE_DVBSRC_TRANSMISSION_MODE);
 }
 
 /* initialize the new element
diff --git a/sys/uvch264/gstuvch264_src.c b/sys/uvch264/gstuvch264_src.c
index e370dc6412..c5708ef486 100644
--- a/sys/uvch264/gstuvch264_src.c
+++ b/sys/uvch264/gstuvch264_src.c
@@ -459,6 +459,11 @@ gst_uvc_h264_src_class_init (GstUvcH264SrcClass * klass)
       G_CALLBACK (gst_uvc_h264_src_get_int_setting), NULL, NULL, NULL,
       G_TYPE_BOOLEAN, 4, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_POINTER,
       G_TYPE_POINTER, 0);
+
+  gst_type_mark_as_plugin_api (UVC_H264_ENTROPY_TYPE);
+  gst_type_mark_as_plugin_api (UVC_H264_RATECONTROL_TYPE);
+  gst_type_mark_as_plugin_api (UVC_H264_SLICEMODE_TYPE);
+  gst_type_mark_as_plugin_api (UVC_H264_USAGETYPE_TYPE);
 }
 
 static void