diff --git a/mailnews/compose/src/nsMsgAttachment.cpp b/mailnews/compose/src/nsMsgAttachment.cpp
index 0c5fa08bbd3..1b0095d5d68 100644
--- a/mailnews/compose/src/nsMsgAttachment.cpp
+++ b/mailnews/compose/src/nsMsgAttachment.cpp
@@ -39,7 +39,7 @@
 #include "nsILocalFile.h"
 #include "nsReadableUtils.h"
 #include "nsNetUtil.h"
-#ifdef XP_MAC
+#ifdef XP_MACOSX
 #include "nsIUnicodeNormalizer.h"
 #endif
 
@@ -65,7 +65,7 @@ NS_IMETHODIMP nsMsgAttachment::GetName(nsAString & aName)
 
 NS_IMETHODIMP nsMsgAttachment::SetName(const nsAString & aName)
 {
-#ifndef XP_MAC
+#ifndef XP_MACOSX
   mName = aName;
 #else
   // Mac OS X filesystem uses NFD. When exporting names to the 'world',
diff --git a/mailnews/compose/src/nsMsgCompose.cpp b/mailnews/compose/src/nsMsgCompose.cpp
index 7b63050d364..6070f989177 100644
--- a/mailnews/compose/src/nsMsgCompose.cpp
+++ b/mailnews/compose/src/nsMsgCompose.cpp
@@ -118,7 +118,7 @@
 #include "plbase64.h"
 #include "nsIUTF8ConverterService.h"
 #include "nsUConvCID.h"
-#ifdef XP_MAC
+#ifdef XP_MACOSX
 #include "nsIUnicodeNormalizer.h"
 #endif
 
@@ -3630,7 +3630,7 @@ nsresult nsMsgCompose::AttachmentPrettyName(const char* url, const char* charset
     nsFileSpec fileSpec(fileUrl);
     char* leafName = fileSpec.GetLeafName();
     NS_ENSURE_TRUE(leafName && *leafName, NS_ERROR_UNEXPECTED);
-#ifdef XP_MAC
+#ifdef XP_MACOSX
     nsAutoString decomposedName;
     CopyUTF8toUTF16(leafName, decomposedName);
     nsCOMPtr<nsIUnicodeNormalizer> normalizer (do_GetService(NS_UNICODE_NORMALIZER_CONTRACTID));