diff --git a/mozilla/widget/src/build/Makefile.in b/mozilla/widget/src/build/Makefile.in
index cbd0140cb59..1996f3b0341 100644
--- a/mozilla/widget/src/build/Makefile.in
+++ b/mozilla/widget/src/build/Makefile.in
@@ -49,7 +49,6 @@ endif
 # nsMotifWidgetFactory actually has no Motif/Xt/Xlib code in it -- surprise!
 
 CPPSRCS_motif	:= \
-	Motifdlldeps.cpp \
 	nsMotifWidgetFactory.cpp
 
 CPPSRCS := \
diff --git a/mozilla/widget/src/motif/nsAppShell.cpp b/mozilla/widget/src/motif/nsAppShell.cpp
index 701cde8150f..f6c813fad5f 100644
--- a/mozilla/widget/src/motif/nsAppShell.cpp
+++ b/mozilla/widget/src/motif/nsAppShell.cpp
@@ -31,7 +31,7 @@
 #include <X11/Xmu/Editres.h>
 #endif
 
-extern XtAppContext gAppContext;
+XtAppContext gAppContext;
 
 //-------------------------------------------------------------------------
 //
@@ -41,9 +41,6 @@ extern XtAppContext gAppContext;
 static NS_DEFINE_IID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID);
 static NS_DEFINE_IID(kCmdLineServiceCID, NS_COMMANDLINE_SERVICE_CID);
 
-//XtAppContext nsAppShell::gAppContext = NULL;
-
-
 //-------------------------------------------------------------------------
 //
 // nsISupports implementation macro
@@ -189,7 +186,8 @@ NS_METHOD nsAppShell::Run()
 
 
 done:
-  printf("Calling gdk_input_add with event queue\n");
+
+  printf("Calling XtAppAddInput() with event queue\n");
 
   XtAppAddInput(gAppContext, 
                 EQueue->GetEventQueueSelectFD(),
@@ -197,12 +195,6 @@ done:
                 nsUnixEventProcessorCallback, 
                 0);
 
-//   gdk_input_add(EQueue->GetEventQueueSelectFD(),
-//                 GDK_INPUT_READ,
-//                 event_processor_callback,
-//                 EQueue);
-//   gtk_main();
-
   XtRealizeWidget(mTopLevel);
 
 #ifdef DO_THE_EDITRES_THING