3 files changed, 5 insertions, 3 deletions
diff --git a/clang/test/Modules/Inputs/dummy.h b/clang/test/Modules/Inputs/dummy.h
index 6e1ac74e44f..cad83154dc2 100644
--- a/clang/test/Modules/Inputs/dummy.h
+++ b/clang/test/Modules/Inputs/dummy.h
@@ -1,3 +1,5 @@
 // This module only exists to make local decl IDs and global decl IDs different.
-
+#ifndef DUMMY_H
+#define DUMMY_H
 struct Dummy {} extern *dummy1, *dummy2, *dummy3;
+#endif
diff --git a/clang/test/Modules/modular_maps.cpp b/clang/test/Modules/modular_maps.cpp
index 3b6afc7552d..fc44131d458 100644
--- a/clang/test/Modules/modular_maps.cpp
+++ b/clang/test/Modules/modular_maps.cpp
@@ -16,4 +16,4 @@
 #include "b.h" // expected-error {{private header}}
 @import C;
 const int v = a + c + x;
-const int val = a + b + c + x; // expected-error {{undeclared identifier}}
+const int val = a + b + c + x;
diff --git a/clang/test/Modules/separate_map_tree.cpp b/clang/test/Modules/separate_map_tree.cpp
index 5a1fff4efc7..a5cb9888a60 100644
--- a/clang/test/Modules/separate_map_tree.cpp
+++ b/clang/test/Modules/separate_map_tree.cpp
@@ -5,4 +5,4 @@
 #include "public-in-b.h" // expected-error {{private header}}
 #include "public-in-c.h"
 #include "private-in-c.h" // expected-error {{private header}}
-const int val = common + b + c + c_; // expected-error {{undeclared identifier}}
+const int val = common + b + c + c_;