diff --git a/ext/cdparanoia/gstcdparanoiasrc.c b/ext/cdparanoia/gstcdparanoiasrc.c
index dfdabdbf34..42b634732f 100644
--- a/ext/cdparanoia/gstcdparanoiasrc.c
+++ b/ext/cdparanoia/gstcdparanoiasrc.c
@@ -194,6 +194,8 @@ gst_cd_paranoia_src_class_init (GstCdParanoiaSrcClass * klass)
       G_SIGNAL_RUN_LAST,
       G_STRUCT_OFFSET (GstCdParanoiaSrcClass, uncorrected_error),
       NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_INT);
+
+  gst_type_mark_as_plugin_api (GST_TYPE_CD_PARANOIA_MODE);
 }
 
 static gboolean
diff --git a/ext/gl/gstglalpha.c b/ext/gl/gstglalpha.c
index 5975a00bd1..e994391e13 100644
--- a/ext/gl/gstglalpha.c
+++ b/ext/gl/gstglalpha.c
@@ -545,6 +545,8 @@ gst_gl_alpha_class_init (GstGLAlphaClass * klass)
 
   filter_class->filter_texture =
       GST_DEBUG_FUNCPTR (gst_gl_alpha_filter_texture);
+
+  gst_type_mark_as_plugin_api (GST_TYPE_GL_ALPHA_METHOD);
 }
 
 static void
diff --git a/ext/gl/gstgldeinterlace.c b/ext/gl/gstgldeinterlace.c
index b8ffa3d101..dfe3644897 100644
--- a/ext/gl/gstgldeinterlace.c
+++ b/ext/gl/gstgldeinterlace.c
@@ -269,6 +269,8 @@ gst_gl_deinterlace_class_init (GstGLDeinterlaceClass * klass)
 
   GST_GL_BASE_FILTER_CLASS (klass)->supported_gl_api =
       GST_GL_API_OPENGL | GST_GL_API_GLES2 | GST_GL_API_OPENGL3;
+
+  gst_type_mark_as_plugin_api (GST_TYPE_GL_DEINTERLACE_METHODS);
 }
 
 static void
diff --git a/ext/gl/gstgleffects.c b/ext/gl/gstgleffects.c
index 02c5ca2c15..f26880b013 100644
--- a/ext/gl/gstgleffects.c
+++ b/ext/gl/gstgleffects.c
@@ -346,6 +346,8 @@ gst_gl_effects_class_init (GstGLEffectsClass * klass)
 
   GST_GL_BASE_FILTER_CLASS (klass)->supported_gl_api =
       GST_GL_API_OPENGL | GST_GL_API_GLES2 | GST_GL_API_OPENGL3;
+
+  gst_type_mark_as_plugin_api (GST_TYPE_GL_EFFECTS_EFFECT);
 }
 
 static void
diff --git a/ext/gl/gstglimagesink.c b/ext/gl/gstglimagesink.c
index 7360b1a82c..03b4f3b7b3 100644
--- a/ext/gl/gstglimagesink.c
+++ b/ext/gl/gstglimagesink.c
@@ -297,6 +297,8 @@ gst_gl_image_sink_bin_class_init (GstGLImageSinkBinClass * klass)
       g_signal_new ("client-reshape", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, G_TYPE_BOOLEAN, 3,
       GST_TYPE_GL_CONTEXT, G_TYPE_UINT, G_TYPE_UINT);
+
+  gst_type_mark_as_plugin_api (GST_TYPE_GL_ROTATE_METHOD);
 }
 
 #define GST_GLIMAGE_SINK_GET_LOCK(glsink) \
diff --git a/ext/gl/gstglmixer.c b/ext/gl/gstglmixer.c
index 49690b0036..ad25736277 100644
--- a/ext/gl/gstglmixer.c
+++ b/ext/gl/gstglmixer.c
@@ -437,6 +437,8 @@ gst_gl_mixer_class_init (GstGLMixerClass * klass)
   g_type_class_ref (GST_TYPE_GL_MIXER_PAD);
 
   klass->set_caps = NULL;
