diff --git a/mozilla/widget/src/mac/nsMacEventHandler.cpp b/mozilla/widget/src/mac/nsMacEventHandler.cpp
index b10669dc3df..7aaaeaedacd 100644
--- a/mozilla/widget/src/mac/nsMacEventHandler.cpp
+++ b/mozilla/widget/src/mac/nsMacEventHandler.cpp
@@ -16,9 +16,19 @@
  * Reserved.
  */
 
+#include <LowMem.h>
+
 #include "nsMacEventHandler.h"
 #include "prinrval.h"
 
+// from MacHeaders.c
+#ifndef topLeft
+	#define topLeft(r)	(((Point *) &(r))[0])
+#endif
+#ifndef botRight
+	#define botRight(r)	(((Point *) &(r))[1])
+#endif
+
 
 //-------------------------------------------------------------------------
 //
diff --git a/mozilla/widget/src/mac/nsMacMessagePump.cpp b/mozilla/widget/src/mac/nsMacMessagePump.cpp
index d62a2865afe..d0aaddc0acf 100644
--- a/mozilla/widget/src/mac/nsMacMessagePump.cpp
+++ b/mozilla/widget/src/mac/nsMacMessagePump.cpp
@@ -23,6 +23,7 @@
 #include "nsWidgetsCID.h"
 #include <MacWindows.h>
 #include <LPeriodical.h>
+#include <ToolUtils.h>
 
 #define DRAW_ON_RESIZE
 
diff --git a/mozilla/widget/src/mac/nsMacMessagePump.h b/mozilla/widget/src/mac/nsMacMessagePump.h
index a41f021dd20..a3978f01176 100644
--- a/mozilla/widget/src/mac/nsMacMessagePump.h
+++ b/mozilla/widget/src/mac/nsMacMessagePump.h
@@ -19,6 +19,8 @@
 #ifndef nsMacMessagePump_h__
 #define nsMacMessagePump_h__
 
+#include <LowMem.h>
+
 #include "prtypes.h"
 class nsToolkit;
 class nsWindow;
diff --git a/mozilla/widget/src/mac/nsMacWindow.cpp b/mozilla/widget/src/mac/nsMacWindow.cpp
index 3edeac6653a..3139b957e92 100644
--- a/mozilla/widget/src/mac/nsMacWindow.cpp
+++ b/mozilla/widget/src/mac/nsMacWindow.cpp
@@ -16,10 +16,20 @@
  * Reserved.
  */
 
+#include <LowMem.h>
+
 #include "nsWindow.h"
 #include "nsMacWindow.h"
 #include "nsMacEventHandler.h"
 
+// from MacHeaders.c
+#ifndef topLeft
+	#define topLeft(r)	(((Point *) &(r))[0])
+#endif
+#ifndef botRight
+	#define botRight(r)	(((Point *) &(r))[1])
+#endif
+
 
 const short kWindowTitleBarHeight = 20;