Take Mike Frysinger's comments into account -- make certain that user

applications stop using _syscall#() and use syscall() instead.  Cleanup
internal handling of syscall includes to use the correct header file.

include/sys/syscall.h

@@ -19,11 +19,19 @@
 #ifndef _SYSCALL_H
 #define _SYSCALL_H	1
 
-/* This file provides us with the useful _syscall[0-6] macros.  The kernel
- * provided syscall macros from asm/unistd.h are not suitable for user-space,
- * lacking PIC support etc, so we use our own libc versions to be certain all
- * such variations are handled properly. */
+/* The _syscall#() macros are for uClibc internal use only.
+ * User application code should use syscall() instead.
+ *
+ * The kernel provided _syscall[0-6] macros from asm/unistd.h are not suitable
+ * for use in uClibc as they lack PIC support etc, so for uClibc we use our own
+ * local _syscall# macros to be certain all such variations are handled
+ * properly.
+ */
+
 #include <features.h>
-#include <bits/syscalls.h>
+#include <bits/sysnum.h>
+#if defined _LIBC && (defined IS_IN_libc || defined NOT_IN_libc)
+# include <bits/syscalls.h>
+#endif
 
 #endif

libc/sysdeps/linux/alpha/bits/syscalls.h

@@ -4,11 +4,6 @@
 # error "Never use <bits/syscalls.h> directly; include <sys/syscall.h> instead."
 #endif
 
-/* This includes the `__NR_<name>' syscall numbers taken from the Linux kernel
- * header files.  It also defines the traditional `SYS_<name>' macros for older
- * programs.  */
-#include <bits/sysnum.h>
-
 #ifndef __ASSEMBLER__
 
 #include <errno.h>

libc/sysdeps/linux/arm/bits/syscalls.h

@@ -4,11 +4,6 @@
 # error "Never use <bits/syscalls.h> directly; include <sys/syscall.h> instead."
 #endif
 
-/* This includes the `__NR_<name>' syscall numbers taken from the Linux kernel
- * header files.  It also defines the traditional `SYS_<name>' macros for older
- * programs.  */
-#include <bits/sysnum.h>
-
 /*
    Some of the sneaky macros in the code were taken from 
    glibc-2.3.2/sysdeps/unix/sysv/linux/arm/sysdep.h

libc/sysdeps/linux/bfin/bits/syscalls.h

@@ -4,11 +4,6 @@
 # error "Never use <bits/syscalls.h> directly; include <sys/syscall.h> instead."
 #endif
 
-/* This includes the `__NR_<name>' syscall numbers taken from the Linux kernel
- * header files.  It also defines the traditional `SYS_<name>' macros for older
- * programs.  */
-#include <bits/sysnum.h>
-
 #ifndef __ASSEMBLER__
 
 #include <errno.h>

libc/sysdeps/linux/common/__rt_sigtimedwait.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <signal.h>
 #define __need_NULL
 #include <stddef.h>

libc/sysdeps/linux/common/__socketcall.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #ifdef __NR_socketcall
 #define __NR___socketcall __NR_socketcall
 int __socketcall(int __call, unsigned long *__args) attribute_hidden;

libc/sysdeps/linux/common/__syscall_fcntl.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <stdarg.h>
 #include <fcntl.h>
 #include <bits/wordsize.h>

libc/sysdeps/linux/common/__syscall_fcntl64.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <stdarg.h>
 #include <fcntl.h>
 

libc/sysdeps/linux/common/__syscall_ipc.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 
 #ifdef __NR_ipc
 #define __NR___syscall_ipc __NR_ipc

libc/sysdeps/linux/common/__syscall_rt_sigaction.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 
 #ifdef __NR_rt_sigaction
 #include <signal.h>

libc/sysdeps/linux/common/__syscall_sigaction.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 
 #ifndef __NR_rt_sigaction
 #define __NR___syscall_sigaction __NR_sigaction

libc/sysdeps/linux/common/access.c

@@ -7,6 +7,6 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <unistd.h>
 _syscall2(int, access, const char *, pathname, int, mode);

libc/sysdeps/linux/common/acct.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <unistd.h>
 #if defined __USE_BSD || (defined __USE_XOPEN && !defined __USE_UNIX98)
 _syscall1(int, acct, const char *, filename);

