diff --git a/mozilla/lib/libmocha/Makefile b/mozilla/lib/libmocha/Makefile
index 07023ed5359..3f4be24b39e 100644
--- a/mozilla/lib/libmocha/Makefile
+++ b/mozilla/lib/libmocha/Makefile
@@ -22,8 +22,8 @@ DEPTH		= ../..
 MODULE		= mocha
 LIBRARY_NAME	= mocha
 
-REQUIRES	= lay net parse img js style layer applet dbm nspr security \
-		  htmldlgs util jtools pref java libreg softupdt jsdebug
+REQUIRES	= lay parse img js style layer applet dbm nspr security \
+		  htmldlgs util jtools pref java libreg softupdt jsdebug netcache network httpurl
 
 ifndef NO_SECURITY
 REQUIRES       += jar
diff --git a/mozilla/lib/libmocha/et_mocha.c b/mozilla/lib/libmocha/et_mocha.c
index 30cb879c7c1..f5fc07afc8f 100644
--- a/mozilla/lib/libmocha/et_mocha.c
+++ b/mozilla/lib/libmocha/et_mocha.c
@@ -39,6 +39,7 @@
 #include "pa_parse.h"
 #include "jsjava.h"
 #include "intl_csi.h"
+#include "netcache.h"
 
 QueueStackElement * et_TopQueue = NULL;
 
diff --git a/mozilla/lib/libmocha/et_moz.c b/mozilla/lib/libmocha/et_moz.c
index c13e39c67c1..6551939a183 100644
--- a/mozilla/lib/libmocha/et_moz.c
+++ b/mozilla/lib/libmocha/et_moz.c
@@ -34,6 +34,7 @@
 #include "np.h"
 #include "prefapi.h"
 #include "pa_parse.h"
+#include "netcache.h"
 
 #define IL_CLIENT
 #include "libimg.h"             /* Image Library public API. */
@@ -1250,9 +1251,6 @@ ET_PostJsEventAck(MWContext* context, LO_Element * pEle, int type,
 
 /****************************************************************************/
 
-#include "mkaccess.h"
-#include "mkcache.h"
-
 /****************************************************************************/
 /****************************************************************************/
 
diff --git a/mozilla/lib/libmocha/lm_doc.c b/mozilla/lib/libmocha/lm_doc.c
index 05eab1e33fb..548ce4838de 100644
--- a/mozilla/lib/libmocha/lm_doc.c
+++ b/mozilla/lib/libmocha/lm_doc.c
@@ -28,10 +28,9 @@
 #include "xp.h"
 #include "lo_ele.h"
 #include "shist.h"
+#include "cookies.h"
 #include "structs.h"            /* for MWContext */
 #include "layout.h"             /* included via -I../layout */
-#include "mkaccess.h"           /* from ../libnet */
-#include "mkcache.h"            /* from ../libnet */
 #include "pa_parse.h"           /* included via -I../libparse */
 #include "pa_tags.h"            /* included via -I../libparse */
 #include "secnav.h"
diff --git a/mozilla/lib/libmocha/lm_form.c b/mozilla/lib/libmocha/lm_form.c
index d4568b72d50..1f617325475 100644
--- a/mozilla/lib/libmocha/lm_form.c
+++ b/mozilla/lib/libmocha/lm_form.c
@@ -22,7 +22,7 @@
  */
 #include "lm.h"
 #include "lo_ele.h"
-#include "mkutils.h"
+#include "netutils.h"
 #include "layout.h"
 #include "pa_tags.h"
 #include "shist.h"
diff --git a/mozilla/lib/libmocha/lm_init.c b/mozilla/lib/libmocha/lm_init.c
index 3905370be03..2d1b7ed5ec6 100644
--- a/mozilla/lib/libmocha/lm_init.c
+++ b/mozilla/lib/libmocha/lm_init.c
@@ -24,7 +24,6 @@
 #include "xp.h"
 #include "net.h"
 #include "structs.h"
-#include "mkutils.h"    /* XXX for NET_URL_Type() */
 #include "layout.h"     /* for lo_FormData */
 #include "pa_tags.h"    /* included via -I../libparse */
 #include "prmem.h"
diff --git a/mozilla/lib/libmocha/lm_taint.c b/mozilla/lib/libmocha/lm_taint.c
index 62481bce14a..a566ca2a3df 100644
--- a/mozilla/lib/libmocha/lm_taint.c
+++ b/mozilla/lib/libmocha/lm_taint.c
@@ -23,7 +23,6 @@
 #include "lm.h"
 #include "xp.h"
 #include "mkparse.h"
-#include "mkutils.h"
 #include "prclist.h"
 #include "plhash.h"
 #include "prmem.h"