diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 351d2df28b..0bd36fcd98 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2014-11-17  Andreas Arnez  <arnez@linux.vnet.ibm.com>
+
+	* gdb.base/bp-permanent.c: Include unistd.h.
+	* gdb.python/py-framefilter-mi.c (main): Add return type.
+	* gdb.python/py-framefilter.c (main): Likewise.
+	* gdb.trace/actions-changed.c (main): Likewise.
+
 2014-11-17  Andreas Arnez  <arnez@linux.vnet.ibm.com>
 
 	* gdb.mi/until.c: Add eye-catchers.
diff --git a/gdb/testsuite/gdb.base/bp-permanent.c b/gdb/testsuite/gdb.base/bp-permanent.c
index 53b3777eb1..a45a922e8f 100644
--- a/gdb/testsuite/gdb.base/bp-permanent.c
+++ b/gdb/testsuite/gdb.base/bp-permanent.c
@@ -18,6 +18,7 @@
 #include <string.h>
 #ifdef SIGNALS
 #include <signal.h>
+#include <unistd.h>
 #endif
 
 #define NOP asm("nop")
diff --git a/gdb/testsuite/gdb.python/py-framefilter-mi.c b/gdb/testsuite/gdb.python/py-framefilter-mi.c
index 242efa1b1e..ae203a6ea8 100644
--- a/gdb/testsuite/gdb.python/py-framefilter-mi.c
+++ b/gdb/testsuite/gdb.python/py-framefilter-mi.c
@@ -132,7 +132,9 @@ int func5(int f, int d)
   return i;
 }
 
+int
 main()
 {
   func5(3,5);
+  return 0;
 }
diff --git a/gdb/testsuite/gdb.python/py-framefilter.c b/gdb/testsuite/gdb.python/py-framefilter.c
index 80087c2f93..8bdb3da28b 100644
--- a/gdb/testsuite/gdb.python/py-framefilter.c
+++ b/gdb/testsuite/gdb.python/py-framefilter.c
@@ -146,10 +146,12 @@ int func5(int f, int d)
   return i;
 }
 
+int
 main()
 {
   int z = 32;
   int y = 44;
   const char *foo1 = "Test";
   func5(3,5);
+  return 0;
 }
diff --git a/gdb/testsuite/gdb.trace/actions-changed.c b/gdb/testsuite/gdb.trace/actions-changed.c
index 602e61a943..b9df26b375 100644
--- a/gdb/testsuite/gdb.trace/actions-changed.c
+++ b/gdb/testsuite/gdb.trace/actions-changed.c
@@ -42,6 +42,7 @@ subr (int parm)
   return busy;
 }
 
+int
 main()
 {
   subr (1);
@@ -63,4 +64,6 @@ main()
   subr (6);
   subr2 (6);
   end (6);
+
+  return 0;
 }