diff --git a/subprojects/gst-plugins-bad/ext/curl/gstcurlelement.c b/subprojects/gst-plugins-bad/ext/curl/gstcurlelement.c
index 01078c4fb8..2a2d3a4f11 100644
--- a/subprojects/gst-plugins-bad/ext/curl/gstcurlelement.c
+++ b/subprojects/gst-plugins-bad/ext/curl/gstcurlelement.c
@@ -20,7 +20,7 @@
 #include <config.h>
 #endif
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #include "gstcurlelements.h"
 
diff --git a/subprojects/gst-plugins-bad/ext/curl/gstcurlhttpsrc.c b/subprojects/gst-plugins-bad/ext/curl/gstcurlhttpsrc.c
index a8de12e822..781a67f960 100644
--- a/subprojects/gst-plugins-bad/ext/curl/gstcurlhttpsrc.c
+++ b/subprojects/gst-plugins-bad/ext/curl/gstcurlhttpsrc.c
@@ -116,7 +116,7 @@
 #include <config.h>
 #endif
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #include "gstcurlelements.h"
 #include "gstcurlhttpsrc.h"
diff --git a/subprojects/gst-plugins-bad/ext/dash/gstdashdemux.c b/subprojects/gst-plugins-bad/ext/dash/gstdashdemux.c
index a71e72dbcf..f26067d97d 100644
--- a/subprojects/gst-plugins-bad/ext/dash/gstdashdemux.c
+++ b/subprojects/gst-plugins-bad/ext/dash/gstdashdemux.c
@@ -285,7 +285,7 @@
 #include <gst/base/gsttypefindhelper.h>
 #include <gst/tag/tag.h>
 #include <gst/net/gstnet.h>
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 #include "gstdashdemux.h"
 #include "gstdash_debug.h"
 
diff --git a/subprojects/gst-plugins-bad/ext/ladspa/gstladspa.c b/subprojects/gst-plugins-bad/ext/ladspa/gstladspa.c
index d19297c2bd..4e5e8321fc 100644
--- a/subprojects/gst-plugins-bad/ext/ladspa/gstladspa.c
+++ b/subprojects/gst-plugins-bad/ext/ladspa/gstladspa.c
@@ -115,7 +115,7 @@
 #include "gstladspafilter.h"
 #include "gstladspasource.h"
 #include "gstladspasink.h"
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #include <string.h>
 #include <ladspa.h>
diff --git a/subprojects/gst-plugins-bad/ext/openal/gstopenal.c b/subprojects/gst-plugins-bad/ext/openal/gstopenal.c
index d266892134..5ad55a720e 100644
--- a/subprojects/gst-plugins-bad/ext/openal/gstopenal.c
+++ b/subprojects/gst-plugins-bad/ext/openal/gstopenal.c
@@ -28,7 +28,7 @@
 
 #include "gstopenalelements.h"
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 
 static gboolean
diff --git a/subprojects/gst-plugins-bad/ext/openal/gstopenalelement.c b/subprojects/gst-plugins-bad/ext/openal/gstopenalelement.c
index 3f85f8d297..6ecd7a8606 100644
--- a/subprojects/gst-plugins-bad/ext/openal/gstopenalelement.c
+++ b/subprojects/gst-plugins-bad/ext/openal/gstopenalelement.c
@@ -30,7 +30,7 @@
 #include "gstopenalsink.h"
 #include "gstopenalsrc.h"
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY (openal_debug);
 
diff --git a/subprojects/gst-plugins-bad/ext/opencv/gsttemplatematch.cpp b/subprojects/gst-plugins-bad/ext/opencv/gsttemplatematch.cpp
index c3096a480a..7caef3cefd 100644
--- a/subprojects/gst-plugins-bad/ext/opencv/gsttemplatematch.cpp
+++ b/subprojects/gst-plugins-bad/ext/opencv/gsttemplatematch.cpp
@@ -60,7 +60,7 @@
 #  include <config.h>
 #endif
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include "gsttemplatematch.h"
 #include <opencv2/imgproc.hpp>
 #include <opencv2/imgcodecs.hpp>
diff --git a/subprojects/gst-plugins-bad/ext/resindvd/resindvdbin.c b/subprojects/gst-plugins-bad/ext/resindvd/resindvdbin.c
index 9fe54f9c9d..75ebd7122a 100644
--- a/subprojects/gst-plugins-bad/ext/resindvd/resindvdbin.c
+++ b/subprojects/gst-plugins-bad/ext/resindvd/resindvdbin.c
@@ -28,7 +28,7 @@
 #include <gst/pbutils/missing-plugins.h>
 #include <gst/video/video.h>
 #include <gst/audio/audio.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #include "resindvdbin.h"
 #include "resindvdsrc.h"
diff --git a/subprojects/gst-plugins-bad/ext/resindvd/resindvdsrc.c b/subprojects/gst-plugins-bad/ext/resindvd/resindvdsrc.c
index b4b8f92582..0b1bd2f693 100644
--- a/subprojects/gst-plugins-bad/ext/resindvd/resindvdsrc.c
+++ b/subprojects/gst-plugins-bad/ext/resindvd/resindvdsrc.c
@@ -28,7 +28,7 @@
 #include <gmodule.h>
 #include <gst/gst.h>
 #include <gst/glib-compat-private.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <gst/video/video.h>
 #include <gst/video/navigation.h>
 #include <gst/tag/tag.h>
diff --git a/subprojects/gst-plugins-bad/ext/rtmp/gstrtmpsrc.c b/subprojects/gst-plugins-bad/ext/rtmp/gstrtmpsrc.c
index bf52cb0c9c..f69b641b2d 100644
--- a/subprojects/gst-plugins-bad/ext/rtmp/gstrtmpsrc.c
+++ b/subprojects/gst-plugins-bad/ext/rtmp/gstrtmpsrc.c
@@ -53,7 +53,7 @@
 #include "config.h"
 #endif
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #include "gstrtmpelements.h"
 #include "gstrtmpsrc.h"
diff --git a/subprojects/gst-plugins-bad/ext/smoothstreaming/gstmssdemux.c b/subprojects/gst-plugins-bad/ext/smoothstreaming/gstmssdemux.c
index a3c24fd1b9..167b4c27ab 100644
--- a/subprojects/gst-plugins-bad/ext/smoothstreaming/gstmssdemux.c
+++ b/subprojects/gst-plugins-bad/ext/smoothstreaming/gstmssdemux.c
@@ -67,7 +67,7 @@
 #include "config.h"
 #endif
 
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/subprojects/gst-plugins-bad/ext/smoothstreaming/gstsmoothstreaming-plugin.c b/subprojects/gst-plugins-bad/ext/smoothstreaming/gstsmoothstreaming-plugin.c
index 36261f0c99..8826ad0bc0 100644
--- a/subprojects/gst-plugins-bad/ext/smoothstreaming/gstsmoothstreaming-plugin.c
+++ b/subprojects/gst-plugins-bad/ext/smoothstreaming/gstsmoothstreaming-plugin.c
@@ -23,7 +23,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 #include <gst/gst.h>
 
 #include "gstmssdemux.h"
diff --git a/subprojects/gst-plugins-bad/ext/sndfile/gstsf.c b/subprojects/gst-plugins-bad/ext/sndfile/gstsf.c
index 6fb9668258..0fb491faca 100644
--- a/subprojects/gst-plugins-bad/ext/sndfile/gstsf.c
+++ b/subprojects/gst-plugins-bad/ext/sndfile/gstsf.c
@@ -22,7 +22,7 @@
 #include "config.h"
 #endif
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <string.h>
 
 #include "gstsfelements.h"
diff --git a/subprojects/gst-plugins-bad/ext/sndfile/gstsfdec.c b/subprojects/gst-plugins-bad/ext/sndfile/gstsfdec.c
index d9f4029ef5..29bdca9dd2 100644
--- a/subprojects/gst-plugins-bad/ext/sndfile/gstsfdec.c
+++ b/subprojects/gst-plugins-bad/ext/sndfile/gstsfdec.c
@@ -22,7 +22,7 @@
 #endif
 
 #include <stdlib.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <gst/audio/audio.h>
 
 #include "gstsfelements.h"
diff --git a/subprojects/gst-plugins-bad/ext/sndfile/gstsfelement.c b/subprojects/gst-plugins-bad/ext/sndfile/gstsfelement.c
index 2151a457ba..b8b332ed06 100644
--- a/subprojects/gst-plugins-bad/ext/sndfile/gstsfelement.c
+++ b/subprojects/gst-plugins-bad/ext/sndfile/gstsfelement.c
@@ -22,7 +22,7 @@
 #include "config.h"
 #endif
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <string.h>
 
 #include "gstsfelements.h"
diff --git a/subprojects/gst-plugins-bad/ext/sndfile/gstsfsink.c b/subprojects/gst-plugins-bad/ext/sndfile/gstsfsink.c
index 219f1a9aae..bd1bb9dad4 100644
--- a/subprojects/gst-plugins-bad/ext/sndfile/gstsfsink.c
+++ b/subprojects/gst-plugins-bad/ext/sndfile/gstsfsink.c
@@ -24,7 +24,7 @@
 
 #include <gst/audio/audio.h>
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #include "gstsfsink.h"
 
diff --git a/subprojects/gst-plugins-bad/ext/sndfile/gstsfsrc.c b/subprojects/gst-plugins-bad/ext/sndfile/gstsfsrc.c
index 9b2dda8630..eda3140a4d 100644
--- a/subprojects/gst-plugins-bad/ext/sndfile/gstsfsrc.c
+++ b/subprojects/gst-plugins-bad/ext/sndfile/gstsfsrc.c
@@ -25,7 +25,7 @@
 #  include "config.h"
 #endif
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #include "gstsfsrc.h"
 
diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/adaptivedemux/gstadaptivedemux.c b/subprojects/gst-plugins-bad/gst-libs/gst/adaptivedemux/gstadaptivedemux.c
index a495ec2e7a..4e7a177b45 100644
--- a/subprojects/gst-plugins-bad/gst-libs/gst/adaptivedemux/gstadaptivedemux.c
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/adaptivedemux/gstadaptivedemux.c
@@ -119,7 +119,7 @@ that the demux object and its streams are not changed by anybody else.
 #endif
 
 #include "gstadaptivedemux.h"
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 #include <gst/base/gstadapter.h>
 
 GST_DEBUG_CATEGORY (adaptivedemux_debug);
diff --git a/subprojects/gst-plugins-bad/gst/aiff/aiffparse.c b/subprojects/gst-plugins-bad/gst/aiff/aiffparse.c
index e155431305..cc96d7570d 100644
--- a/subprojects/gst-plugins-bad/gst/aiff/aiffparse.c
+++ b/subprojects/gst-plugins-bad/gst/aiff/aiffparse.c
@@ -57,7 +57,7 @@
 #include <gst/audio/audio.h>
 #include <gst/tag/tag.h>
 #include <gst/pbutils/descriptions.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY (aiffparse_debug);
 #define GST_CAT_DEFAULT (aiffparse_debug)
diff --git a/subprojects/gst-plugins-bad/gst/aiff/gstaiffelement.c b/subprojects/gst-plugins-bad/gst/aiff/gstaiffelement.c
index 3d2f91b152..4338bc1b74 100644
--- a/subprojects/gst-plugins-bad/gst/aiff/gstaiffelement.c
+++ b/subprojects/gst-plugins-bad/gst/aiff/gstaiffelement.c
@@ -24,7 +24,7 @@
 
 #include <gst/tag/tag.h>
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #include "aiffelements.h"
 
diff --git a/subprojects/gst-plugins-bad/gst/asfmux/gstasfmux.c b/subprojects/gst-plugins-bad/gst/asfmux/gstasfmux.c
index 0ab4660357..99215b9b09 100644
--- a/subprojects/gst-plugins-bad/gst/asfmux/gstasfmux.c
+++ b/subprojects/gst-plugins-bad/gst/asfmux/gstasfmux.c
@@ -75,7 +75,7 @@
 
 #include <string.h>
 #include <stdio.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include "gstasfmux.h"
 
 #define DEFAULT_SIMPLE_INDEX_TIME_INTERVAL G_GUINT64_CONSTANT (10000000)