+
+  gst_type_mark_as_plugin_api (GST_TYPE_GL_MIXER_PAD);
 }
 
 static void
diff --git a/ext/gl/gstglmixerbin.c b/ext/gl/gstglmixerbin.c
index a5f155fdc9..db6255c6e1 100644
--- a/ext/gl/gstglmixerbin.c
+++ b/ext/gl/gstglmixerbin.c
@@ -41,6 +41,7 @@ typedef enum
   GST_GL_MIXER_BIN_START_TIME_SELECTION_SET
 } GstGLMixerBinStartTimeSelection;
 
+#define GST_TYPE_GL_MIXER_BIN_START_TIME_SELECTION (gst_gl_mixer_bin_start_time_selection_get_type())
 static GType
 gst_gl_mixer_bin_start_time_selection_get_type (void)
 {
@@ -195,7 +196,7 @@ gst_gl_mixer_bin_class_init (GstGLMixerBinClass * klass)
   g_object_class_install_property (gobject_class, PROP_START_TIME_SELECTION,
       g_param_spec_enum ("start-time-selection", "Start Time Selection",
           "Decides which start time is output",
-          gst_gl_mixer_bin_start_time_selection_get_type (),
+          GST_TYPE_GL_MIXER_BIN_START_TIME_SELECTION,
           DEFAULT_START_TIME_SELECTION,
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
@@ -234,6 +235,8 @@ gst_gl_mixer_bin_class_init (GstGLMixerBinClass * klass)
   gst_element_class_set_metadata (element_class, "OpenGL video_mixer empty bin",
       "Bin/Filter/Effect/Video/Mixer", "OpenGL video_mixer empty bin",
       "Matthew Waters <matthew@centricular.com>");
+
+  gst_type_mark_as_plugin_api (GST_TYPE_GL_MIXER_BIN_START_TIME_SELECTION);
 }
 
 static void
diff --git a/ext/gl/gstglstereomix.c b/ext/gl/gstglstereomix.c
index 2a6682707e..2c8a3bb31d 100644
--- a/ext/gl/gstglstereomix.c
+++ b/ext/gl/gstglstereomix.c
@@ -210,6 +210,9 @@ gst_gl_stereo_mix_class_init (GstGLStereoMixClass * klass)
 
   base_mix_class->supported_gl_api =
       GST_GL_API_GLES2 | GST_GL_API_OPENGL | GST_GL_API_OPENGL3;
+
+  gst_type_mark_as_plugin_api (GST_TYPE_GL_STEREO_DOWNMIX);
+  gst_type_mark_as_plugin_api (GST_TYPE_GL_STEREO_MIX_PAD);
 }
 
 static void
diff --git a/ext/gl/gstgltestsrc.c b/ext/gl/gstgltestsrc.c
index 1148a44d4f..a5b0b60bcb 100644
--- a/ext/gl/gstgltestsrc.c
+++ b/ext/gl/gstgltestsrc.c
@@ -162,6 +162,8 @@ gst_gl_test_src_class_init (GstGLTestSrcClass * klass)
   gstglbasesrc_class->gl_start = gst_gl_test_src_gl_start;
   gstglbasesrc_class->gl_stop = gst_gl_test_src_gl_stop;
   gstglbasesrc_class->fill_gl_memory = gst_gl_test_src_fill_memory;
+
+  gst_type_mark_as_plugin_api (GST_TYPE_GL_TEST_SRC_PATTERN);
 }
 
 static void
diff --git a/ext/gl/gstglvideoflip.c b/ext/gl/gstglvideoflip.c
index d5bb2ac57d..37b041115a 100644
--- a/ext/gl/gstglvideoflip.c
+++ b/ext/gl/gstglvideoflip.c
@@ -156,6 +156,8 @@ gst_gl_video_flip_class_init (GstGLVideoFlipClass * klass)
   gst_element_class_set_metadata (element_class, "OpenGL video flip filter",
       "Filter/Effect/Video", "Flip video on the GPU",
       "Matthew Waters <matthew@centricular.com>");
