diff --git a/src/kits/tracker/SlowContextPopup.cpp b/src/kits/tracker/SlowContextPopup.cpp
index 166aad5524..3600fe7cec 100644
--- a/src/kits/tracker/SlowContextPopup.cpp
+++ b/src/kits/tracker/SlowContextPopup.cpp
@@ -66,15 +66,20 @@ All rights reserved.
 #undef B_TRANSLATION_CONTEXT
 #define B_TRANSLATION_CONTEXT "SlowContextPopup"
 
+
+//	#pragma mark - BSlowContextMenu
+
+
 BSlowContextMenu::BSlowContextMenu(const char* title)
-	:	BPopUpMenu(title, false, false),
-		fMenuBuilt(false),
-		fMessage(B_REFS_RECEIVED),
-		fParentWindow(NULL),
-		fItemList(NULL),
-		fContainer(NULL),
-		fTypesList(NULL),
-		fIsShowing(false)
+	:
+	BPopUpMenu(title, false, false),
+	fMenuBuilt(false),
+	fMessage(B_REFS_RECEIVED),
+	fParentWindow(NULL),
+	fItemList(NULL),
+	fContainer(NULL),
+	fTypesList(NULL),
+	fIsShowing(false)
 {
 	InitIconPreloader();
 
@@ -214,7 +219,8 @@ BSlowContextMenu::AddDynamicItem(add_state state)
 			break;
 	}
 
-	return true;	// call me again, got more to show
+	return true;
+		// call me again, got more to show
 }
 
 
diff --git a/src/kits/tracker/SlowContextPopup.h b/src/kits/tracker/SlowContextPopup.h
index 31fac10095..fe63e54fa5 100644
--- a/src/kits/tracker/SlowContextPopup.h
+++ b/src/kits/tracker/SlowContextPopup.h
@@ -31,8 +31,8 @@ of Be Incorporated in the United States and other countries. Other brand product
 names are registered trademarks or trademarks of their respective holders.
 All rights reserved.
 */
-#ifndef SLOW_CONTEXT_POPUP_H
-#define SLOW_CONTEXT_POPUP_H
+#ifndef _SLOW_CONTEXT_POPUP_H
+#define _SLOW_CONTEXT_POPUP_H
 
 
 #include <PopUpMenu.h>
@@ -135,4 +135,5 @@ BSlowContextMenu::IsShowing() const
 	return fIsShowing;
 }
 
-#endif	// SLOW_CONTEXT_POPUP_H
+
+#endif	// _SLOW_CONTEXT_POPUP_H