diff --git a/src/add-ons/kernel/partitioning_systems/intel/PartitionMap.cpp b/src/add-ons/kernel/partitioning_systems/intel/PartitionMap.cpp
index dfd303ab8d..fb7540a75a 100644
--- a/src/add-ons/kernel/partitioning_systems/intel/PartitionMap.cpp
+++ b/src/add-ons/kernel/partitioning_systems/intel/PartitionMap.cpp
@@ -12,13 +12,19 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <util/kernel_cpp.h>
+#ifndef _USER_MODE
+#	include <util/kernel_cpp.h>
+#else
+#	include <new>
+#endif
 #ifndef _BOOT_MODE
 #	include <DiskDeviceTypes.h>
 #else
 #	include <boot/partitions.h>
 #endif
-#include <KernelExport.h>
+#ifndef _USER_MODE
+#	include <KernelExport.h>
+#endif
 
 #include "PartitionMap.h"
 
@@ -26,6 +32,8 @@
 //#define TRACE(x) dprintf x
 
 
+using std::nothrow;
+
 // partition_type
 struct partition_type {
 	uint8		type;
diff --git a/src/add-ons/kernel/partitioning_systems/intel/PartitionMap.h b/src/add-ons/kernel/partitioning_systems/intel/PartitionMap.h
index f0ec383f20..aff888ac97 100644
--- a/src/add-ons/kernel/partitioning_systems/intel/PartitionMap.h
+++ b/src/add-ons/kernel/partitioning_systems/intel/PartitionMap.h
@@ -12,7 +12,12 @@
 #define _INTEL_PARTITION_MAP_H
 
 #include <SupportDefs.h>
-#include <util/kernel_cpp.h>
+
+#ifndef _USER_MODE
+#	include <util/kernel_cpp.h>
+#else
+#	include <new>
+#endif
 
 // These match those in DiskDeviceTypes.cpp and *must* be kept in sync.
 #define INTEL_PARTITION_NAME "Intel Partition Map"
diff --git a/src/add-ons/kernel/partitioning_systems/intel/PartitionMapParser.cpp b/src/add-ons/kernel/partitioning_systems/intel/PartitionMapParser.cpp
index a6aa90fa9d..d9a9f49fba 100644
--- a/src/add-ons/kernel/partitioning_systems/intel/PartitionMapParser.cpp
+++ b/src/add-ons/kernel/partitioning_systems/intel/PartitionMapParser.cpp
@@ -1,6 +1,8 @@
 // PartitionMapParser.cpp
 
-#include <KernelExport.h>
+#ifndef _USER_MODE
+#	include <KernelExport.h>
+#endif
 
 #include <errno.h>
 #include <stdio.h>
@@ -15,6 +17,9 @@
 #define TRACE(x) ;
 //#define TRACE(x) dprintf x
 
+
+using std::nothrow;
+
 // Maximal number of logical partitions per extended partition we allow.
 static const int32 kMaxLogicalPartitionCount = 128;