diff --git a/lib/dns/Makefile.in b/lib/dns/Makefile.in
index e2a78451f9..65c259e3d7 100644
--- a/lib/dns/Makefile.in
+++ b/lib/dns/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.110 2000/11/15 00:36:35 gson Exp $
+# $Id: Makefile.in,v 1.111 2000/11/16 01:40:58 bwelling Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -87,11 +87,6 @@ OPENSSLOBJS =	sec/openssl/a_bitstr.@O@ sec/openssl/a_bytes.@O@ \
 		sec/openssl/stack.@O@ sec/openssl/th-lock.@O@ \
 		sec/openssl/x_sig.@O@ sec/openssl/x_algor.@O@
 
-OTHEROBJS =	
-#ifndef NOMINUM_PUBLIC
-OTHEROBJS =	sdb.@O@
-#endif /* NOMINUM_PUBLIC */
-
 # Alphabetically
 OBJS =		a6.@O@ acl.@O@ adb.@O@ byaddr.@O@ \
 		cache.@O@ callbacks.@O@ compress.@O@ \
@@ -99,19 +94,14 @@ OBJS =		a6.@O@ acl.@O@ adb.@O@ byaddr.@O@ \
 		forward.@O@ journal.@O@ keytable.@O@ lib.@O@ log.@O@ \
 		lookup.@O@ master.@O@ masterdump.@O@ message.@O@ \
 		name.@O@ ncache.@O@ nxt.@O@ opt.@O@ peer.@O@ \
-		rbt.@O@ rbtdb.@O@ rbtdb64.@O@ rdata.@O@ rdatalist.@O@ \
-		rdataset.@O@ rdatasetiter.@O@ rdataslab.@O@ request.@O@ \
-		resolver.@O@ result.@O@ rootns.@O@ ssu.@O@ \
+		rbt.@O@ rbtdb.@O@ rbtdb64.@O@ rbtdbhash.@O@ rdata.@O@ \
+		rdatalist.@O@ rdataset.@O@ rdatasetiter.@O@ rdataslab.@O@ \
+		request.@O@ resolver.@O@ result.@O@ rootns.@O@ \
+		sdb.@O@ ssu.@O@ \
 		tcpmsg.@O@ time.@O@ tkey.@O@ \
 		tsig.@O@ ttl.@O@ validator.@O@ \
 		version.@O@ view.@O@ xfrin.@O@ zone.@O@ zt.@O@ \
-		${OTHEROBJS} ${DSTOBJS} @DST_OPENSSL_OBJS@ ${CONFOBJS}
-
-OTHERSRCS =	
-#ifndef NOMINUM_PUBLIC
-OTHERSRCS =	sdb.c
-#endif /* NOMINUM_PUBLIC */
-
+		${DSTOBJS} @DST_OPENSSL_OBJS@ ${CONFOBJS}
 
 # Alphabetically
 SRCS =		a6.c acl.c adb.c byaddr.c \
@@ -120,13 +110,13 @@ SRCS =		a6.c acl.c adb.c byaddr.c \
 		forward.c journal.c keytable.c lib.c log.c \
 		lookup.c master.c masterdump.c message.c \
 		name.c ncache.c nxt.c opt.c peer.c \
-		rbt.c rbtdb.c rbtdb64.c rdata.c rdatalist.c \
-		rdataset.c rdatasetiter.c rdataslab.c request.c \
-		resolver.c result.c rootns.c ssu.c \
+		rbt.c rbtdb.c rbtdb64.c rbtdbhash.c rdata.c \
+		rdatalist.c rdataset.c rdatasetiter.c rdataslab.c \
+		request.c resolver.c result.c rootns.c \
+		sdb.c ssu.c \
 		tcpmsg.c time.c tkey.c \
 		tsig.c ttl.c validator.c \
-		version.c view.c xfrin.c zone.c zt.c \
-		${OTHERSRCS}
+		version.c view.c xfrin.c zone.c zt.c
 
 SUBDIRS =	include sec config
 TARGETS =	include/dns/enumtype.h include/dns/enumclass.h \
diff --git a/lib/dns/db.c b/lib/dns/db.c
index d1b6482385..c816a39061 100644
--- a/lib/dns/db.c
+++ b/lib/dns/db.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: db.c,v 1.60 2000/11/15 23:16:33 tale Exp $ */
+/* $Id: db.c,v 1.61 2000/11/16 01:40:59 bwelling Exp $ */
 
 /***
  *** Imports
@@ -59,16 +59,12 @@ typedef struct {
 
 #include "rbtdb.h"
 #include "rbtdb64.h"
-#ifndef NOMINUM_PUBLIC
 #include "sdb_p.h"
-#endif /* NOMINUM_PUBLIC */
 
 static impinfo_t implementations[] = {
 	{ "rbt", dns_rbtdb_create },
 	{ "rbt64", dns_rbtdb64_create },
-#ifndef NOMINUM_PUBLIC
 	{ "simple", dns_sdb_create },
-#endif /* NOMINUM_PUBLIC */
 	{ NULL, NULL }
 };
 
diff --git a/lib/dns/sdb.c b/lib/dns/sdb.c
index 46b9c0c44e..389d06eb79 100644
--- a/lib/dns/sdb.c
+++ b/lib/dns/sdb.c
@@ -15,9 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sdb.c,v 1.13 2000/11/09 23:55:00 bwelling Exp $ */
-
-/* NOMINUM_PUBLIC_DELETE */
+/* $Id: sdb.c,v 1.14 2000/11/16 01:41:01 bwelling Exp $ */
 
 #include <config.h>
 
diff --git a/lib/dns/sdb_p.h b/lib/dns/sdb_p.h
index df2fe255e0..36adf838c1 100644
--- a/lib/dns/sdb_p.h
+++ b/lib/dns/sdb_p.h
@@ -15,9 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sdb_p.h,v 1.4 2000/09/26 22:45:54 bwelling Exp $ */
-
-/* NOMINUM_PUBLIC_DELETE */
+/* $Id: sdb_p.h,v 1.5 2000/11/16 01:41:02 bwelling Exp $ */
 
 #ifndef DNS_SDB_P_H
 #define DNS_SDB_P_H 1