diff --git a/src/apps/bin/makeudfimage/Jamfile b/src/apps/bin/makeudfimage/Jamfile
index ba69db90b0..499875def9 100644
--- a/src/apps/bin/makeudfimage/Jamfile
+++ b/src/apps/bin/makeudfimage/Jamfile
@@ -1,12 +1,30 @@
 SubDir OBOS_TOP src apps bin makeudfimage ;
 
+UsePrivateHeaders [ FDirName kernel util ] ;	# For kernel_cpp.h
+SubDirHdrs [ FDirName $(OBOS_TOP) src add-ons kernel file_systems udf ] ;
+
+{
+	local defines = [ FDefines USER ] ; 
+	SubDirCcFlags $(defines) ;
+	SubDirC++Flags $(defines) ;
+}
+
 BinCommand makeudfimage 
 	: makeudfimage.cpp
+	  Allocator.cpp
 	  ConsoleListener.cpp
 	  Debug.cpp
 	  Shell.cpp
 	  UdfBuilder.cpp
+
+	  # Common Udf source files
+	  CS0String.cpp
+	  UdfStructures.cpp
+
 	: stdc++.r4
 	
 ;
 
+SEARCH on [ FGristFiles CS0String.cpp UdfStructures.cpp ]
+	= [ FDirName $(OBOS_TOP) src add-ons kernel file_systems udf ] ;
+