+
+  gst_type_mark_as_plugin_api (GST_TYPE_GL_VIDEO_FLIP_METHOD);
 }
 
 static void
diff --git a/ext/gl/gstglvideomixer.c b/ext/gl/gstglvideomixer.c
index 551e20634e..b12039cd7a 100644
--- a/ext/gl/gstglvideomixer.c
+++ b/ext/gl/gstglvideomixer.c
@@ -932,6 +932,11 @@ gst_gl_video_mixer_class_init (GstGLVideoMixerClass * klass)
 
   GST_GL_BASE_MIXER_CLASS (klass)->supported_gl_api =
       GST_GL_API_OPENGL | GST_GL_API_OPENGL3 | GST_GL_API_GLES2;
+
+  gst_type_mark_as_plugin_api (GST_TYPE_GL_VIDEO_MIXER_BACKGROUND);
+  gst_type_mark_as_plugin_api (GST_TYPE_GL_VIDEO_MIXER_PAD);
+  gst_type_mark_as_plugin_api (GST_TYPE_GL_VIDEO_MIXER_BLEND_EQUATION);
+  gst_type_mark_as_plugin_api (GST_TYPE_GL_VIDEO_MIXER_BLEND_FUNCTION);
 }
 
 static void
diff --git a/ext/opus/gstopusenc.c b/ext/opus/gstopusenc.c
index e3ec858dc1..78128b3791 100644
--- a/ext/opus/gstopusenc.c
+++ b/ext/opus/gstopusenc.c
@@ -344,6 +344,11 @@ gst_opus_enc_class_init (GstOpusEncClass * klass)
   gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_opus_enc_finalize);
 
   GST_DEBUG_CATEGORY_INIT (opusenc_debug, "opusenc", 0, "Opus encoder");
+
+  gst_type_mark_as_plugin_api (GST_OPUS_ENC_TYPE_AUDIO_TYPE);
+  gst_type_mark_as_plugin_api (GST_OPUS_ENC_TYPE_BANDWIDTH);
+  gst_type_mark_as_plugin_api (GST_OPUS_ENC_TYPE_BITRATE_TYPE);
+  gst_type_mark_as_plugin_api (GST_OPUS_ENC_TYPE_FRAME_SIZE);
 }
 
 static void
diff --git a/ext/pango/gstbasetextoverlay.c b/ext/pango/gstbasetextoverlay.c
index 4307654683..2595105794 100644
--- a/ext/pango/gstbasetextoverlay.c
+++ b/ext/pango/gstbasetextoverlay.c
@@ -630,6 +630,12 @@ gst_base_text_overlay_class_init (GstBaseTextOverlayClass * klass)
           "Pixel aspect ratio of video scale to compensate for in user scale-mode",
           1, 100, 100, 1, DEFAULT_PROP_SCALE_PAR_N, DEFAULT_PROP_SCALE_PAR_D,
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+  gst_type_mark_as_plugin_api (GST_TYPE_BASE_TEXT_OVERLAY_HALIGN);
+  gst_type_mark_as_plugin_api (GST_TYPE_BASE_TEXT_OVERLAY_VALIGN);
+  gst_type_mark_as_plugin_api (GST_TYPE_BASE_TEXT_OVERLAY_LINE_ALIGN);
+  gst_type_mark_as_plugin_api (GST_TYPE_BASE_TEXT_OVERLAY_SCALE_MODE);
+  gst_type_mark_as_plugin_api (GST_TYPE_BASE_TEXT_OVERLAY_WRAP_MODE);
 }
 
 static void
