diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index e754150ed7de..e1b53538f9b4 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -38,6 +38,8 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20120505: new clang import installed a redundant internal header
+OLD_FILES+=usr/include/clang/3.1/stdalign.h
 # 20120425: libusb version bump (r234684)
 OLD_LIBS+=usr/lib/libusb.so.2
 OLD_LIBS+=usr/lib32/libusb.so.2
diff --git a/lib/clang/include/Makefile b/lib/clang/include/Makefile
index 73a6120c2cdc..05b43cf51979 100644
--- a/lib/clang/include/Makefile
+++ b/lib/clang/include/Makefile
@@ -5,17 +5,23 @@
 INCSDIR=${INCLUDEDIR}/clang/3.1
 
 INCS=	altivec.h \
+	avx2intrin.h \
 	avxintrin.h \
+	bmi2intrin.h \
+	bmiintrin.h \
 	cpuid.h \
 	emmintrin.h \
+	fma4intrin.h \
 	immintrin.h \
+	lzcntintrin.h \
 	mm3dnow.h \
 	mm_malloc.h \
 	mmintrin.h \
+	module.map \
 	nmmintrin.h \
 	pmmintrin.h \
+	popcntintrin.h \
 	smmintrin.h \
-	stdalign.h \
 	tmmintrin.h \
 	unwind.h \
 	wmmintrin.h \