diff --git a/widget/src/mac/nsMacWindow.cpp b/widget/src/mac/nsMacWindow.cpp
index 1be0cfe3cadf..0ab4a91c4715 100644
--- a/widget/src/mac/nsMacWindow.cpp
+++ b/widget/src/mac/nsMacWindow.cpp
@@ -16,13 +16,12 @@
  * Reserved.
  */
 
-#include <LowMem.h>
-
-#include "nsWindow.h"
 #include "nsMacWindow.h"
 #include "nsMacEventHandler.h"
 #include "nsMacMessageSink.h"
 
+#include <LowMem.h>
+
 // from MacHeaders.c
 #ifndef topLeft
 	#define topLeft(r)	(((Point *) &(r))[0])
@@ -56,9 +55,10 @@ NS_IMPL_RELEASE(nsMacWindow);
 nsMacWindow::nsMacWindow() : nsWindow()
 	, mWindowMadeHere(PR_FALSE)
 	, mIsDialog(PR_FALSE)
-	,	mMacEventHandler(new nsMacEventHandler(this))
+	, mMacEventHandler(nsnull)
 {
 	NS_INIT_REFCNT();
+	mMacEventHandler.reset(new nsMacEventHandler(this));
 	strcpy(gInstanceClassName, "nsMacWindow");
 }