diff --git a/bar/wayland.c b/bar/wayland.c
index 270b4ff..16af9fe 100644
--- a/bar/wayland.c
+++ b/bar/wayland.c
@@ -9,7 +9,9 @@
 #include <pthread.h>
 
 #include <sys/mman.h>
+#ifdef __linux__
 #include <linux/memfd.h>
+#endif
 #include <linux/input-event-codes.h>
 
 #include <pixman.h>
diff --git a/main.c b/main.c
index e92e2e5..49d3985 100644
--- a/main.c
+++ b/main.c
@@ -374,7 +374,7 @@ main(int argc, char *const *argv)
     }
 
     if (aborted)
-        LOG_INFO("aborted: %s (%d)", strsignal(aborted), aborted);
+        LOG_INFO("aborted: %s (%ld)", strsignal(aborted), (long)aborted);
 
 done:
     /* Signal abort to other threads */
diff --git a/meson.build b/meson.build
index 08d21bc..1970ec4 100644
--- a/meson.build
+++ b/meson.build
@@ -43,7 +43,9 @@ endif
 # Common dependencies
 dl = cc.find_library('dl')
 m = cc.find_library('m')
-threads = dependency('threads')
+threads = [dependency('threads'), cc.find_library('stdthreads', required: false)]
+libepoll = dependency('epoll-shim', required: false)
+libinotify = dependency('libinotify', required: false)
 pixman = dependency('pixman-1')
 yaml = dependency('yaml-0.1')
 
@@ -117,7 +119,7 @@ yambar = executable(
   'tag.c', 'tag.h',
   'yml.c', 'yml.h',
   version,
-  dependencies: [bar, pixman, yaml, threads, dl, tllist, fcft] +
+  dependencies: [bar, libepoll, libinotify,  pixman, yaml, threads, dl, tllist, fcft] +
                 decorations + particles + modules,
   c_args: [plugin_mpd_enabled? '-DPLUGIN_ENABLED_MPD':[]],
   build_rpath: '$ORIGIN/modules:$ORIGIN/decorations:$ORIGIN/particles',
diff --git a/modules/script.c b/modules/script.c
index f323635..2ddd722 100644
--- a/modules/script.c
+++ b/modules/script.c
@@ -4,6 +4,7 @@
 #include <errno.h>
 #include <assert.h>
 #include <unistd.h>
+#include <libgen.h>
 
 #include <poll.h>
 #include <fcntl.h>
diff --git a/modules/xwindow.c b/modules/xwindow.c
index 3c8655e..3925f4f 100644
--- a/modules/xwindow.c
+++ b/modules/xwindow.c
@@ -4,6 +4,7 @@
 #include <assert.h>
 #include <unistd.h>
 #include <threads.h>
+#include <libgen.h>
 
 #include <sys/stat.h>
 #include <fcntl.h>
diff --git a/particle.c b/particle.c
index 468bd28..1b06f9a 100644
--- a/particle.c
+++ b/particle.c
@@ -5,6 +5,7 @@
 #include <unistd.h>
 #include <assert.h>
 #include <errno.h>
+#include <signal.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>