diff --git a/ChangeLog b/ChangeLog
index 915cae846e..1212089138 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-08-18  Mike Frysinger  <vapier@gentoo.org>
+
+	* sysdeps/unix/sysv/linux/hppa/bits/signalfd.h: New file.
+	* sysdeps/unix/sysv/linux/hppa/sys/signalfd.h: Delete.
+
 2015-08-18  Mike Frysinger  <vapier@gentoo.org>
 
 	* sysdeps/unix/sysv/linux/hppa/bits/inotify.h: New file.
diff --git a/sysdeps/unix/sysv/linux/hppa/sys/signalfd.h b/sysdeps/unix/sysv/linux/hppa/bits/signalfd.h
similarity index 55%
rename from sysdeps/unix/sysv/linux/hppa/sys/signalfd.h
rename to sysdeps/unix/sysv/linux/hppa/bits/signalfd.h
index 1a4a197c72..abb2a23cd5 100644
--- a/sysdeps/unix/sysv/linux/hppa/sys/signalfd.h
+++ b/sysdeps/unix/sysv/linux/hppa/bits/signalfd.h
@@ -12,37 +12,12 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library.  If not, see
+   License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
 #ifndef	_SYS_SIGNALFD_H
-#define	_SYS_SIGNALFD_H	1
-
-#define __need_sigset_t
-#include <signal.h>
-#include <stdint.h>
-
-
-struct signalfd_siginfo
-{
-  uint32_t ssi_signo;
-  int32_t ssi_errno;
-  int32_t ssi_code;
-  uint32_t ssi_pid;
-  uint32_t ssi_uid;
-  int32_t ssi_fd;
-  uint32_t ssi_tid;
-  uint32_t ssi_band;
-  uint32_t ssi_overrun;
-  uint32_t ssi_trapno;
-  int32_t ssi_status;
-  int32_t ssi_int;
-  uint64_t ssi_ptr;
-  uint64_t ssi_utime;
-  uint64_t ssi_stime;
-  uint64_t ssi_addr;
-  uint8_t __pad[48];
-};
+# error "Never use <bits/signalfd.h> directly; include <sys/signalfd.h> instead."
+#endif
 
 /* Flags for signalfd.  */
 enum
@@ -52,14 +27,3 @@ enum
     SFD_NONBLOCK = 00200004 /* HPUX has separate NDELAY & NONBLOCK */
 #define SFD_NONBLOCK SFD_NONBLOCK
   };
-
-__BEGIN_DECLS
-
-/* Request notification for delivery of signals in MASK to be
-   performed using descriptor FD.*/
-extern int signalfd (int __fd, const sigset_t *__mask, int __flags)
-  __THROW __nonnull ((2));
-
-__END_DECLS
-
-#endif /* sys/signalfd.h */