diff --git a/headers/os/storage/NodeMonitor.h b/headers/os/storage/NodeMonitor.h
index 520bdbd02f..9d4db86073 100644
--- a/headers/os/storage/NodeMonitor.h
+++ b/headers/os/storage/NodeMonitor.h
@@ -1,76 +1,69 @@
-/***************************************************************************
-//
-//	File:			NodeMonitor.h
-//
-//	Description:	The Node Monitor
-//
-//	Copyright 1992-98, Be Incorporated, All Rights Reserved.
-//
-***************************************************************************/
-
-
 #ifndef _NODE_MONITOR_H
 #define _NODE_MONITOR_H
+/* Node monitor calls for kernel add-ons
+**
+** Distributed under the terms of the OpenBeOS License.
+*/
+
 
-#ifndef _BE_BUILD_H
-#include <BeBuild.h>
-#endif
 #include <StorageDefs.h>
 #include <Node.h>
 #include <Messenger.h>
 
-class	BLooper;
-class	BHandler;
 
-_IMPEXP_BE status_t watch_node(const node_ref *node, 
-					   uint32 flags, 
-					   BMessenger target);
+class BLooper;
+class BHandler;
 
-_IMPEXP_BE status_t watch_node(const node_ref *node, 
-					   uint32 flags, 
-					   const BHandler *handler,
-					   const BLooper *looper = NULL);
-
-_IMPEXP_BE status_t stop_watching(BMessenger target);
-
-_IMPEXP_BE status_t stop_watching(const BHandler *handler, 
-					  const BLooper *looper=NULL);
 
 /* Flags for the watch_node() call.
- * Note that B_WATCH_MOUNT is NOT included in 
- * B_WATCH_ALL -- the latter is a convenience
- * for watching all watchable state changes for 
- * a specific node.  Watching for volumes
- * being mounted and unmounted (B_WATCH_MOUNT)
- * is in a category by itself. 
  *
- * BVolumeRoster provides a handy cover for
- * volume watching.
+ * Note that B_WATCH_MOUNT is NOT included in B_WATCH_ALL.
+ * You may prefer to use BVolumeRoster for volume watching.
  */
+
 enum {
-    B_STOP_WATCHING = 0x0000,
-	B_WATCH_NAME =	0x0001,
-	B_WATCH_STAT =	0x0002,
-	B_WATCH_ATTR =	0x0004,
-	B_WATCH_DIRECTORY =	0x0008,
-	B_WATCH_ALL = 0x000f,
-	B_WATCH_MOUNT = 0x0010
+    B_STOP_WATCHING		= 0x0000,
+	B_WATCH_NAME		= 0x0001,
+	B_WATCH_STAT		= 0x0002,
+	B_WATCH_ATTR		= 0x0004,
+	B_WATCH_DIRECTORY	= 0x0008,
+	B_WATCH_ALL			= 0x000f,
+
+	B_WATCH_MOUNT		= 0x0010
 };
 
-/* When a node monitor notification
- * returns to the target, the "opcode" field 
- * will hold one of these values.  The other
- * fields in the message tell you which
- * node (or device) changed.  See the documentation
- * for the names of these other fields.
+
+/* The "opcode" field of the B_NODE_MONITOR notification message you get.
+ *
+ * The presence and meaning of the other fields in that message specifying what
+ * exactly caused the notification depend on this value.
  */
-#define		B_ENTRY_CREATED		1
-#define		B_ENTRY_REMOVED		2
-#define		B_ENTRY_MOVED		3
-#define		B_STAT_CHANGED		4
-#define		B_ATTR_CHANGED		5
-#define		B_DEVICE_MOUNTED	6
-#define		B_DEVICE_UNMOUNTED	7
+
+#define	B_ENTRY_CREATED		1
+#define	B_ENTRY_REMOVED		2
+#define	B_ENTRY_MOVED		3
+#define	B_STAT_CHANGED		4
+#define	B_ATTR_CHANGED		5
+#define	B_DEVICE_MOUNTED	6
+#define	B_DEVICE_UNMOUNTED	7
 
 
-#endif
+/* C++ callable Prototypes
+ *
+ * Since you are not able to parse BMessages from plain C, there is no
+ * API exported.
+ */
+
+#ifdef __cplusplus
+
+extern status_t watch_node(const node_ref *node, uint32 flags, BMessenger target);
+extern status_t watch_node(const node_ref *node, uint32 flags, 
+					const BHandler *handler,
+					const BLooper *looper = NULL);
+
+extern status_t stop_watching(BMessenger target);
+extern status_t stop_watching(const BHandler *handler, const BLooper *looper = NULL);
+
+#endif	/* __cplusplus */
+
+#endif	/* _NODE_MONITOR_H*/