diff --git a/headers/os/storage/NodeMonitor.h b/headers/os/storage/NodeMonitor.h
index 9d4db86073..d02d331ace 100644
--- a/headers/os/storage/NodeMonitor.h
+++ b/headers/os/storage/NodeMonitor.h
@@ -7,12 +7,6 @@
 
 
 #include <StorageDefs.h>
-#include <Node.h>
-#include <Messenger.h>
-
-
-class BLooper;
-class BHandler;
 
 
 /* Flags for the watch_node() call.
@@ -56,6 +50,14 @@ enum {
 
 #ifdef __cplusplus
 
+// these are only needed for the function exports
+#include <Node.h>
+#include <Messenger.h>
+
+class BLooper;
+class BHandler;
+
+
 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,