4 files changed, 6 insertions, 6 deletions
diff --git a/test/Modules/Inputs/DependsOnModule.framework/Headers/DependsOnModule.h b/test/Modules/Inputs/DependsOnModule.framework/Headers/DependsOnModule.h
index 8ce3520a3c..d2a5174dfe 100644
--- a/test/Modules/Inputs/DependsOnModule.framework/Headers/DependsOnModule.h
+++ b/test/Modules/Inputs/DependsOnModule.framework/Headers/DependsOnModule.h
@@ -1,5 +1,5 @@
 #include <Module/Module.h> //expected-warning{{treating #include as an import of module 'Module'}}
 
 #define DEPENDS_ON_MODULE 1
-#__private_macro__ DEPENDS_ON_MODULE
+#private DEPENDS_ON_MODULE
 
diff --git a/test/Modules/Inputs/Module.framework/Frameworks/SubFramework.framework/Headers/SubFramework.h b/test/Modules/Inputs/Module.framework/Frameworks/SubFramework.framework/Headers/SubFramework.h
index a7b33f346e..b13bcdd766 100644
--- a/test/Modules/Inputs/Module.framework/Frameworks/SubFramework.framework/Headers/SubFramework.h
+++ b/test/Modules/Inputs/Module.framework/Frameworks/SubFramework.framework/Headers/SubFramework.h
@@ -1,5 +1,5 @@
 #ifndef MODULE_SUBFRAMEWORK_H
 #define MODULE_SUBFRAMEWORK_H
-#__private_macro__ MODULE_SUBFRAMEWORK_H
+#private MODULE_SUBFRAMEWORK_H
 char *module_subframework;
 #endif
diff --git a/test/Modules/Inputs/Module.framework/Headers/Module.h b/test/Modules/Inputs/Module.framework/Headers/Module.h
index 3d10112e55..832855f8de 100644
--- a/test/Modules/Inputs/Module.framework/Headers/Module.h
+++ b/test/Modules/Inputs/Module.framework/Headers/Module.h
@@ -14,7 +14,7 @@ const char *getModuleVersion(void);
 @end
 
 #define MODULE_H_MACRO 1
-#__private_macro__ MODULE_H_MACRO
+#private MODULE_H_MACRO
 
 #include <Module/Sub.h>
 #include <Module/Buried/Treasure.h>
diff --git a/test/Modules/Inputs/macros.h b/test/Modules/Inputs/macros.h
index 4be71aaaa0..ed1b46766f 100644
--- a/test/Modules/Inputs/macros.h
+++ b/test/Modules/Inputs/macros.h
@@ -3,8 +3,8 @@
 #define FLOAT float
 #define DOUBLE double
 
-#__export_macro__ INTEGER
-#__private_macro__ FLOAT
-#__private_macro__ MODULE
+#public INTEGER
+#private FLOAT
+#private MODULE
 
 int (INTEGER);