diff --git a/glamor/Makefile.am b/glamor/Makefile.am
index 97b677a8a..2df76bd53 100644
--- a/glamor/Makefile.am
+++ b/glamor/Makefile.am
@@ -17,7 +17,7 @@ endif
 INCLUDES = \
 	$(XORG_INCS)
 
-AM_CFLAGS = $(XORG_CFLAGS) $(DIX_CFLAGS) $(GLAMOR_GLES2_CFLAGS)
+AM_CFLAGS = $(XORG_CFLAGS) $(DIX_CFLAGS) $(GLAMOR_GLES2_CFLAGS) $(LIBDRM_CFLAGS)
 
 libglamor_la_SOURCES = \
 	glamor.c \
diff --git a/hw/xfree86/glamor/Makefile.am b/hw/xfree86/glamor/Makefile.am
index 71d491441..a00f08ac5 100644
--- a/hw/xfree86/glamor/Makefile.am
+++ b/hw/xfree86/glamor/Makefile.am
@@ -1,7 +1,7 @@
 glamor_la_LTLIBRARIES = glamor.la
 glamor_la_CFLAGS =					\
 	-DHAVE_XORG_CONFIG_H				\
-	@DIX_CFLAGS@ @XORG_CFLAGS@			\
+	@DIX_CFLAGS@ @XORG_CFLAGS@ @LIBDRM_CFLAGS@	\
 	-I$(top_srcdir)/hw/xfree86/common		\
 	-I$(top_srcdir)/hw/xfree86/os-support/bus	\
 	-I$(top_srcdir)/hw/xfree86/parser		\
@@ -9,8 +9,7 @@ glamor_la_CFLAGS =					\
 	-I$(top_srcdir)/hw/xfree86/ddc			\
 	-I$(top_srcdir)/hw/xfree86/ramdac		\
 	-I$(top_srcdir)/hw/xfree86/i2c			\
-	-I$(top_srcdir)/glamor				\
-	-I/usr/include/drm
+	-I$(top_srcdir)/glamor
 
 if GLAMOR_GLES2
 glamor_la_CFLAGS+=-DGLAMOR_GLES2