diff --git a/src/add-ons/kernel/file_systems/udf/Jamfile b/src/add-ons/kernel/file_systems/udf/Jamfile
index 35ab9ddb9f..55963f7a65 100644
--- a/src/add-ons/kernel/file_systems/udf/Jamfile
+++ b/src/add-ons/kernel/file_systems/udf/Jamfile
@@ -12,26 +12,14 @@ oldOPTIM = $(OPTIM) ;
 		KEEP_WRONG_DIRENT_RECLEN
 		;
 
-	defines += COMPILE_FOR_R5 ;
-
-	if $(DEBUG) = 0 {
-		# the gcc on BeOS doesn't compile BFS correctly with -O2 or more
-		OPTIM = -O1 ;
-	}
-
 	defines = [ FDefines $(defines) ] ;
 	SubDirCcFlags $(defines) -Wall -Wno-multichar ;
 	SubDirC++Flags $(defines) -Wall -Wno-multichar ;
 }
 
-UsePrivateHeaders kernel ;			# For kernel_cpp.cpp
-UsePrivateHeaders [ FDirName kernel util ] ;	# For all the UDF source files
+UsePrivateKernelHeaders ;
 
 KernelAddon udf :
-	kernel_cpp.cpp
-	udf.cpp
-
-	DirectoryIterator.cpp
 	DString.cpp
 	Icb.cpp
 	MetadataPartition.cpp
@@ -44,7 +32,9 @@ KernelAddon udf :
 	Utils.cpp
 	VirtualPartition.cpp
 	Volume.cpp
-;
+
+	kernel_interface.cpp
+	;
 
 SEARCH on [ FGristFiles
 		kernel_cpp.cpp 
@@ -66,4 +56,4 @@ InstallUDF install : udf ;
 # restore original optimization level
 OPTIM = $(oldOPTIM) ;
 
-SubInclude HAIKU_TOP src add-ons kernel file_systems udf drive_setup_addon ;
+#SubInclude HAIKU_TOP src add-ons kernel file_systems udf drive_setup_addon ;