diff --git a/db/mdb/Makefile.in b/db/mdb/Makefile.in
index bea7630c65b3..538b6b46c6ef 100644
--- a/db/mdb/Makefile.in
+++ b/db/mdb/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,18 +13,16 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
-DEPTH = ../..
+DEPTH		= ../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-# no src yet, or tests or build
-DIRS = public
-
-include $(topsrcdir)/config/config.mk
+DIRS		= public
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/db/mdb/public/Makefile.in b/db/mdb/public/Makefile.in
index 127ededb047f..435efb44314f 100644
--- a/db/mdb/public/Makefile.in
+++ b/db/mdb/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,20 +13,18 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1999 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
-DEPTH = ../../..
+DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
-MODULE		= msgmdb
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXPORTS= \
-		mdb.h \
-		$(NULL)
+MODULE		= msgmdb
 
-include $(topsrcdir)/config/config.mk
+EXPORTS		= mdb.h
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/db/mork/Makefile.in b/db/mork/Makefile.in
index 859bea2bdf81..7e5f8afb3e91 100644
--- a/db/mork/Makefile.in
+++ b/db/mork/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,17 +13,16 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
-DEPTH = ../..
+DEPTH		= ../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = src build
-
-include $(topsrcdir)/config/config.mk
+DIRS		= src build
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/db/mork/src/Makefile.in b/db/mork/src/Makefile.in
index 0e673cd29007..a31348f4de7b 100644
--- a/db/mork/src/Makefile.in
+++ b/db/mork/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,88 +13,84 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
-DEPTH = ../../..
+DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE = msgmork
-LIBRARY_NAME=msgmork_s
+MODULE		= msgmork
+LIBRARY_NAME	= msgmork_s
 
-EXPORTS = \
-	$(NULL)
+CPPSRCS		= \
+		orkinCell.cpp \
+		orkinCompare.cpp \
+		orkinEnv.cpp \
+		orkinFactory.cpp \
+		orkinFile.cpp \
+		orkinHeap.cpp \
+		orkinPortTableCursor.cpp \
+		orkinRow.cpp \
+		orkinRowCellCursor.cpp \
+		orkinSorting.cpp \
+		orkinStore.cpp \
+		orkinTable.cpp \
+		orkinTableRowCursor.cpp \
+		orkinThumb.cpp \
+		morkArray.cpp \
+		morkAtom.cpp \
+		morkAtomMap.cpp \
+		morkAtomSpace.cpp \
+		morkBlob.cpp \
+		morkBuilder.cpp \
+		morkCell.cpp \
+		morkCellObject.cpp \
+		morkCh.cpp \
+		morkConfig.cpp \
+		morkCursor.cpp \
+		morkDeque.cpp \
+		morkEnv.cpp \
+		morkFactory.cpp \
+		morkFile.cpp \
+		morkHandle.cpp \
+		morkIntMap.cpp \
+		morkMap.cpp \
+		morkNode.cpp \
+		morkNodeMap.cpp \
+		morkObject.cpp \
+		morkParser.cpp \
+		morkPool.cpp \
+		morkQuickSort.cpp \
+		morkRow.cpp \
+		morkRowCellCursor.cpp \
+		morkRowMap.cpp \
+		morkRowObject.cpp \
+		morkRowSpace.cpp \
+		morkSink.cpp \
+		morkSorting.cpp \
+		morkSortingRowCursor.cpp \
+		morkSpace.cpp \
+		morkStore.cpp \
+		morkStream.cpp \
+		morkTable.cpp \
+		morkPortTableCursor.cpp \
+		morkTableRowCursor.cpp \
+		morkThumb.cpp \
+		morkWriter.cpp \
+		morkYarn.cpp \
+		$(NULL)
 
-CPPSRCS = \
-	orkinCell.cpp\
-	orkinCompare.cpp\
-	orkinEnv.cpp\
-	orkinFactory.cpp\
-	orkinFile.cpp\
-	orkinHeap.cpp\
-	orkinPortTableCursor.cpp\
-	orkinRow.cpp\
-	orkinRowCellCursor.cpp\
-	orkinSorting.cpp\
-	orkinStore.cpp\
-	orkinTable.cpp\
-	orkinTableRowCursor.cpp\
-	orkinThumb.cpp\
-	morkArray.cpp\
-	morkAtom.cpp\
-	morkAtomMap.cpp\
-	morkAtomSpace.cpp\
-	morkBlob.cpp\
-	morkBuilder.cpp\
-	morkCell.cpp\
-	morkCellObject.cpp\
-	morkCh.cpp\
-	morkConfig.cpp\
-	morkCursor.cpp \
-	morkDeque.cpp\
-	morkEnv.cpp\
-	morkFactory.cpp\
-	morkFile.cpp\
-	morkHandle.cpp\
-	morkIntMap.cpp\
-	morkMap.cpp\
-	morkNode.cpp\
-	morkNodeMap.cpp\
-	morkObject.cpp\
-	morkParser.cpp\
-	morkPool.cpp\
-	morkQuickSort.cpp\
-	morkRow.cpp\
-	morkRowCellCursor.cpp\
-	morkRowMap.cpp\
-	morkRowObject.cpp\
-	morkRowSpace.cpp\
-	morkSink.cpp\
-	morkSorting.cpp\
-	morkSortingRowCursor.cpp\
-	morkSpace.cpp\
-	morkStore.cpp\
-	morkStream.cpp\
-	morkTable.cpp\
-	morkPortTableCursor.cpp\
-	morkTableRowCursor.cpp\
-	morkThumb.cpp\
-	morkWriter.cpp\
-	morkYarn.cpp\
-	$(NULL)
-
-EXTRA_DSO_LDOPTS =\
-	-L$(DIST)/bin	\
-	-L$(DIST)/lib	\
-	$(NSPR_LIBS)	\
-	$(NULL)
+EXTRA_DSO_LDOPTS = \
+		-L$(DIST)/bin \
+		-L$(DIST)/lib \
+		$(NSPR_LIBS) \
+		$(NULL)
 
 override NO_SHARED_LIB=1
 override NO_STATIC_LIB=
 
-include $(topsrcdir)/config/config.mk
-
 include $(topsrcdir)/config/rules.mk