diff --git a/mozilla/gfx/Makefile.in b/mozilla/gfx/Makefile.in
index 6d8013c3d88..e94187c2e15 100644
--- a/mozilla/gfx/Makefile.in
+++ b/mozilla/gfx/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,20 +13,20 @@
 # 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
 
-DIRS = public src idl
+DIRS		= public src idl
 
 ifdef ENABLE_TESTS
-DIRS += tests
+DIRS		+= tests
 endif
 
-include $(topsrcdir)/config/config.mk
-
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/gfx/idl/Makefile.in b/mozilla/gfx/idl/Makefile.in
index 6ab2d5579f0..f30827859d6 100644
--- a/mozilla/gfx/idl/Makefile.in
+++ b/mozilla/gfx/idl/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,28 +13,19 @@
 # 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
 
-DEFINES += -D_IMPL_NS_UI
+MODULE		= raptor
+XPIDL_MODULE	= gfx
 
-EXPORTS = \
-	$(NULL)
-
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
-
-MODULE = raptor
-XPIDL_MODULE = gfx
-
-XPIDLSRCS =				\
-	nsIScriptableRegion.idl		\
-	$(NULL)
-
-include $(topsrcdir)/config/config.mk
+XPIDLSRCS	= nsIScriptableRegion.idl
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/gfx/public/Makefile.in b/mozilla/gfx/public/Makefile.in
index 36a99269eb5..ae98e3bbed2 100644
--- a/mozilla/gfx/public/Makefile.in
+++ b/mozilla/gfx/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,46 +13,46 @@
 # 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
 
-EXPORTS =				\
-	nsColor.h			\
-	nsColorNames.h			\
-	nsColorNameList.h		\
-	nsCoord.h			\
-	nsFont.h			\
-	nsRect.h			\
-	nsPoint.h			\
-	nsSize.h			\
-	nsMargin.h			\
-	nsTransform2D.h			\
-	nsIRenderingContext.h		\
-	nsIFontMetrics.h		\
-	nsIImageManager.h		\
-	nsIImageGroup.h			\
-	nsIImageRequest.h		\
-	nsIImageObserver.h		\
-	nsIDeviceContext.h		\
-	nsIImage.h			\
-	nsIBlender.h			\
-	nsGfxCIID.h			\
-	nsIRegion.h			\
-	nsDeviceContext.h		\
-	nsIDeviceContextSpec.h		\
-	nsIDeviceContextSpecFactory.h	\
-	nsIDrawingSurface.h		\
-	$(NULL)
+MODULE		= raptor
 
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
+EXPORTS		= \
+		nsColor.h \
+		nsColorNames.h \
+		nsColorNameList.h \
+		nsCoord.h \
+		nsFont.h \
+		nsRect.h \
+		nsPoint.h \
+		nsSize.h \
+		nsMargin.h \
+		nsTransform2D.h \
+		nsIRenderingContext.h \
+		nsIFontMetrics.h \
+		nsIImageManager.h \
+		nsIImageGroup.h \
+		nsIImageRequest.h \
+		nsIImageObserver.h \
+		nsIDeviceContext.h \
+		nsIImage.h \
+		nsIBlender.h \
+		nsGfxCIID.h \
+		nsIRegion.h \
+		nsDeviceContext.h \
+		nsIDeviceContextSpec.h \
+		nsIDeviceContextSpecFactory.h \
+		nsIDrawingSurface.h \
+		$(NULL)
 
-MODULE = raptor
-
-include $(topsrcdir)/config/config.mk
+EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/gfx/src/Makefile.in b/mozilla/gfx/src/Makefile.in
index d191cea830f..b37a2788a02 100644
--- a/mozilla/gfx/src/Makefile.in
+++ b/mozilla/gfx/src/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,78 +13,72 @@
 # 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
 
-include $(topsrcdir)/config/config.mk
+MODULE		= raptor
+LIBRARY_NAME	= raptorgfx
+
+REQUIRES	= util img xpcom raptor netlib dom js
+
+DIRS		= ps
 
 # Build xlibrgb only for X toolkits
