diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 22c6349046..22c69029da 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -41,7 +41,7 @@
 #include <time.h>
 
 #include <glib.h>
-#include <glib/gstdio.h>
+#include <pbd/gstdio_compat.h>
 
 #include <gtkmm/messagedialog.h>
 #include <gtkmm/accelmap.h>
diff --git a/gtk2_ardour/bundle_env_msvc.cc b/gtk2_ardour/bundle_env_msvc.cc
index 7189892f5f..1be6434fb6 100644
--- a/gtk2_ardour/bundle_env_msvc.cc
+++ b/gtk2_ardour/bundle_env_msvc.cc
@@ -29,7 +29,7 @@
 #include <fstream>
 
 #include <glibmm.h>
-#include <glib/gstdio.h>
+#include <pbd/gstdio_compat.h>
 
 #include <fontconfig/fontconfig.h>
 
diff --git a/gtk2_ardour/editor_export_audio.cc b/gtk2_ardour/editor_export_audio.cc
index c2abbca856..0d1f055c80 100644
--- a/gtk2_ardour/editor_export_audio.cc
+++ b/gtk2_ardour/editor_export_audio.cc
@@ -25,7 +25,7 @@
 
 #include <gtkmm/messagedialog.h>
 
-#include <glib/gstdio.h>
+#include <pbd/gstdio_compat.h>
 
 #include "gtkmm2ext/choice.h"
 
diff --git a/gtk2_ardour/editor_snapshots.cc b/gtk2_ardour/editor_snapshots.cc
index 1047f256f7..e0c36f7f0d 100644
--- a/gtk2_ardour/editor_snapshots.cc
+++ b/gtk2_ardour/editor_snapshots.cc
@@ -19,7 +19,7 @@
 
 
 #include <glib.h>
-#include <glib/gstdio.h>
+#include <pbd/gstdio_compat.h>
 
 #include <glibmm.h>
 #include <glibmm/datetime.h>
diff --git a/gtk2_ardour/editor_videotimeline.cc b/gtk2_ardour/editor_videotimeline.cc
index c4987bceb5..4b7189f209 100644
--- a/gtk2_ardour/editor_videotimeline.cc
+++ b/gtk2_ardour/editor_videotimeline.cc
@@ -18,7 +18,7 @@
 
 */
 
-#include <glib/gstdio.h>
+#include <pbd/gstdio_compat.h>
 
 #include "ardour/profile.h"
 #include "ardour/rc_configuration.h"
diff --git a/gtk2_ardour/export_video_dialog.cc b/gtk2_ardour/export_video_dialog.cc
index 13f1f8fe4d..0e3a80e5ec 100644
--- a/gtk2_ardour/export_video_dialog.cc
+++ b/gtk2_ardour/export_video_dialog.cc
@@ -29,7 +29,7 @@
 
 #include <sigc++/bind.h>
 
-#include <glib/gstdio.h>
+#include <pbd/gstdio_compat.h>
 
 #include "pbd/error.h"
 #include "pbd/convert.h"
diff --git a/gtk2_ardour/pingback.cc b/gtk2_ardour/pingback.cc
index 9df81650fa..eb0ab9dd01 100644
--- a/gtk2_ardour/pingback.cc
+++ b/gtk2_ardour/pingback.cc
@@ -32,7 +32,7 @@
 
 #include <curl/curl.h>
 
-#include <glib/gstdio.h>
+#include <pbd/gstdio_compat.h>
 #include <glibmm/miscutils.h>
 
 #include "pbd/compose.h"
diff --git a/gtk2_ardour/session_dialog.cc b/gtk2_ardour/session_dialog.cc
index 2952377ac7..48d9e7e440 100644
--- a/gtk2_ardour/session_dialog.cc
+++ b/gtk2_ardour/session_dialog.cc
@@ -25,7 +25,7 @@
 #include <algorithm>
 
 #include <glib.h>
