diff --git a/configure.ac b/configure.ac
index f28d2b28..12000595 100644
--- a/configure.ac
+++ b/configure.ac
@@ -374,7 +374,7 @@ if test "x${snmp}" != "xno"
 then
     SNMP_ENABLE="-D ENABLE_SNMP"
     SNMP_MODULE_CFLAGS="`net-snmp-config --cflags 2> /dev/null`";
-    SNMP_MODULE_LIBS_A="`net-snmp-config --agent-libs` 2> /dev/null";
+    SNMP_MODULE_LIBS_A="`net-snmp-config --agent-libs 2> /dev/null`";
     SNMP_MODULE_LIBS="`net-snmp-config --libs 2> /dev/null`";
     if test -z "$SNMP_MODULE_LIBS_A"
     then
diff --git a/src/libltfs/ltfs_thread.h b/src/libltfs/ltfs_thread.h
index eb80edad..0e5b7f35 100644
--- a/src/libltfs/ltfs_thread.h
+++ b/src/libltfs/ltfs_thread.h
@@ -67,6 +67,7 @@ extern "C" {
 #endif
 
 #include <pthread.h>
+#include <sched.h>
 #include <sys/time.h>
 #include <sys/syscall.h>
 #include <unistd.h>
@@ -208,11 +209,10 @@ static inline ltfs_thread_t ltfs_thread_self(void)
 
 static inline int ltfs_thread_yield(void)
 {
-#if defined (__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__)
+	/* sched_yield() is the POSIX standard and is available on every
+	 * supported platform; pthread_yield() is deprecated since glibc 2.34
+	 * and absent on some libcs (e.g. musl). */
 	return sched_yield();
-#else
-	return pthread_yield();
-#endif
 }
 
 #if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__)
diff --git a/src/libltfs/xattr.h b/src/libltfs/xattr.h
index 66f82fe2..fd1785ab 100644
--- a/src/libltfs/xattr.h
+++ b/src/libltfs/xattr.h
@@ -66,7 +66,9 @@ extern "C" {
 #include "libltfs/arch/freebsd/xattr.h"
 #endif
 
-#include "fuse.h"
+#include "libltfs/ltfs_fuse_version.h"
+#include <fuse.h>
+
 #include "ltfs.h"
 
 #define LTFS_PRIVATE_PREFIX "ltfs."
diff --git a/src/main.c b/src/main.c
index 533ec70d..05696035 100644
--- a/src/main.c
+++ b/src/main.c
@@ -704,7 +704,7 @@ int main(int argc, char **argv)
 	if (priv->device_list) {
 		ret = show_device_list(priv);
 		ltfs_finish();
-		return (ret != 0) ? 0 : 1;
+		return ret ? 1 : 0;
 	}
 
 	/* Validate sync option */