diff --git a/src/kits/tracker/TrashWatcher.cpp b/src/kits/tracker/TrashWatcher.cpp
index 7143fbb82b..fa9d4e24e2 100644
--- a/src/kits/tracker/TrashWatcher.cpp
+++ b/src/kits/tracker/TrashWatcher.cpp
@@ -33,12 +33,10 @@ All rights reserved.
 */
 
 
-#include "Attributes.h"
-#include "Bitmaps.h"
-#include "FSUtils.h"
-#include "Tracker.h"
 #include "TrashWatcher.h"
 
+#include <string.h>
+
 #include <Debug.h>
 #include <Directory.h>
 #include <NodeMonitor.h>
@@ -46,11 +44,18 @@ All rights reserved.
 #include <Volume.h>
 #include <VolumeRoster.h>
 
-#include <string.h>
+#include "Attributes.h"
+#include "Bitmaps.h"
+#include "FSUtils.h"
+#include "Tracker.h"
+
+
+//	 #pragma mark - BTrashWatcher
 
 
 BTrashWatcher::BTrashWatcher()
-	: BLooper("TrashWatcher", B_LOW_PRIORITY),
+	:
+	BLooper("TrashWatcher", B_LOW_PRIORITY),
 	fTrashNodeList(20, true)
 {
 	FSCreateTrashDirs();
@@ -109,8 +114,9 @@ BTrashWatcher::MessageReceived(BMessage* message)
 			message->FindInt64("to directory", &toDir);
 			if (fromDir == toDir)
 				break;
-		} // fall thru
-		case B_DEVICE_UNMOUNTED: // fall thru
+		}
+		// fall-through
+		case B_DEVICE_UNMOUNTED:
 		case B_ENTRY_REMOVED:
 		{
 			bool full = CheckTrashDirs();
diff --git a/src/kits/tracker/TrashWatcher.h b/src/kits/tracker/TrashWatcher.h
index ef0e2d324a..7a7fe54dd4 100644
--- a/src/kits/tracker/TrashWatcher.h
+++ b/src/kits/tracker/TrashWatcher.h
@@ -36,7 +36,8 @@ All rights reserved.
 
 
 #include <Looper.h>
-#include "ObjectList.h"
+#include <ObjectList.h>
+#include <Node.h>
 
 
 namespace BPrivate {
@@ -52,7 +53,7 @@ public:
 	bool IsTrashNode(const node_ref*) const;
 
 protected:
-	virtual	void MessageReceived(BMessage*);
+	virtual void MessageReceived(BMessage*);
 
 private:
 	void WatchTrashDirs();
@@ -68,4 +69,5 @@ private:
 
 using namespace BPrivate;
 
+
 #endif	// _TRASH_WATCHER_H