diff --git a/mozilla/htmlparser/robot/Makefile.in b/mozilla/htmlparser/robot/Makefile.in
index 77bbfdbd391..6e241aad6f2 100644
--- a/mozilla/htmlparser/robot/Makefile.in
+++ b/mozilla/htmlparser/robot/Makefile.in
@@ -22,43 +22,11 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+LIBRARY_NAME	= DebugRobot
+
 CPPSRCS		= nsDebugRobot.cpp nsRobotSink.cpp
 
-include $(topsrcdir)/config/config.mk
-
-ifndef NECKO
-PROGRAM		= htmlrobot
-else
-LIBRARY_NAME	= DebugRobot
-endif
-
-ifndef NECKO
-LIBS		= \
-		-lnetlib \
-		-lftpurl \
-		-lfileurl \
-		-labouturl \
-		-lgophurl \
-		-lremoturl \
-		-lnetcnvts \
-		-lnetwork \
-		-lsockstuburl \
-		-lmimetype \
-		-lnetcache \
-		-lhttpurl \
-		-lpwcac \
-		-lmozjs \
-		-lxpcom \
-		$(MOZ_TIMER_LIBS) \
-		$(TK_LIBS) \
-		$(NULL)
-
-# Needed to resolve __yylex (?)
-ifeq ($(OS_ARCH)$(OS_RELEASE),FreeBSD2)
-LIBS		+= -lpcap
-endif
-
-else
+ifdef ENABLE_TESTS
 DIRS		= test
 endif
 
diff --git a/mozilla/layout/build/Makefile.in b/mozilla/layout/build/Makefile.in
index cfcf8b3c148..123bab52e5d 100644
--- a/mozilla/layout/build/Makefile.in
+++ b/mozilla/layout/build/Makefile.in
@@ -52,12 +52,9 @@ SHARED_LIBRARY_LIBS = \
 		$(DIST)/lib/libraptorxulcontent_s.a \
 		$(DIST)/lib/libraptorxulbase_s.a \
 		$(DIST)/lib/libraptorlayout_s.a \
+		$(DIST)/lib/libneckoutil_s.a \
 		$(NULL)
 
-ifdef NECKO
-SHARED_LIBRARY_LIBS += $(DIST)/lib/libneckoutil_s.a
-endif
-
 EXTRA_DSO_LDOPTS = \
 		$(MKSHLIB_FORCE_ALL) \
 		$(SHARED_LIBRARY_LIBS) \
diff --git a/mozilla/layout/html/tests/Makefile.in b/mozilla/layout/html/tests/Makefile.in
index 9194ac87297..6278724562f 100644
--- a/mozilla/layout/html/tests/Makefile.in
+++ b/mozilla/layout/html/tests/Makefile.in
@@ -32,29 +32,7 @@ CPPSRCS		= \
 
 LOCAL_INCLUDES	= -I$(srcdir)/../style/src
 
-ifndef NECKO
-NET_LIBS	= \
-		-lpwcac \
-		-lfileurl \
-		-lftpurl \
-		-lgophurl \
-		-lremoturl \
-		-lnetcnvts \
-		-labouturl \
-		-lhttpurl \
-		-lmimetype \
-		-lnetcache \
-		-lnetlib \
-		-lnetwork \
-		-lsockstuburl \
-		$(NULL)
-else
-NET_LIBS = \
-		$(DIST)/lib/libneckoutil_s.a \
-		$(NULL)
-endif
-
-GECKO_LIBS = \
+LIBS		= \
 		$(DIST)/lib/libraptorhtmlbase_s.a \
 		$(DIST)/lib/libnglhtmlcon_s.a \
 		$(DIST)/lib/libraptorhtmldoc_s.a \
@@ -62,16 +40,12 @@ GECKO_LIBS = \
 		$(DIST)/lib/libraptorhtmltable_s.a \
 		$(DIST)/lib/libraptorlayout_s.a \
 		$(DIST)/lib/libraptorevents_s.a \