-ifneq (,$(filter gtk xlib motif qt,$(MOZ_WIDGET_TOOLKIT)))
-XLIB_RGB_DIRS = xlibrgb
+ifneq (,$(filter gtk motif qt xlib,$(MOZ_WIDGET_TOOLKIT)))
+DIRS		+= xlibrgb
 endif
 
-DIRS = ps $(XLIB_RGB_DIRS) $(MOZ_GFX_TOOLKIT)
-
-ifndef MOZ_MONOLITHIC_TOOLKIT
-DIRS = ps $(XLIB_RGB_DIRS) 
+ifdef MOZ_MONOLITHIC_TOOLKIT
+DIRS		+= $(MOZ_GFX_TOOLKIT)
+else
 
 ifdef MOZ_ENABLE_GTK
-  DIRS += gtk
+DIRS		+= gtk
 endif
-
 ifdef MOZ_ENABLE_MOTIF
-  DIRS += motif
+DIRS		+= motif
 endif
-
-ifdef MOZ_ENABLE_XLIB
-  DIRS += xlib
-endif
-
 ifdef MOZ_ENABLE_QT
-  DIRS += qt
+DIRS		+= qt
+endif
+ifdef MOZ_ENABLE_XLIB
+DIRS		+= xlib
 endif
 
-else
-DIRS = ps $(XLIB_RGB_DIRS) $(MOZ_GFX_TOOLKIT)
 endif
 
-LIBRARY_NAME = raptorgfx
+CPPSRCS		= \
+		nsBlender.cpp \
+		nsColor.cpp \
+		nsColorNames.cpp \
+		nsDeviceContext.cpp \
+		nsFont.cpp \
+		nsImageGroup.cpp \
+		nsImageManager.cpp \
+		nsImageNetContextAsync.cpp \
+		nsImageNetContextSync.cpp \
+		nsImageRenderer.cpp \
+		nsImageRequest.cpp \
+		nsImageSystemServices.cpp \
+		nsImageURL.cpp \
+		nsRect.cpp \
+		nsTransform2D.cpp \
+		$(NULL)
 
-MODULE=raptor 
-
-REQUIRES=util img xpcom raptor netlib dom js
-
-DEFINES += -D_IMPL_NS_GFX 
-
-# Alphabetical list of source files
-CPPSRCS =				\
-	nsBlender.cpp			\
-	nsColor.cpp			\
-	nsColorNames.cpp		\
-	nsDeviceContext.cpp		\
-	nsFont.cpp			\
-	nsImageGroup.cpp		\
-	nsImageManager.cpp		\
-	nsImageNetContextAsync.cpp	\
-	nsImageNetContextSync.cpp	\
-	nsImageRenderer.cpp		\
-	nsImageRequest.cpp		\
-	nsImageSystemServices.cpp	\
-	nsImageURL.cpp			\
-	nsRect.cpp			\
-	nsTransform2D.cpp		\
-	$(NULL)
-
-EXTRA_DSO_LDOPTS =	\
-	-L$(DIST)/lib	\
-	-limg_s		\
-	-lneckoutil_s	\
-	-lmozutil_s	\
-	$(NULL)
+EXTRA_DSO_LDOPTS = \
+		-L$(DIST)/lib \
+		-limg_s \
+		-lneckoutil_s \
+		-lmozutil_s \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
+
+DEFINES		+= -D_IMPL_NS_GFX
+
diff --git a/mozilla/gfx/src/beos/Makefile.in b/mozilla/gfx/src/beos/Makefile.in
index c4309e708e9..956af50d1cd 100644
--- a/mozilla/gfx/src/beos/Makefile.in
+++ b/mozilla/gfx/src/beos/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,41 +13,35 @@
 # 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
 
-include $(topsrcdir)/config/config.mk
+MODULE		= raptor
+LIBRARY_NAME	= gfx_beos
 
-LIBRARY_NAME = gfx_beos
+REQUIRES	= util img xpcom raptor netlib ps
 
