diff --git a/source4/lib/tdb/Makefile.tdb b/source4/lib/tdb/Makefile.tdb
index a863b0de8b1..ee612bfb63d 100644
--- a/source4/lib/tdb/Makefile.tdb
+++ b/source4/lib/tdb/Makefile.tdb
@@ -2,13 +2,13 @@
 # Makefile for tdb directory
 #
 
-CFLAGS = -DSTANDALONE -DTDB_DEBUG -g -DHAVE_MMAP=1 -Iinclude
+CFLAGS = -DTDB_DEBUG -g -DHAVE_MMAP=1 -Iinclude
 CC = gcc
 
 PROGS = bin/tdbtest bin/tdbtool bin/tdbtorture
 TDB_OBJ = common/tdb.o common/spinlock.o
 
-default: $(PROGS)
+all: $(PROGS)
 
 bin/tdbtest: tools/tdbtest.o $(TDB_OBJ)
 	$(CC) $(CFLAGS) -o bin/tdbtest tools/tdbtest.o $(TDB_OBJ) -lgdbm
diff --git a/source4/lib/tdb/tools/tdbtorture.c b/source4/lib/tdb/tools/tdbtorture.c
index 890e25af50f..bb2313369bc 100644
--- a/source4/lib/tdb/tools/tdbtorture.c
+++ b/source4/lib/tdb/tools/tdbtorture.c
@@ -219,7 +219,7 @@ static int traverse_fn(TDB_CONTEXT *tdb, TDB_DATA key, TDB_DATA dbuf,
 	if (getpid() == pids[0]) {
 		for (i=0;i<NPROC-1;i++) {
 			int status;
-			if (sys_waitpid(pids[i+1], &status, 0) != pids[i+1]) {
+			if (waitpid(pids[i+1], &status, 0) != pids[i+1]) {
 				printf("failed to wait for %d\n",
 				       (int)pids[i+1]);
 				exit(1);