diff --git a/ext/pango/gsttextrender.c b/ext/pango/gsttextrender.c
index 7f3d53927e..bbf6a53968 100644
--- a/ext/pango/gsttextrender.c
+++ b/ext/pango/gsttextrender.c
@@ -226,6 +226,10 @@ gst_text_render_class_init (GstTextRenderClass * klass)
           "Alignment of text lines relative to each other.",
           GST_TYPE_TEXT_RENDER_LINE_ALIGN, DEFAULT_PROP_LINE_ALIGNMENT,
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+  gst_type_mark_as_plugin_api (GST_TYPE_TEXT_RENDER_HALIGN);
+  gst_type_mark_as_plugin_api (GST_TYPE_TEXT_RENDER_VALIGN);
+  gst_type_mark_as_plugin_api (GST_TYPE_TEXT_RENDER_LINE_ALIGN);
 }
 
 static void
diff --git a/ext/pango/gsttimeoverlay.c b/ext/pango/gsttimeoverlay.c
index 75e1f5a7ba..172484eaf4 100644
--- a/ext/pango/gsttimeoverlay.c
+++ b/ext/pango/gsttimeoverlay.c
@@ -237,6 +237,8 @@ gst_time_overlay_class_init (GstTimeOverlayClass * klass)
           "Whether to display times, counted from datetime-epoch, as dates",
           DEFAULT_SHOW_TIMES_AS_DATES,
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+  gst_type_mark_as_plugin_api (GST_TYPE_TIME_OVERLAY_TIME_LINE);
 }
 
 static void
diff --git a/ext/theora/gsttheoraenc.c b/ext/theora/gsttheoraenc.c
index 85350da8cc..df6dbe6189 100644
--- a/ext/theora/gsttheoraenc.c
+++ b/ext/theora/gsttheoraenc.c
@@ -301,6 +301,8 @@ gst_theora_enc_class_init (GstTheoraEncClass * klass)
           (GParamFlags) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
   GST_DEBUG_CATEGORY_INIT (theoraenc_debug, "theoraenc", 0, "Theora encoder");
+
+  gst_type_mark_as_plugin_api (GST_TYPE_MULTIPASS_MODE);
 }
 
 static void
diff --git a/gst/audiomixer/gstaudiointerleave.c b/gst/audiomixer/gstaudiointerleave.c
index 021ba3282d..f45ed2b4ca 100644
--- a/gst/audiomixer/gstaudiointerleave.c
+++ b/gst/audiomixer/gstaudiointerleave.c
@@ -620,6 +620,8 @@ gst_audio_interleave_class_init (GstAudioInterleaveClass * klass)
           "Channel positions from input",
           "Take channel positions from the input", TRUE,
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+  gst_type_mark_as_plugin_api (GST_TYPE_AUDIO_INTERLEAVE_PAD);
 }
 
 static void
diff --git a/gst/audiomixer/gstaudiomixer.c b/gst/audiomixer/gstaudiomixer.c
index a975e6c542..f0a5b8292b 100644
--- a/gst/audiomixer/gstaudiomixer.c
+++ b/gst/audiomixer/gstaudiomixer.c
@@ -238,6 +238,8 @@ gst_audiomixer_class_init (GstAudioMixerClass * klass)
       GST_DEBUG_FUNCPTR (gst_audiomixer_release_pad);
 
   aagg_class->aggregate_one_buffer = gst_audiomixer_aggregate_one_buffer;
+
+  gst_type_mark_as_plugin_api (GST_TYPE_AUDIO_MIXER_PAD);
 }
 
 static void
diff --git a/gst/audioresample/gstaudioresample.c b/gst/audioresample/gstaudioresample.c
index bfb768feed..f970d34e35 100644
--- a/gst/audioresample/gstaudioresample.c
+++ b/gst/audioresample/gstaudioresample.c
@@ -210,6 +210,10 @@ gst_audio_resample_class_init (GstAudioResampleClass * klass)
       GST_DEBUG_FUNCPTR (gst_audio_resample_submit_input_buffer);
 
   GST_BASE_TRANSFORM_CLASS (klass)->passthrough_on_same_caps = TRUE;
