diff --git a/gdk/gdkdmabufegl.c b/gdk/gdkdmabufegl.c
index 1f5a8213ce..397fe28585 100644
--- a/gdk/gdkdmabufegl.c
+++ b/gdk/gdkdmabufegl.c
@@ -33,7 +33,7 @@
 #include <sys/mman.h>
 #include <sys/ioctl.h>
 #include <linux/dma-buf.h>
-#include <drm/drm_fourcc.h>
+#include <drm_fourcc.h>
 #include <epoxy/egl.h>
 
 /* A dmabuf downloader implementation that downloads buffers via
@@ -187,7 +187,9 @@ get_memory_format (guint32  fourcc,
     case DRM_FORMAT_UYVY:
     case DRM_FORMAT_VYUY:
     case DRM_FORMAT_XYUV8888:
+#ifdef DRM_FORMAT_XVUY8888
     case DRM_FORMAT_XVUY8888:
+#endif
     case DRM_FORMAT_VUY888:
       return GDK_MEMORY_R8G8B8;
 
diff --git a/gdk/gdkglcontext.c b/gdk/gdkglcontext.c
index 7993879e85..725cb5860c 100644
--- a/gdk/gdkglcontext.c
+++ b/gdk/gdkglcontext.c
@@ -97,7 +97,7 @@
 #endif
 
 #ifdef HAVE_DMABUF
-#include <drm/drm_fourcc.h>
+#include <drm_fourcc.h>
 #endif
 
 #include <math.h>
diff --git a/testsuite/gdk/dmabuftexture.c b/testsuite/gdk/dmabuftexture.c
index e939bc4867..d56fb29ef0 100644
--- a/testsuite/gdk/dmabuftexture.c
+++ b/testsuite/gdk/dmabuftexture.c
@@ -6,7 +6,7 @@
 #include <gdk/gdkdmabuftextureprivate.h>
 
 #ifdef HAVE_DMABUF
-#include <drm/drm_fourcc.h>
+#include <drm_fourcc.h>
 #endif
 
 static void