diff --git a/widget/src/mac/nsAppShell.cpp b/widget/src/mac/nsAppShell.cpp
index d31379b83cc..8b83208e2f0 100644
--- a/widget/src/mac/nsAppShell.cpp
+++ b/widget/src/mac/nsAppShell.cpp
@@ -56,17 +56,11 @@
 #include <Fonts.h>
 #include <TextEdit.h>
 #include <Dialogs.h>
-#ifndef XP_MACOSX
-#include <Traps.h>
-#endif
 #include <Events.h>
 #include <Menus.h>
 
 #include <stdlib.h>
 
-#ifndef XP_MACOSX
-#include "macstdlibextras.h"
-#endif
 PRBool nsAppShell::mInitializedToolbox = PR_FALSE;
 
 
diff --git a/widget/src/mac/nsMenuBarX.cpp b/widget/src/mac/nsMenuBarX.cpp
index f7d1fe564f7..419061629c3 100644
--- a/widget/src/mac/nsMenuBarX.cpp
+++ b/widget/src/mac/nsMenuBarX.cpp
@@ -63,16 +63,11 @@
 #include <Balloons.h>
 #include <Resources.h>
 #include <Appearance.h>
-#include <Gestalt.h>
 
 #include "nsMacResources.h"
 
 #include "nsGUIEvent.h"
 
-#if !XP_MACOSX
-#include "MenuSharing.h"
-#endif
-
 // CIDs
 #include "nsWidgetsCID.h"
 static NS_DEFINE_CID(kMenuCID, NS_MENU_CID);
@@ -344,20 +339,6 @@ nsMenuBarX :: CommandEventHandler ( EventHandlerCallRef inHandlerChain, EventRef
           break;
         }
 
-#if !XP_MACOSX
-        case 'SHMN':
-        { // Shared menu support
-          MenuItemIndex index = command.menu.menuItemIndex;
-          if (index)
-          {
-            (void)SharedMenuHit(GetMenuID(command.menu.menuRef), command.menu.menuItemIndex);
-            ::HiliteMenu(0);
-            handled = noErr;
-          }
-          break;
-        }
-#endif
-
         default:
         {
           // given the commandID, look it up in our hashtable and dispatch to
@@ -450,13 +431,10 @@ nsMenuBarX::MenuConstruct( const nsMenuEvent & aMenuEvent, nsIWidget* aParentWin
     
   Create(aParentWindow);
   
-  // if we're on X (using aqua UI guidelines for menus), remove quit and prefs
-  // from our menubar.
-  SInt32 result = 0L;
-  OSStatus err = ::Gestalt ( gestaltMenuMgrAttr, &result );
-  if ( !err && (result & gestaltMenuMgrAquaLayoutMask) )
-    AquifyMenuBar();
-  err = InstallCommandEventHandler();
+  // since we're on OSX, remove quit and prefs from our menubar.
+  AquifyMenuBar();
+  
+  OSStatus err = InstallCommandEventHandler();
   if ( err )
     return nsEventStatus_eIgnore;
 
diff --git a/widget/src/mac/nsNativeThemeMac.cpp b/widget/src/mac/nsNativeThemeMac.cpp
index ad62e210563..de4a94ecc79 100644
--- a/widget/src/mac/nsNativeThemeMac.cpp
+++ b/widget/src/mac/nsNativeThemeMac.cpp
@@ -98,11 +98,6 @@ DoNothing(const Rect *bounds, UInt32 eraseData, SInt16 depth, Boolean isColorDev
   // be gentle, erase nothing.
 }
 
-
-#ifdef XP_MAC
-#pragma mark -
-#endif
-
          
 NS_IMPL_ISUPPORTS1(nsNativeThemeMac, nsITheme)
 
@@ -128,10 +123,6 @@ nsNativeThemeMac::~nsNativeThemeMac()
     ::DisposeThemeEraseUPP(mEraseProc);
 }
 
-#ifdef XP_MAC
-#pragma mark -
-#endif
-
 
 void
 nsNativeThemeMac::DrawCheckboxRadio ( ThemeButtonKind inKind, const Rect& inBoxRect, PRBool inChecked,
@@ -525,11 +516,6 @@ nsNativeThemeMac::DrawWidgetBackground(nsIRenderingContext* aContext, nsIFrame*
 }
 
 
-#ifdef XP_MAC
-#pragma mark -
-#endif
-
-
 NS_IMETHODIMP
 nsNativeThemeMac::GetWidgetBorder(nsIDeviceContext* aContext, 
                                   nsIFrame* aFrame,