diff --git a/mozilla/network/module/nsNetStubs.cpp b/mozilla/network/module/nsNetStubs.cpp
index d155e5b5f3c..8b9679f1d66 100644
--- a/mozilla/network/module/nsNetStubs.cpp
+++ b/mozilla/network/module/nsNetStubs.cpp
@@ -19,16 +19,14 @@
 #include "nsNetStubs.h"
 
 #include "nspr.h"
+#include "plstr.h"
+#include "xp_core.h"
 #include "xp_file.h"
 #include "libi18n.h"
 #include "libevent.h"
 #include "mkgeturl.h"
 #include "net.h"
 
-extern "C" {
-#include "preenc.h"
-};
-
 /* From libimg */
 #define OPAQUE_CONTEXT void
 
diff --git a/mozilla/network/protocol/http/mkhttp.c b/mozilla/network/protocol/http/mkhttp.c
index 59fd8aabf71..e1004795283 100644
--- a/mozilla/network/protocol/http/mkhttp.c
+++ b/mozilla/network/protocol/http/mkhttp.c
@@ -2567,7 +2567,8 @@ net_setup_http_stream(ActiveEntry * ce)
 
         NET_SetReadSelect(CE_WINDOW_ID, cd->connection->sock);
 	  }
-#if  defined(XP_WIN) && defined(MOZILLA_CLIENT)
+/* #if  defined(XP_WIN) && defined(MOZILLA_CLIENT) */
+#if 0
 
 #define COMPUSERVE_HEADER_NAME "Remote-Passphrase"