diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a80f39a35..7fa840856 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -213,6 +213,19 @@ fedora meson build:
     - meson builddir ${MESON_ARGS}
     - ninja -C builddir
     # - ninja -C builddir test
+
+    # Run test scripts
+    #- (cd builddir/src && srcdir=../../src bash "$srcdir/check-def.sh")   This script calls "make cairo.def" and thus does not work with meson
+    - mkdir builddir/src/.libs
+    - touch builddir/src/.libs/libfoo.so
+    - MAKE=echo CAIRO_HAS_HIDDEN_SYMBOLS=1 bash src/check-plt.sh builddir/src/libcairo.so
+    - (cd src && bash "check-headers.sh")
+    - (cd src && bash "check-preprocessor-syntax.sh")
+    - (cd src && bash "check-doc-syntax.sh")
+    - (cd doc/public && bash "check-doc-syntax.sh")
+    # FIXME: The following line really needs gtk-doc to run first
+    - (cd doc/public && DOC_MODULE=cairo bash "check-doc-coverage.sh")
+
     - ninja -C builddir install
   artifacts:
     expire_in: "7 days"
diff --git a/src/check-preprocessor-syntax.sh b/src/check-preprocessor-syntax.sh
index b718f604e..fa0fa715f 100755
--- a/src/check-preprocessor-syntax.sh
+++ b/src/check-preprocessor-syntax.sh
@@ -49,7 +49,7 @@ grep . >&2 && stat=1
 
 
 echo 'Checking that there is no #include <cairo.*.h>'
-grep '#.*\<include\>.*<.*cairo' $ALL >&2 && stat=1
+grep '^[^*]#.*\<include\>.*<.*cairo' $ALL >&2 && stat=1
 
 
 echo 'Checking that feature conditionals are used with #if only (not #ifdef)'
diff --git a/src/win32/cairo-dwrite-font-public.c b/src/win32/cairo-dwrite-font-public.c
index 9e4e56ba8..09eddd51d 100644
--- a/src/win32/cairo-dwrite-font-public.c
+++ b/src/win32/cairo-dwrite-font-public.c
@@ -39,6 +39,7 @@
  * with this .c wrapper containing the gtkdocs for cairo-dwrite-font.cpp.
  */
 
+#include "cairoint.h"
 #include "cairo-win32-private.h"
 
 /**