4 files changed, 16 insertions, 13 deletions
diff --git a/src/test/meson.build b/src/test/meson.build
index 6059c2efd..c811dd675 100644
--- a/src/test/meson.build
+++ b/src/test/meson.build
@@ -365,16 +365,16 @@ tests += [
          [libbasic],
          []],
 
-        [['src/test/test-bpf.c',
-          'src/test/test-helper.c'],
-         [libcore,
-          libshared],
-         [libmount,
-          threads,
-          librt,
-          libseccomp,
-          libselinux,
-          libblkid]],
+#         [['src/test/test-bpf.c',
+#           'src/test/test-helper.c'],
+#          [libcore,
+#           libshared],
+#          [libmount,
+#           threads,
+#           librt,
+#           libseccomp,
+#           libselinux,
+#           libblkid]],
 
         [['src/test/test-hashmap.c',
           'src/test/test-hashmap-plain.c',
diff --git a/src/test/test-cgroup.c b/src/test/test-cgroup.c
index 2ed91c780..509946250 100644
--- a/src/test/test-cgroup.c
+++ b/src/test/test-cgroup.c
@@ -22,9 +22,10 @@
 
 #include "cgroup-util.h"
 #include "path-util.h"
-#include "process-util.h"
 #include "string-util.h"
 #include "util.h"
+/// Additional includes needed by elogind
+#include "process-util.h"
 
 int main(int argc, char*argv[]) {
         char *path;
diff --git a/src/test/test-log.c b/src/test/test-log.c
index ec1bc2a63..2417b3aef 100644
--- a/src/test/test-log.c
+++ b/src/test/test-log.c
@@ -22,8 +22,9 @@
 
 #include "format-util.h"
 #include "log.h"
-#include "process-util.h"
 #include "util.h"
+/// Additional includes needed by elogind
+#include "process-util.h"
 
 assert_cc(LOG_REALM_REMOVE_LEVEL(LOG_REALM_PLUS_LEVEL(LOG_REALM_SYSTEMD, LOG_FTP | LOG_DEBUG))
           == LOG_REALM_SYSTEMD);
diff --git a/src/test/test-signal-util.c b/src/test/test-signal-util.c
index 1830396ac..0db8a1e32 100644
--- a/src/test/test-signal-util.c
+++ b/src/test/test-signal-util.c
@@ -21,8 +21,9 @@
 #include <unistd.h>
 
 #include "macro.h"
-#include "process-util.h"
 #include "signal-util.h"
+/// Additional includes needed by elogind
+#include "process-util.h"
 
 static void test_block_signals(void) {
         sigset_t ss;