3 files changed, 6 insertions, 3 deletions
diff --git a/clang/test/Modules/Inputs/using-decl-redecl/a.h b/clang/test/Modules/Inputs/using-decl-redecl/a.h
index 477546945c0..eaa1876aac6 100644
--- a/clang/test/Modules/Inputs/using-decl-redecl/a.h
+++ b/clang/test/Modules/Inputs/using-decl-redecl/a.h
@@ -1,2 +1,3 @@
 struct string {};
-namespace N { typedef ::string clstring; }
+const int n = 0;
+namespace N { typedef ::string clstring; using ::n; }
diff --git a/clang/test/Modules/Inputs/using-decl-redecl/d.h b/clang/test/Modules/Inputs/using-decl-redecl/d.h
new file mode 100644
index 00000000000..2243de1baf9
--- /dev/null
+++ b/clang/test/Modules/Inputs/using-decl-redecl/d.h
@@ -0,0 +1 @@
+#include "a.h"
diff --git a/clang/test/Modules/Inputs/using-decl-redecl/module.modulemap b/clang/test/Modules/Inputs/using-decl-redecl/module.modulemap
index bd6ea830c2d..a2ebc176764 100644
--- a/clang/test/Modules/Inputs/using-decl-redecl/module.modulemap
+++ b/clang/test/Modules/Inputs/using-decl-redecl/module.modulemap
@@ -1,3 +1,4 @@
 module a { header "a.h" }
-module b { header "b.h" export * }
-module c { header "c.h" export * }
+module b { header "b.h" export a }
+module c { header "c.h" export a export b }
+module d { header "d.h" }