diff --git a/headers/private/interface/BMCPrivate.h b/headers/private/interface/BMCPrivate.h
index 3fe04cdaf3..5c9678c388 100644
--- a/headers/private/interface/BMCPrivate.h
+++ b/headers/private/interface/BMCPrivate.h
@@ -13,9 +13,9 @@
 
 #include <BeBuild.h>
 #include <MenuBar.h>
-#include <MenuItem.h>
 #include <MessageFilter.h>
 
+
 class BMessageRunner;
 
 
@@ -54,7 +54,7 @@ public:
 			bool				IsPopUpMarkerShown() const
 									{ return fShowPopUpMarker; }
 
-	virtual BSize				MinSize();
+	virtual	BSize				MinSize();
 	virtual	BSize				MaxSize();
 
 private:
diff --git a/src/kits/interface/BMCPrivate.cpp b/src/kits/interface/BMCPrivate.cpp
index d3743b12ca..79847f1b57 100644
--- a/src/kits/interface/BMCPrivate.cpp
+++ b/src/kits/interface/BMCPrivate.cpp
@@ -11,22 +11,14 @@
 
 #include <BMCPrivate.h>
 
-#include <stdio.h>
-#include <string.h>
-
 #include <ControlLook.h>
-#include <Font.h>
 #include <LayoutUtils.h>
 #include <MenuField.h>
 #include <MenuItem.h>
 #include <Message.h>
 #include <MessageRunner.h>
-#include <Region.h>
-#include <String.h>
 #include <Window.h>
 
-#include <MenuPrivate.h>
-
 
 static const float kPopUpIndicatorWidth = 10.0f;
 static const float kMarginWidth = 3.0f;
@@ -64,7 +56,6 @@ _BMCFilter_::Filter(BMessage* message, BHandler** handler)
 
 // #pragma mark -
 
-using BPrivate::MenuPrivate;
 
 _BMCMenuBar_::_BMCMenuBar_(BRect frame, bool fixedSize, BMenuField* menuField)
 	: