6 files changed, 18 insertions, 20 deletions
diff --git a/tools/include/nolibc/sys/auxv.h b/tools/include/nolibc/sys/auxv.h
index 04c2b9cbe51a..c52463d6c18d 100644
--- a/tools/include/nolibc/sys/auxv.h
+++ b/tools/include/nolibc/sys/auxv.h
@@ -4,6 +4,9 @@
  * Copyright (C) 2017-2021 Willy Tarreau <w@1wt.eu>
  */
 
+/* make sure to include all global symbols */
+#include "../nolibc.h"
+
 #ifndef _NOLIBC_SYS_AUXV_H
 #define _NOLIBC_SYS_AUXV_H
 
@@ -35,7 +38,4 @@ unsigned long getauxval(unsigned long type)
 	return ret;
 }
 
-/* make sure to include all global symbols */
-#include "../nolibc.h"
-
 #endif /* _NOLIBC_SYS_AUXV_H */
diff --git a/tools/include/nolibc/sys/mman.h b/tools/include/nolibc/sys/mman.h
index ad9d06b6b791..41c7bf45e427 100644
--- a/tools/include/nolibc/sys/mman.h
+++ b/tools/include/nolibc/sys/mman.h
@@ -4,6 +4,9 @@
  * Copyright (C) 2017-2021 Willy Tarreau <w@1wt.eu>
  */
 
+/* make sure to include all global symbols */
+#include "../nolibc.h"
+
 #ifndef _NOLIBC_SYS_MMAN_H
 #define _NOLIBC_SYS_MMAN_H
 
@@ -57,7 +60,4 @@ int munmap(void *addr, size_t length)
 	return __sysret(sys_munmap(addr, length));
 }
 
-/* make sure to include all global symbols */
-#include "../nolibc.h"
-
 #endif /* _NOLIBC_SYS_MMAN_H */
diff --git a/tools/include/nolibc/sys/stat.h b/tools/include/nolibc/sys/stat.h
index 0eaf5496ce23..987c8bb52502 100644
--- a/tools/include/nolibc/sys/stat.h
+++ b/tools/include/nolibc/sys/stat.h
@@ -4,6 +4,9 @@
  * Copyright (C) 2017-2021 Willy Tarreau <w@1wt.eu>
  */
 
+/* make sure to include all global symbols */
+#include "../nolibc.h"
+
 #ifndef _NOLIBC_SYS_STAT_H
 #define _NOLIBC_SYS_STAT_H
 
@@ -67,8 +70,4 @@ int stat(const char *path, struct stat *buf)
 	return 0;
 }
 
-
-/* make sure to include all global symbols */
-#include "../nolibc.h"
-
 #endif /* _NOLIBC_SYS_STAT_H */
diff --git a/tools/include/nolibc/sys/syscall.h b/tools/include/nolibc/sys/syscall.h
index 59efdec8fd1c..4bf97f1386a0 100644
--- a/tools/include/nolibc/sys/syscall.h
+++ b/tools/include/nolibc/sys/syscall.h
@@ -4,6 +4,9 @@
  * Copyright (C) 2024 Thomas Weißschuh <linux@weissschuh.net>
  */
 
+/* make sure to include all global symbols */
+#include "../nolibc.h"
+
 #ifndef _NOLIBC_SYS_SYSCALL_H
 #define _NOLIBC_SYS_SYSCALL_H
 
@@ -13,7 +16,4 @@
 #define _syscall_n(N, ...) _syscall(N, __VA_ARGS__)
 #define syscall(...) _syscall_n(_syscall_narg(__VA_ARGS__), ##__VA_ARGS__)
 
-/* make sure to include all global symbols */
-#include "../nolibc.h"
-
 #endif /* _NOLIBC_SYS_SYSCALL_H */
diff --git a/tools/include/nolibc/sys/time.h b/tools/include/nolibc/sys/time.h
index 1d326c05ee62..785961c52fa3 100644
--- a/tools/include/nolibc/sys/time.h
+++ b/tools/include/nolibc/sys/time.h
@@ -4,6 +4,9 @@
  * Copyright (C) 2017-2021 Willy Tarreau <w@1wt.eu>
  */
 
+/* make sure to include all global symbols */
+#include "../nolibc.h"
+
 #ifndef _NOLIBC_SYS_TIME_H
 #define _NOLIBC_SYS_TIME_H
 
@@ -30,7 +33,4 @@ int gettimeofday(struct timeval *tv, struct timezone *tz)
 	return __sysret(sys_gettimeofday(tv, tz));
 }
 
-/* make sure to include all global symbols */
-#include "../nolibc.h"
-
 #endif /* _NOLIBC_SYS_TIME_H */
diff --git a/tools/include/nolibc/sys/wait.h b/tools/include/nolibc/sys/wait.h
index 9a68e6a6b1df..f27be86ad5e4 100644
--- a/tools/include/nolibc/sys/wait.h
+++ b/tools/include/nolibc/sys/wait.h
@@ -4,6 +4,9 @@
  * Copyright (C) 2017-2021 Willy Tarreau <w@1wt.eu>
  */
 
+/* make sure to include all global symbols */
+#include "../nolibc.h"
+
 #ifndef _NOLIBC_SYS_WAIT_H
 #define _NOLIBC_SYS_WAIT_H
 
@@ -110,8 +113,4 @@ pid_t waitpid(pid_t pid, int *status, int options)
 	return info.si_pid;
 }
 
-
-/* make sure to include all global symbols */
-#include "../nolibc.h"
-
 #endif /* _NOLIBC_SYS_WAIT_H */