diff --git a/src/add-ons/kernel/partitioning_systems/intel/PartitionMap.cpp b/src/add-ons/kernel/partitioning_systems/intel/PartitionMap.cpp
index f6b39c03ce..1576c6ddbb 100644
--- a/src/add-ons/kernel/partitioning_systems/intel/PartitionMap.cpp
+++ b/src/add-ons/kernel/partitioning_systems/intel/PartitionMap.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2006, Haiku, Inc. All Rights Reserved.
+ * Copyright 2003-2008, Haiku, Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -18,6 +18,7 @@
 
 #ifndef _USER_MODE
 #	include <util/kernel_cpp.h>
+#	include <KernelExport.h>
 #else
 #	include <new>
 #endif
@@ -26,20 +27,19 @@
 #else
 #	include <boot/partitions.h>
 #endif
-#ifndef _USER_MODE
-#	include <KernelExport.h>
-#endif
 
 #include "PartitionMap.h"
 
-#define TRACE_ENABLED
 
+//#define TRACE_ENABLED
 #ifdef TRACE_ENABLED
 #	ifdef _USER_MODE
 #		define TRACE(x) printf x
 #	else
 #		define TRACE(x) dprintf x
 #	endif
+#else
+#	define TRACE(x) ;
 #endif
 
 using std::nothrow;
@@ -291,22 +291,24 @@ PartitionType::FindNext()
 
 // constructor
 Partition::Partition()
-	: fPTSOffset(0),
-	  fOffset(0),
-	  fSize(0),
-	  fType(0),
-	  fActive(false)
+	:
+	fPTSOffset(0),
+	fOffset(0),
+	fSize(0),
+	fType(0),
+	fActive(false)
 {
 }
 
 // constructor
 Partition::Partition(const partition_descriptor *descriptor,off_t ptsOffset,
-					 off_t baseOffset)
-	: fPTSOffset(0),
-	  fOffset(0),
-	  fSize(0),
-	  fType(0),
-	  fActive(false)
+		off_t baseOffset)
+	:
+	fPTSOffset(0),
+	fOffset(0),
+	fSize(0),
+	fType(0),
+	fActive(false)
 {
 	SetTo(descriptor, ptsOffset, baseOffset);
 }
@@ -314,9 +316,9 @@ Partition::Partition(const partition_descriptor *descriptor,off_t ptsOffset,
 // SetTo
 void
 Partition::SetTo(const partition_descriptor *descriptor, off_t ptsOffset,
-				 off_t baseOffset)
+	off_t baseOffset)
 {
-TRACE(("Partition::SetTo(): active: %x\n", descriptor->active));
+	TRACE(("Partition::SetTo(): active: %x\n", descriptor->active));
 	SetTo(baseOffset + (off_t)descriptor->start * SECTOR_SIZE,
 		(off_t)descriptor->size * SECTOR_SIZE,
 		descriptor->type,
diff --git a/src/add-ons/kernel/partitioning_systems/intel/PartitionMapParser.cpp b/src/add-ons/kernel/partitioning_systems/intel/PartitionMapParser.cpp
index ee4c1de560..ed664ea624 100644
--- a/src/add-ons/kernel/partitioning_systems/intel/PartitionMapParser.cpp
+++ b/src/add-ons/kernel/partitioning_systems/intel/PartitionMapParser.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2006, Haiku, Inc. All Rights Reserved.
+ * Copyright 2003-2008, Haiku, Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -21,14 +21,16 @@
 #include "PartitionMap.h"
 #include "PartitionMapParser.h"
 
-#define TRACE_ENABLED
 
+//#define TRACE_ENABLED
 #ifdef TRACE_ENABLED
 #	ifdef _USER_MODE
 #		define TRACE(x) printf x
 #	else
 #		define TRACE(x) dprintf x
 #	endif
+#else
+#	define TRACE(x) ;
 #endif
 
 using std::nothrow;
diff --git a/src/add-ons/kernel/partitioning_systems/intel/intel.cpp b/src/add-ons/kernel/partitioning_systems/intel/intel.cpp
index 9e1c8f8497..5a9e2588d4 100644
--- a/src/add-ons/kernel/partitioning_systems/intel/intel.cpp
+++ b/src/add-ons/kernel/partitioning_systems/intel/intel.cpp
@@ -37,15 +37,14 @@
 #ifndef _BOOT_MODE
 #	include <DiskDeviceTypes.h>
 #	include "write_support.h"
+#	define TRACE(x) dprintf x
 #else
 #	include <boot/partitions.h>
 #	include <util/kernel_cpp.h>
+#	define TRACE(x) ;
 #endif
 
 
-//#define TRACE(x) ;
-#define TRACE(x) dprintf x
-
 // module names
 #define INTEL_PARTITION_MODULE_NAME "partitioning_systems/intel/map/v1"
 #define INTEL_EXTENDED_PARTITION_MODULE_NAME \