6 files changed, 9 insertions, 11 deletions
diff --git a/libc/sysdeps/linux/common/fstat.c b/libc/sysdeps/linux/common/fstat.c
index e8bed683e..af3f9a13b 100644
--- a/libc/sysdeps/linux/common/fstat.c
+++ b/libc/sysdeps/linux/common/fstat.c
@@ -9,15 +9,15 @@
 
 /* need to hide the 64bit prototype or the weak_alias()
  * will fail when __NR_fstat64 doesnt exist */
+#define fstat64 __hidefstat64
 #define __fstat64 __hide__fstat64
 
 #include "syscalls.h"
 #include <unistd.h>
-#define _SYS_STAT_H
-#include <bits/stat.h>
-#include <bits/kernel_stat.h>
+#include <sys/stat.h>
 #include "xstatconv.h"
 
+#undef fstat64
 #undef __fstat64
 
 #define __NR___syscall_fstat __NR_fstat
diff --git a/libc/sysdeps/linux/common/fstat64.c b/libc/sysdeps/linux/common/fstat64.c
index e1e9dff5c..0d8bbdb43 100644
--- a/libc/sysdeps/linux/common/fstat64.c
+++ b/libc/sysdeps/linux/common/fstat64.c
@@ -13,7 +13,6 @@
 #define __NR___syscall_fstat64 __NR_fstat64
 #include <unistd.h>
 #include <sys/stat.h>
-#include <bits/kernel_stat.h>
 #include "xstatconv.h"
 
 static inline _syscall2(int, __syscall_fstat64,
diff --git a/libc/sysdeps/linux/common/lstat.c b/libc/sysdeps/linux/common/lstat.c
index 4d01adcec..d7feac273 100644
--- a/libc/sysdeps/linux/common/lstat.c
+++ b/libc/sysdeps/linux/common/lstat.c
@@ -9,15 +9,15 @@
 
 /* need to hide the 64bit prototype or the weak_alias()
  * will fail when __NR_lstat64 doesnt exist */
+#define lstat64 __hidelstat64
 #define __lstat64 __hide__lstat64
 
 #include "syscalls.h"
 #include <unistd.h>
-#define _SYS_STAT_H
-#include <bits/stat.h>
-#include <bits/kernel_stat.h>
+#include <sys/stat.h>
 #include "xstatconv.h"
 
+#undef lstat64
 #undef __lstat64
 
 #define __NR___syscall_lstat __NR_lstat
diff --git a/libc/sysdeps/linux/common/lstat64.c b/libc/sysdeps/linux/common/lstat64.c
index 80268d2a1..99b655a0c 100644
--- a/libc/sysdeps/linux/common/lstat64.c
+++ b/libc/sysdeps/linux/common/lstat64.c
@@ -12,7 +12,6 @@
 #if defined __UCLIBC_HAS_LFS__ && defined __NR_lstat64
 #include <unistd.h>
 #include <sys/stat.h>
-#include <bits/kernel_stat.h>
 #include "xstatconv.h"
 
 #define __NR___syscall_lstat64 __NR_lstat64
diff --git a/libc/sysdeps/linux/common/stat.c b/libc/sysdeps/linux/common/stat.c
index 74d6e2f5f..7cc6131b3 100644
--- a/libc/sysdeps/linux/common/stat.c
+++ b/libc/sysdeps/linux/common/stat.c
@@ -9,14 +9,15 @@
 
 /* need to hide the 64bit prototype or the weak_alias()
  * will fail when __NR_stat64 doesnt exist */
+#define stat64 __hidestat64
 #define __stat64 __hide__stat64
 
 #include "syscalls.h"
 #include <unistd.h>
-#define _SYS_STAT_H
-#include <bits/stat.h>
+#include <sys/stat.h>
 #include "xstatconv.h"
 
+#undef stat64
 #undef __stat64
 
 #define __NR___syscall_stat __NR_stat
diff --git a/libc/sysdeps/linux/common/stat64.c b/libc/sysdeps/linux/common/stat64.c
index f46e52e98..dcd9163fb 100644
--- a/libc/sysdeps/linux/common/stat64.c
+++ b/libc/sysdeps/linux/common/stat64.c
@@ -13,7 +13,6 @@
 #define __NR___syscall_stat64 __NR_stat64
 #include <unistd.h>
 #include <sys/stat.h>
-#include <bits/kernel_stat.h>
 #include "xstatconv.h"
 
 static inline _syscall2(int, __syscall_stat64,