diff --git a/mozilla/shell/src/nsShellInstance.cpp b/mozilla/shell/src/nsShellInstance.cpp
index e72f0d476fc..f89428d2ecb 100644
--- a/mozilla/shell/src/nsShellInstance.cpp
+++ b/mozilla/shell/src/nsShellInstance.cpp
@@ -193,7 +193,7 @@ nsIWidget * nsShellInstance::CreateApplicationWindow(const nsRect &aRect,
   mApplicationWindow->Create((nsIWidget*)NULL, 
                   aRect, 
                   aHandleEventFunction, 
-                  nsnull, nsnull, GetNativeInstance());
+                  nsnull, nsnull, (nsWidgetInitData *) GetNativeInstance());
 
   return (mApplicationWindow);
 }
diff --git a/mozilla/shell/src/unix/main.cpp b/mozilla/shell/src/unix/main.cpp
index 03c924760a7..04947bfcddd 100644
--- a/mozilla/shell/src/unix/main.cpp
+++ b/mozilla/shell/src/unix/main.cpp
@@ -19,8 +19,13 @@
 #include "nsRepository.h"
 #include "nsShellInstance.h"
 #include "nsApplicationManager.h"
+#include "nsGfxCIID.h"
 
-#include <Xm/Xm.h>
+#include "Xm/Xm.h"
+#include "Xm/MainW.h"
+#include "Xm/Frame.h"
+#include "Xm/XmStrDefs.h"
+#include "Xm/DrawingA.h"
 
 #define SHELL_DLL "libshell.so"
 
@@ -43,6 +48,8 @@ void main(int argc, char **argv)
 
   topLevel = XtVaAppInitialize(&app_context, "Shell", NULL, 0, &argc, argv, NULL, NULL);
 
+
+
   // Let get a ShellInstance for this Application instance
   NSRepository::RegisterFactory(kCShellInstanceIID, SHELL_DLL, PR_FALSE, PR_FALSE);