diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index a5effe2d9c..80240ffe38 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,7 @@
+2017-06-09  Sergio Durigan Junior  <sergiodj@redhat.com>
+
+	* fork-child.c: Conditionally include <signal.h>.
+
 2017-06-07  Sergio Durigan Junior  <sergiodj@redhat.com>
 
 	* server.c (handle_general_set): Handle new packet
diff --git a/gdb/gdbserver/fork-child.c b/gdb/gdbserver/fork-child.c
index a1a8ff11d8..1002620759 100644
--- a/gdb/gdbserver/fork-child.c
+++ b/gdb/gdbserver/fork-child.c
@@ -19,6 +19,9 @@
 #include "server.h"
 #include "job-control.h"
 #include "nat/fork-inferior.h"
+#ifdef HAVE_SIGNAL_H
+#include <signal.h>
+#endif
 
 #ifdef SIGTTOU
 /* A file descriptor for the controlling terminal.  */