9 files changed, 14 insertions, 14 deletions
diff --git a/test/Sema/objc-comptypes-1.m b/test/Sema/objc-comptypes-1.m
index 512565c58b..e47bc63565 100644
--- a/test/Sema/objc-comptypes-1.m
+++ b/test/Sema/objc-comptypes-1.m
@@ -1,6 +1,7 @@
 // RUN: clang -fsyntax-only -verify -pedantic %s
 
-#include <objc/objc.h>
+#define nil (void *)0;
+#define Nil (void *)0;
 
 extern void foo();
 
diff --git a/test/Sema/objc-comptypes-2.m b/test/Sema/objc-comptypes-2.m
index 3a60bed5f3..d063d95cc2 100644
--- a/test/Sema/objc-comptypes-2.m
+++ b/test/Sema/objc-comptypes-2.m
@@ -1,6 +1,7 @@
 // RUN: clang -fsyntax-only -verify %s
 
-#include <objc/objc.h>
+#define nil (void *)0;
+#define Nil (void *)0;
 
 @protocol MyProtocol
 - (void) foo;
diff --git a/test/Sema/objc-comptypes-3.m b/test/Sema/objc-comptypes-3.m
index 4aab2d2ee7..1e271c8340 100644
--- a/test/Sema/objc-comptypes-3.m
+++ b/test/Sema/objc-comptypes-3.m
@@ -1,6 +1,8 @@
 // RUN: clang -fsyntax-only -verify %s
+
+#define nil (void *)0;
+
 extern void foo();
-#include <objc/objc.h>
 
 @protocol MyProtocolA
 - (void) methodA;
diff --git a/test/Sema/objc-comptypes-5.m b/test/Sema/objc-comptypes-5.m
index 508c25f01d..e594a6e35d 100644
--- a/test/Sema/objc-comptypes-5.m
+++ b/test/Sema/objc-comptypes-5.m
@@ -1,7 +1,8 @@
 // RUN: clang -fsyntax-only -verify %s
 
+#define nil (void *)0;
+
 extern void foo();
-#include <objc/objc.h>
 
 @protocol MyProtocol
 - (void) method;
diff --git a/test/Sema/objc-comptypes-6.m b/test/Sema/objc-comptypes-6.m
index dd9b396787..2edb181e83 100644
--- a/test/Sema/objc-comptypes-6.m
+++ b/test/Sema/objc-comptypes-6.m
@@ -1,10 +1,10 @@
 // RUN: clang -fsyntax-only -verify -pedantic %s
 
-#include <objc/Object.h>
-
-@interface Derived: Object
+@interface Derived
 @end
 
+@interface Object @end
+
 extern Object* foo(void);
 
 static Derived *test(void)
diff --git a/test/Sema/objc-comptypes-7.m b/test/Sema/objc-comptypes-7.m
index 3e6a9d3434..6e5ff0282f 100644
--- a/test/Sema/objc-comptypes-7.m
+++ b/test/Sema/objc-comptypes-7.m
@@ -1,6 +1,7 @@
 // RUN: clang -fsyntax-only -verify -pedantic %s
 
-#include <objc/objc.h>
+#define nil (void *)0;
+#define Nil (void *)0;
 
 extern void foo();
 
diff --git a/test/Sema/objc-super-test.m b/test/Sema/objc-super-test.m
index 7575dfd840..80f1dddc00 100644
--- a/test/Sema/objc-super-test.m
+++ b/test/Sema/objc-super-test.m
@@ -1,7 +1,5 @@
 // RUN: clang -rewrite-test %s | clang
 
-#include <objc/objc.h>
-
 @interface SUPER
 - (int) MainMethod;
 @end
diff --git a/test/Sema/rewrite-api-bug.m b/test/Sema/rewrite-api-bug.m
index cca02c3b8f..b965c92971 100644
--- a/test/Sema/rewrite-api-bug.m
+++ b/test/Sema/rewrite-api-bug.m
@@ -1,7 +1,5 @@
 // RUN: clang -rewrite-test %s
 
-#include <objc/objc.h>
-
 @interface MyDerived
 - (void) instanceMethod;
 @end
diff --git a/test/Sema/undef-field-reference-1.m b/test/Sema/undef-field-reference-1.m
index 485188b649..36096e57f6 100644
--- a/test/Sema/undef-field-reference-1.m
+++ b/test/Sema/undef-field-reference-1.m
@@ -1,7 +1,5 @@
 // RUN: clang -rewrite-test %s | clang
 
-#include <objc/objc.h>
-
 @interface MyDerived 
 {
 @public