diff --git a/src/add-ons/kernel/file_systems/bfs/BPlusTree.cpp b/src/add-ons/kernel/file_systems/bfs/BPlusTree.cpp
index 32d2728759..af8b70ef6e 100644
--- a/src/add-ons/kernel/file_systems/bfs/BPlusTree.cpp
+++ b/src/add-ons/kernel/file_systems/bfs/BPlusTree.cpp
@@ -14,7 +14,7 @@
 #include "Utility.h"
 #include "Stack.h"
 
-#include <kernel_cpp.h>
+#include <util/kernel_cpp.h>
 #include <TypeConstants.h>
 
 #include <string.h>
diff --git a/src/add-ons/kernel/file_systems/bfs/BlockAllocator.cpp b/src/add-ons/kernel/file_systems/bfs/BlockAllocator.cpp
index 7a121180af..6af62c984d 100644
--- a/src/add-ons/kernel/file_systems/bfs/BlockAllocator.cpp
+++ b/src/add-ons/kernel/file_systems/bfs/BlockAllocator.cpp
@@ -13,7 +13,7 @@
 #include "Stack.h"
 #include "bfs_control.h"
 
-#include <kernel_cpp.h>
+#include <util/kernel_cpp.h>
 #include <stdlib.h>
 
 #ifdef USER
diff --git a/src/add-ons/kernel/file_systems/bfs/BufferPool.cpp b/src/add-ons/kernel/file_systems/bfs/BufferPool.cpp
index db6985ba42..3d1a64f737 100644
--- a/src/add-ons/kernel/file_systems/bfs/BufferPool.cpp
+++ b/src/add-ons/kernel/file_systems/bfs/BufferPool.cpp
@@ -8,7 +8,7 @@
 #include "BufferPool.h"
 #include "Debug.h"
 
-#include <kernel_cpp.h>
+#include <util/kernel_cpp.h>
 
 
 const uint32 kNumBuffers = 8;
diff --git a/src/add-ons/kernel/file_systems/bfs/Index.cpp b/src/add-ons/kernel/file_systems/bfs/Index.cpp
index 0619446a5c..7900e8906c 100644
--- a/src/add-ons/kernel/file_systems/bfs/Index.cpp
+++ b/src/add-ons/kernel/file_systems/bfs/Index.cpp
@@ -11,7 +11,7 @@
 #include "Inode.h"
 #include "BPlusTree.h"
 
-#include <kernel_cpp.h>
+#include <util/kernel_cpp.h>
 #include <TypeConstants.h>
 
 // B_MIME_STRING_TYPE is defined in storage/Mime.h, but we
diff --git a/src/add-ons/kernel/file_systems/bfs/Inode.cpp b/src/add-ons/kernel/file_systems/bfs/Inode.cpp
index e56dc6924c..3b42b0fee5 100644
--- a/src/add-ons/kernel/file_systems/bfs/Inode.cpp
+++ b/src/add-ons/kernel/file_systems/bfs/Inode.cpp
@@ -11,7 +11,7 @@
 #include "Stream.h"
 #include "Index.h"
 
-#include <kernel_cpp.h>
+#include <util/kernel_cpp.h>
 
 #include <string.h>
 #include <stdio.h>
diff --git a/src/add-ons/kernel/file_systems/bfs/Journal.cpp b/src/add-ons/kernel/file_systems/bfs/Journal.cpp
index 3647bfb6e8..267d79c550 100644
--- a/src/add-ons/kernel/file_systems/bfs/Journal.cpp
+++ b/src/add-ons/kernel/file_systems/bfs/Journal.cpp
@@ -9,7 +9,7 @@
 #include "Inode.h"
 #include "Debug.h"
 
-#include <kernel_cpp.h>
+#include <util/kernel_cpp.h>
 
 
 Journal::Journal(Volume *volume)
diff --git a/src/add-ons/kernel/file_systems/bfs/Query.cpp b/src/add-ons/kernel/file_systems/bfs/Query.cpp
index b14085cbfa..e953613611 100644
--- a/src/add-ons/kernel/file_systems/bfs/Query.cpp
+++ b/src/add-ons/kernel/file_systems/bfs/Query.cpp
@@ -18,7 +18,7 @@
 #include "BPlusTree.h"
 #include "Index.h"
 
-#include <kernel_cpp.h>
+#include <util/kernel_cpp.h>
 #include <SupportDefs.h>
 #include <TypeConstants.h>
 #include <AppDefs.h>
diff --git a/src/add-ons/kernel/file_systems/bfs/Utility.cpp b/src/add-ons/kernel/file_systems/bfs/Utility.cpp
index 645da516e8..8e01fcb459 100644
--- a/src/add-ons/kernel/file_systems/bfs/Utility.cpp
+++ b/src/add-ons/kernel/file_systems/bfs/Utility.cpp
@@ -8,7 +8,7 @@
 #include "Utility.h"
 #include "Debug.h"
 
-#include <kernel_cpp.h>
+#include <util/kernel_cpp.h>
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/add-ons/kernel/file_systems/bfs/Volume.cpp b/src/add-ons/kernel/file_systems/bfs/Volume.cpp
index 4d1f590231..40959bc9ce 100644
--- a/src/add-ons/kernel/file_systems/bfs/Volume.cpp
+++ b/src/add-ons/kernel/file_systems/bfs/Volume.cpp
@@ -11,7 +11,7 @@
 #include "Inode.h"
 #include "Query.h"
 
-#include <kernel_cpp.h>
+#include <util/kernel_cpp.h>
 #include <KernelExport.h>
 #include <fs_volume.h>
 
diff --git a/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp b/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp
index 4e2b5d19a3..524d6be16b 100644
--- a/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp
+++ b/src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp
@@ -13,7 +13,7 @@
 #include "Query.h"
 #include "bfs_control.h"
 
-#include <kernel_cpp.h>
+#include <util/kernel_cpp.h>
 
 #include <string.h>
 #include <stdio.h>