-MODULE=raptor 
-
-REQUIRES=util img xpcom raptor netlib ps
-
-DEFINES += -D_IMPL_NS_GFXONXP 
-CXXFLAGS += $(TK_CFLAGS)
-INCLUDES += $(TK_CFLAGS)
-
-CPPSRCS = \
-	nsDeviceContextBeOS.cpp \
-	nsDeviceContextSpecFactoryB.cpp \
-	nsDeviceContextSpecB.cpp \
-	nsDrawingSurfaceBeOS.cpp \
-	nsFontMetricsBeOS.cpp \
-	nsGfxFactoryBeOS.cpp \
-	nsRenderingContextBeOS.cpp \
-	nsImageBeOS.cpp \
-	nsRegionBeOS.cpp \
-	$(NULL)
-
-#        nsGraphicsStateGTK.cpp \
- 
+CPPSRCS		= \
+		nsDeviceContextBeOS.cpp \
+		nsDeviceContextSpecFactoryB.cpp \
+		nsDeviceContextSpecB.cpp \
+		nsDrawingSurfaceBeOS.cpp \
+		nsFontMetricsBeOS.cpp \
+		nsGfxFactoryBeOS.cpp \
+		nsRenderingContextBeOS.cpp \
+		nsImageBeOS.cpp \
+		nsRegionBeOS.cpp \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
+DEFINES		+= -D_IMPL_NS_GFXONXP
+CXXFLAGS	+= $(TK_CFLAGS)
+INCLUDES	+= $(TK_CFLAGS)
 
diff --git a/mozilla/gfx/src/gtk/Makefile.in b/mozilla/gfx/src/gtk/Makefile.in
index 640172dc0d1..d555f5dd92e 100644
--- a/mozilla/gfx/src/gtk/Makefile.in
+++ b/mozilla/gfx/src/gtk/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,50 +13,45 @@
 # 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
 
-LIBRARY_NAME = gfx_gtk
+MODULE		= raptor
+LIBRARY_NAME	= gfx_gtk
 
-MODULE=raptor 
+REQUIRES	= util img xpcom raptor netlib ps
 
-REQUIRES=util img xpcom raptor netlib ps
+CSRCS		= nsPrintdGTK.c
 
-CPPSRCS = \
-	nsDeviceContextGTK.cpp \
-	nsDeviceContextSpecFactoryG.cpp \
-	nsDeviceContextSpecG.cpp \
-	nsDrawingSurfaceGTK.cpp \
-	nsFontMetricsGTK.cpp \
-	nsGfxFactoryGTK.cpp \
-	nsGraphicsStateGTK.cpp \
-	nsImageGTK.cpp \
-	nsRegionGTK.cpp \
-	nsRenderingContextGTK.cpp \
-	$(NULL)
-
-CSRCS = \
-	nsPrintdGTK.c
-
-ifndef MOZ_MONOLITHIC_TOOLKIT
-EXTRA_DSO_LDOPTS += $(MOZ_GTK_LDFLAGS)
-else
-EXTRA_DSO_LDOPTS += $(TK_LIBS)
-endif
+CPPSRCS		= \
+		nsDeviceContextGTK.cpp \
+		nsDeviceContextSpecFactoryG.cpp \
+		nsDeviceContextSpecG.cpp \
+		nsDrawingSurfaceGTK.cpp \
+		nsFontMetricsGTK.cpp \
+		nsGfxFactoryGTK.cpp \
+		nsGraphicsStateGTK.cpp \
+		nsImageGTK.cpp \
+		nsRegionGTK.cpp \
+		nsRenderingContextGTK.cpp \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 ifndef MOZ_MONOLITHIC_TOOLKIT
-CXXFLAGS += $(MOZ_GTK_CFLAGS)
-CFLAGS += $(MOZ_GTK_CFLAGS)
+EXTRA_DSO_LDOPTS += $(MOZ_GTK_LDFLAGS)
+CXXFLAGS	+= $(MOZ_GTK_CFLAGS)
+CFLAGS		+= $(MOZ_GTK_CFLAGS)
 else
-CXXFLAGS += $(TK_CFLAGS)
-CFLAGS += $(TK_CFLAGS)
+EXTRA_DSO_LDOPTS += $(TK_LIBS)
+CXXFLAGS	+= $(TK_CFLAGS)
+CFLAGS		+= $(TK_CFLAGS)
 endif
 
 DEFINES		+= -D_IMPL_NS_GFXNONXP
@@ -66,3 +60,4 @@ INCLUDES	+= \
 		-I$(srcdir)/. \
 		-I$(srcdir)/.. \
 		$(NULL)