diff --git a/subprojects/gst-plugins-bad/gst/asfmux/gstasfparse.c b/subprojects/gst-plugins-bad/gst/asfmux/gstasfparse.c
index 5859c7fcdb..b2b5ffdca6 100644
--- a/subprojects/gst-plugins-bad/gst/asfmux/gstasfparse.c
+++ b/subprojects/gst-plugins-bad/gst/asfmux/gstasfparse.c
@@ -25,7 +25,7 @@
 #include "gstasfparse.h"
 
 /* FIXME add this include
- * #include <gst/gst-i18n-plugin.h> */
+ * #include <glib/gi18n-lib.h> */
 
 GST_DEBUG_CATEGORY_STATIC (asfparse_debug);
 #define GST_CAT_DEFAULT asfparse_debug
diff --git a/subprojects/gst-plugins-bad/gst/camerabin2/camerabingeneral.c b/subprojects/gst-plugins-bad/gst/camerabin2/camerabingeneral.c
index 9a60d35ede..845361385c 100644
--- a/subprojects/gst-plugins-bad/gst/camerabin2/camerabingeneral.c
+++ b/subprojects/gst-plugins-bad/gst/camerabin2/camerabingeneral.c
@@ -35,7 +35,7 @@
 
 #include <glib.h>
 #include <gst/basecamerabinsrc/gstbasecamerasrc.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #include "camerabingeneral.h"
 
diff --git a/subprojects/gst-plugins-bad/gst/camerabin2/gstcamerabin2.c b/subprojects/gst-plugins-bad/gst/camerabin2/gstcamerabin2.c
index 6ac5ce4d21..3824a4b744 100644
--- a/subprojects/gst-plugins-bad/gst/camerabin2/gstcamerabin2.c
+++ b/subprojects/gst-plugins-bad/gst/camerabin2/gstcamerabin2.c
@@ -146,7 +146,7 @@
 
 #include <gst/basecamerabinsrc/gstbasecamerasrc.h>
 #include "gstcamerabin2.h"
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <gst/pbutils/pbutils.h>
 #include <gst/glib-compat-private.h>
 
diff --git a/subprojects/gst-plugins-bad/gst/camerabin2/gstdigitalzoom.c b/subprojects/gst-plugins-bad/gst/camerabin2/gstdigitalzoom.c
index c7de9a6504..041bffc566 100644
--- a/subprojects/gst-plugins-bad/gst/camerabin2/gstdigitalzoom.c
+++ b/subprojects/gst-plugins-bad/gst/camerabin2/gstdigitalzoom.c
@@ -40,7 +40,7 @@
 #  include <config.h>
 #endif
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include "gstdigitalzoom.h"
 
 enum
diff --git a/subprojects/gst-plugins-bad/gst/camerabin2/gstviewfinderbin.c b/subprojects/gst-plugins-bad/gst/camerabin2/gstviewfinderbin.c
index 1c37cef311..1ff70469cb 100644
--- a/subprojects/gst-plugins-bad/gst/camerabin2/gstviewfinderbin.c
+++ b/subprojects/gst-plugins-bad/gst/camerabin2/gstviewfinderbin.c
@@ -38,7 +38,7 @@
 #include "camerabingeneral.h"
 #include <gst/pbutils/pbutils.h>
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY_STATIC (gst_viewfinder_bin_debug);
 #define GST_CAT_DEFAULT gst_viewfinder_bin_debug
diff --git a/subprojects/gst-plugins-bad/gst/camerabin2/gstwrappercamerabinsrc.c b/subprojects/gst-plugins-bad/gst/camerabin2/gstwrappercamerabinsrc.c
index 819a6a581c..cf21f43421 100644
--- a/subprojects/gst-plugins-bad/gst/camerabin2/gstwrappercamerabinsrc.c
+++ b/subprojects/gst-plugins-bad/gst/camerabin2/gstwrappercamerabinsrc.c
@@ -33,7 +33,7 @@
 #endif
 
 #include <gst/interfaces/photography.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #include "gstwrappercamerabinsrc.h"
 #include "gstdigitalzoom.h"
diff --git a/subprojects/gst-plugins-bad/gst/dvdspu/gstdvdspu.c b/subprojects/gst-plugins-bad/gst/dvdspu/gstdvdspu.c
index 2e049b6918..f7d20d2b17 100644
--- a/subprojects/gst-plugins-bad/gst/dvdspu/gstdvdspu.c
+++ b/subprojects/gst-plugins-bad/gst/dvdspu/gstdvdspu.c
@@ -32,7 +32,7 @@
 #  include <config.h>
 #endif
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <gst/video/video.h>
 
 #include <string.h>
diff --git a/subprojects/gst-plugins-bad/gst/midi/midi.c b/subprojects/gst-plugins-bad/gst/midi/midi.c
index 01e9b6dc7e..2385f9808e 100644
--- a/subprojects/gst-plugins-bad/gst/midi/midi.c
+++ b/subprojects/gst-plugins-bad/gst/midi/midi.c
@@ -24,7 +24,7 @@
 
 #include <gst/tag/tag.h>
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #include "midiparse.h"
 
diff --git a/subprojects/gst-plugins-bad/gst/mpegtsdemux/mpegtsbase.c b/subprojects/gst-plugins-bad/gst/mpegtsdemux/mpegtsbase.c
index 4675dc8401..5a0d309cbf 100644
--- a/subprojects/gst-plugins-bad/gst/mpegtsdemux/mpegtsbase.c
+++ b/subprojects/gst-plugins-bad/gst/mpegtsdemux/mpegtsbase.c
@@ -37,7 +37,7 @@
 
 #include <glib.h>
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include "mpegtsbase.h"
 #include "gstmpegdesc.h"
 
diff --git a/subprojects/gst-plugins-bad/gst/transcode/gsttranscodebin.c b/subprojects/gst-plugins-bad/gst/transcode/gsttranscodebin.c
index da56a0d259..706e63925f 100644
--- a/subprojects/gst-plugins-bad/gst/transcode/gsttranscodebin.c
+++ b/subprojects/gst-plugins-bad/gst/transcode/gsttranscodebin.c
@@ -24,7 +24,7 @@
 
 #include "gsttranscoding.h"
 #include "gsttranscodeelements.h"
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <gst/pbutils/pbutils.h>
 
 #include <gst/pbutils/missing-plugins.h>
diff --git a/subprojects/gst-plugins-bad/gst/transcode/gsttranscodeelement.c b/subprojects/gst-plugins-bad/gst/transcode/gsttranscodeelement.c
index 7fae04b1a7..7a51ea8166 100644
--- a/subprojects/gst-plugins-bad/gst/transcode/gsttranscodeelement.c
+++ b/subprojects/gst-plugins-bad/gst/transcode/gsttranscodeelement.c
@@ -24,7 +24,7 @@
 #endif
 
 #include "gsttranscodeelements.h"
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <gst/pbutils/pbutils.h>
 
 #include <gst/pbutils/missing-plugins.h>
diff --git a/subprojects/gst-plugins-bad/sys/dvb/gstdvb.c b/subprojects/gst-plugins-bad/sys/dvb/gstdvb.c
index 0ce6be4ccf..4b1a124535 100644
--- a/subprojects/gst-plugins-bad/sys/dvb/gstdvb.c
+++ b/subprojects/gst-plugins-bad/sys/dvb/gstdvb.c
@@ -25,7 +25,7 @@
 #include "config.h"
 #endif
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #include "gstdvbelements.h"
 
diff --git a/subprojects/gst-plugins-bad/sys/dvb/gstdvbelement.c b/subprojects/gst-plugins-bad/sys/dvb/gstdvbelement.c
index 50f39316fe..ca842519b2 100644
--- a/subprojects/gst-plugins-bad/sys/dvb/gstdvbelement.c
+++ b/subprojects/gst-plugins-bad/sys/dvb/gstdvbelement.c
@@ -24,7 +24,7 @@
 #include "config.h"
 #endif
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #include "gstdvbelements.h"
 
diff --git a/subprojects/gst-plugins-bad/sys/dvb/gstdvbsrc.c b/subprojects/gst-plugins-bad/sys/dvb/gstdvbsrc.c
index 92c918c1aa..b8e5b1a03e 100644
--- a/subprojects/gst-plugins-bad/sys/dvb/gstdvbsrc.c
+++ b/subprojects/gst-plugins-bad/sys/dvb/gstdvbsrc.c
@@ -111,7 +111,7 @@
 #include <linux/dvb/frontend.h>
 #include <linux/dvb/dmx.h>
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 /* Before 5.6 we map A to AC */
 #if !HAVE_V5_MINOR(6)
diff --git a/subprojects/gst-plugins-bad/sys/dvb/parsechannels.c b/subprojects/gst-plugins-bad/sys/dvb/parsechannels.c
index 1ecc38aeaa..cd1dfb72c6 100644
--- a/subprojects/gst-plugins-bad/sys/dvb/parsechannels.c
+++ b/subprojects/gst-plugins-bad/sys/dvb/parsechannels.c
@@ -31,7 +31,7 @@
 #include <string.h>
 #include <gst/gst.h>
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #include "parsechannels.h"
 
diff --git a/subprojects/gst-plugins-base/ext/alsa/gstalsaelement.c b/subprojects/gst-plugins-base/ext/alsa/gstalsaelement.c
index 695537ad8a..2bf4166098 100644
--- a/subprojects/gst-plugins-base/ext/alsa/gstalsaelement.c
+++ b/subprojects/gst-plugins-base/ext/alsa/gstalsaelement.c
@@ -27,7 +27,7 @@
 #include "gstalsaelements.h"
 #include "gstalsadeviceprovider.h"
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY (alsa_debug);
 
diff --git a/subprojects/gst-plugins-base/ext/alsa/gstalsaplugin.c b/subprojects/gst-plugins-base/ext/alsa/gstalsaplugin.c
index 9f1ab2e69f..87803c6318 100644
--- a/subprojects/gst-plugins-base/ext/alsa/gstalsaplugin.c
+++ b/subprojects/gst-plugins-base/ext/alsa/gstalsaplugin.c
@@ -26,7 +26,7 @@
 #include "gstalsaelements.h"
 #include "gstalsadeviceprovider.h"
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 static gboolean
 plugin_init (GstPlugin * plugin)
diff --git a/subprojects/gst-plugins-base/ext/alsa/gstalsasink.c b/subprojects/gst-plugins-base/ext/alsa/gstalsasink.c
index eab405974a..1728213fb8 100644
--- a/subprojects/gst-plugins-base/ext/alsa/gstalsasink.c
+++ b/subprojects/gst-plugins-base/ext/alsa/gstalsasink.c
@@ -52,7 +52,7 @@
 #include "gstalsasink.h"
 
 #include <gst/audio/gstaudioiec61937.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #ifndef ESTRPIPE
 #define ESTRPIPE EPIPE
diff --git a/subprojects/gst-plugins-base/ext/alsa/gstalsasrc.c b/subprojects/gst-plugins-base/ext/alsa/gstalsasrc.c
index 72e54520aa..2e97f39270 100644
--- a/subprojects/gst-plugins-base/ext/alsa/gstalsasrc.c
+++ b/subprojects/gst-plugins-base/ext/alsa/gstalsasrc.c
@@ -48,7 +48,7 @@
 #include "gstalsaelements.h"
 #include "gstalsasrc.h"
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #ifndef ESTRPIPE
 #define ESTRPIPE EPIPE
