diff --git a/mozilla/mailnews/mime/src/Makefile.in b/mozilla/mailnews/mime/src/Makefile.in
index 842cf3ae6d9..e857fc6575b 100644
--- a/mozilla/mailnews/mime/src/Makefile.in
+++ b/mozilla/mailnews/mime/src/Makefile.in
@@ -24,7 +24,7 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE=mime
 LIBRARY_NAME=mime
-
+IS_COMPONENT=1
 EXPORTS = 	nsRFC822toHTMLStreamConverter.h		\
 		nsMimeObjectClassAccess.h		\
 		nsMimeHeaderConverter.h			\
@@ -93,6 +93,17 @@ CSRCS = \
 		oldxp.c		\
 		$(NULL)
 
+EXTRA_DSO_LDOPTS =	\
+	-L$(DIST)/bin	\
+	$(NSPR_LIBS)	\
+	-ljs			\
+	-lraptorbase	\
+	-lpref			\
+	-lsecfree		\
+	-lxp			\
+	-lxpcom			\
+	$(NULL)
+
 #
 # THIS WILL NEED WORK AFTER WE GET A LIBMSG MORE XP-COM-afied
 #			mimedrft.c	\
diff --git a/mozilla/mailnews/mime/src/nsMimeFactory.cpp b/mozilla/mailnews/mime/src/nsMimeFactory.cpp
index 4f0f3e394df..7409993879a 100644
--- a/mozilla/mailnews/mime/src/nsMimeFactory.cpp
+++ b/mozilla/mailnews/mime/src/nsMimeFactory.cpp
@@ -228,9 +228,7 @@ extern "C" NS_EXPORT nsresult NSRegisterSelf(nsISupports* aServMgr, const char *
                            (nsISupports**)&compMgr);
   if (NS_FAILED(rv)) return rv;
 
-#ifdef NS_DEBUG
   printf("*** Mime being registered\n");
-#endif
   
   // Content type handler object class access interface
   rv = compMgr->RegisterComponent(kCMimeMimeObjectClassAccessCID, NULL, NULL, path, 
diff --git a/mozilla/mailnews/mime/src/oldxp.c b/mozilla/mailnews/mime/src/oldxp.c
index 7b7e8cc0364..6ff22c8fbea 100644
--- a/mozilla/mailnews/mime/src/oldxp.c
+++ b/mozilla/mailnews/mime/src/oldxp.c
@@ -26,10 +26,10 @@
 /* RICHIE - THIS HACK MUST GO!!! - INCLUDING FILE TO TRY TO KEEP DIRECTORY CLEAN */
 #ifdef XP_UNIX
 #define PUBLIC
-#else
-#include "..\..\..\lib\xp\xp_time.c"
 #endif
 
+#include "../../../lib/xp/xp_time.c"
+
 PUBLIC void * 
 FE_SetTimeout(TimeoutCallbackFunction func, void * closure, uint32 msecs)
 {