diff --git a/clang/lib/Headers/module.modulemap b/clang/lib/Headers/module.modulemap
index 0f10dd4c0816..b26ff5ebb585 100644
--- a/clang/lib/Headers/module.modulemap
+++ b/clang/lib/Headers/module.modulemap
@@ -71,6 +71,9 @@ module _Builtin_intrinsics [system] [extern_c] {
     textual header "sgxintrin.h"
     textual header "ptwriteintrin.h"
 
+    textual header "__wmmintrin_aes.h"
+    textual header "__wmmintrin_pclmul.h"
+
     explicit module mm_malloc {
       requires !freestanding
       header "mm_malloc.h"
@@ -136,14 +139,6 @@ module _Builtin_intrinsics [system] [extern_c] {
       export aes
       export pclmul
     }
-
-    explicit module aes {
-      header "__wmmintrin_aes.h"
-    }
-
-    explicit module pclmul {
-      header "__wmmintrin_pclmul.h"
-    }
   }
 
   explicit module systemz {