libc/sysdeps/linux/common/adjtimex.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <sys/timex.h>
 
 libc_hidden_proto(adjtimex)

libc/sysdeps/linux/common/alarm.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <unistd.h>
 
 libc_hidden_proto(alarm)

libc/sysdeps/linux/common/arch_prctl.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 
 #ifdef __NR_arch_prctl
 extern int arch_prctl(int code, unsigned long addr);

libc/sysdeps/linux/common/bdflush.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <sys/kdaemon.h>
 
 #ifdef __NR_bdflush

libc/sysdeps/linux/common/capget.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 int capget(void *header, void *data);
 #ifdef __NR_capget
 _syscall2(int, capget, void *, header, void *, data);

libc/sysdeps/linux/common/capset.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 int capset(void *header, const void *data);
 #ifdef __NR_capset
 _syscall2(int, capset, void *, header, const void *, data);

libc/sysdeps/linux/common/chdir.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/param.h>

libc/sysdeps/linux/common/chmod.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <sys/stat.h>
 
 libc_hidden_proto(chmod)

libc/sysdeps/linux/common/chown.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <unistd.h>
 #include <bits/wordsize.h>
 

libc/sysdeps/linux/common/chroot.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <unistd.h>
 #include <string.h>
 #include <sys/param.h>

libc/sysdeps/linux/common/clock_getres.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <time.h>
 #include <unistd.h>
 

libc/sysdeps/linux/common/clock_gettime.c

@@ -8,7 +8,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <time.h>
 #include <sys/time.h>
 

libc/sysdeps/linux/common/clock_settime.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <time.h>
 #include <sys/time.h>
 

libc/sysdeps/linux/common/close.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <unistd.h>
 
 extern __typeof(close) __libc_close;

libc/sysdeps/linux/common/delete_module.c

@@ -6,7 +6,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 int delete_module(const char *name);
 #ifdef __NR_delete_module
 _syscall1(int, delete_module, const char *, name);

libc/sysdeps/linux/common/dup.c

@@ -6,6 +6,6 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <unistd.h>
 _syscall1(int, dup, int, oldfd);

libc/sysdeps/linux/common/dup2.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <unistd.h>
 
 libc_hidden_proto(dup2)

libc/sysdeps/linux/common/epoll.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <sys/epoll.h>
 
 /*

libc/sysdeps/linux/common/execve.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <unistd.h>
 #include <string.h>
 #include <sys/param.h>

libc/sysdeps/linux/common/fchdir.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <unistd.h>
 
 libc_hidden_proto(fchdir)

libc/sysdeps/linux/common/fchmod.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <sys/stat.h>
 
 #define __NR___syscall_fchmod __NR_fchmod

libc/sysdeps/linux/common/fchown.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <unistd.h>
 #include <bits/wordsize.h>
 

libc/sysdeps/linux/common/fdatasync.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <unistd.h>
 
 #if defined __NR_osf_fdatasync

libc/sysdeps/linux/common/flock.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <sys/file.h>
 
 #define __NR___syscall_flock __NR_flock

libc/sysdeps/linux/common/fork.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <unistd.h>
 
 #ifdef __ARCH_USE_MMU__

libc/sysdeps/linux/common/fstat.c

@@ -11,7 +11,7 @@
  * will fail when __NR_fstat64 doesnt exist */
 #define fstat64 __hidefstat64
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <unistd.h>
 #include <sys/stat.h>
 #include "xstatconv.h"

libc/sysdeps/linux/common/fstat64.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 
 #if defined __UCLIBC_HAS_LFS__ && defined __NR_fstat64
 #include <unistd.h>

libc/sysdeps/linux/common/fstatfs.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <sys/vfs.h>
 
 libc_hidden_proto(fstatfs)

libc/sysdeps/linux/common/fsync.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <unistd.h>
 
 extern __typeof(fsync) __libc_fsync;

libc/sysdeps/linux/common/ftruncate.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <unistd.h>
 
 libc_hidden_proto(ftruncate)

libc/sysdeps/linux/common/get_kernel_syms.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 
 struct kernel_sym;
 int get_kernel_syms(struct kernel_sym *table attribute_unused);

libc/sysdeps/linux/common/getegid.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <unistd.h>
 
 libc_hidden_proto(getegid)

libc/sysdeps/linux/common/geteuid.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <unistd.h>
 
 libc_hidden_proto(geteuid)

