12 files changed, 11 insertions, 10 deletions
diff --git a/libpthread/linuxthreads/sysdeps/pthread/kernel-features.h b/libc/sysdeps/linux/common/bits/kernel-features.h
index 88a71828b..88a71828b 100644
--- a/libpthread/linuxthreads/sysdeps/pthread/kernel-features.h
+++ b/libc/sysdeps/linux/common/bits/kernel-features.h
diff --git a/libc/sysdeps/linux/common/getdents.c b/libc/sysdeps/linux/common/getdents.c
index 0baf47eb4..e1aa2a51f 100644
--- a/libc/sysdeps/linux/common/getdents.c
+++ b/libc/sysdeps/linux/common/getdents.c
@@ -16,6 +16,7 @@
 #include <sys/types.h>
 #include <sys/syscall.h>
 #include <bits/kernel_types.h>
+#include <bits/kernel-features.h>
 
 /* With newer versions of linux, the getdents syscall returns d_type
  * information after the name field.
diff --git a/libpthread/linuxthreads/restart.h b/libpthread/linuxthreads/restart.h
index f53642eda..694ec48cf 100644
--- a/libpthread/linuxthreads/restart.h
+++ b/libpthread/linuxthreads/restart.h
@@ -13,7 +13,7 @@
 /* GNU Library General Public License for more details.                 */
 
 #include <signal.h>
-#include <kernel-features.h>
+#include <bits/kernel-features.h>
 
 /* Primitives for controlling thread execution */
 
diff --git a/libpthread/linuxthreads/sysdeps/i386/i686/pt-machine.h b/libpthread/linuxthreads/sysdeps/i386/i686/pt-machine.h
index 222d44a3f..2958c76f0 100644
--- a/libpthread/linuxthreads/sysdeps/i386/i686/pt-machine.h
+++ b/libpthread/linuxthreads/sysdeps/i386/i686/pt-machine.h
@@ -25,7 +25,7 @@
 #ifndef PT_EI
 # define PT_EI __extern_always_inline
 #endif
-#include "kernel-features.h"
+#include <bits/kernel-features.h>
 
 #ifndef __ASSEMBLER__
 extern long int testandset (int *spinlock);
diff --git a/libpthread/linuxthreads/sysdeps/i386/pspinlock.c b/libpthread/linuxthreads/sysdeps/i386/pspinlock.c
index c9c62724b..64b59252a 100644
--- a/libpthread/linuxthreads/sysdeps/i386/pspinlock.c
+++ b/libpthread/linuxthreads/sysdeps/i386/pspinlock.c
@@ -20,7 +20,7 @@
 #include <errno.h>
 #include <pthread.h>
 #include "internals.h"
-#include <kernel-features.h>
+#include <bits/kernel-features.h>
 
 
 /* This implementation is similar to the one used in the Linux kernel.
diff --git a/libpthread/linuxthreads/sysdeps/pthread/getcpuclockid.c b/libpthread/linuxthreads/sysdeps/pthread/getcpuclockid.c
index 1c64e6c2b..cefbd554a 100644
--- a/libpthread/linuxthreads/sysdeps/pthread/getcpuclockid.c
+++ b/libpthread/linuxthreads/sysdeps/pthread/getcpuclockid.c
@@ -23,7 +23,7 @@
 #include <time.h>
 #include <internals.h>
 #include <spinlock.h>
-#include <kernel-features.h>
+#include <bits/kernel-features.h>
 #include <kernel-posix-cpu-timers.h>
 
 
diff --git a/libpthread/linuxthreads/sysdeps/pthread/uClibc-glue.h b/libpthread/linuxthreads/sysdeps/pthread/uClibc-glue.h
index e5c577ffb..b957dedc9 100644
--- a/libpthread/linuxthreads/sysdeps/pthread/uClibc-glue.h
+++ b/libpthread/linuxthreads/sysdeps/pthread/uClibc-glue.h
@@ -6,7 +6,7 @@
 #include <bits/uClibc_page.h>
 
 #ifdef IS_IN_libpthread
-#include "kernel-features.h"
+#include <bits/kernel-features.h>
 
 #ifndef __GLIBC_HAVE_LONG_LONG
 # define __GLIBC_HAVE_LONG_LONG
diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/i386/vfork.S b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/i386/vfork.S
index c7a120d23..78eeabf53 100644
--- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/i386/vfork.S
+++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/i386/vfork.S
@@ -20,7 +20,7 @@
 #include <sysdep-cancel.h>
 #define _ERRNO_H	1
 #include <bits/errno.h>
-#include <kernel-features.h>
+#include <bits/kernel-features.h>
 
 /* Clone the calling process, but without copying the whole address space.
    The calling process is suspended until the new process exits or is
diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/m68k/vfork.S b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/m68k/vfork.S
index 49b8a3c0a..9f304abbe 100644
--- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/m68k/vfork.S
+++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/m68k/vfork.S
@@ -20,7 +20,7 @@
 #include <sysdep-cancel.h>
 #define _ERRNO_H	1
 #include <bits/errno.h>
-#include <kernel-features.h>
+#include <bits/kernel-features.h>
 
 /* Clone the calling process, but without copying the whole address space.
    The calling process is suspended until the new process exits or is
diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/powerpc/powerpc32/vfork.S b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/powerpc/powerpc32/vfork.S
index 724d4cc54..353c7d07f 100644
--- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/powerpc/powerpc32/vfork.S
+++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/powerpc/powerpc32/vfork.S
@@ -19,7 +19,7 @@
 #include <sysdep-cancel.h>
 #define _ERRNO_H	1
 #include <bits/errno.h>
-#include <kernel-features.h>
+#include <bits/kernel-features.h>
 
 /* Clone the calling process, but without copying the whole address space.
    The calling process is suspended until the new process exits or is
diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/powerpc/powerpc64/vfork.S b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/powerpc/powerpc64/vfork.S
index b408e31b7..7a3cb82c1 100644
--- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/powerpc/powerpc64/vfork.S
+++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/powerpc/powerpc64/vfork.S
@@ -19,7 +19,7 @@
 #include <sysdep-cancel.h>
 #define _ERRNO_H	1
 #include <bits/errno.h>
-#include <kernel-features.h>
+#include <bits/kernel-features.h>
 
 /* Clone the calling process, but without copying the whole address space.
    The calling process is suspended until the new process exits or is
diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/pt-sigsuspend.c b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/pt-sigsuspend.c
index 7c9fe36e2..613980593 100644
--- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/pt-sigsuspend.c
+++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/pt-sigsuspend.c
@@ -24,7 +24,7 @@
 #include <sys/syscall.h>
 #include <linuxthreads/internals.h>
 
-#include <kernel-features.h>
+#include <bits/kernel-features.h>
 
 void
 __pthread_sigsuspend (const sigset_t *set)