+
diff --git a/mozilla/gfx/src/motif/Makefile.in b/mozilla/gfx/src/motif/Makefile.in
index b2bd18d5dc5..0bb7f1e4a57 100644
--- a/mozilla/gfx/src/motif/Makefile.in
+++ b/mozilla/gfx/src/motif/Makefile.in
@@ -22,8 +22,8 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= gfx_motif
 MODULE		= raptor
+LIBRARY_NAME	= gfx_motif
 
 REQUIRES	= util img xpcom raptor netlib
 
@@ -36,18 +36,14 @@ CPPSRCS		= \
 		nsImageMotif.cpp \
 		$(NULL)
 
-ifndef MOZ_MONOLITHIC_TOOLKIT
-EXTRA_DSO_LDOPTS += -L$(DIST)/bin -lxlibrgb $(MOZ_MOTIF_LDFLAGS)
-else
-EXTRA_DSO_LDOPTS += $(TK_LIBS)
-endif
-
 include $(topsrcdir)/config/rules.mk
 
 ifndef MOZ_MONOLITHIC_TOOLKIT
-CXXFLAGS += $(MOZ_MOTIF_CFLAGS)
+EXTRA_DSO_LDOPTS += -L$(DIST)/bin -lxlibrgb $(MOZ_MOTIF_LDFLAGS)
+CXXFLAGS	+= $(MOZ_MOTIF_CFLAGS)
 else
-CXXFLAGS += $(TK_CFLAGS)
+EXTRA_DSO_LDOPTS += $(TK_LIBS)
+CXXFLAGS	+= $(TK_CFLAGS)
 endif
 
 DEFINES		+= -D_IMPL_NS_GFXNONXP
@@ -56,3 +52,4 @@ INCLUDES	+= \
 		-I$(srcdir)/. \
 		-I$(srcdir)/.. \
 		$(NULL)
+
diff --git a/mozilla/gfx/src/os2/Makefile.in b/mozilla/gfx/src/os2/Makefile.in
index fbf9b4fc57c..26c1ac485f4 100644
--- a/mozilla/gfx/src/os2/Makefile.in
+++ b/mozilla/gfx/src/os2/Makefile.in
@@ -18,48 +18,47 @@
 # Contributor(s): 
 #
 # Makefile for gfx/src/os2
+#
 
-DEPTH = ../../..
+DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-include $(topsrcdir)/config/config.mk
+MODULE		= raptor
+OS2_LIBRARYNAME	= gfx_os2
+OS2_IMPLIB	= 1
 
-OS2_IMPLIB = 1
-OS2_LIBRARYNAME = gfx_os2
+REQUIRES	= util img xpcom raptor dom netlib java js
 
-MODULE = raptor 
+CSRCS		= libprint.c
 
-REQUIRES = util img xpcom raptor dom netlib java js
+CPPSRCS		= \
+		nsDeviceContextOS2.cpp \
+		nsRenderingContextOS2.cpp \
+		nsFontMetricsOS2.cpp \
+		nsImageOS2.cpp \
+		nsPaletteOS2.cpp \
+		nsRegionOS2.cpp \
+		nsDeviceContextSpecFactoryO.cpp \
+		nsDeviceContextSpecOS2.cpp \
+		nsDrawingSurfaceOS2.cpp \
+		nsGfxFactoryOS2.cpp \
+		$(NULL)
 
-DEFINES += -D_IMPL_NS_GFXONXP
+RES_FILE	= $(srcdir)/libprint.res
 
-OS2_LIBS = nggfx img mozjs mozutil netlib xpcom
-OS_LIBS += $(NSPR_LIBS) -luconv
-
-CPPSRCS = \
-	nsDeviceContextOS2.cpp          \
-	nsRenderingContextOS2.cpp       \
-	nsFontMetricsOS2.cpp            \
-	nsImageOS2.cpp                  \
-	nsPaletteOS2.cpp                \
-	nsRegionOS2.cpp                 \
-	nsDeviceContextSpecFactoryO.cpp \
-	nsDeviceContextSpecOS2.cpp      \
-	nsDrawingSurfaceOS2.cpp         \
-	nsGfxFactoryOS2.cpp             \
-	$(NULL)
-
-CSRCS = libprint.c
-
-RES_FILE = $(srcdir)/libprint.res
+OS2_LIBS	= nggfx img mozjs mozutil netlib xpcom
 
 include $(topsrcdir)/config/rules.mk
 
