diff --git a/include/linux/arm/kernel-stat.h b/include/linux/arm/kernel-stat.h
index a32eb981..79dc48ec 100644
--- a/include/linux/arm/kernel-stat.h
+++ b/include/linux/arm/kernel-stat.h
@@ -74,21 +74,6 @@ struct stat
   unsigned long long st_ino;
 };
 
-#undef SYS_stat
-#define SYS_stat SYS_stat64
-
-#undef SYS_lstat
-#define SYS_lstat SYS_lstat64
-
-#undef SYS_fstat
-#define SYS_fstat SYS_fstat64
-
-#undef SYS_fctnl
-#define SYS_fctnl SYS_fcntl64
-
-#undef SYS_getdents
-#define SYS_getdents SYS_getdents64
-
 #endif // __SIZEOF_LONG_LONG__ == 8
 
 #endif // __MES_LINUX_ARM_KERNEL_STAT_H
diff --git a/include/linux/arm/syscall.h b/include/linux/arm/syscall.h
index 5883dc13..ae866310 100644
--- a/include/linux/arm/syscall.h
+++ b/include/linux/arm/syscall.h
@@ -55,7 +55,6 @@
 #define SYS_lseek  0x13
 #define SYS_rmdir  0x28
 #define SYS_stat   0x6a
-#define SYS_stat64 0xc3
 
 /* libc+gnu */
 #define SYS_chdir     0x0c
@@ -70,16 +69,12 @@
 #define SYS_rt_sigaction 0xae
 #define SYS_rt_sigreturn 0xad
 #define SYS_fcntl     0x37
-#define SYS_fcntl64   0xdd
 #define SYS_getrusage 0x4d
 #define SYS_lstat     0x6b
-#define SYS_lstat64   0xc4
 #define SYS_setitimer 0x68
 #define SYS_fstat     0x6c
-#define SYS_fstat64   0xc5
 #define SYS_nanosleep 0xa2
 #define SYS_getdents  0x8d
-#define SYS_getdents64 0xdc
 
 /* bash */
 #define SYS_setuid    0x17
@@ -100,4 +95,29 @@
 #define SYS_mmap      0x5a
 #define SYS_munmap    0x5b
 
+#if __SIZEOF_LONG_LONG__ == 8
+
+#define SYS_stat64     0xc3
+#define SYS_lstat64    0xc4
+#define SYS_fstat64    0xc5
+#define SYS_fcntl64    0xdd
+#define SYS_getdents64 0xdc
+
+#undef SYS_stat
+#define SYS_stat SYS_stat64
+
+#undef SYS_lstat
+#define SYS_lstat SYS_lstat64
+
+#undef SYS_fstat
+#define SYS_fstat SYS_fstat64
+
+#undef SYS_fctnl
+#define SYS_fctnl SYS_fcntl64
+
+#undef SYS_getdents
+#define SYS_getdents SYS_getdents64
+
+#endif  // __SIZEOF_LONG_LONG__ == 8
+
 #endif /* __MES_LINUX_ARM_SYSCALL_H */
diff --git a/include/linux/x86/kernel-stat.h b/include/linux/x86/kernel-stat.h
index f93face1..997fadc7 100644
--- a/include/linux/x86/kernel-stat.h
+++ b/include/linux/x86/kernel-stat.h
@@ -74,21 +74,6 @@ struct stat
   unsigned long long st_ino;
 };
 
-#undef SYS_stat
-#define SYS_stat SYS_stat64
-
-#undef SYS_lstat
-#define SYS_lstat SYS_lstat64
-
-#undef SYS_fstat
-#define SYS_fstat SYS_fstat64
-
-#undef SYS_fctnl
-#define SYS_fctnl SYS_fcntl64
-
-#undef SYS_getdents
-#define SYS_getdents SYS_getdents64
-
 #endif // __SIZEOF_LONG_LONG__ == 8
 
 #endif // __MES_LINUX_X86_KERNEL_STAT_H
diff --git a/include/linux/x86/syscall.h b/include/linux/x86/syscall.h
index a44d7a60..0600f72f 100644
--- a/include/linux/x86/syscall.h
+++ b/include/linux/x86/syscall.h
@@ -53,7 +53,6 @@
 #define SYS_lseek  0x13
 #define SYS_rmdir  0x28
 #define SYS_stat   0x6a
-#define SYS_stat64 0xc3
 
 /* libc+gnu */
 #define SYS_chdir     0x0c
@@ -70,16 +69,12 @@
 #define SYS_rt_sigaction 0xae
 #define SYS_signal    0x30
 #define SYS_fcntl     0x37
-#define SYS_fcntl64   0xdd
 #define SYS_getrusage 0x4d
 #define SYS_lstat     0x6b
-#define SYS_lstat64   0xc4
 #define SYS_setitimer 0x68
 #define SYS_fstat     0x6c
-#define SYS_fstat64   0xc5
 #define SYS_nanosleep 0xa2
 #define SYS_getdents  0x8d
-#define SYS_getdents64 0xdc
 
 /* bash */
 #define SYS_setuid    0x17
@@ -100,4 +95,29 @@
 #define SYS_mmap      0x5a
 #define SYS_munmap    0x5b
 
+#if __SIZEOF_LONG_LONG__ == 8
+
+#define SYS_stat64     0xc3
+#define SYS_lstat64    0xc4
+#define SYS_fstat64    0xc5
+#define SYS_fcntl64    0xdd
+#define SYS_getdents64 0xdc
+
+#undef SYS_stat
+#define SYS_stat SYS_stat64
+
+#undef SYS_lstat
+#define SYS_lstat SYS_lstat64
+
+#undef SYS_fstat
+#define SYS_fstat SYS_fstat64
+
+#undef SYS_fctnl
+#define SYS_fctnl SYS_fcntl64
+
+#undef SYS_getdents
+#define SYS_getdents SYS_getdents64
+
+#endif  // __SIZEOF_LONG_LONG__ == 8
+
 #endif /* __MES_LINUX_X86_SYSCALL_H */