diff --git a/meson.build b/meson.build
index dd6495723..057ea0946 100644
--- a/meson.build
+++ b/meson.build
@@ -90,12 +90,17 @@ schemas_dep = dependency('gsettings-desktop-schemas', version: schemas_req)
 gnome_desktop_dep = dependency('gnome-desktop-4', version: gnome_desktop_req)
 pango_dep = dependency('pango', version: pango_req)
 
+have_fonts = mutter_dep.get_variable('have_fonts') == 'true'
 have_x11 = mutter_dep.get_variable('have_x11') == 'true'
 have_x11_client = mutter_dep.get_variable('have_x11_client') == 'true'
 if have_x11_client or have_x11
   x11_dep = dependency('x11')
 endif
 
+if not have_fonts
+  error('Shell requires mutter to be built with fonts rendering support')
+endif
+
 
 nm_deps = []
 if get_option('networkmanager')
diff --git a/src/shell-secure-text-buffer.h b/src/shell-secure-text-buffer.h
index f5b68a29b..dfa2abee6 100644
--- a/src/shell-secure-text-buffer.h
+++ b/src/shell-secure-text-buffer.h
@@ -24,6 +24,7 @@
 #pragma once
 
 #include <clutter/clutter.h>
+#include <clutter/clutter-pango.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/st/meson.build b/src/st/meson.build
index 4553cdbe2..449a06aa8 100644
--- a/src/st/meson.build
+++ b/src/st/meson.build
@@ -210,7 +210,7 @@ if get_option('tests') and have_x11_client
   test_theme = executable('test-theme',
     sources: 'test-theme.c',
     c_args: st_cflags,
-    dependencies: [mutter_test_dep, mtk_dep, libxml_dep],
+    dependencies: [mutter_test_dep, mtk_dep, libxml_dep, pango_dep],
     build_rpath: mutter_typelibdir,
     link_with: libst
   )
diff --git a/src/st/st-button.c b/src/st/st-button.c
index 448554b21..d0e4caf37 100644
--- a/src/st/st-button.c
+++ b/src/st/st-button.c
@@ -36,6 +36,7 @@
 #include <glib.h>
 
 #include <clutter/clutter.h>
+#include <clutter/clutter-pango.h>
 
 #include "st-button.h"
 
diff --git a/src/st/st-entry.c b/src/st/st-entry.c
index 8a773586d..d2b9c61cd 100644
--- a/src/st/st-entry.c
+++ b/src/st/st-entry.c
@@ -45,6 +45,7 @@
 #include <glib.h>
 
 #include <clutter/clutter.h>
+#include <clutter/clutter-pango.h>
 
 #include "st-entry.h"
 
diff --git a/src/st/st-label.c b/src/st/st-label.c
index 05b9af556..fe88f19ea 100644
--- a/src/st/st-label.c
+++ b/src/st/st-label.c
@@ -38,6 +38,7 @@
 #include <glib.h>
 
 #include <clutter/clutter.h>
+#include <clutter/clutter-pango.h>
 
 #include "st-label.h"
 #include "st-private.h"
diff --git a/src/st/st-password-entry.c b/src/st/st-password-entry.c
index b149e2d7f..3fe50082f 100644
--- a/src/st/st-password-entry.c
+++ b/src/st/st-password-entry.c
@@ -17,6 +17,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <clutter/clutter-pango.h>
+
 #include "st-private.h"
 #include "st-password-entry.h"
 #include "st-icon.h"
diff --git a/src/st/st-private.c b/src/st/st-private.c
index 133bf065e..7e4257d7e 100644
--- a/src/st/st-private.c
+++ b/src/st/st-private.c
@@ -22,6 +22,8 @@
 #include <math.h>
 #include <string.h>
 
+#include <clutter/clutter-pango.h>
+
 #include "st-private.h"
 #include "st-image-content.h"
 
diff --git a/src/st/st-spinner-content.c b/src/st/st-spinner-content.c
index 76e48b88f..76fe3f2da 100644
--- a/src/st/st-spinner-content.c
+++ b/src/st/st-spinner-content.c
@@ -17,6 +17,8 @@
 
 #include "st-spinner-content.h"
 
+#include <cairo.h>
+
 #include <st-widget.h>
 
 #define MIN_RADIUS 8
diff --git a/src/st/st-theme-node.h b/src/st/st-theme-node.h
index 683b5f21d..3da1a4776 100644
--- a/src/st/st-theme-node.h
+++ b/src/st/st-theme-node.h
@@ -23,6 +23,8 @@
 #pragma once
 
 #include <clutter/clutter.h>
+#include <pango/pango.h>
+
 #include "st-border-image.h"
 #include "st-icon-colors.h"
 #include "st-shadow.h"
diff --git a/src/st/st-widget.c b/src/st/st-widget.c
index 025da73f6..812c16f4e 100644
--- a/src/st/st-widget.c
+++ b/src/st/st-widget.c
@@ -30,6 +30,7 @@
 #include <math.h>
 
 #include <clutter/clutter.h>
+#include <clutter/clutter-pango.h>
 
 #include "st-widget.h"
 
diff --git a/src/st/test-theme.c b/src/st/test-theme.c
index ab654e639..ab99f558d 100644
--- a/src/st/test-theme.c
+++ b/src/st/test-theme.c
@@ -19,6 +19,8 @@
  */
 
 #include <clutter/clutter.h>
+#include <clutter/clutter-pango.h>
+
 #include "st-theme.h"
 #include "st-theme-context.h"
 #include "st-label.h"