-INCLUDES += -I$(topsrcdir)/gfx/src
+DEFINES		+= -D_IMPL_NS_GFXONXP
+
+INCLUDES	+= -I$(topsrcdir)/gfx/src
+
+OS_LIBS		+= $(NSPR_LIBS) -luconv
 
 # This adds the resources for the print dialog to the gfxos2 dll.
 # I guess eventually we ought to use an xml dialog...
diff --git a/mozilla/gfx/src/photon/Makefile.in b/mozilla/gfx/src/photon/Makefile.in
index d20130f15a5..6f881e46f68 100644
--- a/mozilla/gfx/src/photon/Makefile.in
+++ b/mozilla/gfx/src/photon/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,37 @@
 # 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
 
-include $(topsrcdir)/config/config.mk
+MODULE		= raptor
+LIBRARY_NAME	= gfx_photon
 
-LIBRARY_NAME = gfx_photon
+REQUIRES	= util img xpcom raptor netlib ps
 
-MODULE=raptor 
+CPPSRCS		= \
+		nsDeviceContextPh.cpp \
+		nsDeviceContextSpecFactoryP.cpp \
+		nsDeviceContextSpecPh.cpp \
+		nsDrawingSurfacePh.cpp \
+		nsFontMetricsPh.cpp \
+		nsGfxFactoryPh.cpp \
+		nsImagePh.cpp \
+		nsRegionPh.cpp \
+		nsRenderingContextPh.cpp \
+		clip.cpp \
+		$(NULL)
 
-REQUIRES=util img xpcom raptor netlib ps
-
-#DEFINES +=
-
-EXPORTS = nsIRenderingContextPh.h
-
-CXXFLAGS += $(TK_CFLAGS)
-INCLUDES += $(TK_CFLAGS) -I$(srcdir)/..
-
-CPPSRCS = \
-	nsDeviceContextPh.cpp				\
-	nsDeviceContextSpecFactoryP.cpp		\
-	nsDeviceContextSpecPh.cpp			\
-	nsDrawingSurfacePh.cpp				\
-	nsFontMetricsPh.cpp					\
-	nsGfxFactoryPh.cpp					\
-	nsImagePh.cpp						\
-	nsRegionPh.cpp						\
-	nsRenderingContextPh.cpp			\
-	clip.cpp							\
-	$(NULL)
+EXPORTS		= nsIRenderingContextPh.h
 
 include $(topsrcdir)/config/rules.mk
 
+CXXFLAGS	+= $(TK_CFLAGS)
+INCLUDES	+= $(TK_CFLAGS) -I$(srcdir)/..
 
diff --git a/mozilla/gfx/src/ps/Makefile.in b/mozilla/gfx/src/ps/Makefile.in
index 63771885b38..636303e7d2c 100644
--- a/mozilla/gfx/src/ps/Makefile.in
+++ b/mozilla/gfx/src/ps/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,48 +13,48 @@
 # 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
 
-include $(topsrcdir)/config/config.mk
+MODULE		= raptor
+LIBRARY_NAME	= gfxps
+IS_COMPONENT	= 1
 
-LIBRARY_NAME = gfxps
+CSRCS		= font_metrics.c
 
-MODULE=raptor 
-IS_COMPONENT=1
+CPPSRCS		= \
+		nsDeviceContextPS.cpp \
+		nsFontMetricsPS.cpp \
+		nsRenderingContextPS.cpp \
+		nsPostScriptObj.cpp \
+		nsAFMObject.cpp \
+		nsGfxFactoryPS.cpp \
+		$(NULL)
 
-DEFINES += -D_IMPL_NS_GFXONXP 
-CFLAGS	+= $(TK_CFLAGS)
+EXPORTS		= \
+		nsIDeviceContextPS.h \
+		nsGfxPSCID.h \
+		nsIDeviceContextSpecPS.h \
+		nsPostScriptObj.h \
+		$(NULL)
 
