4 files changed, 9 insertions, 16 deletions
diff --git a/util/libreboot-utils/lib/file.c b/util/libreboot-utils/lib/file.c
index 9c4683ce..685cdf9a 100644
--- a/util/libreboot-utils/lib/file.c
+++ b/util/libreboot-utils/lib/file.c
@@ -16,8 +16,8 @@ more correct usage example:
 long max = pathconf("/", _PC_PATH_MAX);
  */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
+#ifndef _POSIX_C_SOURCE
+#define _POSIX_C_SOURCE 200809L
 #endif
 
 #include <sys/types.h>
@@ -34,6 +34,7 @@ long max = pathconf("/", _PC_PATH_MAX);
 #ifdef __linux__
 #include <linux/openat2.h>
 #include <sys/syscall.h>
+long syscall(long number, ...);
 #endif
 
 #include "../include/common.h"
diff --git a/util/libreboot-utils/lib/mkhtemp.c b/util/libreboot-utils/lib/mkhtemp.c
index 4d7ad0bd..46f6419f 100644
--- a/util/libreboot-utils/lib/mkhtemp.c
+++ b/util/libreboot-utils/lib/mkhtemp.c
@@ -4,9 +4,8 @@
  * Hardened mktemp (be nice to the demon).
  */
 
-#if defined(__linux__) && !defined(_GNU_SOURCE)
-/* for openat2 syscall on linux */
-#define _GNU_SOURCE 1
+#if !defined(_POSIX_C_SOURCE)
+#define _POSIX_C_SOURCE 200809L
 #endif
 
 #include <sys/types.h>
diff --git a/util/libreboot-utils/lib/rand.c b/util/libreboot-utils/lib/rand.c
index 082612d6..8c3fbf4c 100644
--- a/util/libreboot-utils/lib/rand.c
+++ b/util/libreboot-utils/lib/rand.c
@@ -7,28 +7,21 @@
 #ifndef RAND_H
 #define RAND_H
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
-
 #ifdef __OpenBSD__
 #include <sys/param.h>
 #endif
 #include <sys/types.h>
 
-#ifndef USE_URANDOM
-#define USE_URANDOM 0
-#endif
-
-#include <errno.h>
 #if defined(USE_URANDOM) && \
     ((USE_URANDOM) > 0)
 #include <fcntl.h> /* if not arc4random: /dev/urandom */
 #elif defined(__linux__)
 #include <sys/random.h>
 #include <sys/syscall.h>
+long syscall(long number, ...);
 #endif
 
+#include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
 #include <stddef.h>
diff --git a/util/libreboot-utils/lib/state.c b/util/libreboot-utils/lib/state.c
index b956a483..a7c85bfb 100644
--- a/util/libreboot-utils/lib/state.c
+++ b/util/libreboot-utils/lib/state.c
@@ -4,8 +4,8 @@
  * State machine (singleton) for nvmutil data.
  */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
+#ifndef _POSIX_C_SOURCE
+#define _POSIX_C_SOURCE 200809L
 #endif
 
 #include <sys/types.h>