diff --git a/src/apps/deskbar/TeamMenu.cpp b/src/apps/deskbar/TeamMenu.cpp
index fc98d14b2c..9aa7db013f 100644
--- a/src/apps/deskbar/TeamMenu.cpp
+++ b/src/apps/deskbar/TeamMenu.cpp
@@ -50,6 +50,9 @@ All rights reserved.
 #include "TeamMenuItem.h"
 
 
+//	#pragma mark - TTeamMenuItem
+
+
 TTeamMenu::TTeamMenu()
 	:
 	BMenu("Team Menu")
diff --git a/src/apps/deskbar/TeamMenuItem.cpp b/src/apps/deskbar/TeamMenuItem.cpp
index 3fc4872af9..da06dc14f4 100644
--- a/src/apps/deskbar/TeamMenuItem.cpp
+++ b/src/apps/deskbar/TeamMenuItem.cpp
@@ -65,6 +65,9 @@ const float kLabelOffset = 8.0f;
 const float kSwitchWidth = 12.0f;
 
 
+//	#pragma mark - TTeamMenuItem
+
+
 TTeamMenuItem::TTeamMenuItem(BList* team, BBitmap* icon, char* name,
 	char* signature, float width, float height)
 	:
diff --git a/src/apps/deskbar/WindowMenu.cpp b/src/apps/deskbar/WindowMenu.cpp
index e9563f974e..6a19baa1c4 100644
--- a/src/apps/deskbar/WindowMenu.cpp
+++ b/src/apps/deskbar/WindowMenu.cpp
@@ -46,7 +46,6 @@ All rights reserved.
 
 #include "BarApp.h"
 #include "BarView.h"
-#include "ExpandoMenuBar.h"
 #include "ShowHideMenuItem.h"
 #include "TeamMenu.h"
 #include "TeamMenuItem.h"
@@ -66,6 +65,10 @@ const int32 kSystemFloater = 6;
 #undef B_TRANSLATION_CONTEXT
 #define B_TRANSLATION_CONTEXT "WindowMenu"
 
+
+//	#pragma mark - TWindowMenu
+
+
 bool
 TWindowMenu::WindowShouldBeListed(client_window_info* info)
 {
diff --git a/src/apps/deskbar/WindowMenuItem.cpp b/src/apps/deskbar/WindowMenuItem.cpp
index a31eada4e5..f051469637 100644
--- a/src/apps/deskbar/WindowMenuItem.cpp
+++ b/src/apps/deskbar/WindowMenuItem.cpp
@@ -44,11 +44,12 @@ All rights reserved.
 #include "BarMenuBar.h"
 #include "BarView.h"
 #include "ExpandoMenuBar.h"
-#include "icons.h"
 #include "ResourceSet.h"
 #include "TeamMenu.h"
 #include "WindowMenu.h"
 
+#include "icons.h"
+
 
 const float kHPad = 10.0f;
 const float kVPad = 2.0f;
@@ -57,6 +58,9 @@ const float kLabelOffset = 8.0f;
 const BRect kIconRect(1.0f, 1.0f, 13.0f, 14.0f);
 
 
+//	#pragma mark - TWindowMenuItem
+
+
 TWindowMenuItem::TWindowMenuItem(const char* label, int32 id, bool mini,
 	bool currentWorkspace, bool dragging)
 	: