diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 6dd3192f3..088d8182f 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,11 @@
+2002-07-12  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* libc/sys/linux/include/mqueue.h: Change to use <bits/siginfo.h>
+	instead of <asm/siginfo.h>.
+	* libc/sys/linux/sys/signal.h: Change to include various linux
+	<bits/xxx.h> header files, rather than <linux/signal.h> so as
+	to work with multiple releases of glibc header files.
+
 2002-07-11  Chris Demetriou  <cgd@broadcom.com>
 
         * testsuite/newlib.search/hsearchtest.c: New file to test
diff --git a/newlib/libc/sys/linux/include/mqueue.h b/newlib/libc/sys/linux/include/mqueue.h
index 10e81e72f..1cdc095ec 100644
--- a/newlib/libc/sys/linux/include/mqueue.h
+++ b/newlib/libc/sys/linux/include/mqueue.h
@@ -7,7 +7,7 @@
 
 #include <sys/types.h>
 #define __need_sigevent_t 1
-#include <asm/siginfo.h>
+#include <bits/siginfo.h>
 
 /* message queue types */
 typedef int mqd_t;
diff --git a/newlib/libc/sys/linux/sys/signal.h b/newlib/libc/sys/linux/sys/signal.h
index 73e9c7921..edbec6f50 100644
--- a/newlib/libc/sys/linux/sys/signal.h
+++ b/newlib/libc/sys/linux/sys/signal.h
@@ -8,7 +8,6 @@
 #define _SIGNAL_H
 
 #include <sys/types.h>
-#include <linux/signal.h>
 #include <bits/sigset.h>
 #include <bits/signum.h>
 
@@ -20,6 +19,12 @@
 #undef sigset_t
 #define sigset_t __sigset_t
 
+typedef void (*__sighandler_t) (int);
+
+#include <bits/siginfo.h>
+#include <bits/sigaction.h>
+#include <bits/sigstack.h>
+
 /* --- include/signal.h thinks it knows better :-( --- */
 
 #undef SIG_DFL