diff --git a/libs/glibmm2/glib/glibmm/convert.cc b/libs/glibmm2/glib/glibmm/convert.cc
index 9a46526fa8..0d13461950 100644
--- a/libs/glibmm2/glib/glibmm/convert.cc
+++ b/libs/glibmm2/glib/glibmm/convert.cc
@@ -25,7 +25,7 @@
  */
 
 #include <glib/gconvert.h>
-#include <glib/gmessages.h>
+#include <glib.h>
 #include <glib/gunicode.h>
 #include <glibmm/utility.h>
 
diff --git a/libs/glibmm2/glib/glibmm/date.cc b/libs/glibmm2/glib/glibmm/date.cc
index 331402dd4b..eb71cf314a 100644
--- a/libs/glibmm2/glib/glibmm/date.cc
+++ b/libs/glibmm2/glib/glibmm/date.cc
@@ -25,7 +25,7 @@
  */
 
 #include <glib/gmem.h>
-#include <glib/gmessages.h>
+#include <glib.h>
 
 #include <ctime>
 #include <algorithm>
diff --git a/libs/glibmm2/glib/glibmm/debug.h b/libs/glibmm2/glib/glibmm/debug.h
index 2e7698b17d..3d7368a0c5 100644
--- a/libs/glibmm2/glib/glibmm/debug.h
+++ b/libs/glibmm2/glib/glibmm/debug.h
@@ -28,7 +28,7 @@
 
 #ifdef GLIBMM_DEBUG_REFCOUNTING
 
-#include <glib/gmessages.h>
+#include <glib.h>
 
 /* We can't use G_GNUC_PRETTY_FUNCTION because it's always disabled in C++,
  * even though __PRETTY_FUNCTION__ works fine in C++ as well if you use it
diff --git a/libs/glibmm2/glib/glibmm/error.cc b/libs/glibmm2/glib/glibmm/error.cc
index bbde5f589b..5fdf00acdb 100644
--- a/libs/glibmm2/glib/glibmm/error.cc
+++ b/libs/glibmm2/glib/glibmm/error.cc
@@ -21,7 +21,7 @@
  */
 
 #include <glib/gerror.h>
-#include <glib/gmessages.h>
+#include <glib.h>
 
 #include <map>
 #include <glibmmconfig.h>
diff --git a/libs/glibmm2/glib/glibmm/exception.cc b/libs/glibmm2/glib/glibmm/exception.cc
index 875c891c31..6e094a2427 100644
--- a/libs/glibmm2/glib/glibmm/exception.cc
+++ b/libs/glibmm2/glib/glibmm/exception.cc
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <glib/gmessages.h>
+#include <glib.h>
 #include <glibmm/exception.h>
 
 
diff --git a/libs/glibmm2/glib/glibmm/main.cc b/libs/glibmm2/glib/glibmm/main.cc
index 3ae43e3a4a..4b95192cf4 100644
--- a/libs/glibmm2/glib/glibmm/main.cc
+++ b/libs/glibmm2/glib/glibmm/main.cc
@@ -24,7 +24,7 @@
 #include <glibmm/wrap.h>
 #include <glibmm/iochannel.h>
 
-#include <glib/gmessages.h>
+#include <glib.h>
 #include <algorithm>
 
 GLIBMM_USING_STD(min)
diff --git a/libs/glibmm2/glib/glibmm/thread.cc b/libs/glibmm2/glib/glibmm/thread.cc
index 0bd41232b3..9a67a0b4ee 100644
--- a/libs/glibmm2/glib/glibmm/thread.cc
+++ b/libs/glibmm2/glib/glibmm/thread.cc
@@ -25,7 +25,7 @@
  */
 
 #include <glibmm/exceptionhandler.h>
-#include <glib/gmessages.h>
+#include <glib.h>
 
 
 namespace
diff --git a/libs/glibmm2/glib/glibmm/timeval.cc b/libs/glibmm2/glib/glibmm/timeval.cc
index 61882138f1..8010ef720d 100644
--- a/libs/glibmm2/glib/glibmm/timeval.cc
+++ b/libs/glibmm2/glib/glibmm/timeval.cc
@@ -21,7 +21,7 @@
  */
 
 #include <glib/gmain.h>
-#include <glib/gmessages.h>
+#include <glib.h>
 #include <glib/gtimer.h>
 
 #include <glibmm/timeval.h>
diff --git a/libs/glibmm2/glib/src/convert.ccg b/libs/glibmm2/glib/src/convert.ccg
index dc19705611..d598fc17b9 100644
--- a/libs/glibmm2/glib/src/convert.ccg
+++ b/libs/glibmm2/glib/src/convert.ccg
@@ -19,7 +19,7 @@
  */
 
 #include <glib/gconvert.h>
-#include <glib/gmessages.h>
+#include <glib.h>
 #include <glib/gunicode.h>
 #include <glibmm/utility.h>
 
diff --git a/libs/glibmm2/glib/src/date.ccg b/libs/glibmm2/glib/src/date.ccg
index 8f66c8e8f8..ab99a1c407 100644
--- a/libs/glibmm2/glib/src/date.ccg
+++ b/libs/glibmm2/glib/src/date.ccg
@@ -19,7 +19,7 @@
  */
 
 #include <glib/gmem.h>
-#include <glib/gmessages.h>
+#include <glib.h>
 
 #include <ctime>
 #include <algorithm>
diff --git a/libs/glibmm2/glib/src/thread.ccg b/libs/glibmm2/glib/src/thread.ccg
index bfdefbf425..5e3ff52d0d 100644
--- a/libs/glibmm2/glib/src/thread.ccg
+++ b/libs/glibmm2/glib/src/thread.ccg
@@ -19,7 +19,7 @@
  */
 
 #include <glibmm/exceptionhandler.h>
-#include <glib/gmessages.h>
+#include <glib.h>
 
 
 namespace