diff --git a/Makefile.am b/Makefile.am
index 453e5f672ae..76451763776 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -57,6 +57,13 @@ EXTRA_FILES = \
 	src/mesa/program/program_parse.tab.h		\
 	`git ls-files | grep "Makefile.am" | sed -e "s/Makefile.am/Makefile.in/"`
 
+noinst_HEADERS =					\
+	include/c99_compat.h				\
+	include/c99					\
+	include/c11					\
+	include/D3D9					\
+	include/HaikuGL					\
+	include/pci_ids
 
 IGNORE_FILES = \
 	-x autogen.sh
diff --git a/src/mesa/drivers/dri/Makefile.am b/src/mesa/drivers/dri/Makefile.am
index 2009da921ba..d63425d6c6c 100644
--- a/src/mesa/drivers/dri/Makefile.am
+++ b/src/mesa/drivers/dri/Makefile.am
@@ -46,7 +46,8 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = dri.pc
 
 driincludedir = $(includedir)/GL/internal
-driinclude_HEADERS = $(top_srcdir)/include/GL/internal/dri_interface.h
+driinclude_HEADERS = \
+	$(top_srcdir)/include/GL/internal/dri_interface.h
 
 nodist_EXTRA_mesa_dri_drivers_la_SOURCES = dummy.cpp
 mesa_dri_drivers_la_SOURCES =