33 files changed, 8 insertions, 8 deletions
diff --git a/source/Makefile.in b/source/Makefile.in
index 82ca96222d0..874150e92d4 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -195,11 +195,11 @@ MODULES = $(VFS_MODULES) $(PDB_MODULES) $(RPC_MODULES) $(IDMAP_MODULES) \
 # object file lists
 ######################################################################
 
-TDBBASE_OBJ = tdb/common/tdb.o tdb/common/dump.o tdb/common/error.o \
-	tdb/common/freelist.o tdb/common/freelistcheck.o tdb/common/io.o tdb/common/lock.o \
-	tdb/common/open.o tdb/common/transaction.o tdb/common/traverse.o
+TDBBASE_OBJ = lib/tdb/common/tdb.o lib/tdb/common/dump.o lib/tdb/common/error.o \
+	lib/tdb/common/freelist.o lib/tdb/common/freelistcheck.o lib/tdb/common/io.o lib/tdb/common/lock.o \
+	lib/tdb/common/open.o lib/tdb/common/transaction.o lib/tdb/common/traverse.o
 
-TDB_OBJ = $(TDBBASE_OBJ) lib/util_tdb.o tdb/common/tdbback.o \
+TDB_OBJ = $(TDBBASE_OBJ) lib/util_tdb.o lib/tdb/common/tdbback.o \
 	lib/dbwrap.o lib/dbwrap_tdb.o
 
 SMBLDAP_OBJ = @SMBLDAP@ @SMBLDAPUTIL@
@@ -813,13 +813,13 @@ POPT_OBJ=popt/findme.o popt/popt.o popt/poptconfig.o \
 INIPARSER_OBJ = iniparser/src/iniparser.o iniparser/src/dictionary.o \
 		iniparser/src/strlib.o
 
-TDBBACKUP_OBJ = tdb/tools/tdbbackup.o tdb/common/tdbback.o $(LIBREPLACE_OBJ) \
+TDBBACKUP_OBJ = lib/tdb/tools/tdbbackup.o lib/tdb/common/tdbback.o $(LIBREPLACE_OBJ) \
 	$(TDBBASE_OBJ) $(SOCKET_WRAPPER_OBJ)
 
-TDBTOOL_OBJ = tdb/tools/tdbtool.o $(TDBBASE_OBJ) $(LIBREPLACE_OBJ) \
+TDBTOOL_OBJ = lib/tdb/tools/tdbtool.o $(TDBBASE_OBJ) $(LIBREPLACE_OBJ) \
 	$(SOCKET_WRAPPER_OBJ)
 
-TDBDUMP_OBJ = tdb/tools/tdbdump.o $(TDBBASE_OBJ) $(LIBREPLACE_OBJ) \
+TDBDUMP_OBJ = lib/tdb/tools/tdbdump.o $(TDBBASE_OBJ) $(LIBREPLACE_OBJ) \
 	$(SOCKET_WRAPPER_OBJ)
 
 NTLM_AUTH_OBJ1 = utils/ntlm_auth.o utils/ntlm_auth_diagnostics.o
diff --git a/source/configure.in b/source/configure.in
index 81f235eee00..bd31d24a228 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -239,7 +239,7 @@ done
 SAMBA_CPPFLAGS="-Iinclude -I${srcdir-.}/include  -I. -I${srcdir-.}"
 SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/lib/replace"
 SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/lib/talloc"
-SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/tdb/include"
+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/lib/tdb/include"
 SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/libaddns"
 SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/librpc"
 
