4 files changed, 2 insertions, 6 deletions
diff --git a/test/CodeGen/builtins-powi.c b/test/CodeGen/builtins-powi.c
index 5b413a8895..57fa81a3ad 100644
--- a/test/CodeGen/builtins-powi.c
+++ b/test/CodeGen/builtins-powi.c
@@ -3,7 +3,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <math.h>
 
 void test(long double a, int b) {
   printf("%Lf**%d: %08x %08x %016Lx\n", 
diff --git a/test/CodeGen/builtins.c b/test/CodeGen/builtins.c
index 165db9c267..35a588ec88 100644
--- a/test/CodeGen/builtins.c
+++ b/test/CodeGen/builtins.c
@@ -2,7 +2,6 @@
 // RUN: not grep __builtin %t
 
 #include <stdio.h>
-#include <math.h>
 
 void p(char *str, int x) {
   printf("%s: %d\n", str, x);
@@ -118,7 +117,7 @@ int main() {
 
 
 
-void strcat() {}
+char *strcat(char *, char const *) {}
 
 void foo() {
  __builtin_strcat(0, 0);
diff --git a/test/CodeGen/const-init.c b/test/CodeGen/const-init.c
index 29e9c55615..e25da9c6eb 100644
--- a/test/CodeGen/const-init.c
+++ b/test/CodeGen/const-init.c
@@ -1,6 +1,6 @@
 // RUN: clang-cc -triple i386-pc-linux-gnu -verify -emit-llvm -o - %s | FileCheck %s
 
-#include <stdint.h>
+typedef __INTPTR_TYPE__          intptr_t;
 
 // Brace-enclosed string array initializers
 char a[] = { "asdf" };
diff --git a/test/CodeGen/mandel.c b/test/CodeGen/mandel.c
index 6f46ee407f..27993f0559 100644
--- a/test/CodeGen/mandel.c
+++ b/test/CodeGen/mandel.c
@@ -25,8 +25,6 @@ int main() { return 0; }
 
 #define I 1.0iF
 
-#include <math.h>
-
 #include <stdio.h>
 
 volatile double __complex__ accum;