diff --git a/src/add-ons/kernel/file_systems/udf/Array.h b/src/add-ons/kernel/file_systems/udf/Array.h
index cc9a25c7ba..40f3f1ef03 100644
--- a/src/add-ons/kernel/file_systems/udf/Array.h
+++ b/src/add-ons/kernel/file_systems/udf/Array.h
@@ -8,12 +8,11 @@
 #ifndef _UDF_ARRAY_H
 #define _UDF_ARRAY_H
 
-#include "kernel_cpp.h"
 
 #include "SupportDefs.h"
 #include "UdfDebug.h"
 
-namespace Udf {
+#include <util/kernel_cpp.h>
 
 /*! \brief Slightly more typesafe static array type than built-in arrays,
 	with array length information stored implicitly (i.e. consuming no
@@ -87,7 +86,4 @@ struct array<char, arrayLength> {
 	uint8 data[arrayLength];
 };
 
-
-};	// namespace UDF
-
 #endif	// _UDF_ARRAY_H
diff --git a/src/add-ons/kernel/file_systems/udf/MemoryChunk.h b/src/add-ons/kernel/file_systems/udf/MemoryChunk.h
index f05467867a..c2d229fe71 100644
--- a/src/add-ons/kernel/file_systems/udf/MemoryChunk.h
+++ b/src/add-ons/kernel/file_systems/udf/MemoryChunk.h
@@ -10,9 +10,7 @@
 
 #include <malloc.h>
 
-#include "kernel_cpp.h"
-
-namespace Udf {
+#include <util/kernel_cpp.h>
 
 /*! Simple class to encapsulate the boring details of allocating
 	and deallocating a chunk of memory.
@@ -67,6 +65,4 @@ private:
 	uint8 fData[size];
 };
 
-};	// namespace Udf
-
 #endif	// _UDF_MEMORY_CHUNK_H
diff --git a/src/add-ons/kernel/file_systems/udf/MetadataPartition.h b/src/add-ons/kernel/file_systems/udf/MetadataPartition.h
index 4c0dd10377..d172c14f85 100644
--- a/src/add-ons/kernel/file_systems/udf/MetadataPartition.h
+++ b/src/add-ons/kernel/file_systems/udf/MetadataPartition.h
@@ -10,13 +10,11 @@
 /*! \file MetadataPartition.h
 */
 
-#include <kernel_cpp.h>
+#include <util/kernel_cpp.h>
 
 #include "Partition.h"
 #include "UdfDebug.h"
 
-namespace Udf {
-
 /*! \brief Type 2 metadata partition
 
 	Metadata partitions allow for clustering of metadata (ICBs, directory
@@ -46,6 +44,4 @@ private:
 	status_t fInitStatus;
 };
 
-};	// namespace Udf
-
 #endif	// _UDF_METADATA_PARTITION_H
diff --git a/src/add-ons/kernel/file_systems/udf/PhysicalPartition.cpp b/src/add-ons/kernel/file_systems/udf/PhysicalPartition.cpp
index 6950c9674d..4903e35cca 100644
--- a/src/add-ons/kernel/file_systems/udf/PhysicalPartition.cpp
+++ b/src/add-ons/kernel/file_systems/udf/PhysicalPartition.cpp
@@ -2,7 +2,6 @@
 
 #define B_NOT_IMPLEMENTED B_ERROR
 
-using namespace Udf;
 
 /*! \brief Creates a new PhysicalPartition object.
 */
diff --git a/src/add-ons/kernel/file_systems/udf/SparablePartition.cpp b/src/add-ons/kernel/file_systems/udf/SparablePartition.cpp
index dd71f2f35c..4602464d06 100644
--- a/src/add-ons/kernel/file_systems/udf/SparablePartition.cpp
+++ b/src/add-ons/kernel/file_systems/udf/SparablePartition.cpp
@@ -2,7 +2,6 @@
 
 #define B_NOT_IMPLEMENTED B_ERROR
 
-using namespace Udf;
 
 /*! \brief Creates a new SparablePartition object.
 */
diff --git a/src/add-ons/kernel/file_systems/udf/UdfDebug.cpp b/src/add-ons/kernel/file_systems/udf/UdfDebug.cpp
index af2f299081..601c4c67da 100644
--- a/src/add-ons/kernel/file_systems/udf/UdfDebug.cpp
+++ b/src/add-ons/kernel/file_systems/udf/UdfDebug.cpp
@@ -14,6 +14,7 @@
 #include "UdfDebug.h"
 
 #include <stdlib.h>
+#include <string.h>
 #include <KernelExport.h>
 #include <TLS.h>
 
diff --git a/src/add-ons/kernel/file_systems/udf/UdfDebug.h b/src/add-ons/kernel/file_systems/udf/UdfDebug.h
index 7cf907e2a3..d699052734 100644
--- a/src/add-ons/kernel/file_systems/udf/UdfDebug.h
+++ b/src/add-ons/kernel/file_systems/udf/UdfDebug.h
@@ -47,7 +47,7 @@ extern "C" int 	vsprintf(char *s, const char *format, va_list arg);
 //#	define __out printf
 #endif
 
-#include "kernel_cpp.h"
+#include <util/kernel_cpp.h>
 
 class DebugHelper;
 
@@ -230,6 +230,7 @@ private:
 #endif	// ifdef DEBUG else
 
 #define TRACE(x) DBG(dprintf x)
+#define TRACE_ERROR(x) DBG(dprintf x)
 
 // These macros turn on or off extensive and generally unnecessary
 // debugging output regarding table of contents parsing
diff --git a/src/add-ons/kernel/file_systems/udf/UdfStructures.h b/src/add-ons/kernel/file_systems/udf/UdfStructures.h
index d76f70224f..2eea220f68 100644
--- a/src/add-ons/kernel/file_systems/udf/UdfStructures.h
+++ b/src/add-ons/kernel/file_systems/udf/UdfStructures.h
@@ -12,11 +12,12 @@
 #include <ByteOrder.h>
 #include <SupportDefs.h>
 
-#include "kernel_cpp.h"
 #include "UdfDebug.h"
 
 #include "Array.h"
 
+#include <util/kernel_cpp.h>
+
 /*! \file UdfStructures.h
 
 	\brief UDF on-disk data structure declarations
@@ -42,8 +43,6 @@
 	- <a href='http://www.hi-ho.ne.jp/y-komachi/committees/fpro/fpro.htm'>Possible test disc image generator (?)</a>
 */
 
-namespace Udf {
-
 //----------------------------------------------------------------------
 // ECMA-167 Part 1
 //----------------------------------------------------------------------
@@ -615,7 +614,7 @@ public:
 			// crc_length, based off provided descriptor
 			set_crc_length(size - sizeof(descriptor_tag));
 			// crc
-			uint16 crc = Udf::calculate_crc(reinterpret_cast<uint8*>(this)
+			uint16 crc = calculate_crc(reinterpret_cast<uint8*>(this)
 			               + sizeof(descriptor_tag), crc_length());
 			set_crc(crc);
 			// checksum (which depends on the other two values)
@@ -2198,7 +2197,5 @@ private:
 };
 		
 
-};	// namespace Udf
-
 #endif	// _UDF_DISK_STRUCTURES_H
 
diff --git a/src/add-ons/kernel/file_systems/udf/VirtualPartition.cpp b/src/add-ons/kernel/file_systems/udf/VirtualPartition.cpp
index d5216060ec..62f45376d4 100644
--- a/src/add-ons/kernel/file_systems/udf/VirtualPartition.cpp
+++ b/src/add-ons/kernel/file_systems/udf/VirtualPartition.cpp
@@ -2,7 +2,6 @@
 
 #define B_NOT_IMPLEMENTED B_ERROR
 
-using namespace Udf;
 
 /*! \brief Creates a new VirtualPartition object.