diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 0bf7cbe8be5..b5de70b45c3 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,25 @@
+2014-10-06  Marek Polacek  <polacek@redhat.com>
+
+	* testsuite/libgomp.c/affinity-1.c: Fix implicit declarations.
+	* testsuite/libgomp.c/nqueens-1.c: Likewise.
+	* testsuite/libgomp.c/pr26943-3.c: Likewise.
+	* testsuite/libgomp.c/pr26943-4.c: Likewise.
+	* testsuite/libgomp.c/pr36802-2.c: Likewise.
+	* testsuite/libgomp.c/pr36802-3.c: Likewise.
+	* testsuite/libgomp.c/thread-limit-1.c: Likewise.
+	* testsuite/libgomp.c/thread-limit-2.c: Likewise.
+	* testsuite/libgomp.c/appendix-a/a.15.1.c: Include <omp.h>.
+	* testsuite/libgomp.c/omp-loop02.c: Fix defaulting to int.
+	* testsuite/libgomp.c/omp-parallel-for.c: Likewise.
+	* testsuite/libgomp.c/omp-parallel-if.c: Likewise.
+	* testsuite/libgomp.c/omp-single-1.c: Likewise.
+	* testsuite/libgomp.c/omp-single-2.c: Likewise.
+	* testsuite/libgomp.c/omp_matvec.c: Likewise.
+	* testsuite/libgomp.c/omp_workshare3.c: Likewise.
+	* testsuite/libgomp.c/omp_workshare4.c: Likewise.
+	* testsuite/libgomp.c/shared-1.c: Fix defaulting to int.  Fix implicit
+	declarations.
+
 2014-10-03  Jakub Jelinek  <jakub@redhat.com>
 
 	PR libgomp/61200
diff --git a/libgomp/testsuite/libgomp.c/affinity-1.c b/libgomp/testsuite/libgomp.c/affinity-1.c
index b3c1d0c61ae..a1a2a12e56c 100644
--- a/libgomp/testsuite/libgomp.c/affinity-1.c
+++ b/libgomp/testsuite/libgomp.c/affinity-1.c
@@ -31,6 +31,7 @@
 
 #ifdef DO_FORK
 #include <signal.h>
+pid_t waitpid (pid_t, int *, int);
 #endif
 #ifdef HAVE_PTHREAD_AFFINITY_NP
 #include <sched.h>
diff --git a/libgomp/testsuite/libgomp.c/appendix-a/a.15.1.c b/libgomp/testsuite/libgomp.c/appendix-a/a.15.1.c
index 276ac6caad9..c167dab5c93 100644
--- a/libgomp/testsuite/libgomp.c/appendix-a/a.15.1.c
+++ b/libgomp/testsuite/libgomp.c/appendix-a/a.15.1.c
@@ -1,5 +1,6 @@
 /* { dg-do run } */
 
+#include <omp.h>
 #include <stdio.h>
 
 void
diff --git a/libgomp/testsuite/libgomp.c/nqueens-1.c b/libgomp/testsuite/libgomp.c/nqueens-1.c
index 1fdc67b2963..ed6c17921ea 100644
--- a/libgomp/testsuite/libgomp.c/nqueens-1.c
+++ b/libgomp/testsuite/libgomp.c/nqueens-1.c
@@ -6,6 +6,7 @@
 #include <stdio.h>
 #include <string.h>
 
+unsigned long int strtoul(const char *, char **, int);
 int cnt;
 #pragma omp threadprivate (cnt)
 
diff --git a/libgomp/testsuite/libgomp.c/omp-loop02.c b/libgomp/testsuite/libgomp.c/omp-loop02.c
index 04aaea2e356..ae0d7485d30 100644
--- a/libgomp/testsuite/libgomp.c/omp-loop02.c
+++ b/libgomp/testsuite/libgomp.c/omp-loop02.c
@@ -15,6 +15,7 @@ void parloop (int *a)
     a[i] = i + 3;
 }
 
