diff --git a/src/kernel/core/messaging/Jamfile b/src/kernel/core/messaging/Jamfile
index 727716a0d9..a9bb723fb4 100644
--- a/src/kernel/core/messaging/Jamfile
+++ b/src/kernel/core/messaging/Jamfile
@@ -9,6 +9,7 @@ UseHeaders [ FDirName $(OBOS_TOP) src kernel core disk_device_manager ] ;
 	# for "Locker.h"
 
 KernelMergeObject kernel_messaging.o :
+	KMessage.cpp
 	MessagingService.cpp
 
 	: -fno-pic -Wno-unused -D_KERNEL_MODE
diff --git a/src/kernel/core/util/KMessage.cpp b/src/kernel/core/messaging/KMessage.cpp
similarity index 100%
rename from src/kernel/core/util/KMessage.cpp
rename to src/kernel/core/messaging/KMessage.cpp
diff --git a/src/kernel/core/util/Jamfile b/src/kernel/core/util/Jamfile
index 5827846d85..5d1567fed2 100644
--- a/src/kernel/core/util/Jamfile
+++ b/src/kernel/core/util/Jamfile
@@ -6,7 +6,6 @@ KernelMergeObject kernel_util.o :
 	cbuf.c
 	kernel_cpp.cpp
 	khash.c
-	KMessage.cpp
 	list.c
 	queue.c