libc/sysdeps/linux/common/getgid.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <unistd.h>
 
 #if defined __NR_getxgid

libc/sysdeps/linux/common/getgroups.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <grp.h>

libc/sysdeps/linux/common/getitimer.c

@@ -7,6 +7,6 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <sys/time.h>
 _syscall2(int, getitimer, __itimer_which_t, which, struct itimerval *, value);

libc/sysdeps/linux/common/getpgid.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <unistd.h>
 
 #define __NR___syscall_getpgid __NR_getpgid

libc/sysdeps/linux/common/getpgrp.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <unistd.h>
 
 #ifdef __NR_getpgrp

libc/sysdeps/linux/common/getpid.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <unistd.h>
 
 extern __typeof(getpid) __libc_getpid;

libc/sysdeps/linux/common/getppid.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <unistd.h>
 #ifdef	__NR_getppid
 _syscall0(pid_t, getppid);

libc/sysdeps/linux/common/getpriority.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <sys/resource.h>
 
 libc_hidden_proto(getpriority)

libc/sysdeps/linux/common/getresgid.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #ifdef __USE_GNU
 #include <unistd.h>
 

libc/sysdeps/linux/common/getresuid.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #ifdef __USE_GNU
 #include <unistd.h>
 

libc/sysdeps/linux/common/getrlimit.c

@@ -8,7 +8,7 @@
  */
 
 #define getrlimit64 __hide_getrlimit64
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <unistd.h>
 #include <sys/resource.h>
 #undef getrlimit64

libc/sysdeps/linux/common/getrusage.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <unistd.h>
 #include <wait.h>
 _syscall2(int, getrusage, __rusage_who_t, who, struct rusage *, usage);

libc/sysdeps/linux/common/getsid.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <unistd.h>
 
 #ifdef __USE_XOPEN_EXTENDED

libc/sysdeps/linux/common/gettimeofday.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <sys/time.h>
 
 libc_hidden_proto(gettimeofday)

libc/sysdeps/linux/common/getuid.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <unistd.h>
 
 #if defined __NR_getxuid

libc/sysdeps/linux/common/init_module.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 int init_module(void *first, void *second, void *third, void *fourth, void *fifth);
 #ifdef __NR_init_module
 /* This may have 5 arguments (for old 2.0 kernels) or 2 arguments

libc/sysdeps/linux/common/inotify.c

@@ -8,7 +8,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <sys/inotify.h>
 
 #ifdef __NR_inotify_init

libc/sysdeps/linux/common/ioctl.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <stdarg.h>
 #include <sys/ioctl.h>
 

libc/sysdeps/linux/common/ioperm.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #if defined __ARCH_USE_MMU__ && defined __NR_ioperm
 /* psm: can't #include <sys/io.h>, some archs miss it */
 extern int ioperm(unsigned long __from, unsigned long __num, int __turn_on) __THROW;

libc/sysdeps/linux/common/iopl.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #if defined __ARCH_USE_MMU__ && defined __NR_iopl
 /* psm: can't #include <sys/io.h>, some archs miss it */
 extern int iopl(int __level) __THROW;

libc/sysdeps/linux/common/kill.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <signal.h>
 
 libc_hidden_proto(kill)

libc/sysdeps/linux/common/klogctl.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <unistd.h>
 #include <sys/klog.h>
 #define __NR__syslog		__NR_syslog

libc/sysdeps/linux/common/lchown.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <unistd.h>
 #include <bits/wordsize.h>
 

libc/sysdeps/linux/common/link.c

@@ -7,6 +7,6 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <unistd.h>
 _syscall2(int, link, const char *, oldpath, const char *, newpath);

libc/sysdeps/linux/common/llseek.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <unistd.h>
 
 extern __typeof(lseek64) __libc_lseek64;

libc/sysdeps/linux/common/lseek.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <unistd.h>
 
 extern __typeof(lseek) __libc_lseek;

libc/sysdeps/linux/common/lstat.c

@@ -11,7 +11,7 @@
  * will fail when __NR_lstat64 doesnt exist */
 #define lstat64 __hidelstat64
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <unistd.h>
 #include <sys/stat.h>
 #include "xstatconv.h"

libc/sysdeps/linux/common/lstat64.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 
 #if defined __UCLIBC_HAS_LFS__ && defined __NR_lstat64
 # include <unistd.h>

