diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/haiku/HaikuKernelFileSystem.h b/src/add-ons/kernel/file_systems/userlandfs/server/haiku/HaikuKernelFileSystem.h
index 5b1072ec0e..1eb4e49ae6 100644
--- a/src/add-ons/kernel/file_systems/userlandfs/server/haiku/HaikuKernelFileSystem.h
+++ b/src/add-ons/kernel/file_systems/userlandfs/server/haiku/HaikuKernelFileSystem.h
@@ -3,7 +3,7 @@
 #ifndef USERLAND_FS_HAIKU_KERNEL_FILE_SYSTEM_H
 #define USERLAND_FS_HAIKU_KERNEL_FILE_SYSTEM_H
 
-#include "FileSystem.h"
+#include "../FileSystem.h"
 
 struct file_system_module_info;
 
diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/haiku/HaikuKernelVolume.cpp b/src/add-ons/kernel/file_systems/userlandfs/server/haiku/HaikuKernelVolume.cpp
index fa22951137..59df1e343e 100644
--- a/src/add-ons/kernel/file_systems/userlandfs/server/haiku/HaikuKernelVolume.cpp
+++ b/src/add-ons/kernel/file_systems/userlandfs/server/haiku/HaikuKernelVolume.cpp
@@ -8,7 +8,9 @@
 #include <unistd.h>
 
 #include "Debug.h"
-#include "kernel_emu.h"
+
+#include "../kernel_emu.h"
+
 #include "HaikuKernelNode.h"
 
 
diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/haiku/HaikuKernelVolume.h b/src/add-ons/kernel/file_systems/userlandfs/server/haiku/HaikuKernelVolume.h
index 339c9de240..0812f9cc02 100644
--- a/src/add-ons/kernel/file_systems/userlandfs/server/haiku/HaikuKernelVolume.h
+++ b/src/add-ons/kernel/file_systems/userlandfs/server/haiku/HaikuKernelVolume.h
@@ -5,7 +5,7 @@
 
 #include <fs_interface.h>
 
-#include "Volume.h"
+#include "../Volume.h"
 
 namespace UserlandFS {
 
diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/haiku/Jamfile b/src/add-ons/kernel/file_systems/userlandfs/server/haiku/Jamfile
index a112da2b4d..662753bbc7 100644
--- a/src/add-ons/kernel/file_systems/userlandfs/server/haiku/Jamfile
+++ b/src/add-ons/kernel/file_systems/userlandfs/server/haiku/Jamfile
@@ -7,7 +7,6 @@ local userlandFSIncludes = [ PrivateHeaders userlandfs ] ;
 SubDirSysHdrs [ FDirName $(userlandFSIncludes) ] ;
 SubDirHdrs [ FDirName $(userlandFSIncludes) private ] ;
 SubDirHdrs [ FDirName $(userlandFSIncludes) shared ] ;
-SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) ] ;
 
 UsePrivateSystemHeaders ;
 UsePrivateHeaders libroot ;
diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/haiku/haiku_kernel_emu.cpp b/src/add-ons/kernel/file_systems/userlandfs/server/haiku/haiku_kernel_emu.cpp
index e579cfab70..6e9b620c6b 100644
--- a/src/add-ons/kernel/file_systems/userlandfs/server/haiku/haiku_kernel_emu.cpp
+++ b/src/add-ons/kernel/file_systems/userlandfs/server/haiku/haiku_kernel_emu.cpp
@@ -10,9 +10,11 @@
 #include <NodeMonitor.h>
 
 #include "Debug.h"
+
+#include "../kernel_emu.h"
+
 #include "HaikuKernelNode.h"
 #include "HaikuKernelVolume.h"
-#include "kernel_emu.h"
 #include "vfs.h"