diff --git a/mozilla/layout/build/Makefile b/mozilla/layout/build/Makefile
index 10020d54ed1..6781d51908c 100644
--- a/mozilla/layout/build/Makefile
+++ b/mozilla/layout/build/Makefile
@@ -31,11 +31,13 @@ CPPSRCS=dlldeps.cpp
 
 #INCLUDES +=  -I../html/base/src -I../base/src -I../css/layout/src
 
-LD = $(CCC) -all
+LD = $(CCC)
 
 LOBJS = \
+	-all						\
 	$(DIST)/lib/libraptorlayout_s.a			\
 	$(DIST)/lib/libraptorhtmlbase_s.a		\
+	$(DIST)/lib/libnglhtmlcon_s.a			\
 	$(DIST)/lib/libnglcsslay_s.a			\
 	$(DIST)/lib/libraptorhtmldoc_s.a		\
 	$(DIST)/lib/libraptorhtmlforms_s.a		\
@@ -45,6 +47,7 @@ LOBJS = \
 
 
 EXTRA_DSO_LDOPTS = \
+	-none						\
 	$(DIST)/bin/libraptorhtmlpars.so		\
 	$(DIST)/bin/libraptorgfx.so			\
 	$(DIST)/bin/libraptorbase.so			\
diff --git a/mozilla/layout/build/makefile.win b/mozilla/layout/build/makefile.win
index 1ebfec6220b..cd515fb7074 100644
--- a/mozilla/layout/build/makefile.win
+++ b/mozilla/layout/build/makefile.win
@@ -35,6 +35,7 @@ DLL=.\$(OBJDIR)\$(DLLNAME).dll
 MISCDEP =				\
  $(DIST)\lib\raptorlayout_s.lib		\
  $(DIST)\lib\raptorhtmlbase_s.lib	\
+ $(DIST)\lib\nglhtmlcon_s.lib		\
  $(DIST)\lib\nglcsslay_s.lib		\
  $(DIST)\lib\raptorhtmldoc_s.lib	\
  $(DIST)\lib\raptorhtmlforms_s.lib	\
@@ -60,12 +61,13 @@ LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor -I..\..\style\src
 LLIBS=					\
  $(DIST)\lib\raptorlayout_s.lib		\
  $(DIST)\lib\raptorhtmlbase_s.lib	\
- $(DIST)\lib\nglcsslay_s.lib	\
+ $(DIST)\lib\nglhtmlcon_s.lib		\
+ $(DIST)\lib\nglcsslay_s.lib		\
  $(DIST)\lib\raptorhtmldoc_s.lib	\
  $(DIST)\lib\raptorhtmlforms_s.lib	\
  $(DIST)\lib\raptorhtmlstyle_s.lib	\
  $(DIST)\lib\raptorhtmltable_s.lib	\
- $(DIST)\lib\raptorevents_s.lib	\
+ $(DIST)\lib\raptorevents_s.lib		\
  $(DIST)\lib\xpcom32.lib		\
  $(DIST)\lib\raptorbase.lib		\
  $(DIST)\lib\raptorgfx.lib		\