diff --git a/source/tdb/Makefile.in b/source/lib/tdb/Makefile.in
index 455a6e52ce4..455a6e52ce4 100644
--- a/source/tdb/Makefile.in
+++ b/source/lib/tdb/Makefile.in
diff --git a/source/tdb/aclocal.m4 b/source/lib/tdb/aclocal.m4
index 5605e476bab..5605e476bab 100644
--- a/source/tdb/aclocal.m4
+++ b/source/lib/tdb/aclocal.m4
diff --git a/source/tdb/autogen.sh b/source/lib/tdb/autogen.sh
index 1691689e10c..1691689e10c 100755
--- a/source/tdb/autogen.sh
+++ b/source/lib/tdb/autogen.sh
diff --git a/source/tdb/common/dump.c b/source/lib/tdb/common/dump.c
index 3f5c2c87f5b..3f5c2c87f5b 100644
--- a/source/tdb/common/dump.c
+++ b/source/lib/tdb/common/dump.c
diff --git a/source/tdb/common/error.c b/source/lib/tdb/common/error.c
index 4cf33a29ab2..4cf33a29ab2 100644
--- a/source/tdb/common/error.c
+++ b/source/lib/tdb/common/error.c
diff --git a/source/tdb/common/freelist.c b/source/lib/tdb/common/freelist.c
index 0efe47f8798..0efe47f8798 100644
--- a/source/tdb/common/freelist.c
+++ b/source/lib/tdb/common/freelist.c
diff --git a/source/tdb/common/freelistcheck.c b/source/lib/tdb/common/freelistcheck.c
index 3f79a016b86..3f79a016b86 100644
--- a/source/tdb/common/freelistcheck.c
+++ b/source/lib/tdb/common/freelistcheck.c
diff --git a/source/tdb/common/io.c b/source/lib/tdb/common/io.c
index 9a8e270dcc6..9a8e270dcc6 100644
--- a/source/tdb/common/io.c
+++ b/source/lib/tdb/common/io.c
diff --git a/source/tdb/common/lock.c b/source/lib/tdb/common/lock.c
index 8a964371d3a..8a964371d3a 100644
--- a/source/tdb/common/lock.c
+++ b/source/lib/tdb/common/lock.c
diff --git a/source/tdb/common/open.c b/source/lib/tdb/common/open.c
index c7fd3f66564..c7fd3f66564 100644
--- a/source/tdb/common/open.c
+++ b/source/lib/tdb/common/open.c
diff --git a/source/tdb/common/tdb.c b/source/lib/tdb/common/tdb.c
index bf43701d2ed..bf43701d2ed 100644
--- a/source/tdb/common/tdb.c
+++ b/source/lib/tdb/common/tdb.c
diff --git a/source/tdb/common/tdb_private.h b/source/lib/tdb/common/tdb_private.h
index 10bc6dacdcf..10bc6dacdcf 100644
--- a/source/tdb/common/tdb_private.h
+++ b/source/lib/tdb/common/tdb_private.h
diff --git a/source/tdb/common/tdbback.c b/source/lib/tdb/common/tdbback.c
index 28de85c29f8..28de85c29f8 100644
--- a/source/tdb/common/tdbback.c
+++ b/source/lib/tdb/common/tdbback.c
diff --git a/source/tdb/common/transaction.c b/source/lib/tdb/common/transaction.c
index 8bda651f1e4..8bda651f1e4 100644
--- a/source/tdb/common/transaction.c
+++ b/source/lib/tdb/common/transaction.c
diff --git a/source/tdb/common/traverse.c b/source/lib/tdb/common/traverse.c
index 6d3b111479c..6d3b111479c 100644
--- a/source/tdb/common/traverse.c
+++ b/source/lib/tdb/common/traverse.c
diff --git a/source/tdb/config.m4 b/source/lib/tdb/config.m4
index a37f36b29e0..a37f36b29e0 100644
--- a/source/tdb/config.m4
+++ b/source/lib/tdb/config.m4
diff --git a/source/tdb/config.mk b/source/lib/tdb/config.mk
index c5d1a339907..c5d1a339907 100644
--- a/source/tdb/config.mk
+++ b/source/lib/tdb/config.mk
diff --git a/source/tdb/configure.in b/source/lib/tdb/configure.in
index 0a72af20d94..0a72af20d94 100644
--- a/source/tdb/configure.in
+++ b/source/lib/tdb/configure.in
diff --git a/source/tdb/docs/README b/source/lib/tdb/docs/README
index b31ce36ab14..b31ce36ab14 100644
--- a/source/tdb/docs/README
+++ b/source/lib/tdb/docs/README
diff --git a/source/tdb/docs/tdb.magic b/source/lib/tdb/docs/tdb.magic
index f5619e7327e..f5619e7327e 100644
--- a/source/tdb/docs/tdb.magic
+++ b/source/lib/tdb/docs/tdb.magic
diff --git a/source/tdb/include/tdb.h b/source/lib/tdb/include/tdb.h
index 51bf709f442..51bf709f442 100644
--- a/source/tdb/include/tdb.h
+++ b/source/lib/tdb/include/tdb.h
diff --git a/source/tdb/include/tdbback.h b/source/lib/tdb/include/tdbback.h
index 69d3bb6f91a..69d3bb6f91a 100644
--- a/source/tdb/include/tdbback.h
+++ b/source/lib/tdb/include/tdbback.h
diff --git a/source/tdb/include/tdbconfig.h.in b/source/lib/tdb/include/tdbconfig.h.in
index d6d2c09b3c8..d6d2c09b3c8 100644
--- a/source/tdb/include/tdbconfig.h.in
+++ b/source/lib/tdb/include/tdbconfig.h.in
diff --git a/source/tdb/swig/Tdb.py b/source/lib/tdb/swig/Tdb.py
index aac7a90354d..aac7a90354d 100644
--- a/source/tdb/swig/Tdb.py
+++ b/source/lib/tdb/swig/Tdb.py
diff --git a/source/tdb/swig/tdb.i b/source/lib/tdb/swig/tdb.i
index 98bf6441ce8..98bf6441ce8 100644
--- a/source/tdb/swig/tdb.i
+++ b/source/lib/tdb/swig/tdb.i
diff --git a/source/tdb/tdb.pc.in b/source/lib/tdb/tdb.pc.in
index 0d54afe2424..0d54afe2424 100644
--- a/source/tdb/tdb.pc.in
+++ b/source/lib/tdb/tdb.pc.in
diff --git a/source/tdb/tools/tdbbackup.c b/source/lib/tdb/tools/tdbbackup.c
index 4ae5a4f9212..4ae5a4f9212 100644
--- a/source/tdb/tools/tdbbackup.c
+++ b/source/lib/tdb/tools/tdbbackup.c
diff --git a/source/tdb/tools/tdbdump.c b/source/lib/tdb/tools/tdbdump.c
index b702fb07355..b702fb07355 100644
--- a/source/tdb/tools/tdbdump.c
+++ b/source/lib/tdb/tools/tdbdump.c
diff --git a/source/tdb/tools/tdbtest.c b/source/lib/tdb/tools/tdbtest.c
index 1564a42bc41..1564a42bc41 100644
--- a/source/tdb/tools/tdbtest.c
+++ b/source/lib/tdb/tools/tdbtest.c
diff --git a/source/tdb/tools/tdbtool.c b/source/lib/tdb/tools/tdbtool.c
index bcfb96adc09..bcfb96adc09 100644
--- a/source/tdb/tools/tdbtool.c
+++ b/source/lib/tdb/tools/tdbtool.c
diff --git a/source/tdb/tools/tdbtorture.c b/source/lib/tdb/tools/tdbtorture.c
index 14a2b48cdc7..14a2b48cdc7 100644
--- a/source/tdb/tools/tdbtorture.c
+++ b/source/lib/tdb/tools/tdbtorture.c