diff --git a/src/os/Makefile.am b/src/os/Makefile.am
index ba80fd356db..f1c68431eb8 100644
--- a/src/os/Makefile.am
+++ b/src/os/Makefile.am
@@ -8,7 +8,6 @@ if ENABLE_SERVER
 libos_la_SOURCES = \
 	os/chain_xattr.cc \
 	os/fs/FS.cc \
-	os/fs/XFS.cc \
 	os/DBObjectMap.cc \
 	os/GenericObjectMap.cc \
 	os/FileJournal.cc \
@@ -31,7 +30,9 @@ libos_la_SOURCES += os/BtrfsFileStoreBackend.cc
 endif
 
 if WITH_LIBXFS
-libos_la_SOURCES += os/XfsFileStoreBackend.cc
+libos_la_SOURCES += \
+    os/fs/XFS.cc \
+    os/XfsFileStoreBackend.cc
 endif
 
 if WITH_LIBZFS
diff --git a/src/os/fs/FS.cc b/src/os/fs/FS.cc
index 78392f6a307..5df8adf7d79 100644
--- a/src/os/fs/FS.cc
+++ b/src/os/fs/FS.cc
@@ -24,9 +24,12 @@
 
 #include "FS.h"
 
-#include "XFS.h"
-
 #include "acconfig.h"
+
+#ifdef HAVE_LIBXFS
+#include "XFS.h"
+#endif
+
 #ifdef DARWIN
 #include <sys/mount.h>
 #else