diff --git a/src/fspp/fuse/CMakeLists.txt b/src/fspp/fuse/CMakeLists.txt
index 194f5ba8..7d7992be 100644
--- a/src/fspp/fuse/CMakeLists.txt
+++ b/src/fspp/fuse/CMakeLists.txt
@@ -1,3 +1,3 @@
 add_library(fspp_fuse Fuse.cpp)
 
-target_link_libraries(fspp_fuse fuse fspp_impl)
+target_link_libraries(fspp_fuse fuse fspp_impl boost_filesystem boost_system)
diff --git a/src/fspp/impl/CMakeLists.txt b/src/fspp/impl/CMakeLists.txt
index e0731c30..d1337ef8 100644
--- a/src/fspp/impl/CMakeLists.txt
+++ b/src/fspp/impl/CMakeLists.txt
@@ -1 +1,3 @@
 add_library(fspp_impl FilesystemImpl.cpp FuseOpenFileList.cpp IdList.cpp FuseErrnoException.cpp)
+
+target_link_libraries(fspp_impl boost_filesystem boost_system)
diff --git a/src/test/fspp/fs_interface/DeviceTest.cpp b/src/test/fspp/fs_interface/DeviceTest.cpp
new file mode 100644
index 00000000..dea9204e
--- /dev/null
+++ b/src/test/fspp/fs_interface/DeviceTest.cpp
@@ -0,0 +1,4 @@
+/*
+ * Tests that the header can be included without needing additional header includes as dependencies.
+ */
+#include "fspp/fs_interface/Device.h"
diff --git a/src/test/fspp/fs_interface/DirTest.cpp b/src/test/fspp/fs_interface/DirTest.cpp
new file mode 100644
index 00000000..91a92c24
--- /dev/null
+++ b/src/test/fspp/fs_interface/DirTest.cpp
@@ -0,0 +1,4 @@
+/*
+ * Tests that the header can be included without needing additional header includes as dependencies.
+ */
+#include "fspp/fs_interface/Dir.h"
diff --git a/src/test/fspp/fs_interface/FileTest.cpp b/src/test/fspp/fs_interface/FileTest.cpp
new file mode 100644
index 00000000..fd4831bb
--- /dev/null
+++ b/src/test/fspp/fs_interface/FileTest.cpp
@@ -0,0 +1,4 @@
+/*
+ * Tests that the header can be included without needing additional header includes as dependencies.
+ */
+#include "fspp/fs_interface/File.h"
diff --git a/src/test/fspp/fs_interface/NodeTest.cpp b/src/test/fspp/fs_interface/NodeTest.cpp
new file mode 100644
index 00000000..9b1a03d2
--- /dev/null
+++ b/src/test/fspp/fs_interface/NodeTest.cpp
@@ -0,0 +1,4 @@
+/*
+ * Tests that the header can be included without needing additional header includes as dependencies.
+ */
+#include "fspp/fs_interface/Node.h"
diff --git a/src/test/fspp/fs_interface/OpenFileTest.cpp b/src/test/fspp/fs_interface/OpenFileTest.cpp
new file mode 100644
index 00000000..20db933d
--- /dev/null
+++ b/src/test/fspp/fs_interface/OpenFileTest.cpp
@@ -0,0 +1,4 @@
+/*
+ * Tests that the header can be included without needing additional header includes as dependencies.
+ */
+#include "fspp/fs_interface/OpenFile.h"