-#include <glib/gstdio.h>
+#include <pbd/gstdio_compat.h>
 
 #include <glibmm.h>
 #include <glibmm/datetime.h>
diff --git a/gtk2_ardour/sfdb_freesound_mootcher.cc b/gtk2_ardour/sfdb_freesound_mootcher.cc
index 6bab2bd019..bc367c3ddd 100644
--- a/gtk2_ardour/sfdb_freesound_mootcher.cc
+++ b/gtk2_ardour/sfdb_freesound_mootcher.cc
@@ -48,7 +48,7 @@
 #include <iostream>
 
 #include <glib.h>
-#include <glib/gstdio.h>
+#include <pbd/gstdio_compat.h>
 
 #include "i18n.h"
 
diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc
index f8f3003bc8..bcb1df07df 100644
--- a/gtk2_ardour/sfdb_ui.cc
+++ b/gtk2_ardour/sfdb_ui.cc
@@ -33,7 +33,7 @@
 #include <gtkmm/box.h>
 #include <gtkmm/stock.h>
 
-#include <glib/gstdio.h>
+#include <pbd/gstdio_compat.h>
 #include <glibmm/fileutils.h>
 
 #include "pbd/convert.h"
diff --git a/gtk2_ardour/soundcloud_export_selector.cc b/gtk2_ardour/soundcloud_export_selector.cc
index e9ef5a3060..23b4995c43 100644
--- a/gtk2_ardour/soundcloud_export_selector.cc
+++ b/gtk2_ardour/soundcloud_export_selector.cc
@@ -30,7 +30,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <iostream>
-#include <glib/gstdio.h>
+#include <pbd/gstdio_compat.h>
 
 #include "i18n.h"
 
diff --git a/gtk2_ardour/startup.cc b/gtk2_ardour/startup.cc
index 19ae453a1d..c19c14f7aa 100644
--- a/gtk2_ardour/startup.cc
+++ b/gtk2_ardour/startup.cc
@@ -26,7 +26,7 @@
 #include <algorithm>
 #include <fcntl.h>
 
-#include <glib/gstdio.h>
+#include <pbd/gstdio_compat.h>
 
 #include <gtkmm/main.h>
 #include <gtkmm/filechooser.h>
diff --git a/gtk2_ardour/theme_manager.cc b/gtk2_ardour/theme_manager.cc
index db0aebb143..ec040735f7 100644
--- a/gtk2_ardour/theme_manager.cc
+++ b/gtk2_ardour/theme_manager.cc
@@ -24,7 +24,7 @@
 
 #include "fix_carbon.h"
 
-#include <glib/gstdio.h>
+#include <pbd/gstdio_compat.h>
 
 #include <gtkmm/stock.h>
 #include <gtkmm/settings.h>
diff --git a/gtk2_ardour/transcode_video_dialog.cc b/gtk2_ardour/transcode_video_dialog.cc
index 04c21b6140..ac3d4808fc 100644
--- a/gtk2_ardour/transcode_video_dialog.cc
+++ b/gtk2_ardour/transcode_video_dialog.cc
@@ -29,7 +29,7 @@
 
 #include <sigc++/bind.h>
 
-#include <glib/gstdio.h>
+#include <pbd/gstdio_compat.h>
 
 #include "pbd/error.h"
 #include "pbd/convert.h"
diff --git a/gtk2_ardour/ui_config.cc b/gtk2_ardour/ui_config.cc
index 83c2fd0540..232eb8f1a4 100644
--- a/gtk2_ardour/ui_config.cc
+++ b/gtk2_ardour/ui_config.cc
@@ -33,7 +33,7 @@
 #include <pango/pangocairo.h> // for fontmap resolution control for GnomeCanvas
 
 #include <glibmm/miscutils.h>
-#include <glib/gstdio.h>
+#include <pbd/gstdio_compat.h>
 
 #include <gtkmm/settings.h>