diff --git a/clang/lib/Headers/avx512fintrin.h b/clang/lib/Headers/avx512fintrin.h
diff --git a/clang/lib/Headers/immintrin.h b/clang/lib/Headers/immintrin.h
@@ -76,6 +76,14 @@
 #include <fmaintrin.h>
 #endif
 
+#ifdef __AVX512F__
+#include <avx512fintrin.h>
+#endif
+
+#ifdef __AVX512ER__
+#include <avx512erintrin.h>
+#endif
+
 #ifdef __RDRND__
 static __inline__ int __attribute__((__always_inline__, __nodebug__))
 _rdrand16_step(unsigned short *__p)

diff --git a/clang/test/CodeGen/avx512f-builtins.c b/clang/test/CodeGen/avx512f-builtins.c
@@ -0,0 +1,30 @@
+// RUN: %clang_cc1 %s -O0 -triple=x86_64-apple-darwin -target-feature +avx512f -emit-llvm -o - -Werror | FileCheck %s
+
+// Don't include mm_malloc.h, it's system specific.
+#define __MM_MALLOC_H
+
+#include <immintrin.h>
+
+__m512d test_mm512_sqrt_pd(__m512d a)
+{
+  // CHECK: @llvm.x86.avx512.sqrt.pd.512
+  return _mm512_sqrt_pd(a);
+}
+
+__m512 test_mm512_sqrt_ps(__m512 a)
+{
+  // CHECK: @llvm.x86.avx512.sqrt.ps.512
+  return _mm512_sqrt_ps(a);
+}
+
+__m512d test_mm512_rsqrt14_pd(__m512d a)
+{
+  // CHECK: @llvm.x86.avx512.rsqrt14.pd.512
+  return _mm512_rsqrt14_pd(a);
+}
+
+__m512 test_mm512_rsqrt14_ps(__m512 a)
+{
+  // CHECK: @llvm.x86.avx512.rsqrt14.ps.512
+  return _mm512_rsqrt14_ps(a);
+}
diff --git a/clang/test/Headers/x86intrin.c b/clang/test/Headers/x86intrin.c
@@ -84,6 +84,12 @@
 #ifndef __RDRND__
 #define __RDRND__
 #endif
+#ifndef __AVX512F__
+#define __AVX512F__
+#endif
+#ifndef __AVX512ER__
+#define __AVX512ER__
+#endif
 
 // Now include the metaheader that includes all x86 intrinsic headers.
 #include <x86intrin.h>