libc/sysdeps/linux/common/madvise.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <sys/mman.h>
 #if defined __NR_madvise && defined __USE_BSD
 _syscall3(int, madvise, void *, __addr, size_t, __len, int, __advice);

libc/sysdeps/linux/common/mincore.c

@@ -6,7 +6,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <unistd.h>
 #include <sys/mman.h>
 

libc/sysdeps/linux/common/mkdir.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <sys/stat.h>
 
 libc_hidden_proto(mkdir)

libc/sysdeps/linux/common/mknod.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <sys/stat.h>
 #include <sys/sysmacros.h>
 

libc/sysdeps/linux/common/mlock.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <sys/mman.h>
 #if defined __ARCH_USE_MMU__ && defined __NR_mlock
 _syscall2(int, mlock, const void *, addr, size_t, len);

libc/sysdeps/linux/common/mlockall.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <sys/mman.h>
 #if defined __ARCH_USE_MMU__ && defined __NR_mlockall
 _syscall1(int, mlockall, int, flags);

libc/sysdeps/linux/common/mmap.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <unistd.h>
 #include <sys/mman.h>
 

libc/sysdeps/linux/common/modify_ldt.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 
 int modify_ldt (int func, void *ptr, unsigned long bytecount);
 #ifdef __NR_modify_ldt

libc/sysdeps/linux/common/mount.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <sys/mount.h>
 _syscall5(int, mount, const char *, specialfile, const char *, dir,
 		  const char *, filesystemtype, unsigned long, rwflag,

libc/sysdeps/linux/common/mprotect.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <sys/mman.h>
 
 #ifdef __NR_mprotect

libc/sysdeps/linux/common/mremap.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <unistd.h>
 
 #ifdef __NR_mremap

libc/sysdeps/linux/common/msync.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <unistd.h>
 
 #ifdef __NR_msync

libc/sysdeps/linux/common/munlock.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <sys/mman.h>
 #if defined __ARCH_USE_MMU__ && defined __NR_munlock
 _syscall2(int, munlock, const void *, addr, size_t, len);

libc/sysdeps/linux/common/munlockall.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <sys/mman.h>
 #if defined __ARCH_USE_MMU__
 _syscall0(int, munlockall);

libc/sysdeps/linux/common/munmap.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <unistd.h>
 #include <sys/mman.h>
 

libc/sysdeps/linux/common/nanosleep.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <time.h>
 
 extern __typeof(nanosleep) __libc_nanosleep;

libc/sysdeps/linux/common/nice.c

@@ -8,7 +8,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <unistd.h>
 #include <sys/resource.h>
 

libc/sysdeps/linux/common/open.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <fcntl.h>

libc/sysdeps/linux/common/pause.c

@@ -8,7 +8,7 @@
  */
 
 #define __UCLIBC_HIDE_DEPRECATED__
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <unistd.h>
 
 extern __typeof(pause) __libc_pause;

libc/sysdeps/linux/common/personality.c

@@ -7,6 +7,6 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <sys/personality.h>
 _syscall1(int, personality, unsigned long int, __persona);

libc/sysdeps/linux/common/pipe.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <unistd.h>
 
 libc_hidden_proto(pipe)

libc/sysdeps/linux/common/pivot_root.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 
 int pivot_root(const char *new_root, const char *put_old);
 #ifdef __NR_pivot_root

libc/sysdeps/linux/common/poll.c

@@ -17,7 +17,7 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <sys/poll.h>
 
 extern __typeof(poll) __libc_poll;

libc/sysdeps/linux/common/posix_fadvise.c

@@ -12,7 +12,7 @@
  * will fail when __NR_fadvise64_64 doesnt exist */
 #define posix_fadvise64 __hideposix_fadvise64
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <fcntl.h>
 
 #undef posix_fadvise64

libc/sysdeps/linux/common/prctl.c

@@ -7,7 +7,7 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <stdarg.h>
 /* psm: including sys/prctl.h would depend on kernel headers */
 extern int prctl (int, long, long, long, long);

libc/sysdeps/linux/common/pread_write.c

@@ -13,7 +13,7 @@
  * from GNU libc 2.2.5, but reworked considerably...
  */
 
-#include "syscalls.h"
+#include <sys/syscall.h>
 #include <unistd.h>
 #include <stdint.h>