diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 28563c0af3..aa84f1dcab 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,9 @@
 2001-10-14  Mark Kettenis  <kettenis@gnu.org>
 
+	* config/s390/nm-linux.h: Don't include <signal.h>.
+	(lin_lwp_attach_lwp, ATTACH_LWP, lin_thread_get_thread_signals,
+	GET_THREAD_SIGNAL): Remove.
+
 	* config/nm-linux.h (struct objfile): Remove forward declaration.
 	(linuxthreads_new_objfile): Remove prototype.
 	(linuxthreads_pid_to_str): Remove prototype.
diff --git a/gdb/config/s390/nm-linux.h b/gdb/config/s390/nm-linux.h
index ddf298e00f..242d57cf42 100644
--- a/gdb/config/s390/nm-linux.h
+++ b/gdb/config/s390/nm-linux.h
@@ -75,16 +75,6 @@ extern int s390_remove_watchpoint (int pid, CORE_ADDR addr, int len);
 	 ((type) == bp_read_watchpoint) || \
          ((type) == bp_access_watchpoint))
 
-#undef PREPARE_TO_PROCEED
-
-extern void lin_lwp_attach_lwp (ptid_t ptid, int verbose);
-#define ATTACH_LWP(ptid, verbose) lin_lwp_attach_lwp ((ptid), (verbose))
-
-
-#include <signal.h>
-
-extern void lin_thread_get_thread_signals (sigset_t * mask);
-#define GET_THREAD_SIGNALS(mask) lin_thread_get_thread_signals (mask)
 
 /* Needed for s390x */
 #define PTRACE_ARG3_TYPE long