diff --git a/meson.build b/meson.build
index aa51a3aead..efdf0501b3 100644
--- a/meson.build
+++ b/meson.build
@@ -771,7 +771,6 @@ if not cc.has_header('sys/capability.h')
 endif
 foreach header : ['crypt.h',
                   'linux/ioprio.h',
-                  'linux/memfd.h',
                   'linux/time_types.h',
                   'sys/auxv.h',
                   'sys/sdt.h',
diff --git a/src/basic/memfd-util.c b/src/basic/memfd-util.c
index 9d3983b181..70ffa93a78 100644
--- a/src/basic/memfd-util.c
+++ b/src/basic/memfd-util.c
@@ -1,13 +1,10 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <errno.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#if HAVE_LINUX_MEMFD_H
-#include <linux/memfd.h>
-#endif
 #include <stdio.h>
 #include <sys/prctl.h>
+#include <sys/stat.h>
+#include <unistd.h>
 
 #include "alloc-util.h"
 #include "errno-util.h"
diff --git a/src/basic/missing_threads.h b/src/basic/missing_threads.h
index fb3b72249b..d48e05d586 100644
--- a/src/basic/missing_threads.h
+++ b/src/basic/missing_threads.h
@@ -5,9 +5,7 @@
 #if HAVE_THREADS_H
 #  include <threads.h>
 #elif !(defined(thread_local))
-/* Don't break on glibc < 2.16 that doesn't define __STDC_NO_THREADS__
- * see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53769 */
-#  if __STDC_VERSION__ >= 201112L && !(defined(__STDC_NO_THREADS__) || (defined(__GNU_LIBRARY__) && __GLIBC__ == 2 && __GLIBC_MINOR__ < 16))
+#  if __STDC_VERSION__ >= 201112L && !(defined(__STDC_NO_THREADS__))
 #    define thread_local _Thread_local
 #  else
 #    define thread_local __thread
diff --git a/src/home/homed-home.c b/src/home/homed-home.c
index fd9d90be90..a6f99713dd 100644
--- a/src/home/homed-home.c
+++ b/src/home/homed-home.c
@@ -1,9 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#if HAVE_LINUX_MEMFD_H
-#include <linux/memfd.h>
-#endif
-
 #include <sys/mman.h>
 #include <sys/quota.h>
 #include <sys/vfs.h>