+
+  gst_type_mark_as_plugin_api (GST_TYPE_AUDIO_RESAMPLER_METHOD);
+  gst_type_mark_as_plugin_api (GST_TYPE_AUDIO_RESAMPLER_FILTER_INTERPOLATION);
+  gst_type_mark_as_plugin_api (GST_TYPE_AUDIO_RESAMPLER_FILTER_MODE);
 }
 
 static void
diff --git a/gst/audiotestsrc/gstaudiotestsrc.c b/gst/audiotestsrc/gstaudiotestsrc.c
index 00645eb209..0a5de0c3b0 100644
--- a/gst/audiotestsrc/gstaudiotestsrc.c
+++ b/gst/audiotestsrc/gstaudiotestsrc.c
@@ -307,6 +307,8 @@ gst_audio_test_src_class_init (GstAudioTestSrcClass * klass)
   gstbasesrc_class->start = GST_DEBUG_FUNCPTR (gst_audio_test_src_start);
   gstbasesrc_class->stop = GST_DEBUG_FUNCPTR (gst_audio_test_src_stop);
   gstbasesrc_class->fill = GST_DEBUG_FUNCPTR (gst_audio_test_src_fill);
+
+  gst_type_mark_as_plugin_api (GST_TYPE_AUDIO_TEST_SRC_WAVE);
 }
 
 static void
diff --git a/gst/compositor/compositor.c b/gst/compositor/compositor.c
index 44be5dd710..f717e986a5 100644
--- a/gst/compositor/compositor.c
+++ b/gst/compositor/compositor.c
@@ -142,6 +142,29 @@ gst_compositor_operator_get_type (void)
   return compositor_operator_type;
 }
 
+#define GST_TYPE_COMPOSITOR_BACKGROUND (gst_compositor_background_get_type())
+static GType
+gst_compositor_background_get_type (void)
+{
+  static GType compositor_background_type = 0;
+
+  static const GEnumValue compositor_background[] = {
+    {COMPOSITOR_BACKGROUND_CHECKER, "Checker pattern", "checker"},
+    {COMPOSITOR_BACKGROUND_BLACK, "Black", "black"},
+    {COMPOSITOR_BACKGROUND_WHITE, "White", "white"},
+    {COMPOSITOR_BACKGROUND_TRANSPARENT,
+        "Transparent Background to enable further compositing", "transparent"},
+    {0, NULL, NULL},
+  };
+
+  if (!compositor_background_type) {
+    compositor_background_type =
+        g_enum_register_static ("GstCompositorBackground",
+        compositor_background);
+  }
+  return compositor_background_type;
+}
+
 #define DEFAULT_PAD_XPOS   0
 #define DEFAULT_PAD_YPOS   0
 #define DEFAULT_PAD_WIDTH  0
@@ -522,29 +545,6 @@ enum
   PROP_BACKGROUND,
 };
 
-#define GST_TYPE_COMPOSITOR_BACKGROUND (gst_compositor_background_get_type())
-static GType
-gst_compositor_background_get_type (void)
-{
-  static GType compositor_background_type = 0;
-
-  static const GEnumValue compositor_background[] = {
-    {COMPOSITOR_BACKGROUND_CHECKER, "Checker pattern", "checker"},
-    {COMPOSITOR_BACKGROUND_BLACK, "Black", "black"},
-    {COMPOSITOR_BACKGROUND_WHITE, "White", "white"},
-    {COMPOSITOR_BACKGROUND_TRANSPARENT,
-        "Transparent Background to enable further compositing", "transparent"},
-    {0, NULL, NULL},
-  };
-
-  if (!compositor_background_type) {
-    compositor_background_type =
-        g_enum_register_static ("GstCompositorBackground",
-        compositor_background);
-  }
-  return compositor_background_type;
-}
-
 static void
 gst_compositor_get_property (GObject * object,
     guint prop_id, GValue * value, GParamSpec * pspec)
