diff --git a/lib/Headers/module.modulemap b/lib/Headers/module.modulemap
index b147e891dceb3000f0b5c5f419d069220956a1e7..afb38652ef54d53b99785e9fcada1330f1448ff8 100644
--- a/lib/Headers/module.modulemap
+++ b/lib/Headers/module.modulemap
@@ -44,6 +44,7 @@ module _Builtin_intrinsics [system] [extern_c] {
     }
 
     explicit module sse {
+      export mm_malloc
       export mmx
       export sse2 // note: for hackish <emmintrin.h> dependency
       header "xmmintrin.h"
diff --git a/test/Headers/xmmintrin.c b/test/Headers/xmmintrin.c
index 39743c96b783c1b354e2d4997978577715143b74..9e15f3ba4649b0dea22876c7f7fed2157c6ffff5 100644
--- a/test/Headers/xmmintrin.c
+++ b/test/Headers/xmmintrin.c
@@ -23,3 +23,7 @@ __m128 test_xmmintrin_provides_emmintrin(__m128d __a, __m128d __b) {
   return _mm_add_sd(__a, __b);
 }
 
+#if __STDC_HOSTED__
+// Make sure stdlib.h symbols are accessible.
+void *p = NULL;
+#endif