diff --git a/examples/misc/adssearch.pl b/examples/misc/adssearch.pl
index 02c4464abba..13a85bede98 100755
--- a/examples/misc/adssearch.pl
+++ b/examples/misc/adssearch.pl
@@ -42,13 +42,11 @@ my $rebind_url;
 
 
 my $tdbdump	= "/usr/bin/tdbdump";
-my $ntdbdump	= "/usr/bin/ntdbdump";
 my $testparm	= "/usr/bin/testparm";
 my $net		= "/usr/bin/net";
 my $dig		= "/usr/bin/dig";
 my $nmblookup	= "/usr/bin/nmblookup";
 my $secrets_tdb = "/etc/samba/secrets.tdb";
-my $secrets_ntdb = "/etc/samba/secrets.ntdb";
 my $klist	= "/usr/bin/klist";
 my $kinit	= "/usr/bin/kinit";
 my $workgroup	= "";
@@ -725,21 +723,13 @@ sub get_machine_password {
 	my $workgroup = shift || "";
 	$workgroup = uc($workgroup);
 
-	my ($found, $tmp, $dbdump, $db);
-	if (-r $secrets_ntdb) {
-	    -x $ntdbdump || die "ntdbdump is not installed. cannot proceed autodetection\n";
-	    $dbdump = $ntdbdump;
-	    $db = $secrets_ntdb;
-	} else {
-	    -x $tdbdump || die "tdbdump is not installed. cannot proceed autodetection\n";
-	    -r $secrets_tdb || die "cannot read $secrets_tdb. cannot proceed autodetection\n";
-	    $dbdump = $tdbdump;
-	    $db = $secrets_tdb;
-	}
+	my ($found, $tmp);
+	-x $tdbdump || die "tdbdump is not installed. cannot proceed autodetection\n";
+	-r $secrets_tdb || die "cannot read $secrets_tdb. cannot proceed autodetection\n";
 
 	# get machine-password
 	my $key = sprintf("SECRETS/MACHINE_PASSWORD/%s", $workgroup);
-	open(SECRETS,"$dbdump $db |");
+	open(SECRETS,"$tdbdump $secrets_tdb |");
 	while(my $line = <SECRETS>) {
 		chomp($line);
 		if ($found) {
diff --git a/python/samba/tests/upgradeprovision.py b/python/samba/tests/upgradeprovision.py
index d785bc1cb4d..3c0bc2af13e 100644
--- a/python/samba/tests/upgradeprovision.py
+++ b/python/samba/tests/upgradeprovision.py
@@ -147,7 +147,7 @@ class UpdateSecretsTests(samba.tests.TestCaseInTempDir):
         self.assertEquals(newmodules.msgs, refmodules.msgs)
 
     def tearDown(self):
-        for name in ["ref.ldb", "secrets.ldb", "secrets.tdb", "secrets.tdb.bak", "secrets.ntdb"]:
+        for name in ["ref.ldb", "secrets.ldb", "secrets.tdb", "secrets.tdb.bak"]:
             path = os.path.join(self.tempdir, name)
             if os.path.exists(path):
                 os.unlink(path)
diff --git a/python/samba/tests/upgradeprovisionneeddc.py b/python/samba/tests/upgradeprovisionneeddc.py
index bf254531510..914beeba726 100644
--- a/python/samba/tests/upgradeprovisionneeddc.py
+++ b/python/samba/tests/upgradeprovisionneeddc.py
@@ -172,7 +172,7 @@ class UpgradeProvisionWithLdbTestCase(TestCaseInTempDir):
         self.assertTrue(re.match(".*upgrade to.*", str(oem2)))
 
     def tearDown(self):
-        for name in ["ref.ldb", "secrets.ldb", "secrets.tdb", "secrets.tdb.bak", "secrets.ntdb", "sam.ldb"]:
+        for name in ["ref.ldb", "secrets.ldb", "secrets.tdb", "secrets.tdb.bak", "sam.ldb"]:
             path = os.path.join(self.tempdir, name)
             if os.path.exists(path):
                 os.unlink(path)
diff --git a/script/librelease.sh b/script/librelease.sh
index 7584e481d30..5119ca4aca7 100755
--- a/script/librelease.sh
+++ b/script/librelease.sh
@@ -80,7 +80,7 @@ release_lib() {
 
 for lib in $*; do
     case $lib in
-	talloc | tdb | ntdb | tevent | ldb)
+	talloc | tdb | tevent | ldb)
 	    [ -z "$GPG_USER" ] && {
 	        GPG_USER='Samba Library Distribution Key <samba-bugs@samba.org>'
 	    }
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 097d90a8de4..0c48ddabb25 100755
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -607,9 +607,6 @@ $ret->{USERNAME} = KTEST\\Administrator
 	system("cp $self->{srcdir}/source3/selftest/ktest-secrets.tdb $prefix/private/secrets.tdb");
 	chmod 0600, "$prefix/private/secrets.tdb";
 
-#Make sure there's no old ntdb file.
-	system("rm -f $prefix/private/secrets.ntdb");
-
 #This uses a pre-calculated krb5 credentials cache, obtained by running Samba4 with:
 # "--option=kdc:service ticket lifetime=239232" "--option=kdc:user ticket lifetime=239232" "--option=kdc:renewal lifetime=239232"
 #
diff --git a/testsuite/headers/wscript_build b/testsuite/headers/wscript_build
index f612ad92615..d0625a0fcb8 100644
--- a/testsuite/headers/wscript_build
+++ b/testsuite/headers/wscript_build
@@ -8,10 +8,6 @@ def build_test_headers(task):
     f.write('/* generated header test */\n')
     hlist = task.env.public_headers_list[:]
     hlist.sort()
-    # We need to include tdb.h before ntdb.h.  It's the rules!
-    if 'tdb.h' in hlist and 'ntdb.h' in hlist:
-        hlist.remove('ntdb.h')
-        hlist.append('ntdb.h')
 
     for h in hlist:
         f.write('#include "%s"\n' % os.path.normpath(h))