+int
 main()
 {
   int i, a[N];
diff --git a/libgomp/testsuite/libgomp.c/omp-parallel-for.c b/libgomp/testsuite/libgomp.c/omp-parallel-for.c
index c6631a0a7cb..924697660dc 100644
--- a/libgomp/testsuite/libgomp.c/omp-parallel-for.c
+++ b/libgomp/testsuite/libgomp.c/omp-parallel-for.c
@@ -1,5 +1,6 @@
 extern void abort (void);
 
+int
 main()
 {
   int i, a;
diff --git a/libgomp/testsuite/libgomp.c/omp-parallel-if.c b/libgomp/testsuite/libgomp.c/omp-parallel-if.c
index 5e378359aac..b9c27fd1a75 100644
--- a/libgomp/testsuite/libgomp.c/omp-parallel-if.c
+++ b/libgomp/testsuite/libgomp.c/omp-parallel-if.c
@@ -8,6 +8,7 @@ foo (void)
   return 10;
 }
 
+int
 main ()
 {
   int A = 0;
diff --git a/libgomp/testsuite/libgomp.c/omp-single-1.c b/libgomp/testsuite/libgomp.c/omp-single-1.c
index a44ca54ace7..91555cbea02 100644
--- a/libgomp/testsuite/libgomp.c/omp-single-1.c
+++ b/libgomp/testsuite/libgomp.c/omp-single-1.c
@@ -1,5 +1,6 @@
 extern void abort (void);
 
+int
 main()
 {
   int i = 0;
diff --git a/libgomp/testsuite/libgomp.c/omp-single-2.c b/libgomp/testsuite/libgomp.c/omp-single-2.c
index 68785597397..f16cbbeb1f3 100644
--- a/libgomp/testsuite/libgomp.c/omp-single-2.c
+++ b/libgomp/testsuite/libgomp.c/omp-single-2.c
@@ -9,6 +9,7 @@ struct X
   int c;
 };
 
+int
 main()
 {
   int i = 0;
diff --git a/libgomp/testsuite/libgomp.c/omp_matvec.c b/libgomp/testsuite/libgomp.c/omp_matvec.c
index 12b8c689608..44547b6ebb5 100644
--- a/libgomp/testsuite/libgomp.c/omp_matvec.c
+++ b/libgomp/testsuite/libgomp.c/omp_matvec.c
@@ -16,6 +16,7 @@
 #define SIZE 10
 
 
+int
 main ()
 {
 
diff --git a/libgomp/testsuite/libgomp.c/omp_workshare3.c b/libgomp/testsuite/libgomp.c/omp_workshare3.c
index 913f1f731bf..4c55f13d58d 100644
--- a/libgomp/testsuite/libgomp.c/omp_workshare3.c
+++ b/libgomp/testsuite/libgomp.c/omp_workshare3.c
@@ -16,6 +16,7 @@
 #define N       50
 #define CHUNKSIZE   5
 
+int
 main ()  {
 
 int i, chunk, tid;
diff --git a/libgomp/testsuite/libgomp.c/omp_workshare4.c b/libgomp/testsuite/libgomp.c/omp_workshare4.c
index 67605e38b56..4ebe68cf4c2 100644
--- a/libgomp/testsuite/libgomp.c/omp_workshare4.c
+++ b/libgomp/testsuite/libgomp.c/omp_workshare4.c
@@ -15,6 +15,7 @@
 #define N       50
 #define CHUNKSIZE   5
 
+int
 main ()  {
 
 int i, chunk, tid;
diff --git a/libgomp/testsuite/libgomp.c/pr26943-3.c b/libgomp/testsuite/libgomp.c/pr26943-3.c
index 855a4b27446..68278e441f3 100644
--- a/libgomp/testsuite/libgomp.c/pr26943-3.c
+++ b/libgomp/testsuite/libgomp.c/pr26943-3.c
@@ -2,6 +2,7 @@
 /* { dg-do run } */
 
 extern int omp_set_dynamic (int);
+extern void omp_set_nested (int);
 extern int omp_get_thread_num (void);
 extern void abort (void);
 extern void GOMP_barrier (void);
diff --git a/libgomp/testsuite/libgomp.c/pr26943-4.c b/libgomp/testsuite/libgomp.c/pr26943-4.c
index 24f253d236d..ff03704c715 100644
--- a/libgomp/testsuite/libgomp.c/pr26943-4.c
+++ b/libgomp/testsuite/libgomp.c/pr26943-4.c
@@ -2,6 +2,7 @@
 /* { dg-do run } */
 
 extern int omp_set_dynamic (int);
+extern void omp_set_nested (int);
 extern int omp_get_thread_num (void);
 extern void abort (void);
 extern void GOMP_barrier (void);
diff --git a/libgomp/testsuite/libgomp.c/pr36802-2.c b/libgomp/testsuite/libgomp.c/pr36802-2.c
index 06e792f0f14..7bda6593197 100644
--- a/libgomp/testsuite/libgomp.c/pr36802-2.c
+++ b/libgomp/testsuite/libgomp.c/pr36802-2.c
@@ -1,6 +1,9 @@
 /* PR middle-end/36802 */
 
 extern void abort (void);
+extern int omp_set_dynamic (int);
+extern void omp_set_nested (int);
+extern int omp_get_num_threads (void);
 
 int q;
 
diff --git a/libgomp/testsuite/libgomp.c/pr36802-3.c b/libgomp/testsuite/libgomp.c/pr36802-3.c
index f11baa09f57..700c2036f47 100644
--- a/libgomp/testsuite/libgomp.c/pr36802-3.c
+++ b/libgomp/testsuite/libgomp.c/pr36802-3.c
@@ -1,6 +1,9 @@
 /* PR middle-end/36802 */
 
 extern void abort (void);
+extern int omp_set_dynamic (int);
+extern void omp_set_nested (int);
+extern int omp_get_num_threads (void);
 
 int q;
 
diff --git a/libgomp/testsuite/libgomp.c/shared-1.c b/libgomp/testsuite/libgomp.c/shared-1.c
index f7d4fb2d60f..8e1980bb0f5 100644
--- a/libgomp/testsuite/libgomp.c/shared-1.c
+++ b/libgomp/testsuite/libgomp.c/shared-1.c
@@ -1,4 +1,5 @@
 extern void abort (void);
+extern int omp_get_num_threads (void);
 
 struct Y
 {
@@ -51,6 +52,7 @@ parallel (int a, int b)
     abort ();
 }
 
+int
 main()
 {
   parallel (1, 2);
diff --git a/libgomp/testsuite/libgomp.c/thread-limit-1.c b/libgomp/testsuite/libgomp.c/thread-limit-1.c
index 6cc716bee89..7571f23e24d 100644
--- a/libgomp/testsuite/libgomp.c/thread-limit-1.c
+++ b/libgomp/testsuite/libgomp.c/thread-limit-1.c
@@ -4,6 +4,11 @@
 #include <stdlib.h>
 #include <unistd.h>
 
+extern int omp_get_thread_limit (void);
+extern int omp_set_dynamic (int);
+extern void omp_set_nested (int);
+extern int omp_get_num_threads (void);
+
 int
 main ()
 {
diff --git a/libgomp/testsuite/libgomp.c/thread-limit-2.c b/libgomp/testsuite/libgomp.c/thread-limit-2.c
index 0fc9dae0fd1..ca9ad23b31f 100644
--- a/libgomp/testsuite/libgomp.c/thread-limit-2.c
+++ b/libgomp/testsuite/libgomp.c/thread-limit-2.c
@@ -4,6 +4,11 @@
 #include <stdlib.h>
 #include <unistd.h>
 
+extern int omp_get_thread_limit (void);
+extern int omp_set_dynamic (int);
+extern void omp_set_nested (int);
+extern int omp_get_num_threads (void);
+
 int
 main ()
 {