diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d80e5e8484d1c3f30de55645c6c9df8f4b5603ce..2ab7179e9c49f95baa246ab7d6f424637768bdda 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,7 +18,7 @@ variables:
     DEBIAN_VERSION: testing-slim
     DEBIAN_EXEC: 'bash .gitlab-ci/debian-install.sh'
 
-    DEBIAN_TAG: "2019-09-03"
+    DEBIAN_TAG: "2020-01-06"
     IMAGE_LOCAL: "$CI_REGISTRY_IMAGE/debian/$DEBIAN_VERSION:$DEBIAN_TAG"
 
 include:
@@ -53,20 +53,16 @@ debian-testing:
         when: on_failure
         paths:
             - build/test/piglit-results/
-    cache:
-        paths:
-            - ccache/
     variables:
+        CCACHE_COMPILERCHECK: content
+        CCACHE_DIR: /cache/xserver/cache
         LC_ALL: C.UTF-8
     before_script:
         - export CCACHE_BASEDIR="$PWD"
-        - export CCACHE_DIR="$PWD/ccache"
-        - export CCACHE_COMPILERCHECK=content
         - export PATH="/usr/lib/ccache:$PATH"
-        - ccache --zero-stats
         - ccache --show-stats
     after_script:
-        - CCACHE_DIR="$PWD/ccache" ccache --show-stats
+        - ccache --show-stats
 
 autotools-build-and-test:
     extends: .common-build-and-test
@@ -74,8 +70,8 @@ autotools-build-and-test:
         - mkdir build/
         - cd build/
         - ../autogen.sh --prefix=/usr
-        - make -j$(nproc) distcheck
-        - PIGLIT_DIR=/root/piglit XTEST_DIR=/root/xts make -j$(nproc) check
+        - make -j4 distcheck
+        - PIGLIT_DIR=/root/piglit XTEST_DIR=/root/xts make -j4 check
         - cd ..
         - .gitlab-ci/manpages-check
 
@@ -86,6 +82,6 @@ meson-build-and-test:
         XTEST_DIR: /root/xts
     script:
         - meson -Dprefix=/usr -Dxephyr=true build/
-        - ninja -C build/ install
-        - ninja -C build/ test
+        - ninja -j4 -C build/ install
+        - ninja -j4 -C build/ test
         - .gitlab-ci/manpages-check
diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh
index a17bccff21ad8bdbf7cb16c3a58a2483e013ae18..845b49581cd0a78dea7df265d1c628e2fed0c173 100644
--- a/.gitlab-ci/debian-install.sh
+++ b/.gitlab-ci/debian-install.sh
@@ -6,10 +6,24 @@ set -o xtrace
 echo 'deb-src https://deb.debian.org/debian testing main' > /etc/apt/sources.list.d/deb-src.list
 apt-get update
 apt-get install -y \
-	meson git ca-certificates ccache automake autoconf libtool \
-	libxkbcommon-dev python3-mako python3-numpy python3-six \
-	x11-utils x11-xserver-utils xauth xvfb \
-        libgl1 libglx-mesa0
+	autoconf \
+	automake \
+	ca-certificates \
+	ccache \
+	git \
+	libgl1 \
+	libglx-mesa0 \
+	libnvidia-egl-wayland-dev \
+	libtool \
+	libxkbcommon-dev \
+	meson \
+	python3-mako \
+	python3-numpy \
+	python3-six \
+	x11-utils \
+	x11-xserver-utils \
+	xauth \
+	xvfb \
 
 apt-get build-dep -y xorg-server
 
@@ -20,22 +34,29 @@ git clone https://gitlab.freedesktop.org/mesa/piglit.git --depth 1
 git clone https://gitlab.freedesktop.org/xorg/test/xts --depth 1
 cd xts
 ./autogen.sh
-xvfb-run make -j$(nproc)
+xvfb-run make -j4
 cd ..
 
 git clone https://gitlab.freedesktop.org/xorg/test/rendercheck --depth 1
 cd rendercheck
 meson build
-ninja -C build install
+ninja -j4 -C build install
 cd ..
 
-rm -rf piglit/.git xts/.git
+rm -rf piglit/.git xts/.git piglit/tests/spec/
 
 echo '[xts]' > piglit/piglit.conf
 echo 'path=/root/xts' >> piglit/piglit.conf
 
-find -name \*.a -o -name \*.o | xargs rm
+find -name \*.a -o -name \*.o -o -name \*.c -o -name \*.h -o -name \*.la\* | xargs rm
+strip xts/xts5/*/.libs/*
+
+apt-get purge -y \
+	git \
+	libxkbcommon-dev \
+	x11-utils \
+	x11-xserver-utils \
+	xauth \
+	xvfb \
 
-apt-get purge -y git libxkbcommon-dev \
-    x11-utils x11-xserver-utils xauth xvfb
 apt-get autoremove -y --purge
diff --git a/hw/xwayland/xwayland-glamor-eglstream.c b/hw/xwayland/xwayland-glamor-eglstream.c
index 81947a6baf7fed93b9086141d15f9f57b1690b0a..aa5267a4d600396ea4aaa111651fedc1ff1c66bf 100644
--- a/hw/xwayland/xwayland-glamor-eglstream.c
+++ b/hw/xwayland/xwayland-glamor-eglstream.c
@@ -43,6 +43,7 @@
 #include "xwayland-glamor.h"
 #include "xwayland-pixmap.h"
 #include "xwayland-screen.h"
+#include "xwayland-window.h"
 
 #include "wayland-eglstream-client-protocol.h"
 #include "wayland-eglstream-controller-client-protocol.h"