diff --git a/src/add-ons/kernel/disk_scanner/Jamfile b/src/add-ons/kernel/disk_scanner/Jamfile
index f713104e4f..09ca856d21 100644
--- a/src/add-ons/kernel/disk_scanner/Jamfile
+++ b/src/add-ons/kernel/disk_scanner/Jamfile
@@ -6,6 +6,6 @@ R5KernelAddon disk_scanner : kernel disk_scanner :
 	disk_scanner.c
 ;
 
-#SubInclude OBOS_TOP src add-ons kernel disk_scanner fs ;
+SubInclude OBOS_TOP src add-ons kernel disk_scanner fs ;
 SubInclude OBOS_TOP src add-ons kernel disk_scanner partition ;
-#SubInclude OBOS_TOP src add-ons kernel disk_scanner session ;
+SubInclude OBOS_TOP src add-ons kernel disk_scanner session ;
diff --git a/src/add-ons/kernel/disk_scanner/fs/Jamfile b/src/add-ons/kernel/disk_scanner/fs/Jamfile
new file mode 100644
index 0000000000..5cfc446084
--- /dev/null
+++ b/src/add-ons/kernel/disk_scanner/fs/Jamfile
@@ -0,0 +1 @@
+SubDir OBOS_TOP src add-ons kernel disk_scanner fs ;
diff --git a/src/add-ons/kernel/disk_scanner/session/Jamfile b/src/add-ons/kernel/disk_scanner/session/Jamfile
new file mode 100644
index 0000000000..b672d0a0a0
--- /dev/null
+++ b/src/add-ons/kernel/disk_scanner/session/Jamfile
@@ -0,0 +1 @@
+SubDir OBOS_TOP src add-ons kernel disk_scanner session ;