diff --git a/src/kits/tracker/PendingNodeMonitorCache.cpp b/src/kits/tracker/PendingNodeMonitorCache.cpp
index a3005c15d0..68fbfaaed8 100644
--- a/src/kits/tracker/PendingNodeMonitorCache.cpp
+++ b/src/kits/tracker/PendingNodeMonitorCache.cpp
@@ -44,9 +44,10 @@ const bigtime_t kDelayedNodeMonitorLifetime = 10000000;
 
 PendingNodeMonitorEntry::PendingNodeMonitorEntry(const node_ref* node,
 	const BMessage* nodeMonitor)
-	:	fExpiresAfter(system_time() + kDelayedNodeMonitorLifetime),
-		fNodeMonitor(*nodeMonitor),
-		fNode(*node)
+	:
+	fExpiresAfter(system_time() + kDelayedNodeMonitorLifetime),
+	fNodeMonitor(*nodeMonitor),
+	fNode(*node)
 {
 }
 
@@ -73,7 +74,8 @@ PendingNodeMonitorEntry::TooOld(bigtime_t now) const
 
 
 PendingNodeMonitorCache::PendingNodeMonitorCache()
-	:	fList(10, true)
+	:
+	fList(10, true)
 {
 }
 
diff --git a/src/kits/tracker/PendingNodeMonitorCache.h b/src/kits/tracker/PendingNodeMonitorCache.h
index 68d598e150..35d546e457 100644
--- a/src/kits/tracker/PendingNodeMonitorCache.h
+++ b/src/kits/tracker/PendingNodeMonitorCache.h
@@ -39,14 +39,13 @@ All rights reserved.
 //	The respective node montior messages are stored in a list and applied
 //  later, when their target shows up. They get nuked when they become too
 //  old.
-#ifndef __PENDING_NODEMONITOR_CACHE_H__
-#define __PENDING_NODEMONITOR_CACHE_H__
+#ifndef _PENDING_NODE_MONITOR_CACHE_H
+#define _PENDING_NODE_MONITOR_CACHE_H
 
 
 #include <Message.h>
 #include <Node.h>
-
-#include "ObjectList.h"
+#include <ObjectList.h>
 
 
 namespace BPrivate {
@@ -67,7 +66,6 @@ private:
 	node_ref fNode;
 };
 
-
 class PendingNodeMonitorCache {
 public:
 	PendingNodeMonitorCache();
@@ -87,4 +85,5 @@ private:
 
 using namespace BPrivate;
 
-#endif	// __PENDING_NODEMONITOR_CACHE_H__
+
+#endif	// _PENDING_NODE_MONITOR_CACHE_H