diff --git a/content/base/src/nsRuleNode.cpp b/content/base/src/nsRuleNode.cpp
index a849d4855c0c..30b9363f290f 100644
--- a/content/base/src/nsRuleNode.cpp
+++ b/content/base/src/nsRuleNode.cpp
@@ -1841,7 +1841,7 @@ SetFont(nsIPresContext* aPresContext, nsIStyleContext* aContext,
     }
 
     // NavQuirks uses sans-serif instead of whatever the native font is
-#ifdef XP_MAC
+#if defined(XP_MAC) || defined(XP_MACOSX)
     if (eCompatibility_NavQuirks == mode) {
       switch (sysID) {
         case eSystemFont_Field:
@@ -1908,7 +1908,7 @@ SetFont(nsIPresContext* aPresContext, nsIStyleContext* aContext,
     }
 #endif
 
-#ifdef XP_UNIX
+#if defined(XP_UNIX) && !defined(XP_MACOSX)
     if (eCompatibility_NavQuirks == mode) {
       switch (sysID) {
         case eSystemFont_Field:
diff --git a/gfx/src/nsRenderingContextImpl.cpp b/gfx/src/nsRenderingContextImpl.cpp
index 8b5db8bbfd9a..9b0b73dfb945 100644
--- a/gfx/src/nsRenderingContextImpl.cpp
+++ b/gfx/src/nsRenderingContextImpl.cpp
@@ -132,7 +132,7 @@ nsTransform2D       *theTransform;
       theTransform->SetToIdentity();  
 	    theTransform->AddScale(app2dev, app2dev);
 
-#ifdef XP_UNIX
+#if defined(XP_UNIX) && !defined(XP_MACOSX)
       srcRect.SetRect(0,0,tvrect.width,tvrect.height);
       SetClipRect(srcRect, nsClipCombine_kReplace, clip);
 #endif
diff --git a/gfx/src/shared/nsRenderingContextImpl.cpp b/gfx/src/shared/nsRenderingContextImpl.cpp
index 8b5db8bbfd9a..9b0b73dfb945 100644
--- a/gfx/src/shared/nsRenderingContextImpl.cpp
+++ b/gfx/src/shared/nsRenderingContextImpl.cpp
@@ -132,7 +132,7 @@ nsTransform2D       *theTransform;
       theTransform->SetToIdentity();  
 	    theTransform->AddScale(app2dev, app2dev);
 
-#ifdef XP_UNIX
+#if defined(XP_UNIX) && !defined(XP_MACOSX)
       srcRect.SetRect(0,0,tvrect.width,tvrect.height);
       SetClipRect(srcRect, nsClipCombine_kReplace, clip);
 #endif
diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
index 3d121e220915..6677a70a88ef 100644
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -766,7 +766,7 @@ nsFrame::GetDataForTableSelection(nsIFrameSelection *aFrameSelection, nsMouseEve
   // Test if special 'table selection' key is pressed
   PRBool doTableSelection;
   
-#ifdef XP_MAC
+#if defined(XP_MAC) || defined(XP_MACOSX)
   doTableSelection = aMouseEvent->isMeta;
 #else
   doTableSelection = aMouseEvent->isControl;
@@ -1079,7 +1079,7 @@ nsFrame::HandlePress(nsIPresContext* aPresContext,
 
   nsMouseEvent *me = (nsMouseEvent *)aEvent;
 
-#ifdef XP_MAC
+#if defined(XP_MAC) || defined(XP_MACOSX)
   if (me->isControl)
     return NS_OK;//short ciruit. hard coded for mac due to time restraints.
 #endif
diff --git a/layout/html/base/src/nsFrame.cpp b/layout/html/base/src/nsFrame.cpp
index 3d121e220915..6677a70a88ef 100644
--- a/layout/html/base/src/nsFrame.cpp
+++ b/layout/html/base/src/nsFrame.cpp
@@ -766,7 +766,7 @@ nsFrame::GetDataForTableSelection(nsIFrameSelection *aFrameSelection, nsMouseEve
   // Test if special 'table selection' key is pressed
   PRBool doTableSelection;
   
-#ifdef XP_MAC
+#if defined(XP_MAC) || defined(XP_MACOSX)
   doTableSelection = aMouseEvent->isMeta;
 #else
   doTableSelection = aMouseEvent->isControl;
@@ -1079,7 +1079,7 @@ nsFrame::HandlePress(nsIPresContext* aPresContext,
 
   nsMouseEvent *me = (nsMouseEvent *)aEvent;
 
-#ifdef XP_MAC
+#if defined(XP_MAC) || defined(XP_MACOSX)
   if (me->isControl)
     return NS_OK;//short ciruit. hard coded for mac due to time restraints.
 #endif
diff --git a/layout/style/nsRuleNode.cpp b/layout/style/nsRuleNode.cpp
index a849d4855c0c..30b9363f290f 100644
--- a/layout/style/nsRuleNode.cpp
+++ b/layout/style/nsRuleNode.cpp
@@ -1841,7 +1841,7 @@ SetFont(nsIPresContext* aPresContext, nsIStyleContext* aContext,
     }
 
     // NavQuirks uses sans-serif instead of whatever the native font is
-#ifdef XP_MAC
+#if defined(XP_MAC) || defined(XP_MACOSX)
     if (eCompatibility_NavQuirks == mode) {
       switch (sysID) {
         case eSystemFont_Field:
@@ -1908,7 +1908,7 @@ SetFont(nsIPresContext* aPresContext, nsIStyleContext* aContext,
     }
 #endif
 
-#ifdef XP_UNIX
+#if defined(XP_UNIX) && !defined(XP_MACOSX)
     if (eCompatibility_NavQuirks == mode) {
       switch (sysID) {
         case eSystemFont_Field: