diff --git a/src/system/kernel/Notifications.cpp b/src/system/kernel/Notifications.cpp
index 48c1d80044..d9c36b63ce 100644
--- a/src/system/kernel/Notifications.cpp
+++ b/src/system/kernel/Notifications.cpp
@@ -10,14 +10,19 @@
 
 #include <Notifications.h>
 
+#include <new>
+
 #include <team.h>
 
 
+#ifdef _KERNEL_MODE
+
 static const char* kEventMaskString = "event mask";
 
-
 NotificationManager NotificationManager::sManager;
 
+#endif
+
 
 // #pragma mark - NotificationListener
 
@@ -50,6 +55,9 @@ NotificationListener::operator==(const NotificationListener& other) const
 // #pragma mark - UserMessagingMessageSender
 
 
+#ifdef _KERNEL_MODE
+
+
 UserMessagingMessageSender::UserMessagingMessageSender()
 	:
 	fMessage(NULL),
@@ -140,7 +148,7 @@ default_listener::~default_listener()
 }
 
 
-//	#pragma mark - NotificationService
+//	#pragma mark - DefaultNotificationService
 
 
 DefaultNotificationService::DefaultNotificationService(const char* name)
@@ -600,3 +608,5 @@ notifications_init(void)
 	}
 }
 
+
+#endif	// _KERNEL_MODE