diff --git a/mozilla/htmlparser/src/Makefile.in b/mozilla/htmlparser/src/Makefile.in
index 2e057663b19..1c0987f4e3c 100644
--- a/mozilla/htmlparser/src/Makefile.in
+++ b/mozilla/htmlparser/src/Makefile.in
@@ -22,8 +22,8 @@ VPATH		= .:@srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= raptorhtmlpars
 MODULE		= htmlparser
+LIBRARY_NAME	= raptorhtmlpars
 
 REQUIRES	= xpcom netlib raptor
 
@@ -111,14 +111,15 @@ EXTRA_DSO_LDOPTS = \
 
 include $(topsrcdir)/config/rules.mk
 
+#
 # Currently on HP, we need this sl to be linked using aCC to call the
 # global constructs for the CTagList.  Unfortunately if we turn on CXX
 # linking for all .sl's there is a problem with gfx
-
+#
 ifeq ($(OS_ARCH),HP-UX)
 ifneq (,$(filter aCC,$(CXX)))
-DSO_LDOPTS      = -b -Wl,-E -Wl,+s -L$(DIST)/bin
-MKSHLIB         = $(CXX) $(DSO_LDOPTS)
+DSO_LDOPTS	= -b -Wl,-E -Wl,+s -L$(DIST)/bin
+MKSHLIB		= $(CXX) $(DSO_LDOPTS)
 endif
 endif
 
diff --git a/mozilla/htmlparser/tests/outsinks/Makefile.in b/mozilla/htmlparser/tests/outsinks/Makefile.in
index e1f0c49e812..f937c62ee08 100644
--- a/mozilla/htmlparser/tests/outsinks/Makefile.in
+++ b/mozilla/htmlparser/tests/outsinks/Makefile.in
@@ -1,3 +1,4 @@
+#
 # 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
 # compliance with the NPL.  You may obtain a copy of the NPL at
@@ -12,30 +13,27 @@
 # 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
 
+PROGRAM		= Convert
+
 CPPSRCS		= \
 		Convert.cpp \
 		nsSetupRegistry.cpp \
 		$(NULL)
 
-PROGRAM         = Convert
-
 LIBS		= \
 		-lraptorhtmlpars \
 		-lxpcom \
 		$(NSPR_LIBS) \
 		$(NULL)
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 
-
-
diff --git a/mozilla/parser/htmlparser/src/Makefile.in b/mozilla/parser/htmlparser/src/Makefile.in
index 2e057663b19..1c0987f4e3c 100644
--- a/mozilla/parser/htmlparser/src/Makefile.in
+++ b/mozilla/parser/htmlparser/src/Makefile.in
@@ -22,8 +22,8 @@ VPATH		= .:@srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= raptorhtmlpars
 MODULE		= htmlparser
+LIBRARY_NAME	= raptorhtmlpars
 
 REQUIRES	= xpcom netlib raptor
 
@@ -111,14 +111,15 @@ EXTRA_DSO_LDOPTS = \
 
 include $(topsrcdir)/config/rules.mk
 
+#
 # Currently on HP, we need this sl to be linked using aCC to call the
 # global constructs for the CTagList.  Unfortunately if we turn on CXX
 # linking for all .sl's there is a problem with gfx
-
+#
 ifeq ($(OS_ARCH),HP-UX)
 ifneq (,$(filter aCC,$(CXX)))
-DSO_LDOPTS      = -b -Wl,-E -Wl,+s -L$(DIST)/bin
-MKSHLIB         = $(CXX) $(DSO_LDOPTS)
+DSO_LDOPTS	= -b -Wl,-E -Wl,+s -L$(DIST)/bin
+MKSHLIB		= $(CXX) $(DSO_LDOPTS)
 endif
 endif
 
diff --git a/mozilla/parser/htmlparser/tests/outsinks/Makefile.in b/mozilla/parser/htmlparser/tests/outsinks/Makefile.in
index e1f0c49e812..f937c62ee08 100644
--- a/mozilla/parser/htmlparser/tests/outsinks/Makefile.in
+++ b/mozilla/parser/htmlparser/tests/outsinks/Makefile.in
@@ -1,3 +1,4 @@
+#
 # 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
 # compliance with the NPL.  You may obtain a copy of the NPL at
@@ -12,30 +13,27 @@
 # 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
 
+PROGRAM		= Convert
+
 CPPSRCS		= \
 		Convert.cpp \
 		nsSetupRegistry.cpp \
 		$(NULL)
 
-PROGRAM         = Convert
-
 LIBS		= \
 		-lraptorhtmlpars \
 		-lxpcom \
 		$(NSPR_LIBS) \
 		$(NULL)
 
-include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 
-
-