@@ -1116,6 +1116,10 @@ gst_compositor_class_init (GstCompositorClass * klass)
       "Filter/Editor/Video/Compositor",
       "Composite multiple video streams", "Wim Taymans <wim@fluendo.com>, "
       "Sebastian Dröge <sebastian.droege@collabora.co.uk>");
+
+  gst_type_mark_as_plugin_api (GST_TYPE_COMPOSITOR_PAD);
+  gst_type_mark_as_plugin_api (GST_TYPE_COMPOSITOR_OPERATOR);
+  gst_type_mark_as_plugin_api (GST_TYPE_COMPOSITOR_BACKGROUND);
 }
 
 static void
diff --git a/gst/encoding/gstencodebin.c b/gst/encoding/gstencodebin.c
index 62f7869e09..01fcdd8425 100644
--- a/gst/encoding/gstencodebin.c
+++ b/gst/encoding/gstencodebin.c
@@ -445,6 +445,8 @@ gst_encode_bin_class_init (GstEncodeBinClass * klass)
       "Generic/Bin/Encoder",
       "Convenience encoding/muxing element",
       "Edward Hervey <edward.hervey@collabora.co.uk>");
+
+  gst_type_mark_as_plugin_api (GST_TYPE_ENCODEBIN_FLAGS);
 }
 
 static void
diff --git a/gst/playback/gstdecodebin2.c b/gst/playback/gstdecodebin2.c
index 2d8314ffd2..c578d0e4a0 100644
--- a/gst/playback/gstdecodebin2.c
+++ b/gst/playback/gstdecodebin2.c
@@ -1044,6 +1044,8 @@ gst_decode_bin_class_init (GstDecodeBinClass * klass)
       GST_DEBUG_FUNCPTR (gst_decode_bin_remove_element);
 
   g_type_class_ref (GST_TYPE_DECODE_PAD);
+
+  gst_type_mark_as_plugin_api (GST_TYPE_AUTOPLUG_SELECT_RESULT);
 }
 
 /* Must be called with factories lock! */
diff --git a/gst/playback/gstplaybin2.c b/gst/playback/gstplaybin2.c
index abdacb6733..c73929cda6 100644
--- a/gst/playback/gstplaybin2.c
+++ b/gst/playback/gstplaybin2.c
@@ -1341,6 +1341,8 @@ gst_play_bin_class_init (GstPlayBinClass * klass)
       GST_DEBUG_FUNCPTR (gst_play_bin_handle_message);
   gstbin_klass->deep_element_added =
       GST_DEBUG_FUNCPTR (gst_play_bin_deep_element_added);
+
+  gst_type_mark_as_plugin_api (GST_TYPE_PLAY_FLAGS);
 }
 
 static void
diff --git a/gst/playback/gstplaysink.c b/gst/playback/gstplaysink.c
index ad2e27d12a..97be4134a8 100644
--- a/gst/playback/gstplaysink.c
+++ b/gst/playback/gstplaysink.c
@@ -666,6 +666,8 @@ gst_play_sink_class_init (GstPlaySinkClass * klass)
 
   g_type_class_ref (GST_TYPE_STREAM_SYNCHRONIZER);
   g_type_class_ref (GST_TYPE_COLOR_BALANCE_CHANNEL);
+
+  gst_type_mark_as_plugin_api (GST_TYPE_PLAY_SINK_SEND_EVENT_MODE);
 }
 
 static void
diff --git a/gst/rawparse/gstrawaudioparse.c b/gst/rawparse/gstrawaudioparse.c
index fe77e2d982..ca45e02a9b 100644
--- a/gst/rawparse/gstrawaudioparse.c
+++ b/gst/rawparse/gstrawaudioparse.c
@@ -225,7 +225,7 @@ gst_raw_audio_parse_class_init (GstRawAudioParseClass * klass)
       g_param_spec_enum ("format",
           "Format",
           "Format of the raw audio stream",
-          gst_raw_audio_parse_format_get_type (),
+          GST_TYPE_RAW_AUDIO_PARSE_FORMAT,
           GST_RAW_AUDIO_PARSE_FORMAT_PCM,
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)
       );
