diff --git a/src/intel/Makefile.am b/src/intel/Makefile.am
index 63bfd45fdd1..269d73dfcb0 100644
--- a/src/intel/Makefile.am
+++ b/src/intel/Makefile.am
@@ -37,7 +37,6 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/mesa \
 	-I$(top_srcdir)/src/gallium/auxiliary \
 	-I$(top_srcdir)/src/gallium/include \
-	$(INTEL_CFLAGS) \
 	$(VALGRIND_CFLAGS) \
 	$(DEFINES)
 
diff --git a/src/intel/Makefile.common.am b/src/intel/Makefile.common.am
index 848598457ca..a772b5fcd12 100644
--- a/src/intel/Makefile.common.am
+++ b/src/intel/Makefile.common.am
@@ -21,4 +21,5 @@
 
 noinst_LTLIBRARIES += common/libintel_common.la
 
+common_libintel_common_la_CFLAGS = $(AM_CFLAGS) $(LIBDRM_CFLAGS)
 common_libintel_common_la_SOURCES = $(COMMON_FILES) $(DECODER_FILES)