-		$(NULL)
-
-LIBS		= \
-		$(GECKO_LIBS) \
 		-lmozjs \
 		-lraptorgfx \
 		-lxpcom \
 		$(MOZ_TIMER_LIBS) \
 		$(TK_LIBS) \
-		$(NET_LIBS) \
+		$(DIST)/lib/libneckoutil_s.a \
 		$(NSPR_LIBS) \
 		$(NULL)
 
diff --git a/mozilla/parser/htmlparser/robot/Makefile.in b/mozilla/parser/htmlparser/robot/Makefile.in
index 77bbfdbd391..6e241aad6f2 100644
--- a/mozilla/parser/htmlparser/robot/Makefile.in
+++ b/mozilla/parser/htmlparser/robot/Makefile.in
@@ -22,43 +22,11 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+LIBRARY_NAME	= DebugRobot
+
 CPPSRCS		= nsDebugRobot.cpp nsRobotSink.cpp
 
-include $(topsrcdir)/config/config.mk
-
-ifndef NECKO
-PROGRAM		= htmlrobot
-else
-LIBRARY_NAME	= DebugRobot
-endif
-
-ifndef NECKO
-LIBS		= \
-		-lnetlib \
-		-lftpurl \
-		-lfileurl \
-		-labouturl \
-		-lgophurl \
-		-lremoturl \
-		-lnetcnvts \
-		-lnetwork \
-		-lsockstuburl \
-		-lmimetype \
-		-lnetcache \
-		-lhttpurl \
-		-lpwcac \
-		-lmozjs \
-		-lxpcom \
-		$(MOZ_TIMER_LIBS) \
-		$(TK_LIBS) \
-		$(NULL)
-
-# Needed to resolve __yylex (?)
-ifeq ($(OS_ARCH)$(OS_RELEASE),FreeBSD2)
-LIBS		+= -lpcap
-endif
-
-else
+ifdef ENABLE_TESTS
 DIRS		= test
 endif
 
diff --git a/mozilla/webshell/public/Makefile.in b/mozilla/webshell/public/Makefile.in
index 009bd2f4087..d75c44856af 100644
--- a/mozilla/webshell/public/Makefile.in
+++ b/mozilla/webshell/public/Makefile.in
@@ -1,4 +1,3 @@
-#!gmake
 #
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
@@ -14,42 +13,36 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
-DEPTH = ../..
+DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE = raptor
+MODULE		= raptor
 
-EXPORTS =					\
-        nsIBrowserWindow.h \
-        nsIClipboardCommands.h \
-        nsIContentViewer.h \
-        nsIContentViewerContainer.h \
-        nsIDocStreamLoaderFactory.h \
-        nsIDocumentLoader.h \
-        nsIDocumentLoaderObserver.h \
-        nsILinkHandler.h \
-        nsIModalWindowSupport.h \
-        nsIThrobber.h \
-        nsIUrlDispatcher.h \
-        nsIWebShell.h \
-        nsIWebShellServices.h \
-        nsweb.h \
-        $(NULL)
+EXPORTS		= \
+		nsIBrowserWindow.h \
+		nsIClipboardCommands.h \
+		nsIContentViewer.h \
+		nsIContentViewerContainer.h \
+		nsIDocStreamLoaderFactory.h \
+		nsIDocumentLoader.h \
+		nsIDocumentLoaderObserver.h \
+		nsILinkHandler.h \
+		nsIModalWindowSupport.h \
+		nsIThrobber.h \
+		nsIUrlDispatcher.h \
+		nsIWebShell.h \
+		nsIWebShellServices.h \
+		nsweb.h \
+		nsIRefreshURI.h \
+		$(NULL)
 
-ifdef NECKO
-EXPORTS +=\
-	nsIRefreshURI.h \
-	$(NULL)
-endif
-
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
-
-include $(topsrcdir)/config/config.mk
+EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
 include $(topsrcdir)/config/rules.mk