@@ -280,6 +280,8 @@ gst_raw_audio_parse_class_init (GstRawAudioParseClass * klass)
       "Codec/Parser/Audio",
       "Converts unformatted data streams into timestamped raw audio frames",
       "Carlos Rafael Giani <dv@pseudoterminal.org>");
+
+  gst_type_mark_as_plugin_api (GST_TYPE_RAW_AUDIO_PARSE_FORMAT);
 }
 
 static void
diff --git a/gst/rawparse/gstrawaudioparse.h b/gst/rawparse/gstrawaudioparse.h
index 9538408c0a..c0ef00fd50 100644
--- a/gst/rawparse/gstrawaudioparse.h
+++ b/gst/rawparse/gstrawaudioparse.h
@@ -101,6 +101,7 @@ struct _GstRawAudioParse
   GstRawAudioParseConfig *current_config;
 };
 
+#define GST_TYPE_RAW_AUDIO_PARSE_FORMAT (gst_raw_audio_parse_format_get_type())
 GType gst_raw_audio_parse_format_get_type (void);
 
 G_END_DECLS
diff --git a/gst/tcp/gstmultihandlesink.c b/gst/tcp/gstmultihandlesink.c
index d595567c0d..93bbc6895d 100644
--- a/gst/tcp/gstmultihandlesink.c
+++ b/gst/tcp/gstmultihandlesink.c
@@ -484,6 +484,10 @@ gst_multi_handle_sink_class_init (GstMultiHandleSinkClass * klass)
 
   GST_DEBUG_CATEGORY_INIT (multihandlesink_debug, "multihandlesink", 0,
       "Multi socket sink");
+
+  gst_type_mark_as_plugin_api (GST_TYPE_RECOVER_POLICY);
+  gst_type_mark_as_plugin_api (GST_TYPE_SYNC_METHOD);
+  gst_type_mark_as_plugin_api (GST_TYPE_CLIENT_STATUS);
 }
 
 static void
diff --git a/gst/videoscale/gstvideoscale.c b/gst/videoscale/gstvideoscale.c
index d7dd68a68d..97c7f90d06 100644
--- a/gst/videoscale/gstvideoscale.c
+++ b/gst/videoscale/gstvideoscale.c
@@ -297,6 +297,8 @@ gst_video_scale_class_init (GstVideoScaleClass * klass)
 
   _size_quark = g_quark_from_static_string (GST_META_TAG_VIDEO_SIZE_STR);
   _scale_quark = gst_video_meta_transform_scale_get_quark ();
+
+  gst_type_mark_as_plugin_api (GST_TYPE_VIDEO_SCALE_METHOD);
 }
 
 static void
diff --git a/gst/videotestsrc/gstvideotestsrc.c b/gst/videotestsrc/gstvideotestsrc.c
index 4903581e55..ca2afbad37 100644
--- a/gst/videotestsrc/gstvideotestsrc.c
+++ b/gst/videotestsrc/gstvideotestsrc.c
@@ -376,6 +376,10 @@ gst_video_test_src_class_init (GstVideoTestSrcClass * klass)
   gstbasesrc_class->decide_allocation = gst_video_test_src_decide_allocation;
 
   gstpushsrc_class->fill = gst_video_test_src_fill;
+
+  gst_type_mark_as_plugin_api (GST_TYPE_VIDEO_TEST_SRC_ANIMATION_MODE);
+  gst_type_mark_as_plugin_api (GST_TYPE_VIDEO_TEST_SRC_MOTION_TYPE);
+  gst_type_mark_as_plugin_api (GST_TYPE_VIDEO_TEST_SRC_PATTERN);
 }
 
 static void