-LLIBS+=$(DIST)/lib/libxpcom.a $(DIST)/lib/libraptorgfx.a
-
-CPPSRCS = \
-	nsDeviceContextPS.cpp \
-	nsFontMetricsPS.cpp \
-	nsRenderingContextPS.cpp \
-	nsPostScriptObj.cpp \
-	nsAFMObject.cpp \
-	nsGfxFactoryPS.cpp	\
-	$(NULL)
-
-CSRCS = \
-	font_metrics.c \
-
-EXPORTS =                               \
-		nsIDeviceContextPS.h	\
-		nsGfxPSCID.h			\
-        nsIDeviceContextSpecPS.h \
-        nsPostScriptObj.h
-
-EXTRA_DSO_LDOPTS =\
-			-L$(DIST)/lib \
-			-limg_s \
-			-lmozutil_s
+EXTRA_DSO_LDOPTS = \
+		-L$(DIST)/lib \
+		-limg_s \
+		-lmozutil_s \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
+DEFINES		+= -D_IMPL_NS_GFXONXP
+CFLAGS		+= $(TK_CFLAGS)
+CXXFLAGS	+= $(TK_CFLAGS)
+
+LLIBS		+= $(DIST)/lib/libxpcom.a $(DIST)/lib/libraptorgfx.a
+
diff --git a/mozilla/gfx/src/qt/Makefile.in b/mozilla/gfx/src/qt/Makefile.in
index b6b35be5472..2c78fb3873a 100644
--- a/mozilla/gfx/src/qt/Makefile.in
+++ b/mozilla/gfx/src/qt/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,46 +13,42 @@
 # 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
 
-LIBRARY_NAME = gfx_qt
+MODULE		= raptor
+LIBRARY_NAME	= gfx_qt
 
-MODULE=raptor 
+REQUIRES	= util img xpcom raptor netlib ps
 
-REQUIRES=util img xpcom raptor netlib ps
-
-CPPSRCS = \
-	nsDeviceContextQT.cpp \
-	nsDeviceContextSpecFactoryQT.cpp \
-	nsDeviceContextSpecQT.cpp \
-	nsDrawingSurfaceQT.cpp \
-	nsFontMetricsQT.cpp \
-	nsGfxFactoryQT.cpp \
-	nsImageQT.cpp \
-	nsRegionQT.cpp  \
-	nsRenderingContextQT.cpp \
-	$(NULL)
-
-ifndef MOZ_MONOLITHIC_TOOLKIT
-EXTRA_DSO_LDOPTS += $(MOZ_QT_LDFLAGS)
-else
-EXTRA_DSO_LDOPTS += $(TK_LIBS)
-endif
+CPPSRCS		= \
+		nsDeviceContextQT.cpp \
+		nsDeviceContextSpecFactoryQT.cpp \
+		nsDeviceContextSpecQT.cpp \
+		nsDrawingSurfaceQT.cpp \
+		nsFontMetricsQT.cpp \
+		nsGfxFactoryQT.cpp \
+		nsImageQT.cpp \
+		nsRegionQT.cpp \
+		nsRenderingContextQT.cpp \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 ifndef MOZ_MONOLITHIC_TOOLKIT
-CXXFLAGS += $(MOZ_QT_CFLAGS)
-CFLAGS += $(MOZ_QT_CFLAGS)
+EXTRA_DSO_LDOPTS += $(MOZ_QT_LDFLAGS)
+CXXFLAGS	+= $(MOZ_QT_CFLAGS)
+CFLAGS		+= $(MOZ_QT_CFLAGS)
 else
-CXXFLAGS += $(TK_CFLAGS)
-CFLAGS += $(TK_CFLAGS)
+EXTRA_DSO_LDOPTS += $(TK_LIBS)
+CXXFLAGS	+= $(TK_CFLAGS)
+CFLAGS		+= $(TK_CFLAGS)
 endif
 
 DEFINES		+= -D_IMPL_NS_GFXNONXP
@@ -62,3 +57,4 @@ INCLUDES	+= \
 		-I$(srcdir)/. \
 		-I$(srcdir)/.. \
 		$(NULL)