diff --git a/subprojects/gst-plugins-base/ext/cdparanoia/gstcdparanoiasrc.c b/subprojects/gst-plugins-base/ext/cdparanoia/gstcdparanoiasrc.c
index 572fb89c73..41717320aa 100644
--- a/subprojects/gst-plugins-base/ext/cdparanoia/gstcdparanoiasrc.c
+++ b/subprojects/gst-plugins-base/ext/cdparanoia/gstcdparanoiasrc.c
@@ -29,7 +29,7 @@
 #include <stdio.h>
 
 #include "gstcdparanoiasrc.h"
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 
 enum
 {
diff --git a/subprojects/gst-plugins-base/ext/gl/gstgltestsrc.c b/subprojects/gst-plugins-base/ext/gl/gstgltestsrc.c
index b3cc83f5ea..7d021f40cb 100644
--- a/subprojects/gst-plugins-base/ext/gl/gstgltestsrc.c
+++ b/subprojects/gst-plugins-base/ext/gl/gstgltestsrc.c
@@ -43,7 +43,7 @@
 #endif
 
 #include <gst/gl/gstglfuncs.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #include "gstglelements.h"
 #include "gstgltestsrc.h"
diff --git a/subprojects/gst-plugins-base/ext/ogg/gstoggdemux.c b/subprojects/gst-plugins-base/ext/ogg/gstoggdemux.c
index 91bf1d842e..649f63d593 100644
--- a/subprojects/gst-plugins-base/ext/ogg/gstoggdemux.c
+++ b/subprojects/gst-plugins-base/ext/ogg/gstoggdemux.c
@@ -40,7 +40,7 @@
 #endif
 
 #include <string.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <gst/tag/tag.h>
 #include <gst/audio/audio.h>
 
diff --git a/subprojects/gst-plugins-base/gst-libs/gst/audio/gstaudiobasesrc.c b/subprojects/gst-plugins-base/gst-libs/gst/audio/gstaudiobasesrc.c
index a384e8eb34..8edd11868d 100644
--- a/subprojects/gst-plugins-base/gst-libs/gst/audio/gstaudiobasesrc.c
+++ b/subprojects/gst-plugins-base/gst-libs/gst/audio/gstaudiobasesrc.c
@@ -40,7 +40,7 @@
 #include <gst/audio/audio.h>
 #include "gstaudiobasesrc.h"
 
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY_STATIC (gst_audio_base_src_debug);
 #define GST_CAT_DEFAULT gst_audio_base_src_debug
diff --git a/subprojects/gst-plugins-base/gst-libs/gst/audio/gstaudiocdsrc.c b/subprojects/gst-plugins-base/gst-libs/gst/audio/gstaudiocdsrc.c
index d295f39d81..437bebb5dd 100644
--- a/subprojects/gst-plugins-base/gst-libs/gst/audio/gstaudiocdsrc.c
+++ b/subprojects/gst-plugins-base/gst-libs/gst/audio/gstaudiocdsrc.c
@@ -96,7 +96,7 @@
 #include <gst/tag/tag.h>
 #include <gst/audio/audio.h>
 #include "gstaudiocdsrc.h"
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY_STATIC (gst_audio_cd_src_debug);
 #define GST_CAT_DEFAULT gst_audio_cd_src_debug
diff --git a/subprojects/gst-plugins-base/gst-libs/gst/gl/gstglbasesrc.c b/subprojects/gst-plugins-base/gst-libs/gst/gl/gstglbasesrc.c
index 8716b72173..fa283459c0 100644
--- a/subprojects/gst-plugins-base/gst-libs/gst/gl/gstglbasesrc.c
+++ b/subprojects/gst-plugins-base/gst-libs/gst/gl/gstglbasesrc.c
@@ -27,7 +27,7 @@
 #endif
 
 #include <gst/gl/gl.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 /**
  * SECTION:gstglbasesrc
diff --git a/subprojects/gst-plugins-base/gst-libs/gst/pbutils/descriptions.c b/subprojects/gst-plugins-base/gst-libs/gst/pbutils/descriptions.c
index 3c6943e045..a46823beea 100644
--- a/subprojects/gst-plugins-base/gst-libs/gst/pbutils/descriptions.c
+++ b/subprojects/gst-plugins-base/gst-libs/gst/pbutils/descriptions.c
@@ -37,7 +37,7 @@
 # include "config.h"
 #endif
 
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 
 #include <gst/audio/audio.h>
 #include <gst/video/video.h>
diff --git a/subprojects/gst-plugins-base/gst-libs/gst/pbutils/missing-plugins.c b/subprojects/gst-plugins-base/gst-libs/gst/pbutils/missing-plugins.c
index 4b0f687ce9..52540bce49 100644
--- a/subprojects/gst-plugins-base/gst-libs/gst/pbutils/missing-plugins.c
+++ b/subprojects/gst-plugins-base/gst-libs/gst/pbutils/missing-plugins.c
@@ -53,7 +53,7 @@
 # include <unistd.h>            /* getpid on UNIX */
 #endif
 
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 
 #include "pbutils.h"
 #include "pbutils-private.h"
diff --git a/subprojects/gst-plugins-base/gst-libs/gst/pbutils/pbutils.c b/subprojects/gst-plugins-base/gst-libs/gst/pbutils/pbutils.c
index 3aee17ecca..a6408d82fb 100644
--- a/subprojects/gst-plugins-base/gst-libs/gst/pbutils/pbutils.c
+++ b/subprojects/gst-plugins-base/gst-libs/gst/pbutils/pbutils.c
@@ -59,7 +59,7 @@
 #include "pbutils.h"
 #include "pbutils-private.h"
 
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 
 #ifndef GST_DISABLE_GST_DEBUG
 #define GST_CAT_DEFAULT gst_pb_utils_ensure_debug_category()
diff --git a/subprojects/gst-plugins-base/gst-libs/gst/tag/gsttagdemux.c b/subprojects/gst-plugins-base/gst-libs/gst/tag/gsttagdemux.c
index 5702f7ca9e..173da37374 100644
--- a/subprojects/gst-plugins-base/gst-libs/gst/tag/gsttagdemux.c
+++ b/subprojects/gst-plugins-base/gst-libs/gst/tag/gsttagdemux.c
@@ -64,7 +64,7 @@
 
 #include <gst/base/gsttypefindhelper.h>
 #include <gst/base/gstadapter.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <string.h>
 
 typedef enum
diff --git a/subprojects/gst-plugins-base/gst-libs/gst/tag/lang.c b/subprojects/gst-plugins-base/gst-libs/gst/tag/lang.c
index 28279d105b..ae6dd5417c 100644
--- a/subprojects/gst-plugins-base/gst-libs/gst/tag/lang.c
+++ b/subprojects/gst-plugins-base/gst-libs/gst/tag/lang.c
@@ -38,7 +38,7 @@
 #define ISO_639_XML_PATH ISO_CODES_PREFIX "/share/xml/iso-codes/iso_639.xml"
 #define ISO_CODES_LOCALEDIR ISO_CODES_PREFIX "/share/locale"
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <gst/gst.h>
 
 #include <string.h>
diff --git a/subprojects/gst-plugins-base/gst-libs/gst/tag/tags.c b/subprojects/gst-plugins-base/gst-libs/gst/tag/tags.c
index 7f0eef467d..f9dce252ff 100644
--- a/subprojects/gst-plugins-base/gst-libs/gst/tag/tags.c
+++ b/subprojects/gst-plugins-base/gst-libs/gst/tag/tags.c
@@ -22,7 +22,7 @@
 #include "config.h"
 #endif
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <gst/base/gsttypefindhelper.h>
 #include <gst/gst.h>
 #include "tag.h"
diff --git a/subprojects/gst-plugins-base/gst/encoding/gstencodebasebin.c b/subprojects/gst-plugins-base/gst/encoding/gstencodebasebin.c
index a62e86adbf..e8b7af2c1f 100644
--- a/subprojects/gst-plugins-base/gst/encoding/gstencodebasebin.c
+++ b/subprojects/gst-plugins-base/gst/encoding/gstencodebasebin.c
@@ -29,7 +29,7 @@
 #include "gstsmartencoder.h"
 #include "gststreamsplitter.h"
 #include "gststreamcombiner.h"
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 /**
  * SECTION:element-encodebin
diff --git a/subprojects/gst-plugins-base/gst/encoding/gstencodingelements.c b/subprojects/gst-plugins-base/gst/encoding/gstencodingelements.c
index a06a808c3b..04a1bdb51a 100644
--- a/subprojects/gst-plugins-base/gst/encoding/gstencodingelements.c
+++ b/subprojects/gst-plugins-base/gst/encoding/gstencodingelements.c
@@ -25,7 +25,7 @@
 #endif
 
 #include <gst/gst.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #include "gstencodingelements.h"
 
diff --git a/subprojects/gst-plugins-base/gst/playback/gstdecodebin2.c b/subprojects/gst-plugins-base/gst/playback/gstdecodebin2.c
index f4be478e7f..8a8722da66 100644
--- a/subprojects/gst-plugins-base/gst/playback/gstdecodebin2.c
+++ b/subprojects/gst-plugins-base/gst/playback/gstdecodebin2.c
@@ -92,7 +92,7 @@
 #include "config.h"
 #endif
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #include <string.h>
 #include <gst/gst.h>
diff --git a/subprojects/gst-plugins-base/gst/playback/gstparsebin.c b/subprojects/gst-plugins-base/gst/playback/gstparsebin.c
index a17cc6bd2b..c1b7cae9dd 100644
--- a/subprojects/gst-plugins-base/gst/playback/gstparsebin.c
+++ b/subprojects/gst-plugins-base/gst/playback/gstparsebin.c
@@ -97,7 +97,7 @@
 #include "config.h"
 #endif
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #include <string.h>
 #include <gst/gst.h>
diff --git a/subprojects/gst-plugins-base/gst/playback/gstplaybackelement.c b/subprojects/gst-plugins-base/gst/playback/gstplaybackelement.c
index 8505fdfdec..244c164341 100644
--- a/subprojects/gst-plugins-base/gst/playback/gstplaybackelement.c
+++ b/subprojects/gst-plugins-base/gst/playback/gstplaybackelement.c
@@ -30,7 +30,7 @@
 
 #include <gst/gst.h>
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <gst/pbutils/pbutils.h>
 
 #include "gstplaybackelements.h"
diff --git a/subprojects/gst-plugins-base/gst/playback/gstplaybackplugin.c b/subprojects/gst-plugins-base/gst/playback/gstplaybackplugin.c
index 4adc532728..8d3a72ba38 100644
--- a/subprojects/gst-plugins-base/gst/playback/gstplaybackplugin.c
+++ b/subprojects/gst-plugins-base/gst/playback/gstplaybackplugin.c
@@ -29,7 +29,7 @@
 #include <string.h>
 #include <gst/gst.h>
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <gst/pbutils/pbutils.h>
 
 #include "gstplaybackelements.h"
diff --git a/subprojects/gst-plugins-base/gst/playback/gstplaybin2.c b/subprojects/gst-plugins-base/gst/playback/gstplaybin2.c
index 1dc2b45249..beeaaa8585 100644
--- a/subprojects/gst-plugins-base/gst/playback/gstplaybin2.c
+++ b/subprojects/gst-plugins-base/gst/playback/gstplaybin2.c
@@ -207,7 +207,7 @@
 #include <string.h>
 #include <gst/gst.h>
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <gst/pbutils/pbutils.h>
 #include <gst/audio/streamvolume.h>
 #include <gst/video/video-info.h>
diff --git a/subprojects/gst-plugins-base/gst/playback/gstplaybin3.c b/subprojects/gst-plugins-base/gst/playback/gstplaybin3.c
index d7089bd6ec..29384596c9 100644
--- a/subprojects/gst-plugins-base/gst/playback/gstplaybin3.c
+++ b/subprojects/gst-plugins-base/gst/playback/gstplaybin3.c
@@ -219,7 +219,7 @@
 #include <string.h>
 #include <gst/gst.h>
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <gst/pbutils/pbutils.h>
 #include <gst/audio/streamvolume.h>
 #include <gst/video/video-info.h>
diff --git a/subprojects/gst-plugins-base/gst/playback/gstplaysink.c b/subprojects/gst-plugins-base/gst/playback/gstplaysink.c
index a870613cb5..2a45fec2f7 100644
--- a/subprojects/gst-plugins-base/gst/playback/gstplaysink.c
+++ b/subprojects/gst-plugins-base/gst/playback/gstplaysink.c
@@ -25,7 +25,7 @@
 #include <string.h>
 #include <gst/gst.h>
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <gst/pbutils/pbutils.h>
 #include <gst/video/video.h>
 #include <gst/audio/streamvolume.h>
diff --git a/subprojects/gst-plugins-base/gst/playback/gstplaysinkaudioconvert.c b/subprojects/gst-plugins-base/gst/playback/gstplaysinkaudioconvert.c
index 3f984da09f..0eeea551d7 100644
--- a/subprojects/gst-plugins-base/gst/playback/gstplaysinkaudioconvert.c
+++ b/subprojects/gst-plugins-base/gst/playback/gstplaysinkaudioconvert.c
@@ -24,7 +24,7 @@
 #include "gstplaysinkaudioconvert.h"
 
 #include <gst/pbutils/pbutils.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY_STATIC (gst_play_sink_audio_convert_debug);
 #define GST_CAT_DEFAULT gst_play_sink_audio_convert_debug
diff --git a/subprojects/gst-plugins-base/gst/playback/gstplaysinkconvertbin.c b/subprojects/gst-plugins-base/gst/playback/gstplaysinkconvertbin.c
index d4f65708f6..1e5b2e2dcb 100644
--- a/subprojects/gst-plugins-base/gst/playback/gstplaysinkconvertbin.c
+++ b/subprojects/gst-plugins-base/gst/playback/gstplaysinkconvertbin.c
@@ -25,7 +25,7 @@
 #include "gstplaysinkconvertbin.h"
 
 #include <gst/pbutils/pbutils.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY_STATIC (gst_play_sink_convert_bin_debug);
 #define GST_CAT_DEFAULT gst_play_sink_convert_bin_debug
diff --git a/subprojects/gst-plugins-base/gst/playback/gstplaysinkvideoconvert.c b/subprojects/gst-plugins-base/gst/playback/gstplaysinkvideoconvert.c
index 5bac5d0463..c0f0bebb27 100644
--- a/subprojects/gst-plugins-base/gst/playback/gstplaysinkvideoconvert.c
+++ b/subprojects/gst-plugins-base/gst/playback/gstplaysinkvideoconvert.c
@@ -24,7 +24,7 @@
 #include "gstplaysinkvideoconvert.h"
 
 #include <gst/pbutils/pbutils.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY_STATIC (gst_play_sink_video_convert_debug);
 #define GST_CAT_DEFAULT gst_play_sink_video_convert_debug
diff --git a/subprojects/gst-plugins-base/gst/playback/gsturidecodebin.c b/subprojects/gst-plugins-base/gst/playback/gsturidecodebin.c
index d2ef65883c..b27c2fcd96 100644
--- a/subprojects/gst-plugins-base/gst/playback/gsturidecodebin.c
+++ b/subprojects/gst-plugins-base/gst/playback/gsturidecodebin.c
@@ -36,7 +36,7 @@
 #include <string.h>
 
 #include <gst/gst.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <gst/pbutils/missing-plugins.h>
 
 #include "gstplay-enum.h"
diff --git a/subprojects/gst-plugins-base/gst/playback/gsturidecodebin3.c b/subprojects/gst-plugins-base/gst/playback/gsturidecodebin3.c
index 36253931cb..85af4a6e76 100644
--- a/subprojects/gst-plugins-base/gst/playback/gsturidecodebin3.c
+++ b/subprojects/gst-plugins-base/gst/playback/gsturidecodebin3.c
@@ -50,7 +50,7 @@
 #include <string.h>
 
 #include <gst/gst.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <gst/pbutils/missing-plugins.h>
 
 #include "gstplay-enum.h"
diff --git a/subprojects/gst-plugins-base/gst/playback/gsturisourcebin.c b/subprojects/gst-plugins-base/gst/playback/gsturisourcebin.c
index 2bff98af60..c362779a95 100644
--- a/subprojects/gst-plugins-base/gst/playback/gsturisourcebin.c
+++ b/subprojects/gst-plugins-base/gst/playback/gsturisourcebin.c
@@ -45,7 +45,7 @@
 #include <string.h>
 
 #include <gst/gst.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <gst/pbutils/missing-plugins.h>
 
 #include "gstplay-enum.h"
diff --git a/subprojects/gst-plugins-base/gst/tcp/gstmultifdsink.c b/subprojects/gst-plugins-base/gst/tcp/gstmultifdsink.c
index e0e710c5f3..c1ba106caa 100644
--- a/subprojects/gst-plugins-base/gst/tcp/gstmultifdsink.c
+++ b/subprojects/gst-plugins-base/gst/tcp/gstmultifdsink.c
@@ -104,7 +104,7 @@
 #include "config.h"
 #endif
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #include <sys/ioctl.h>
 
diff --git a/subprojects/gst-plugins-base/gst/tcp/gstmultihandlesink.c b/subprojects/gst-plugins-base/gst/tcp/gstmultihandlesink.c
index 32c6eb50a0..b7f76dd7ca 100644
--- a/subprojects/gst-plugins-base/gst/tcp/gstmultihandlesink.c
+++ b/subprojects/gst-plugins-base/gst/tcp/gstmultihandlesink.c
@@ -26,7 +26,7 @@
 #include "config.h"
 #endif
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #include "gstmultihandlesink.h"
 
diff --git a/subprojects/gst-plugins-base/gst/tcp/gstmultisocketsink.c b/subprojects/gst-plugins-base/gst/tcp/gstmultisocketsink.c
index 0031fac93b..56d99d8360 100644
--- a/subprojects/gst-plugins-base/gst/tcp/gstmultisocketsink.c
+++ b/subprojects/gst-plugins-base/gst/tcp/gstmultisocketsink.c
@@ -103,7 +103,7 @@
 #include "config.h"
 #endif
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <gst/net/gstnetcontrolmessagemeta.h>
 
 #include <string.h>
diff --git a/subprojects/gst-plugins-base/gst/tcp/gstsocketsrc.c b/subprojects/gst-plugins-base/gst/tcp/gstsocketsrc.c
index 22d77b2aae..151d33f05b 100644
--- a/subprojects/gst-plugins-base/gst/tcp/gstsocketsrc.c
+++ b/subprojects/gst-plugins-base/gst/tcp/gstsocketsrc.c
@@ -49,7 +49,7 @@
 #include "config.h"
 #endif
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <gst/net/gstnetcontrolmessagemeta.h>
 #include "gsttcpelements.h"
 #include "gstsocketsrc.h"
diff --git a/subprojects/gst-plugins-base/gst/tcp/gsttcpclientsink.c b/subprojects/gst-plugins-base/gst/tcp/gsttcpclientsink.c
index 18253ce949..a3a21bc38c 100644
--- a/subprojects/gst-plugins-base/gst/tcp/gsttcpclientsink.c
+++ b/subprojects/gst-plugins-base/gst/tcp/gsttcpclientsink.c
@@ -41,7 +41,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #include "gsttcpelements.h"
 #include "gsttcpclientsink.h"
diff --git a/subprojects/gst-plugins-base/gst/tcp/gsttcpclientsrc.c b/subprojects/gst-plugins-base/gst/tcp/gsttcpclientsrc.c
index 5d65b26aac..acb57340aa 100644
--- a/subprojects/gst-plugins-base/gst/tcp/gsttcpclientsrc.c
+++ b/subprojects/gst-plugins-base/gst/tcp/gsttcpclientsrc.c
@@ -43,7 +43,7 @@
 #include "config.h"
 #endif
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include "gsttcpelements.h"
 #include "gsttcpclientsrc.h"
 #include "gsttcpsrcstats.h"
diff --git a/subprojects/gst-plugins-base/gst/tcp/gsttcpserversink.c b/subprojects/gst-plugins-base/gst/tcp/gsttcpserversink.c
index 2a9a4bd8ab..8022481cf7 100644
--- a/subprojects/gst-plugins-base/gst/tcp/gsttcpserversink.c
+++ b/subprojects/gst-plugins-base/gst/tcp/gsttcpserversink.c
@@ -37,7 +37,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <string.h>             /* memset */
 
 #include "gsttcpelements.h"
diff --git a/subprojects/gst-plugins-base/gst/tcp/gsttcpserversrc.c b/subprojects/gst-plugins-base/gst/tcp/gsttcpserversrc.c
index b415235364..2e3403bdd7 100644
--- a/subprojects/gst-plugins-base/gst/tcp/gsttcpserversrc.c
+++ b/subprojects/gst-plugins-base/gst/tcp/gsttcpserversrc.c
@@ -40,7 +40,7 @@
 #include "config.h"
 #endif
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include "gsttcpelements.h"
 #include "gsttcpsrcstats.h"
 #include "gsttcpserversrc.h"
diff --git a/subprojects/gst-plugins-base/tools/gst-device-monitor.c b/subprojects/gst-plugins-base/tools/gst-device-monitor.c
index 13ea0f4acc..ef57acc015 100644
--- a/subprojects/gst-plugins-base/tools/gst-device-monitor.c
+++ b/subprojects/gst-plugins-base/tools/gst-device-monitor.c
@@ -24,7 +24,7 @@
 #include <locale.h>
 
 #include <gst/gst.h>
-#include <gst/gst-i18n-app.h>
+#include <glib/gi18n.h>
 #include <gst/math-compat.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/subprojects/gst-plugins-base/tools/gst-play.c b/subprojects/gst-plugins-base/tools/gst-play.c
index fdeb2851fc..8d0b697ede 100644
--- a/subprojects/gst-plugins-base/tools/gst-play.c
+++ b/subprojects/gst-plugins-base/tools/gst-play.c
@@ -27,7 +27,7 @@
 #include <locale.h>
 
 #include <gst/gst.h>
-#include <gst/gst-i18n-app.h>
+#include <glib/gi18n.h>
 #include <gst/audio/audio.h>
 #include <gst/video/video.h>
 #include <gst/pbutils/pbutils.h>
diff --git a/subprojects/gst-plugins-good/ext/adaptivedemux2/gstadaptivedemux-stream.c b/subprojects/gst-plugins-good/ext/adaptivedemux2/gstadaptivedemux-stream.c
index 8ef5056d60..38f36dba7d 100644
--- a/subprojects/gst-plugins-good/ext/adaptivedemux2/gstadaptivedemux-stream.c
+++ b/subprojects/gst-plugins-good/ext/adaptivedemux2/gstadaptivedemux-stream.c
@@ -30,7 +30,7 @@
 #include "gstadaptivedemux.h"
 #include "gstadaptivedemux-private.h"
 
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 #include <gst/app/gstappsrc.h>
 
 GST_DEBUG_CATEGORY_EXTERN (adaptivedemux2_debug);
diff --git a/subprojects/gst-plugins-good/ext/adaptivedemux2/gstadaptivedemux.c b/subprojects/gst-plugins-good/ext/adaptivedemux2/gstadaptivedemux.c
index a805012307..6588112dca 100644
--- a/subprojects/gst-plugins-good/ext/adaptivedemux2/gstadaptivedemux.c
+++ b/subprojects/gst-plugins-good/ext/adaptivedemux2/gstadaptivedemux.c
@@ -105,7 +105,7 @@ By using the api_lock a thread is protected against other API calls.
 #include "gstadaptivedemux.h"
 #include "gstadaptivedemux-private.h"
 
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 #include <gst/base/gstadapter.h>
 #include <gst/app/gstappsrc.h>
 
diff --git a/subprojects/gst-plugins-good/ext/adaptivedemux2/mss/gstmssdemux.c b/subprojects/gst-plugins-good/ext/adaptivedemux2/mss/gstmssdemux.c
index ca790ba97a..843f0c67f7 100644
--- a/subprojects/gst-plugins-good/ext/adaptivedemux2/mss/gstmssdemux.c
+++ b/subprojects/gst-plugins-good/ext/adaptivedemux2/mss/gstmssdemux.c
@@ -67,7 +67,7 @@
 #include "config.h"
 #endif
 
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/subprojects/gst-plugins-good/ext/flac/gstflacdec.c b/subprojects/gst-plugins-good/ext/flac/gstflacdec.c
index 361d18139f..49cb1480b2 100644
--- a/subprojects/gst-plugins-good/ext/flac/gstflacdec.c
+++ b/subprojects/gst-plugins-good/ext/flac/gstflacdec.c
@@ -44,7 +44,7 @@
 #include <string.h>
 
 #include "gstflacdec.h"
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <gst/tag/tag.h>
 
 #include "gstflacelements.h"
diff --git a/subprojects/gst-plugins-good/ext/flac/gstflacelement.c b/subprojects/gst-plugins-good/ext/flac/gstflacelement.c
index 23eb3bad53..6a408b6dee 100644
--- a/subprojects/gst-plugins-good/ext/flac/gstflacelement.c
+++ b/subprojects/gst-plugins-good/ext/flac/gstflacelement.c
@@ -24,7 +24,7 @@
 #include "gstflacelements.h"
 
 #include <gst/tag/tag.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 void
 flac_element_init (GstPlugin * plugin)
diff --git a/subprojects/gst-plugins-good/ext/jack/gstjackaudiosink.c b/subprojects/gst-plugins-good/ext/jack/gstjackaudiosink.c
index 4d18f7a36f..aa150378df 100644
--- a/subprojects/gst-plugins-good/ext/jack/gstjackaudiosink.c
+++ b/subprojects/gst-plugins-good/ext/jack/gstjackaudiosink.c
@@ -57,7 +57,7 @@
 #include "config.h"
 #endif
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <stdlib.h>
 #include <string.h>
 #include <gst/audio/audio.h>
diff --git a/subprojects/gst-plugins-good/ext/jack/gstjackaudiosrc.c b/subprojects/gst-plugins-good/ext/jack/gstjackaudiosrc.c
index 40784fa4a8..b7e73306d5 100644
--- a/subprojects/gst-plugins-good/ext/jack/gstjackaudiosrc.c
+++ b/subprojects/gst-plugins-good/ext/jack/gstjackaudiosrc.c
@@ -76,7 +76,7 @@
 #include "config.h"
 #endif
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/subprojects/gst-plugins-good/ext/jpeg/gstjpegdec.c b/subprojects/gst-plugins-good/ext/jpeg/gstjpegdec.c
index 06559adc69..b251abcbc2 100644
--- a/subprojects/gst-plugins-good/ext/jpeg/gstjpegdec.c
+++ b/subprojects/gst-plugins-good/ext/jpeg/gstjpegdec.c
@@ -44,7 +44,7 @@
 #include <gst/video/video.h>
 #include <gst/video/gstvideometa.h>
 #include <gst/video/gstvideopool.h>
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 #include <jerror.h>
 
 #define MIN_WIDTH  1
diff --git a/subprojects/gst-plugins-good/ext/lame/gstlamemp3enc.c b/subprojects/gst-plugins-good/ext/lame/gstlamemp3enc.c
index 4016ff3438..461cd52297 100644
--- a/subprojects/gst-plugins-good/ext/lame/gstlamemp3enc.c
+++ b/subprojects/gst-plugins-good/ext/lame/gstlamemp3enc.c
@@ -63,7 +63,7 @@
 
 #include <string.h>
 #include "gstlamemp3enc.h"
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 /* lame < 3.98 */
 #ifndef HAVE_LAME_SET_VBR_QUALITY
diff --git a/subprojects/gst-plugins-good/ext/lame/plugin.c b/subprojects/gst-plugins-good/ext/lame/plugin.c
index 6eb9fdcab7..5ab5692a5e 100644
--- a/subprojects/gst-plugins-good/ext/lame/plugin.c
+++ b/subprojects/gst-plugins-good/ext/lame/plugin.c
@@ -22,7 +22,7 @@
 #endif
 
 #include <gst/gst.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #include "gstlamemp3enc.h"
 
diff --git a/subprojects/gst-plugins-good/ext/libpng/gstpngdec.c b/subprojects/gst-plugins-good/ext/libpng/gstpngdec.c
index 5f6dc8f88a..3775227dbd 100644
--- a/subprojects/gst-plugins-good/ext/libpng/gstpngdec.c
+++ b/subprojects/gst-plugins-good/ext/libpng/gstpngdec.c
@@ -37,7 +37,7 @@
 #include <gst/video/video.h>
 #include <gst/video/gstvideometa.h>
 #include <gst/video/gstvideopool.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY_STATIC (pngdec_debug);
 #define GST_CAT_DEFAULT pngdec_debug
diff --git a/subprojects/gst-plugins-good/ext/pulse/gstpulseelement.c b/subprojects/gst-plugins-good/ext/pulse/gstpulseelement.c
index d539408706..41fee1a6ae 100644
--- a/subprojects/gst-plugins-good/ext/pulse/gstpulseelement.c
+++ b/subprojects/gst-plugins-good/ext/pulse/gstpulseelement.c
@@ -23,7 +23,7 @@
 #include "config.h"
 #endif
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #include "gstpulseelements.h"
 #include "pulsedeviceprovider.h"
diff --git a/subprojects/gst-plugins-good/ext/pulse/pulsesink.c b/subprojects/gst-plugins-good/ext/pulse/pulsesink.c
index a61c93d0a4..723d8f95fd 100644
--- a/subprojects/gst-plugins-good/ext/pulse/pulsesink.c
+++ b/subprojects/gst-plugins-good/ext/pulse/pulsesink.c
@@ -53,7 +53,7 @@
 #include <gst/base/gstbasesink.h>
 #include <gst/gsttaglist.h>
 #include <gst/audio/audio.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #include <gst/pbutils/pbutils.h>        /* only used for GST_PLUGINS_BASE_VERSION_* */
 
diff --git a/subprojects/gst-plugins-good/ext/shout2/gstshout2.c b/subprojects/gst-plugins-good/ext/shout2/gstshout2.c
index 8e2a59e1e5..0c32b6aecb 100644
--- a/subprojects/gst-plugins-good/ext/shout2/gstshout2.c
+++ b/subprojects/gst-plugins-good/ext/shout2/gstshout2.c
@@ -43,7 +43,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY_STATIC (shout2_debug);
 #define GST_CAT_DEFAULT shout2_debug
diff --git a/subprojects/gst-plugins-good/ext/soup/gstsoup.c b/subprojects/gst-plugins-good/ext/soup/gstsoup.c
index 477e4a1490..4fb181668e 100644
--- a/subprojects/gst-plugins-good/ext/soup/gstsoup.c
+++ b/subprojects/gst-plugins-good/ext/soup/gstsoup.c
@@ -17,7 +17,7 @@
 #include "config.h"
 #endif
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #include "gstsoupelements.h"
 #include "gstsouploader.h"
diff --git a/subprojects/gst-plugins-good/ext/soup/gstsoupelement.c b/subprojects/gst-plugins-good/ext/soup/gstsoupelement.c
index 303187ec0f..7558d72a0f 100644
--- a/subprojects/gst-plugins-good/ext/soup/gstsoupelement.c
+++ b/subprojects/gst-plugins-good/ext/soup/gstsoupelement.c
@@ -16,7 +16,7 @@
 #include "config.h"
 #endif
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #include "gstsoupelements.h"
 #include "gstsouphttpsrc.h"
diff --git a/subprojects/gst-plugins-good/ext/soup/gstsouphttpsrc.c b/subprojects/gst-plugins-good/ext/soup/gstsouphttpsrc.c
index 30d2f79703..094ca76975 100644
--- a/subprojects/gst-plugins-good/ext/soup/gstsouphttpsrc.c
+++ b/subprojects/gst-plugins-good/ext/soup/gstsouphttpsrc.c
@@ -77,7 +77,7 @@
 #include <stdlib.h>             /* atoi() */
 #endif
 #include <gst/gstelement.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include "gstsoupelements.h"
 #include "gstsouphttpsrc.h"
 #include "gstsouputils.h"
diff --git a/subprojects/gst-plugins-good/ext/twolame/gsttwolamemp2enc.c b/subprojects/gst-plugins-good/ext/twolame/gsttwolamemp2enc.c
index 1fc7f09020..649a71df3c 100644
--- a/subprojects/gst-plugins-good/ext/twolame/gsttwolamemp2enc.c
+++ b/subprojects/gst-plugins-good/ext/twolame/gsttwolamemp2enc.c
@@ -53,7 +53,7 @@
 
 #include "string.h"
 #include "gsttwolamemp2enc.h"
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY_STATIC (debug);
 #define GST_CAT_DEFAULT debug
diff --git a/subprojects/gst-plugins-good/ext/wavpack/gstwavpackelement.c b/subprojects/gst-plugins-good/ext/wavpack/gstwavpackelement.c
index 65ec0e8e78..5a2c515132 100644
--- a/subprojects/gst-plugins-good/ext/wavpack/gstwavpackelement.c
+++ b/subprojects/gst-plugins-good/ext/wavpack/gstwavpackelement.c
@@ -23,7 +23,7 @@
 #include "config.h"
 #endif
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #include "gstwavpackelements.h"
 
diff --git a/subprojects/gst-plugins-good/gst/apetag/gstapedemux.c b/subprojects/gst-plugins-good/gst/apetag/gstapedemux.c
index 425bdb3f31..a357f84a9c 100644
--- a/subprojects/gst-plugins-good/gst/apetag/gstapedemux.c
+++ b/subprojects/gst-plugins-good/gst/apetag/gstapedemux.c
@@ -47,7 +47,7 @@
 #endif
 
 #include <gst/gst.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <gst/pbutils/pbutils.h>
 
 #include "gstapedemux.h"
diff --git a/subprojects/gst-plugins-good/gst/avi/gstavidemux.c b/subprojects/gst-plugins-good/gst/avi/gstavidemux.c
index e25085f7f6..eafe865494 100644
--- a/subprojects/gst-plugins-good/gst/avi/gstavidemux.c
+++ b/subprojects/gst-plugins-good/gst/avi/gstavidemux.c
@@ -50,7 +50,7 @@
 #include "gstavielements.h"
 #include "gstavidemux.h"
 #include "avi-ids.h"
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <gst/base/gstadapter.h>
 #include <gst/tag/tag.h>
 
diff --git a/subprojects/gst-plugins-good/gst/avi/gstavielement.c b/subprojects/gst-plugins-good/gst/avi/gstavielement.c
index 37ff7c3380..23010dad2c 100644
--- a/subprojects/gst-plugins-good/gst/avi/gstavielement.c
+++ b/subprojects/gst-plugins-good/gst/avi/gstavielement.c
@@ -23,7 +23,7 @@
 #include "config.h"
 #endif
 
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 #include "gst/riff/riff-read.h"
 
 #include "gstavielements.h"
diff --git a/subprojects/gst-plugins-good/gst/avi/gstavimux.c b/subprojects/gst-plugins-good/gst/avi/gstavimux.c
index a71c243695..5a14e9f81c 100644
--- a/subprojects/gst-plugins-good/gst/avi/gstavimux.c
+++ b/subprojects/gst-plugins-good/gst/avi/gstavimux.c
@@ -60,7 +60,7 @@
 #include "config.h"
 #endif
 
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/subprojects/gst-plugins-good/gst/icydemux/gsticydemux.c b/subprojects/gst-plugins-good/gst/icydemux/gsticydemux.c
index c8420e86fc..833ff4c643 100644
--- a/subprojects/gst-plugins-good/gst/icydemux/gsticydemux.c
+++ b/subprojects/gst-plugins-good/gst/icydemux/gsticydemux.c
@@ -42,7 +42,7 @@
 #include "config.h"
 #endif
 #include <gst/gst.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <gst/tag/tag.h>
 
 #include "gsticydemux.h"
diff --git a/subprojects/gst-plugins-good/gst/id3demux/gstid3demux.c b/subprojects/gst-plugins-good/gst/id3demux/gstid3demux.c
index 7c2b5e75e3..b3e8adbd8e 100644
--- a/subprojects/gst-plugins-good/gst/id3demux/gstid3demux.c
+++ b/subprojects/gst-plugins-good/gst/id3demux/gstid3demux.c
@@ -49,7 +49,7 @@
 #include "config.h"
 #endif
 #include <gst/gst.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <gst/tag/tag.h>
 #include <gst/pbutils/pbutils.h>
 #include <string.h>
diff --git a/subprojects/gst-plugins-good/gst/isomp4/gstisomp4element.c b/subprojects/gst-plugins-good/gst/isomp4/gstisomp4element.c
index 06a82d2b62..7aea13be56 100644
--- a/subprojects/gst-plugins-good/gst/isomp4/gstisomp4element.c
+++ b/subprojects/gst-plugins-good/gst/isomp4/gstisomp4element.c
@@ -22,7 +22,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 #include <gst/pbutils/pbutils.h>
 
 #include "gstisomp4elements.h"
diff --git a/subprojects/gst-plugins-good/gst/isomp4/isomp4-plugin.c b/subprojects/gst-plugins-good/gst/isomp4/isomp4-plugin.c
index 3694d157b2..c401c5a8c7 100644
--- a/subprojects/gst-plugins-good/gst/isomp4/isomp4-plugin.c
+++ b/subprojects/gst-plugins-good/gst/isomp4/isomp4-plugin.c
@@ -22,7 +22,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 
 #include "gstisomp4elements.h"
 
diff --git a/subprojects/gst-plugins-good/gst/isomp4/qtdemux.c b/subprojects/gst-plugins-good/gst/isomp4/qtdemux.c
index 1f9b587a7f..a67e5d3494 100644
--- a/subprojects/gst-plugins-good/gst/isomp4/qtdemux.c
+++ b/subprojects/gst-plugins-good/gst/isomp4/qtdemux.c
@@ -50,7 +50,7 @@
 #include "config.h"
 #endif
 
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 
 #include <glib/gprintf.h>
 #include <gst/base/base.h>
diff --git a/subprojects/gst-plugins-good/gst/multifile/gstsplitmuxsrc.c b/subprojects/gst-plugins-good/gst/multifile/gstsplitmuxsrc.c
index 6f220ed9b8..27eae2d8b4 100644
--- a/subprojects/gst-plugins-good/gst/multifile/gstsplitmuxsrc.c
+++ b/subprojects/gst-plugins-good/gst/multifile/gstsplitmuxsrc.c
@@ -50,7 +50,7 @@
 #include "gstsplitmuxsrc.h"
 #include "gstsplitutils.h"
 
-#include "../../gst-libs/gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY (splitmux_debug);
 #define GST_CAT_DEFAULT splitmux_debug
diff --git a/subprojects/gst-plugins-good/gst/rtsp/gstrtspelement.c b/subprojects/gst-plugins-good/gst/rtsp/gstrtspelement.c
index f296a4b0d4..7c3df4f767 100644
--- a/subprojects/gst-plugins-good/gst/rtsp/gstrtspelement.c
+++ b/subprojects/gst-plugins-good/gst/rtsp/gstrtspelement.c
@@ -47,7 +47,7 @@
 #include "config.h"
 #endif
 
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 
 #include "gstrtspelements.h"
 
diff --git a/subprojects/gst-plugins-good/gst/rtsp/gstrtspsrc.c b/subprojects/gst-plugins-good/gst/rtsp/gstrtspsrc.c
index e1180a14cb..e41c7b7f3f 100644
--- a/subprojects/gst-plugins-good/gst/rtsp/gstrtspsrc.c
+++ b/subprojects/gst-plugins-good/gst/rtsp/gstrtspsrc.c
@@ -112,7 +112,7 @@
 #include <gst/sdp/gstmikey.h>
 #include <gst/rtp/rtp.h>
 
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 
 #include "gstrtspelements.h"
 #include "gstrtspsrc.h"
diff --git a/subprojects/gst-plugins-good/gst/wavparse/gstwavparse.c b/subprojects/gst-plugins-good/gst/wavparse/gstwavparse.c
index 04dca3e043..f7b218f8f7 100644
--- a/subprojects/gst-plugins-good/gst/wavparse/gstwavparse.c
+++ b/subprojects/gst-plugins-good/gst/wavparse/gstwavparse.c
@@ -55,7 +55,7 @@
 #include "gst/riff/riff-media.h"
 #include <gst/base/gsttypefindhelper.h>
 #include <gst/pbutils/descriptions.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY_STATIC (wavparse_debug);
 #define GST_CAT_DEFAULT (wavparse_debug)
diff --git a/subprojects/gst-plugins-good/sys/oss/gstossaudio.c b/subprojects/gst-plugins-good/sys/oss/gstossaudio.c
index 5d476b4c9b..2edf0c4ef9 100644
--- a/subprojects/gst-plugins-good/sys/oss/gstossaudio.c
+++ b/subprojects/gst-plugins-good/sys/oss/gstossaudio.c
@@ -21,7 +21,7 @@
 #include "config.h"
 #endif
 
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 
 #include "common.h"
 #include "gstossaudioelements.h"
diff --git a/subprojects/gst-plugins-good/sys/oss/gstossaudioelement.c b/subprojects/gst-plugins-good/sys/oss/gstossaudioelement.c
index 1793bca4f4..50e06a9ed0 100644
--- a/subprojects/gst-plugins-good/sys/oss/gstossaudioelement.c
+++ b/subprojects/gst-plugins-good/sys/oss/gstossaudioelement.c
@@ -21,7 +21,7 @@
 #include "config.h"
 #endif
 
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 
 #include "common.h"
 #include "gstossaudioelements.h"
diff --git a/subprojects/gst-plugins-good/sys/oss/gstosshelper.c b/subprojects/gst-plugins-good/sys/oss/gstosshelper.c
index e649e00829..8290441e71 100644
--- a/subprojects/gst-plugins-good/sys/oss/gstosshelper.c
+++ b/subprojects/gst-plugins-good/sys/oss/gstosshelper.c
@@ -24,7 +24,7 @@
 #include "config.h"
 #endif
 
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
diff --git a/subprojects/gst-plugins-good/sys/oss/gstosssink.c b/subprojects/gst-plugins-good/sys/oss/gstosssink.c
index bae8edf1dc..6af97292e1 100644
--- a/subprojects/gst-plugins-good/sys/oss/gstosssink.c
+++ b/subprojects/gst-plugins-good/sys/oss/gstosssink.c
@@ -69,7 +69,7 @@
 #include "gstossaudioelements.h"
 #include "gstosssink.h"
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY_EXTERN (oss_debug);
 #define GST_CAT_DEFAULT oss_debug
diff --git a/subprojects/gst-plugins-good/sys/oss/gstosssrc.c b/subprojects/gst-plugins-good/sys/oss/gstosssrc.c
index a34e1ee87f..a299d47999 100644
--- a/subprojects/gst-plugins-good/sys/oss/gstosssrc.c
+++ b/subprojects/gst-plugins-good/sys/oss/gstosssrc.c
@@ -63,7 +63,7 @@
 #include "gstossaudioelements.h"
 #include "gstosssrc.h"
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY_EXTERN (oss_debug);
 #define GST_CAT_DEFAULT oss_debug
diff --git a/subprojects/gst-plugins-good/sys/oss4/oss4-audio.c b/subprojects/gst-plugins-good/sys/oss4/oss4-audio.c
index 8c3eb62dbb..9e7be54a53 100644
--- a/subprojects/gst-plugins-good/sys/oss4/oss4-audio.c
+++ b/subprojects/gst-plugins-good/sys/oss4/oss4-audio.c
@@ -32,7 +32,7 @@
 #include <unistd.h>
 #include <string.h>
 
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 #include <gst/audio/audio.h>
 
 #include "oss4-audio.h"
diff --git a/subprojects/gst-plugins-good/sys/oss4/oss4-sink.c b/subprojects/gst-plugins-good/sys/oss4/oss4-sink.c
index 65331051e6..4e98992871 100644
--- a/subprojects/gst-plugins-good/sys/oss4/oss4-sink.c
+++ b/subprojects/gst-plugins-good/sys/oss4/oss4-sink.c
@@ -52,7 +52,7 @@
 #include <unistd.h>
 #include <string.h>
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <gst/audio/streamvolume.h>
 
 #define NO_LEGACY_MIXER
diff --git a/subprojects/gst-plugins-good/sys/oss4/oss4-source.c b/subprojects/gst-plugins-good/sys/oss4/oss4-source.c
index 4b994a0700..4e071336b6 100644
--- a/subprojects/gst-plugins-good/sys/oss4/oss4-source.c
+++ b/subprojects/gst-plugins-good/sys/oss4/oss4-source.c
@@ -48,7 +48,7 @@
 #include <unistd.h>
 #include <string.h>
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #define NO_LEGACY_MIXER
 #include "oss4-audio.h"
diff --git a/subprojects/gst-plugins-good/sys/osxaudio/gstosxaudioringbuffer.c b/subprojects/gst-plugins-good/sys/osxaudio/gstosxaudioringbuffer.c
index 4201e045f1..32eb120fd5 100644
--- a/subprojects/gst-plugins-good/sys/osxaudio/gstosxaudioringbuffer.c
+++ b/subprojects/gst-plugins-good/sys/osxaudio/gstosxaudioringbuffer.c
@@ -48,7 +48,7 @@
 #endif
 
 #include <gst/gst.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <gst/audio/audio-channels.h>
 #include "gstosxaudioringbuffer.h"
 #include "gstosxaudiosink.h"
diff --git a/subprojects/gst-plugins-good/sys/rpicamsrc/gstrpicamsrcdeviceprovider.c b/subprojects/gst-plugins-good/sys/rpicamsrc/gstrpicamsrcdeviceprovider.c
index 0a5b82ca88..c8abf39d09 100644
--- a/subprojects/gst-plugins-good/sys/rpicamsrc/gstrpicamsrcdeviceprovider.c
+++ b/subprojects/gst-plugins-good/sys/rpicamsrc/gstrpicamsrcdeviceprovider.c
@@ -27,7 +27,7 @@
 
 #include "RaspiCapture.h"
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 static GstRpiCamSrcDevice *gst_rpi_cam_src_device_new (void);
 
diff --git a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2.c b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2.c
index ec53bc9e83..2d60709447 100644
--- a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2.c
+++ b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2.c
@@ -29,7 +29,7 @@
 # define _GNU_SOURCE            /* O_CLOEXEC */
 #endif
 
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 
 #include <gst/gst.h>
 
diff --git a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2bufferpool.c b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2bufferpool.c
index 18fb61b976..a1dc9a01c2 100644
--- a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2bufferpool.c
+++ b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2bufferpool.c
@@ -43,7 +43,7 @@
 #include <gstv4l2bufferpool.h>
 
 #include "gstv4l2object.h"
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 #include <gst/glib-compat-private.h>
 
 GST_DEBUG_CATEGORY_STATIC (v4l2bufferpool_debug);
diff --git a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2element.c b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2element.c
index e547e3be70..08b3056b86 100644
--- a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2element.c
+++ b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2element.c
@@ -25,7 +25,7 @@
 #include "config.h"
 #endif
 
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 #include <gst/gst.h>
 
 #include "gstv4l2elements.h"
diff --git a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2fwhtenc.c b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2fwhtenc.c
index 973993ec42..9a2229eaf3 100644
--- a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2fwhtenc.c
+++ b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2fwhtenc.c
@@ -35,7 +35,7 @@
 #include "gstv4l2fwhtenc.h"
 
 #include <string.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY_STATIC (gst_v4l2_fwht_enc_debug);
 #define GST_CAT_DEFAULT gst_v4l2_fwht_enc_debug
diff --git a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2h263enc.c b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2h263enc.c
index b930986eae..7a83731064 100644
--- a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2h263enc.c
+++ b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2h263enc.c
@@ -33,7 +33,7 @@
 #include "gstv4l2h263enc.h"
 
 #include <string.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY_STATIC (gst_v4l2_h263_enc_debug);
 #define GST_CAT_DEFAULT gst_v4l2_h263_enc_debug
diff --git a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2h264enc.c b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2h264enc.c
index 535725ba4e..a5c193ccc1 100644
--- a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2h264enc.c
+++ b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2h264enc.c
@@ -34,7 +34,7 @@
 #include "gstv4l2h264codec.h"
 
 #include <string.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY_STATIC (gst_v4l2_h264_enc_debug);
 #define GST_CAT_DEFAULT gst_v4l2_h264_enc_debug
diff --git a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2h265enc.c b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2h265enc.c
index 4e4797bf83..d84438a26c 100644
--- a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2h265enc.c
+++ b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2h265enc.c
@@ -34,7 +34,7 @@
 #include "gstv4l2h265codec.h"
 
 #include <string.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY_STATIC (gst_v4l2_h265_enc_debug);
 #define GST_CAT_DEFAULT gst_v4l2_h265_enc_debug
diff --git a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2jpegenc.c b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2jpegenc.c
index f99218a8a2..eee7a67da5 100644
--- a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2jpegenc.c
+++ b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2jpegenc.c
@@ -35,7 +35,7 @@
 #include "gstv4l2jpegenc.h"
 
 #include <string.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY_STATIC (gst_v4l2_jpeg_enc_debug);
 #define GST_CAT_DEFAULT gst_v4l2_jpeg_enc_debug
diff --git a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2mpeg4enc.c b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2mpeg4enc.c
index af18688af2..f38ab3c7fb 100644
--- a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2mpeg4enc.c
+++ b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2mpeg4enc.c
@@ -34,7 +34,7 @@
 #include "gstv4l2mpeg4codec.h"
 
 #include <string.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY_STATIC (gst_v4l2_mpeg4_enc_debug);
 #define GST_CAT_DEFAULT gst_v4l2_mpeg4_enc_debug
diff --git a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2object.c b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2object.c
index 08fbf1bb37..5c8a1126fd 100644
--- a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2object.c
+++ b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2object.c
@@ -39,7 +39,7 @@
 #include "gstv4l2tuner.h"
 #include "gstv4l2colorbalance.h"
 
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 
 #include <gst/video/video.h>
 #include <gst/allocators/gstdmabuf.h>
diff --git a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2radio.c b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2radio.c
index c375492d04..0c69b7d303 100644
--- a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2radio.c
+++ b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2radio.c
@@ -42,7 +42,7 @@
 
 #include <string.h>
 
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 
 #include "gstv4l2elements.h"
 #include "gstv4l2object.h"
diff --git a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2sink.c b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2sink.c
index cc601ac947..0500879404 100644
--- a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2sink.c
+++ b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2sink.c
@@ -61,7 +61,7 @@
 
 #include "gstv4l2elements.h"
 #include "gstv4l2sink.h"
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 
 #include <string.h>
 
diff --git a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2src.c b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2src.c
index d250147718..f95250afde 100644
--- a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2src.c
+++ b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2src.c
@@ -61,7 +61,7 @@
 #include "gstv4l2tuner.h"
 #include "gstv4l2vidorient.h"
 
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY (v4l2src_debug);
 #define GST_CAT_DEFAULT v4l2src_debug
diff --git a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2transform.c b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2transform.c
index de7f39baae..1da6ba0af4 100644
--- a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2transform.c
+++ b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2transform.c
@@ -33,7 +33,7 @@
 #include "gstv4l2transform.h"
 
 #include <string.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 #define DEFAULT_PROP_DEVICE "/dev/video10"
 
diff --git a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2videodec.c b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2videodec.c
index 71438f9188..6684a912bb 100644
--- a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2videodec.c
+++ b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2videodec.c
@@ -40,7 +40,7 @@
 #include "gstv4l2vp9codec.h"
 
 #include <string.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY_STATIC (gst_v4l2_video_dec_debug);
 #define GST_CAT_DEFAULT gst_v4l2_video_dec_debug
diff --git a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2videoenc.c b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2videoenc.c
index 19496b73f0..3c70dc04bc 100644
--- a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2videoenc.c
+++ b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2videoenc.c
@@ -35,7 +35,7 @@
 #include "gstv4l2videoenc.h"
 
 #include <string.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY_STATIC (gst_v4l2_video_enc_debug);
 #define GST_CAT_DEFAULT gst_v4l2_video_enc_debug
diff --git a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2vp8enc.c b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2vp8enc.c
index 8bf9086727..22e0fa9541 100644
--- a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2vp8enc.c
+++ b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2vp8enc.c
@@ -34,7 +34,7 @@
 #include "gstv4l2vp8codec.h"
 
 #include <string.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY_STATIC (gst_v4l2_vp8_enc_debug);
 #define GST_CAT_DEFAULT gst_v4l2_vp8_enc_debug
diff --git a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2vp9enc.c b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2vp9enc.c
index f26a2ebc78..6b2d27b553 100644
--- a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2vp9enc.c
+++ b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2vp9enc.c
@@ -34,7 +34,7 @@
 #include "gstv4l2vp9codec.h"
 
 #include <string.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY_STATIC (gst_v4l2_vp9_enc_debug);
 #define GST_CAT_DEFAULT gst_v4l2_vp9_enc_debug
diff --git a/subprojects/gst-plugins-good/sys/v4l2/v4l2_calls.c b/subprojects/gst-plugins-good/sys/v4l2/v4l2_calls.c
index c13b142003..cb37ea781b 100644
--- a/subprojects/gst-plugins-good/sys/v4l2/v4l2_calls.c
+++ b/subprojects/gst-plugins-good/sys/v4l2/v4l2_calls.c
@@ -46,7 +46,7 @@
 #include "gstv4l2sink.h"
 #include "gstv4l2videodec.h"
 
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY_EXTERN (v4l2_debug);
 #define GST_CAT_DEFAULT v4l2_debug
diff --git a/subprojects/gst-plugins-good/sys/ximage/gstximagesrc.c b/subprojects/gst-plugins-good/sys/ximage/gstximagesrc.c
index 28970083a1..dc6352add8 100644
--- a/subprojects/gst-plugins-good/sys/ximage/gstximagesrc.c
+++ b/subprojects/gst-plugins-good/sys/ximage/gstximagesrc.c
@@ -47,7 +47,7 @@
 #include <X11/Xutil.h>
 
 #include <gst/gst.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <gst/video/video.h>
 
 #include "gst/glib-compat-private.h"
diff --git a/subprojects/gst-plugins-ugly/ext/cdio/gstcdiocddasrc.c b/subprojects/gst-plugins-ugly/ext/cdio/gstcdiocddasrc.c
index 15b044cad1..91010aa43d 100644
--- a/subprojects/gst-plugins-ugly/ext/cdio/gstcdiocddasrc.c
+++ b/subprojects/gst-plugins-ugly/ext/cdio/gstcdiocddasrc.c
@@ -68,7 +68,7 @@
 #include "gstcdiocddasrc.h"
 
 #include <gst/gst.h>
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 
 #include <sys/types.h>
 #include <stdlib.h>
diff --git a/subprojects/gst-plugins-ugly/ext/dvdread/dvdreadsrc.c b/subprojects/gst-plugins-ugly/ext/dvdread/dvdreadsrc.c
index cfd72ad6a3..f09c88071f 100644
--- a/subprojects/gst-plugins-ugly/ext/dvdread/dvdreadsrc.c
+++ b/subprojects/gst-plugins-ugly/ext/dvdread/dvdreadsrc.c
@@ -36,7 +36,7 @@
 
 #include <gmodule.h>
 
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY_STATIC (gstgst_dvd_read_src_debug);
 #define GST_CAT_DEFAULT (gstgst_dvd_read_src_debug)
diff --git a/subprojects/gst-plugins-ugly/gst/asfdemux/gstasf.c b/subprojects/gst-plugins-ugly/gst/asfdemux/gstasf.c
index 73a7db2997..3be4b4be77 100644
--- a/subprojects/gst-plugins-ugly/gst/asfdemux/gstasf.c
+++ b/subprojects/gst-plugins-ugly/gst/asfdemux/gstasf.c
@@ -23,7 +23,7 @@
 
 #include <gst/gst.h>
 #include <gst/riff/riff-read.h>
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 
 #include "gstasfelements.h"
 
diff --git a/subprojects/gst-plugins-ugly/gst/asfdemux/gstasfdemux.c b/subprojects/gst-plugins-ugly/gst/asfdemux/gstasfdemux.c
index 0c8dc848c9..87c685aa23 100644
--- a/subprojects/gst-plugins-ugly/gst/asfdemux/gstasfdemux.c
+++ b/subprojects/gst-plugins-ugly/gst/asfdemux/gstasfdemux.c
@@ -37,7 +37,7 @@
 #include <gst/base/gsttypefindhelper.h>
 #include <gst/riff/riff-media.h>
 #include <gst/tag/tag.h>
-#include <gst/gst-i18n-plugin.h>
+#include <glib/gi18n-lib.h>
 #include <gst/video/video.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/subprojects/gst-plugins-ugly/gst/asfdemux/gstasfelement.c b/subprojects/gst-plugins-ugly/gst/asfdemux/gstasfelement.c
index 3991f489e8..19448fc6ad 100644
--- a/subprojects/gst-plugins-ugly/gst/asfdemux/gstasfelement.c
+++ b/subprojects/gst-plugins-ugly/gst/asfdemux/gstasfelement.c
@@ -23,7 +23,7 @@
 
 #include <gst/gst.h>
 #include <gst/riff/riff-read.h>
-#include "gst/gst-i18n-plugin.h"
+#include <glib/gi18n-lib.h>
 
 #include "gstasfelements.h"
 
diff --git a/subprojects/gstreamer/docs/gst-hotdoc-plugins-scanner.c b/subprojects/gstreamer/docs/gst-hotdoc-plugins-scanner.c
index 653086a62b..16054e5c00 100644
--- a/subprojects/gstreamer/docs/gst-hotdoc-plugins-scanner.c
+++ b/subprojects/gstreamer/docs/gst-hotdoc-plugins-scanner.c
@@ -8,7 +8,7 @@
 #include <glib/gprintf.h>
 #include <gst/gst.h>
 #include <gio/gio.h>
-#include "gst/gst-i18n-app.h"
+#include <glib/gi18n.h>
 
 static GRegex *cleanup_caps_field = NULL;
 static void _add_object_details (GString * json, GString * other_types,
diff --git a/subprojects/gstreamer/gst/gst.c b/subprojects/gstreamer/gst/gst.c
index 9d45442ab1..21c237c0c2 100644
--- a/subprojects/gstreamer/gst/gst.c
+++ b/subprojects/gstreamer/gst/gst.c
@@ -119,7 +119,7 @@
 #endif
 #endif
 
-#include "gst-i18n-lib.h"
+#include <glib/gi18n-lib.h>
 #include <locale.h>             /* for LC_ALL */
 
 #include "gst.h"
diff --git a/subprojects/gstreamer/gst/gstelement.c b/subprojects/gstreamer/gst/gstelement.c
index 112ee477f0..168bfc2ec5 100644
--- a/subprojects/gstreamer/gst/gstelement.c
+++ b/subprojects/gstreamer/gst/gstelement.c
@@ -101,7 +101,7 @@
 #include "gstquark.h"
 #include "gsttracerutils.h"
 #include "gstvalue.h"
-#include "gst-i18n-lib.h"
+#include <glib/gi18n-lib.h>
 #include "glib-compat-private.h"
 
 #ifndef GST_DISABLE_GST_DEBUG
diff --git a/subprojects/gstreamer/gst/gsterror.c b/subprojects/gstreamer/gst/gsterror.c
index 059cbcabea..3e115660b0 100644
--- a/subprojects/gstreamer/gst/gsterror.c
+++ b/subprojects/gstreamer/gst/gsterror.c
@@ -117,7 +117,7 @@
 
 #include "gst_private.h"
 #include <gst/gst.h>
-#include "gst-i18n-lib.h"
+#include <glib/gi18n-lib.h>
 
 #define QUARK_FUNC(string)                                              \
 GQuark gst_ ## string ## _error_quark (void) {                          \
diff --git a/subprojects/gstreamer/gst/gstpipeline.c b/subprojects/gstreamer/gst/gstpipeline.c
index b5bbb453c6..e3a7f504df 100644
--- a/subprojects/gstreamer/gst/gstpipeline.c
+++ b/subprojects/gstreamer/gst/gstpipeline.c
@@ -80,7 +80,7 @@
 
 #include "gst_private.h"
 #include "gsterror.h"
-#include "gst-i18n-lib.h"
+#include <glib/gi18n-lib.h>
 
 #include "gstpipeline.h"
 #include "gstinfo.h"
diff --git a/subprojects/gstreamer/gst/gstregistry.c b/subprojects/gstreamer/gst/gstregistry.c
index 2ae339f60e..47d6065583 100644
--- a/subprojects/gstreamer/gst/gstregistry.c
+++ b/subprojects/gstreamer/gst/gstregistry.c
@@ -112,7 +112,7 @@
 
 #include "gstpluginloader.h"
 
-#include "gst-i18n-lib.h"
+#include <glib/gi18n-lib.h>
 
 #include "gst.h"
 #include "glib-compat-private.h"
diff --git a/subprojects/gstreamer/gst/gsttaglist.c b/subprojects/gstreamer/gst/gsttaglist.c
index fedfc37309..cc9a42e472 100644
--- a/subprojects/gstreamer/gst/gsttaglist.c
+++ b/subprojects/gstreamer/gst/gsttaglist.c
@@ -37,7 +37,7 @@
 #define GST_DISABLE_MINIOBJECT_INLINE_FUNCTIONS
 #include "gst_private.h"
 #include "math-compat.h"
-#include "gst-i18n-lib.h"
+#include <glib/gi18n-lib.h>
 #include "gsttaglist.h"
 #include "gstinfo.h"
 #include "gstvalue.h"
diff --git a/subprojects/gstreamer/gst/gsturi.c b/subprojects/gstreamer/gst/gsturi.c
index d3501a8360..8d524231d1 100644
--- a/subprojects/gstreamer/gst/gsturi.c
+++ b/subprojects/gstreamer/gst/gsturi.c
@@ -49,7 +49,7 @@
 #include "gstinfo.h"
 #include "gstregistry.h"
 
-#include "gst-i18n-lib.h"
+#include <glib/gi18n-lib.h>
 
 #include <string.h>
 #include <glib.h>
diff --git a/subprojects/gstreamer/gst/gstutils.c b/subprojects/gstreamer/gst/gstutils.c
index 85433b6865..ebe00b9eff 100644
--- a/subprojects/gstreamer/gst/gstutils.c
+++ b/subprojects/gstreamer/gst/gstutils.c
@@ -45,7 +45,7 @@
 #include "gstparse.h"
 #include "gstvalue.h"
 #include "gstquark.h"
-#include "gst-i18n-lib.h"
+#include <glib/gi18n-lib.h>
 #include "glib-compat-private.h"
 #include <math.h>
 
diff --git a/subprojects/gstreamer/gst/parse/grammar.y.in b/subprojects/gstreamer/gst/parse/grammar.y.in
index cf5eb16ba7..e544f5cfb4 100644
--- a/subprojects/gstreamer/gst/parse/grammar.y.in
+++ b/subprojects/gstreamer/gst/parse/grammar.y.in
@@ -7,7 +7,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "../gst-i18n-lib.h"
+#include <glib/gi18n-lib.h>
 
 #include "../gstconfig.h"
 #include "../gstparse.h"
diff --git a/subprojects/gstreamer/libs/gst/base/gstbasesink.c b/subprojects/gstreamer/libs/gst/base/gstbasesink.c
index 751986d911..294d94684d 100644
--- a/subprojects/gstreamer/libs/gst/base/gstbasesink.c
+++ b/subprojects/gstreamer/libs/gst/base/gstbasesink.c
@@ -147,7 +147,7 @@
 #include <gst/gst_private.h>
 
 #include "gstbasesink.h"
-#include <gst/gst-i18n-lib.h>
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY_STATIC (gst_base_sink_debug);
 #define GST_CAT_DEFAULT gst_base_sink_debug
diff --git a/subprojects/gstreamer/libs/gst/base/gstbasesrc.c b/subprojects/gstreamer/libs/gst/base/gstbasesrc.c
index 28259f42a5..25bd2a09a1 100644
--- a/subprojects/gstreamer/libs/gst/base/gstbasesrc.c
+++ b/subprojects/gstreamer/libs/gst/base/gstbasesrc.c
@@ -152,7 +152,7 @@
 #include <gst/glib-compat-private.h>
 
 #include "gstbasesrc.h"
-#include <gst/gst-i18n-lib.h>
+#include <glib/gi18n-lib.h>
 
 GST_DEBUG_CATEGORY_STATIC (gst_base_src_debug);
 #define GST_CAT_DEFAULT gst_base_src_debug
diff --git a/subprojects/gstreamer/libs/gst/base/gstbasetransform.c b/subprojects/gstreamer/libs/gst/base/gstbasetransform.c
index e4e7ee6415..c4ed029d59 100644
--- a/subprojects/gstreamer/libs/gst/base/gstbasetransform.c
+++ b/subprojects/gstreamer/libs/gst/base/gstbasetransform.c
@@ -141,7 +141,7 @@
 #include <string.h>
 
 #include "../../../gst/gst_private.h"
-#include "../../../gst/gst-i18n-lib.h"
+#include <glib/gi18n-lib.h>
 #include "../../../gst/glib-compat-private.h"
 #include "gstbasetransform.h"
 
diff --git a/subprojects/gstreamer/plugins/elements/gstcapsfilter.c b/subprojects/gstreamer/plugins/elements/gstcapsfilter.c
index 438f6e1f04..8ab961ac60 100644
--- a/subprojects/gstreamer/plugins/elements/gstcapsfilter.c
+++ b/subprojects/gstreamer/plugins/elements/gstcapsfilter.c
@@ -40,7 +40,7 @@
 #include "config.h"
 #endif
 
-#include "../../gst/gst-i18n-lib.h"
+#include <glib/gi18n-lib.h>
 #include "gstcapsfilter.h"
 #include "gstcoreelementselements.h"
 
diff --git a/subprojects/gstreamer/plugins/elements/gstdownloadbuffer.c b/subprojects/gstreamer/plugins/elements/gstdownloadbuffer.c
index 6d01bf91b9..2a6232fc82 100644
--- a/subprojects/gstreamer/plugins/elements/gstdownloadbuffer.c
+++ b/subprojects/gstreamer/plugins/elements/gstdownloadbuffer.c
@@ -57,7 +57,7 @@
 
 #include <glib/gstdio.h>
 
-#include "gst/gst-i18n-lib.h"
+#include <glib/gi18n-lib.h>
 #include "gst/glib-compat-private.h"
 
 #include <string.h>
diff --git a/subprojects/gstreamer/plugins/elements/gstfdsink.c b/subprojects/gstreamer/plugins/elements/gstfdsink.c
index ad69ec0882..df7b61284c 100644
--- a/subprojects/gstreamer/plugins/elements/gstfdsink.c
+++ b/subprojects/gstreamer/plugins/elements/gstfdsink.c
@@ -36,7 +36,7 @@
 #  include "config.h"
 #endif
 
-#include "../../gst/gst-i18n-lib.h"
+#include <glib/gi18n-lib.h>
 
 #include <sys/types.h>
 
diff --git a/subprojects/gstreamer/plugins/elements/gstfilesink.c b/subprojects/gstreamer/plugins/elements/gstfilesink.c
index ce0fba328a..8802c6d171 100644
--- a/subprojects/gstreamer/plugins/elements/gstfilesink.c
+++ b/subprojects/gstreamer/plugins/elements/gstfilesink.c
@@ -38,7 +38,7 @@
 #  include "config.h"
 #endif
 
-#include "../../gst/gst-i18n-lib.h"
+#include <glib/gi18n-lib.h>
 
 #include <gst/gst.h>
 #include <glib/gstdio.h>
diff --git a/subprojects/gstreamer/plugins/elements/gstfilesrc.c b/subprojects/gstreamer/plugins/elements/gstfilesrc.c
index 62ffb202f4..5dfe014169 100644
--- a/subprojects/gstreamer/plugins/elements/gstfilesrc.c
+++ b/subprojects/gstreamer/plugins/elements/gstfilesrc.c
@@ -79,7 +79,7 @@
 #include <errno.h>
 #include <string.h>
 
-#include "../../gst/gst-i18n-lib.h"
+#include <glib/gi18n-lib.h>
 
 static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src",
     GST_PAD_SRC,
diff --git a/subprojects/gstreamer/plugins/elements/gstidentity.c b/subprojects/gstreamer/plugins/elements/gstidentity.c
index 482147d75d..9037c01102 100644
--- a/subprojects/gstreamer/plugins/elements/gstidentity.c
+++ b/subprojects/gstreamer/plugins/elements/gstidentity.c
@@ -36,7 +36,7 @@
 #include <string.h>
 
 #include "gstelements_private.h"
-#include "../../gst/gst-i18n-lib.h"
+#include <glib/gi18n-lib.h>
 #include "gstidentity.h"
 #include "gstcoreelementselements.h"
 
diff --git a/subprojects/gstreamer/plugins/elements/gstqueue.c b/subprojects/gstreamer/plugins/elements/gstqueue.c
index e381083a87..6955d63cf5 100644
--- a/subprojects/gstreamer/plugins/elements/gstqueue.c
+++ b/subprojects/gstreamer/plugins/elements/gstqueue.c
@@ -62,7 +62,7 @@
 #include "gstqueue.h"
 #include "gstcoreelementselements.h"
 
-#include "../../gst/gst-i18n-lib.h"
+#include <glib/gi18n-lib.h>
 #include "../../gst/glib-compat-private.h"
 
 static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
diff --git a/subprojects/gstreamer/plugins/elements/gstqueue2.c b/subprojects/gstreamer/plugins/elements/gstqueue2.c
index 6d9dad9a88..3373e1e503 100644
--- a/subprojects/gstreamer/plugins/elements/gstqueue2.c
+++ b/subprojects/gstreamer/plugins/elements/gstqueue2.c
@@ -66,7 +66,7 @@
 
 #include <glib/gstdio.h>
 
-#include "gst/gst-i18n-lib.h"
+#include <glib/gi18n-lib.h>
 #include "gst/glib-compat-private.h"
 
 #include <string.h>
diff --git a/subprojects/gstreamer/plugins/elements/gsttypefindelement.c b/subprojects/gstreamer/plugins/elements/gsttypefindelement.c
index 41dedb27fe..7ba30c386b 100644
--- a/subprojects/gstreamer/plugins/elements/gsttypefindelement.c
+++ b/subprojects/gstreamer/plugins/elements/gsttypefindelement.c
@@ -74,7 +74,7 @@
 
 #include "gsttypefindelement.h"
 #include "gstcoreelementselements.h"
-#include "gst/gst-i18n-lib.h"
+#include <glib/gi18n-lib.h>
 #include "gst/base/gsttypefindhelper.h"
 
 #include <gst/gsttypefind.h>
diff --git a/subprojects/gstreamer/tools/tools.h b/subprojects/gstreamer/tools/tools.h
index fb24718999..bda8cf4a45 100644
--- a/subprojects/gstreamer/tools/tools.h
+++ b/subprojects/gstreamer/tools/tools.h
@@ -26,7 +26,7 @@
 #include <stdlib.h>
 
 #include <gst/gst.h>
-#include "gst/gst-i18n-app.h"
+#include <glib/gi18n.h>
 
 /*
  * This is a kind of hacky way to make all the tools use the same version code.