diff --git a/src/apps/deskbar/BarWindow.cpp b/src/apps/deskbar/BarWindow.cpp
index 85dd4b95b9..18db86b4d2 100644
--- a/src/apps/deskbar/BarWindow.cpp
+++ b/src/apps/deskbar/BarWindow.cpp
@@ -57,12 +57,15 @@ All rights reserved.
 // method from the TBarWindow::ShowBeMenu() method.
 // Don't do this at home -- but why the hell is this method private?
 #if __MWERKS__
-	extern "C" void StartMenuBar__8BMenuBarFlbbP5BRect(BMenuBar *,int32,bool,bool,BRect *);
-#elif __GCC__ <= 2
-	extern "C" void StartMenuBar__8BMenuBarlbT2P5BRect(BMenuBar *,int32,bool,bool,BRect *);
+	#define BMenuBar_StartMenuBar_Hack StartMenuBar__8BMenuBarFlbbP5BRect
+#elif __GNUC__ <= 2
+	#define BMenuBar_StartMenuBar_Hack StartMenuBar__8BMenuBarlbT2P5BRect
+#elif __GNUC__ > 2
+	#define BMenuBar_StartMenuBar_Hack _ZN8BMenuBar12StartMenuBarElbbP5BRect
 #else
 #	error "You may want to port this ugly hack to your compiler ABI"
 #endif
+extern "C" void BMenuBar_StartMenuBar_Hack(BMenuBar *,int32,bool,bool,BRect *);
 
 
 TBeMenu *TBarWindow::sBeMenu = NULL;
@@ -280,11 +283,7 @@ TBarWindow::ShowBeMenu()
 	if (menuBar == NULL)
 		return;
 
-#if __MWERKS__
-	StartMenuBar__8BMenuBarFlbbP5BRect(menuBar,0,true,true,NULL);
-#elif __GCC__ <= 2
-	StartMenuBar__8BMenuBarlbT2P5BRect(menuBar,0,true,true,NULL);
-#endif
+	BMenuBar_StartMenuBar_Hack(menuBar,0,true,true,NULL);
 }
 
 
@@ -298,11 +297,7 @@ TBarWindow::ShowTeamMenu()
 	if (KeyMenuBar() == NULL)
 		return;
 
-#if __MWERKS__
-	StartMenuBar__8BMenuBarFlbbP5BRect(KeyMenuBar(),index,true,true,NULL);
-#elif __GCC__ <= 2
-	StartMenuBar__8BMenuBarlbT2P5BRect(KeyMenuBar(),index,true,true,NULL);
-#endif
+	BMenuBar_StartMenuBar_Hack(KeyMenuBar(),index,true,true,NULL);
 }
 
 
diff --git a/src/kits/tracker/FBCPadding.cpp b/src/kits/tracker/FBCPadding.cpp
index 1773686446..34ebf1e0ae 100644
--- a/src/kits/tracker/FBCPadding.cpp
+++ b/src/kits/tracker/FBCPadding.cpp
@@ -95,7 +95,7 @@ void BFilePanel::_ReservedFilePanel8() {}
 
 // deprecated cruft
 
-#if __GNUC__ || __MWERKS__
+#if __GNUC__ && __GNUC__ < 3 || __MWERKS__
 extern "C" {
 
 _EXPORT BFilePanel*
diff --git a/src/kits/tracker/PoseView.cpp b/src/kits/tracker/PoseView.cpp
index 8062db88de..e3a4ad7884 100644
--- a/src/kits/tracker/PoseView.cpp
+++ b/src/kits/tracker/PoseView.cpp
@@ -2761,20 +2761,6 @@ BPoseView::MapToNewIconMode(BPose *pose, BPoint oldGrid, BPoint oldOffset)
 }
 
 
-inline bool
-BPoseView::HasPosesInClipboard()
-{
-	return fHasPosesInClipboard;
-}
-
-
-inline void
-BPoseView::SetHasPosesInClipboard(bool hasPoses)
-{
-	fHasPosesInClipboard = hasPoses;
-}
-
-
 void
 BPoseView::SetPosesClipboardMode(uint32 clipboardMode)
 {
diff --git a/src/kits/tracker/PoseView.h b/src/kits/tracker/PoseView.h
index ad2705efe7..014a64123a 100644
--- a/src/kits/tracker/PoseView.h
+++ b/src/kits/tracker/PoseView.h
@@ -303,8 +303,8 @@ class BPoseView : public BView {
 		void PlaceFolder(const entry_ref *, const BMessage *);
 
 		// clipboard handling for poses
-		bool HasPosesInClipboard();
-		void SetHasPosesInClipboard(bool hasPoses);
+		inline bool HasPosesInClipboard();
+		inline void SetHasPosesInClipboard(bool hasPoses);
 		void SetPosesClipboardMode(uint32 clipboardMode);
 		void UpdatePosesClipboardModeFromClipboard(BMessage *clipboardReport = NULL);
 
@@ -1001,6 +1001,20 @@ BPoseView::FindPose(const entry_ref *entry, int32 *index) const
 }
 
 
+inline bool
+BPoseView::HasPosesInClipboard()
+{
+	return fHasPosesInClipboard;
+}
+
+
+inline void
+BPoseView::SetHasPosesInClipboard(bool hasPoses)
+{
+	fHasPosesInClipboard = hasPoses;
+}
+
+
 template<class Param1>
 void 
 EachTextWidget(BPose *pose, BPoseView *poseView,