+
diff --git a/mozilla/gfx/src/rhapsody/Makefile.in b/mozilla/gfx/src/rhapsody/Makefile.in
index 6335ebcaa52..34507ad8248 100644
--- a/mozilla/gfx/src/rhapsody/Makefile.in
+++ b/mozilla/gfx/src/rhapsody/Makefile.in
@@ -38,5 +38,3 @@ MODULE		= raptor
 
 include $(topsrcdir)/config/rules.mk
 
-#LCFLAGS	+= -D_IMPL_NS_GFXONXP
-
diff --git a/mozilla/gfx/src/xlib/Makefile.in b/mozilla/gfx/src/xlib/Makefile.in
index 80d772382aa..a2586154f64 100644
--- a/mozilla/gfx/src/xlib/Makefile.in
+++ b/mozilla/gfx/src/xlib/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,46 +13,40 @@
 # 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
 
-include $(topsrcdir)/config/config.mk
+MODULE		= raptor
+LIBRARY_NAME	= gfx_xlib
 
-LIBRARY_NAME = gfx_xlib
+REQUIRES	= util img xpcom raptor netlib ps
 
-MODULE=raptor 
-
-REQUIRES=util img xpcom raptor netlib ps
-
-CPPSRCS =\
-	nsDeviceContextSpecFactoryX.cpp \
-	nsDeviceContextSpecXlib.cpp \
-	nsDeviceContextXlib.cpp \
-	nsDrawingSurfaceXlib.cpp \
-	nsFontMetricsXlib.cpp \
-	nsGfxFactoryXlib.cpp \
-	nsImageXlib.cpp \
-	nsRegionXlib.cpp \
-	nsRenderingContextXlib.cpp \
-	$(NULL)
-
-ifndef MOZ_MONOLITHIC_TOOLKIT
-EXTRA_DSO_LDOPTS += -L$(DIST)/bin -lxlibrgb $(MOZ_XLIB_LDFLAGS)
-else
-EXTRA_DSO_LDOPTS += $(TK_LIBS)
-endif
+CPPSRCS		= \
+		nsDeviceContextSpecFactoryX.cpp \
+		nsDeviceContextSpecXlib.cpp \
+		nsDeviceContextXlib.cpp \
+		nsDrawingSurfaceXlib.cpp \
+		nsFontMetricsXlib.cpp \
+		nsGfxFactoryXlib.cpp \
+		nsImageXlib.cpp \
+		nsRegionXlib.cpp \
+		nsRenderingContextXlib.cpp \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 ifndef MOZ_MONOLITHIC_TOOLKIT
-CXXFLAGS += $(MOZ_XLIB_CFLAGS)
+EXTRA_DSO_LDOPTS += -L$(DIST)/bin -lxlibrgb $(MOZ_XLIB_LDFLAGS)
+CXXFLAGS	+= $(MOZ_XLIB_CFLAGS)
 else
-CXXFLAGS += $(TK_CFLAGS)
+EXTRA_DSO_LDOPTS += $(TK_LIBS)
+CXXFLAGS	+= $(TK_CFLAGS)
 endif
 
 DEFINES		+= -D_IMPL_NS_GFXNONXP
diff --git a/mozilla/gfx/src/xlibrgb/Makefile.in b/mozilla/gfx/src/xlibrgb/Makefile.in
index 9327c9bd955..f2ff1833bb4 100644
--- a/mozilla/gfx/src/xlibrgb/Makefile.in
+++ b/mozilla/gfx/src/xlibrgb/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,27 +13,25 @@
 # 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
 
-include $(topsrcdir)/config/config.mk
+MODULE		= raptor
+LIBRARY_NAME	= xlibrgb
 
-LIBRARY_NAME = xlibrgb
+CSRCS		= xlibrgb.c
 
-MODULE=raptor 
-
-DEFINES += -D_IMPL_NS_GFXONXP -DUSE_MOZILLA_TYPES
-INCLUDES += $(TK_CFLAGS)
-
-CSRCS = xlibrgb.c
-
-EXPORTS = xlibrgb.h
+EXPORTS		= xlibrgb.h
 
 include $(topsrcdir)/config/rules.mk
 
+DEFINES		+= -D_IMPL_NS_GFXONXP -DUSE_MOZILLA_TYPES
+
+INCLUDES	+= $(TK_CFLAGS)