166 files changed, 55 insertions, 50 deletions

diff --git a/compression/lzxpress.c b/lib/compression/lzxpress.c
index 0abbfc4d3d..0abbfc4d3d 100644
--- a/compression/lzxpress.c
+++ b/lib/compression/lzxpress.c
diff --git a/compression/lzxpress.h b/lib/compression/lzxpress.h
index df0ee59a0e..df0ee59a0e 100644
--- a/compression/lzxpress.h
+++ b/lib/compression/lzxpress.h
diff --git a/compression/mszip.c b/lib/compression/mszip.c
index 9aa1772414..9aa1772414 100644
--- a/compression/mszip.c
+++ b/lib/compression/mszip.c
diff --git a/compression/mszip.h b/lib/compression/mszip.h
index bb835f2595..bb835f2595 100644
--- a/compression/mszip.h
+++ b/lib/compression/mszip.h
diff --git a/compression/testsuite.c b/lib/compression/testsuite.c
index b9cebb2e8d..b9cebb2e8d 100644
--- a/compression/testsuite.c
+++ b/lib/compression/testsuite.c
diff --git a/nss_wrapper/config.m4 b/lib/nss_wrapper/config.m4
index 9b86b4dbb8..45423788d1 100644
--- a/nss_wrapper/config.m4
+++ b/lib/nss_wrapper/config.m4
@@ -12,7 +12,7 @@ if eval "test x$enable_nss_wrapper = xyes"; then
 	HAVE_NSS_WRAPPER=yes
 
 	# this is only used for samba3
-	NSS_WRAPPER_OBJS="../nss_wrapper/nss_wrapper.o"
+	NSS_WRAPPER_OBJS="../lib/nss_wrapper/nss_wrapper.o"
 fi
 
 AC_SUBST(HAVE_NSS_WRAPPER)
diff --git a/nss_wrapper/config.mk b/lib/nss_wrapper/config.mk
index 015fbe511c..015fbe511c 100644
--- a/nss_wrapper/config.mk
+++ b/lib/nss_wrapper/config.mk
diff --git a/nss_wrapper/nss_wrapper.c b/lib/nss_wrapper/nss_wrapper.c
index da090832b0..da090832b0 100644
--- a/nss_wrapper/nss_wrapper.c
+++ b/lib/nss_wrapper/nss_wrapper.c
diff --git a/nss_wrapper/nss_wrapper.h b/lib/nss_wrapper/nss_wrapper.h
index 35a47348a8..35a47348a8 100644
--- a/nss_wrapper/nss_wrapper.h
+++ b/lib/nss_wrapper/nss_wrapper.h
diff --git a/nss_wrapper/nss_wrapper.pl b/lib/nss_wrapper/nss_wrapper.pl
index b1c9be5365..b1c9be5365 100644
--- a/nss_wrapper/nss_wrapper.pl
+++ b/lib/nss_wrapper/nss_wrapper.pl
diff --git a/popt/CHANGES b/lib/popt/CHANGES
index db16a5fdd0..db16a5fdd0 100644
--- a/popt/CHANGES
+++ b/lib/popt/CHANGES
diff --git a/popt/COPYING b/lib/popt/COPYING
index b4c7ca876c..b4c7ca876c 100644
--- a/popt/COPYING
+++ b/lib/popt/COPYING
diff --git a/popt/README b/lib/popt/README
index 0b5205bfdd..0b5205bfdd 100644
--- a/popt/README
+++ b/lib/popt/README
diff --git a/popt/config.mk b/lib/popt/config.mk
index 04cc2c7ea5..04cc2c7ea5 100644
--- a/popt/config.mk
+++ b/lib/popt/config.mk
diff --git a/popt/dummy.in b/lib/popt/dummy.in
index e69de29bb2..e69de29bb2 100644
--- a/popt/dummy.in
+++ b/lib/popt/dummy.in
diff --git a/popt/findme.c b/lib/popt/findme.c
index b28981ba1f..b28981ba1f 100644
--- a/popt/findme.c
+++ b/lib/popt/findme.c
diff --git a/popt/findme.h b/lib/popt/findme.h
index a016b867ea..a016b867ea 100644
--- a/popt/findme.h
+++ b/lib/popt/findme.h
diff --git a/popt/libpopt.m4 b/lib/popt/libpopt.m4
index 79980d1d6b..79980d1d6b 100644
--- a/popt/libpopt.m4
+++ b/lib/popt/libpopt.m4
diff --git a/popt/popt.c b/lib/popt/popt.c
index d9e8411b9f..d9e8411b9f 100644
--- a/popt/popt.c
+++ b/lib/popt/popt.c
diff --git a/popt/popt.h b/lib/popt/popt.h
index 08701d73b5..08701d73b5 100644
--- a/popt/popt.h
+++ b/lib/popt/popt.h
diff --git a/popt/poptconfig.c b/lib/popt/poptconfig.c
index 837828ccf9..837828ccf9 100644
--- a/popt/poptconfig.c
+++ b/lib/popt/poptconfig.c
diff --git a/popt/popthelp.c b/lib/popt/popthelp.c
index e965ff6168..e965ff6168 100644
--- a/popt/popthelp.c
+++ b/lib/popt/popthelp.c
diff --git a/popt/poptint.h b/lib/popt/poptint.h
index 5d308efe96..5d308efe96 100644
--- a/popt/poptint.h
+++ b/lib/popt/poptint.h
diff --git a/popt/poptparse.c b/lib/popt/poptparse.c
index b03deef085..b03deef085 100644
--- a/popt/poptparse.c
+++ b/lib/popt/poptparse.c
diff --git a/popt/samba.m4 b/lib/popt/samba.m4
index 9ee77dfa13..627dd854b2 100644
--- a/popt/samba.m4
+++ b/lib/popt/samba.m4
@@ -1,8 +1,8 @@
-m4_include(../popt/libpopt.m4)
+m4_include(../lib/popt/libpopt.m4)
 
 if test x"$POPT_OBJ" = "x"; then
 	SMB_EXT_LIB(LIBPOPT, [${POPT_LIBS}])
 else
-	SMB_INCLUDE_MK(../popt/config.mk)
+	SMB_INCLUDE_MK(../lib/popt/config.mk)
 fi
 
diff --git a/popt/system.h b/lib/popt/system.h
index 1d1b9dae88..1d1b9dae88 100644
--- a/popt/system.h
+++ b/lib/popt/system.h
diff --git a/replace/.checker_innocent b/lib/replace/.checker_innocent
index e619176540..e619176540 100644
--- a/replace/.checker_innocent
+++ b/lib/replace/.checker_innocent
diff --git a/replace/Makefile.in b/lib/replace/Makefile.in
index c989835a8d..c989835a8d 100644
--- a/replace/Makefile.in
+++ b/lib/replace/Makefile.in
diff --git a/replace/README b/lib/replace/README
index 4d94317c4b..4d94317c4b 100644
--- a/replace/README
+++ b/lib/replace/README
diff --git a/replace/aclocal.m4 b/lib/replace/aclocal.m4
index 5605e476ba..5605e476ba 100644
--- a/replace/aclocal.m4
+++ b/lib/replace/aclocal.m4
diff --git a/replace/autoconf-2.60.m4 b/lib/replace/autoconf-2.60.m4
index acdcd38efe..acdcd38efe 100644
--- a/replace/autoconf-2.60.m4
+++ b/lib/replace/autoconf-2.60.m4
diff --git a/replace/autogen.sh b/lib/replace/autogen.sh
index d46a4279f3..d46a4279f3 100755
--- a/replace/autogen.sh
+++ b/lib/replace/autogen.sh
diff --git a/replace/config.guess b/lib/replace/config.guess
index 354dbe175a..354dbe175a 100755
--- a/replace/config.guess
+++ b/lib/replace/config.guess
diff --git a/replace/config.sub b/lib/replace/config.sub
index 23cd6fd75c..23cd6fd75c 100755
--- a/replace/config.sub
+++ b/lib/replace/config.sub
diff --git a/replace/configure.ac b/lib/replace/configure.ac
index 81997e09b7..81997e09b7 100644
--- a/replace/configure.ac
+++ b/lib/replace/configure.ac
diff --git a/replace/dlfcn.c b/lib/replace/dlfcn.c
index 3b109d7e40..3b109d7e40 100644
--- a/replace/dlfcn.c
+++ b/lib/replace/dlfcn.c
diff --git a/replace/dlfcn.m4 b/lib/replace/dlfcn.m4
index 42f56f26be..42f56f26be 100644
--- a/replace/dlfcn.m4
+++ b/lib/replace/dlfcn.m4
diff --git a/replace/getaddrinfo.c b/lib/replace/getaddrinfo.c
index c5cd52be93..c5cd52be93 100644
--- a/replace/getaddrinfo.c
+++ b/lib/replace/getaddrinfo.c
diff --git a/replace/getaddrinfo.h b/lib/replace/getaddrinfo.h
index dddd699b62..dddd699b62 100644
--- a/replace/getaddrinfo.h
+++ b/lib/replace/getaddrinfo.h
diff --git a/replace/getifaddrs.c b/lib/replace/getifaddrs.c
index f6f0ec080c..f6f0ec080c 100644
--- a/replace/getifaddrs.c
+++ b/lib/replace/getifaddrs.c
diff --git a/replace/getpass.c b/lib/replace/getpass.c
index 0be618fc91..0be618fc91 100644
--- a/replace/getpass.c
+++ b/lib/replace/getpass.c
diff --git a/replace/getpass.m4 b/lib/replace/getpass.m4
index b93817f9d3..b93817f9d3 100644
--- a/replace/getpass.m4
+++ b/lib/replace/getpass.m4
diff --git a/replace/inet_aton.c b/lib/replace/inet_aton.c
index c6b3bb11a7..c6b3bb11a7 100644
--- a/replace/inet_aton.c
+++ b/lib/replace/inet_aton.c
diff --git a/replace/inet_ntoa.c b/lib/replace/inet_ntoa.c
index e3b80ebef8..e3b80ebef8 100644
--- a/replace/inet_ntoa.c
+++ b/lib/replace/inet_ntoa.c
diff --git a/replace/inet_ntop.c b/lib/replace/inet_ntop.c
index fb3d8e90c8..fb3d8e90c8 100644
--- a/replace/inet_ntop.c
+++ b/lib/replace/inet_ntop.c
diff --git a/replace/inet_pton.c b/lib/replace/inet_pton.c
index 80e4865ef4..80e4865ef4 100644
--- a/replace/inet_pton.c
+++ b/lib/replace/inet_pton.c
diff --git a/replace/install-sh b/lib/replace/install-sh
index 58719246f0..58719246f0 100755
--- a/replace/install-sh
+++ b/lib/replace/install-sh
diff --git a/replace/libreplace.m4 b/lib/replace/libreplace.m4
index 71fa041672..dc7d88e6e1 100644
--- a/replace/libreplace.m4
+++ b/lib/replace/libreplace.m4
@@ -5,7 +5,7 @@ echo "LIBREPLACE_LOCATION_CHECKS: START"
 dnl find the libreplace sources. This is meant to work both for 
 dnl libreplace standalone builds, and builds of packages using libreplace
 libreplacedir=""
-libreplacepaths="$srcdir $srcdir/lib/replace $srcdir/libreplace $srcdir/../libreplace $srcdir/../replace"
+libreplacepaths="$srcdir $srcdir/lib/replace $srcdir/libreplace $srcdir/../libreplace $srcdir/../replace $srcdir/../lib/replace"
 for d in $libreplacepaths; do
 	if test -f "$d/replace.c"; then
 		libreplacedir="$d"		
@@ -34,13 +34,18 @@ echo "LIBREPLACE_BROKEN_CHECKS: START"
 dnl find the libreplace sources. This is meant to work both for 
 dnl libreplace standalone builds, and builds of packages using libreplace
 libreplacedir=""
-for d in "$srcdir" "$srcdir/lib/replace" "$srcdir/libreplace" "$srcdir/../libreplace" "$srcdir/../replace"; do
+libreplacepaths="$srcdir $srcdir/lib/replace $srcdir/libreplace $srcdir/../libreplace $srcdir/../replace $srcdir/../lib/replace"
+for d in $libreplacepaths; do
 	if test -f "$d/replace.c"; then
 		libreplacedir="$d"		
 		AC_SUBST(libreplacedir)
 		break;
 	fi
 done
+if test x"$libreplacedir" = "x"; then
+	AC_MSG_ERROR([cannot find libreplace in $libreplacepaths])
+fi
+
 LIBREPLACEOBJ="replace.o"
 AC_SUBST(LIBREPLACEOBJ)
 
diff --git a/replace/libreplace_cc.m4 b/lib/replace/libreplace_cc.m4
index 30c63f2f05..30c63f2f05 100644
--- a/replace/libreplace_cc.m4
+++ b/lib/replace/libreplace_cc.m4
diff --git a/replace/libreplace_ld.m4 b/lib/replace/libreplace_ld.m4
index 81bde46219..81bde46219 100644
--- a/replace/libreplace_ld.m4
+++ b/lib/replace/libreplace_ld.m4
diff --git a/replace/libreplace_macros.m4 b/lib/replace/libreplace_macros.m4
index 1856eacf66..1856eacf66 100644
--- a/replace/libreplace_macros.m4
+++ b/lib/replace/libreplace_macros.m4
diff --git a/replace/libreplace_network.m4 b/lib/replace/libreplace_network.m4
index 4edb55c03a..4edb55c03a 100644
--- a/replace/libreplace_network.m4
+++ b/lib/replace/libreplace_network.m4
diff --git a/replace/repdir.m4 b/lib/replace/repdir.m4
index f53a4c2974..f53a4c2974 100644
--- a/replace/repdir.m4
+++ b/lib/replace/repdir.m4
diff --git a/replace/repdir_getdents.c b/lib/replace/repdir_getdents.c
index afc634a796..afc634a796 100644
--- a/replace/repdir_getdents.c
+++ b/lib/replace/repdir_getdents.c
diff --git a/replace/repdir_getdirentries.c b/lib/replace/repdir_getdirentries.c
index 197e5931fc..197e5931fc 100644
--- a/replace/repdir_getdirentries.c
+++ b/lib/replace/repdir_getdirentries.c
diff --git a/replace/replace.c b/lib/replace/replace.c
index 98d799b07e..98d799b07e 100644
--- a/replace/replace.c
+++ b/lib/replace/replace.c
diff --git a/replace/replace.h b/lib/replace/replace.h
index c69ea6cdac..c69ea6cdac 100644
--- a/replace/replace.h
+++ b/lib/replace/replace.h
diff --git a/replace/samba.m4 b/lib/replace/samba.m4
index 07c4d38887..07c4d38887 100644
--- a/replace/samba.m4
+++ b/lib/replace/samba.m4
diff --git a/replace/snprintf.c b/lib/replace/snprintf.c
index c54d721ce5..c54d721ce5 100644
--- a/replace/snprintf.c
+++ b/lib/replace/snprintf.c
diff --git a/replace/socket.c b/lib/replace/socket.c
index 35e975fce7..35e975fce7 100644
--- a/replace/socket.c
+++ b/lib/replace/socket.c
diff --git a/replace/socketpair.c b/lib/replace/socketpair.c
index c775730952..c775730952 100644
--- a/replace/socketpair.c
+++ b/lib/replace/socketpair.c
diff --git a/replace/strptime.c b/lib/replace/strptime.c
index 0e40f7561a..0e40f7561a 100644
--- a/replace/strptime.c
+++ b/lib/replace/strptime.c
diff --git a/replace/strptime.m4 b/lib/replace/strptime.m4
index da22fc5a97..da22fc5a97 100644
--- a/replace/strptime.m4
+++ b/lib/replace/strptime.m4
diff --git a/replace/system/README b/lib/replace/system/README
index 69a2b80b56..69a2b80b56 100644
--- a/replace/system/README
+++ b/lib/replace/system/README
diff --git a/replace/system/aio.h b/lib/replace/system/aio.h
index 784d77fa28..784d77fa28 100644
--- a/replace/system/aio.h
+++ b/lib/replace/system/aio.h
diff --git a/replace/system/capability.h b/lib/replace/system/capability.h
index a7b78f0275..a7b78f0275 100644
--- a/replace/system/capability.h
+++ b/lib/replace/system/capability.h
diff --git a/replace/system/config.m4 b/lib/replace/system/config.m4
index 5c9b53d5c5..5c9b53d5c5 100644
--- a/replace/system/config.m4
+++ b/lib/replace/system/config.m4
diff --git a/replace/system/dir.h b/lib/replace/system/dir.h
index dec2d54649..dec2d54649 100644
--- a/replace/system/dir.h
+++ b/lib/replace/system/dir.h
diff --git a/replace/system/filesys.h b/lib/replace/system/filesys.h
index 4bf1f64865..4bf1f64865 100644
--- a/replace/system/filesys.h
+++ b/lib/replace/system/filesys.h
diff --git a/replace/system/glob.h b/lib/replace/system/glob.h
index 3e23db6828..3e23db6828 100644
--- a/replace/system/glob.h
+++ b/lib/replace/system/glob.h
diff --git a/replace/system/iconv.h b/lib/replace/system/iconv.h
index 3c8a71f2f7..3c8a71f2f7 100644
--- a/replace/system/iconv.h
+++ b/lib/replace/system/iconv.h
diff --git a/replace/system/kerberos.h b/lib/replace/system/kerberos.h
index 2981024bee..2981024bee 100644
--- a/replace/system/kerberos.h
+++ b/lib/replace/system/kerberos.h
diff --git a/replace/system/locale.h b/lib/replace/system/locale.h
index e73a9bb274..e73a9bb274 100644
--- a/replace/system/locale.h
+++ b/lib/replace/system/locale.h
diff --git a/replace/system/network.h b/lib/replace/system/network.h
index 473d79b5f2..473d79b5f2 100644
--- a/replace/system/network.h
+++ b/lib/replace/system/network.h
diff --git a/replace/system/passwd.h b/lib/replace/system/passwd.h
index 9d7de34bce..9d7de34bce 100644
--- a/replace/system/passwd.h
+++ b/lib/replace/system/passwd.h
diff --git a/replace/system/readline.h b/lib/replace/system/readline.h
index ba34dc6a61..ba34dc6a61 100644
--- a/replace/system/readline.h
+++ b/lib/replace/system/readline.h
diff --git a/replace/system/select.h b/lib/replace/system/select.h
index da18de0cfc..da18de0cfc 100644
--- a/replace/system/select.h
+++ b/lib/replace/system/select.h
diff --git a/replace/system/shmem.h b/lib/replace/system/shmem.h
index 64fe39b6cb..64fe39b6cb 100644
--- a/replace/system/shmem.h
+++ b/lib/replace/system/shmem.h
diff --git a/replace/system/syslog.h b/lib/replace/system/syslog.h
index 104be1df84..104be1df84 100644
--- a/replace/system/syslog.h
+++ b/lib/replace/system/syslog.h
diff --git a/replace/system/terminal.h b/lib/replace/system/terminal.h
index 9ad601ace0..9ad601ace0 100644
--- a/replace/system/terminal.h
+++ b/lib/replace/system/terminal.h
diff --git a/replace/system/time.h b/lib/replace/system/time.h
index 4abf295d1a..4abf295d1a 100644
--- a/replace/system/time.h
+++ b/lib/replace/system/time.h
diff --git a/replace/system/wait.h b/lib/replace/system/wait.h
index 5784b1ae92..5784b1ae92 100644
--- a/replace/system/wait.h
+++ b/lib/replace/system/wait.h
diff --git a/replace/test/getifaddrs.c b/lib/replace/test/getifaddrs.c
index 8b00ac2f40..8b00ac2f40 100644
--- a/replace/test/getifaddrs.c
+++ b/lib/replace/test/getifaddrs.c
diff --git a/replace/test/os2_delete.c b/lib/replace/test/os2_delete.c
index b45c135355..b45c135355 100644
--- a/replace/test/os2_delete.c
+++ b/lib/replace/test/os2_delete.c
diff --git a/replace/test/shared_mmap.c b/lib/replace/test/shared_mmap.c
index 50dad8d696..50dad8d696 100644
--- a/replace/test/shared_mmap.c
+++ b/lib/replace/test/shared_mmap.c
diff --git a/replace/test/strptime.c b/lib/replace/test/strptime.c
index fade3ecc57..fade3ecc57 100644
--- a/replace/test/strptime.c
+++ b/lib/replace/test/strptime.c
diff --git a/replace/test/testsuite.c b/lib/replace/test/testsuite.c
index 1e8290906e..1e8290906e 100644
--- a/replace/test/testsuite.c
+++ b/lib/replace/test/testsuite.c
diff --git a/replace/timegm.c b/lib/replace/timegm.c
index 395c684e11..395c684e11 100644
--- a/replace/timegm.c
+++ b/lib/replace/timegm.c
diff --git a/replace/timegm.m4 b/lib/replace/timegm.m4
index 59f3ae0521..59f3ae0521 100644
--- a/replace/timegm.m4
+++ b/lib/replace/timegm.m4
diff --git a/replace/win32.m4 b/lib/replace/win32.m4
index eb364e2cb9..eb364e2cb9 100644
--- a/replace/win32.m4
+++ b/lib/replace/win32.m4
diff --git a/replace/win32_replace.h b/lib/replace/win32_replace.h
index 9901e72f6e..9901e72f6e 100644
--- a/replace/win32_replace.h
+++ b/lib/replace/win32_replace.h
diff --git a/socket_wrapper/config.m4 b/lib/socket_wrapper/config.m4
index 23f033e664..68e392b3e7 100644
--- a/socket_wrapper/config.m4
+++ b/lib/socket_wrapper/config.m4
@@ -14,7 +14,7 @@ if eval "test x$enable_socket_wrapper = xyes"; then
 	HAVE_SOCKET_WRAPPER=yes
 
 	# this is only used for samba3
-	SOCKET_WRAPPER_OBJS="../socket_wrapper/socket_wrapper.o"
+	SOCKET_WRAPPER_OBJS="../lib/socket_wrapper/socket_wrapper.o"
 fi
 
 AC_SUBST(DEFAULT_TEST_OPTIONS)
diff --git a/socket_wrapper/config.mk b/lib/socket_wrapper/config.mk
index 60cfb3209a..60cfb3209a 100644
--- a/socket_wrapper/config.mk
+++ b/lib/socket_wrapper/config.mk
diff --git a/socket_wrapper/socket_wrapper.c b/lib/socket_wrapper/socket_wrapper.c
index e8d27adc37..e8d27adc37 100644
--- a/socket_wrapper/socket_wrapper.c
+++ b/lib/socket_wrapper/socket_wrapper.c
diff --git a/socket_wrapper/socket_wrapper.h b/lib/socket_wrapper/socket_wrapper.h
index cc8b937608..cc8b937608 100644
--- a/socket_wrapper/socket_wrapper.h
+++ b/lib/socket_wrapper/socket_wrapper.h
diff --git a/socket_wrapper/testsuite.c b/lib/socket_wrapper/testsuite.c
index e6e08e3be6..e6e08e3be6 100644
--- a/socket_wrapper/testsuite.c
+++ b/lib/socket_wrapper/testsuite.c
diff --git a/talloc/Makefile.in b/lib/talloc/Makefile.in
index 07b8fd4ff0..07b8fd4ff0 100644
--- a/talloc/Makefile.in
+++ b/lib/talloc/Makefile.in
diff --git a/talloc/NEWS b/lib/talloc/NEWS
index e5b3aa0731..e5b3aa0731 100644
--- a/talloc/NEWS
+++ b/lib/talloc/NEWS
diff --git a/talloc/aclocal.m4 b/lib/talloc/aclocal.m4
index 5605e476ba..5605e476ba 100644
--- a/talloc/aclocal.m4
+++ b/lib/talloc/aclocal.m4
diff --git a/talloc/autogen.sh b/lib/talloc/autogen.sh
index bf84eeee19..bf84eeee19 100755
--- a/talloc/autogen.sh
+++ b/lib/talloc/autogen.sh
diff --git a/talloc/config.guess b/lib/talloc/config.guess
index 354dbe175a..354dbe175a 100755
--- a/talloc/config.guess
+++ b/lib/talloc/config.guess
diff --git a/talloc/config.mk b/lib/talloc/config.mk
index 5cdf3a1a8e..5cdf3a1a8e 100644
--- a/talloc/config.mk
+++ b/lib/talloc/config.mk
diff --git a/talloc/config.sub b/lib/talloc/config.sub
index 23cd6fd75c..23cd6fd75c 100755
--- a/talloc/config.sub
+++ b/lib/talloc/config.sub
diff --git a/talloc/configure.ac b/lib/talloc/configure.ac
index 4719aa04b5..4719aa04b5 100644
--- a/talloc/configure.ac
+++ b/lib/talloc/configure.ac
diff --git a/talloc/install-sh b/lib/talloc/install-sh
index 58719246f0..58719246f0 100755
--- a/talloc/install-sh
+++ b/lib/talloc/install-sh
diff --git a/talloc/libtalloc.m4 b/lib/talloc/libtalloc.m4
index fd2b4b22cd..e6830fbef6 100644
--- a/talloc/libtalloc.m4
+++ b/lib/talloc/libtalloc.m4
@@ -1,7 +1,7 @@
 dnl find the talloc sources. This is meant to work both for 
 dnl talloc standalone builds, and builds of packages using talloc
 tallocdir=""
-tallocpaths=". lib/talloc talloc ../talloc"
+tallocpaths=". lib/talloc talloc ../talloc ../lib/talloc"
 for d in $tallocpaths; do
 	if test -f "$srcdir/$d/talloc.c"; then
 		tallocdir="$d"
diff --git a/talloc/rules.mk b/lib/talloc/rules.mk
index 6cee126529..6cee126529 100644
--- a/talloc/rules.mk
+++ b/lib/talloc/rules.mk
diff --git a/talloc/talloc.3.xml b/lib/talloc/talloc.3.xml
index 67de15bfc8..67de15bfc8 100644
--- a/talloc/talloc.3.xml
+++ b/lib/talloc/talloc.3.xml
diff --git a/talloc/talloc.c b/lib/talloc/talloc.c
index 1f7e52439f..1f7e52439f 100644
--- a/talloc/talloc.c
+++ b/lib/talloc/talloc.c
diff --git a/talloc/talloc.h b/lib/talloc/talloc.h
index 5431971655..5431971655 100644
--- a/talloc/talloc.h
+++ b/lib/talloc/talloc.h
diff --git a/talloc/talloc.i b/lib/talloc/talloc.i
index a9afb97ed7..a9afb97ed7 100644
--- a/talloc/talloc.i
+++ b/lib/talloc/talloc.i
diff --git a/talloc/talloc.mk b/lib/talloc/talloc.mk
index e1fe88c84b..e1fe88c84b 100644
--- a/talloc/talloc.mk
+++ b/lib/talloc/talloc.mk
diff --git a/talloc/talloc.pc.in b/lib/talloc/talloc.pc.in
index 459cce70b1..459cce70b1 100644
--- a/talloc/talloc.pc.in
+++ b/lib/talloc/talloc.pc.in
diff --git a/talloc/talloc_guide.txt b/lib/talloc/talloc_guide.txt
index 18663b370d..18663b370d 100644
--- a/talloc/talloc_guide.txt
+++ b/lib/talloc/talloc_guide.txt
diff --git a/talloc/testsuite.c b/lib/talloc/testsuite.c
index 3f06eee566..3f06eee566 100644
--- a/talloc/testsuite.c
+++ b/lib/talloc/testsuite.c
diff --git a/talloc/web/index.html b/lib/talloc/web/index.html
index 5deab93665..5deab93665 100644
--- a/talloc/web/index.html
+++ b/lib/talloc/web/index.html
diff --git a/tdb/Makefile.in b/lib/tdb/Makefile.in
index 090bb6e2dc..090bb6e2dc 100644
--- a/tdb/Makefile.in
+++ b/lib/tdb/Makefile.in
diff --git a/tdb/aclocal.m4 b/lib/tdb/aclocal.m4
index 5605e476ba..5605e476ba 100644
--- a/tdb/aclocal.m4
+++ b/lib/tdb/aclocal.m4
diff --git a/tdb/autogen.sh b/lib/tdb/autogen.sh
index 88ac4cfcf7..88ac4cfcf7 100755
--- a/tdb/autogen.sh
+++ b/lib/tdb/autogen.sh
diff --git a/tdb/common/dump.c b/lib/tdb/common/dump.c
index d1c902ddfd..d1c902ddfd 100644
--- a/tdb/common/dump.c
+++ b/lib/tdb/common/dump.c
diff --git a/tdb/common/error.c b/lib/tdb/common/error.c
index 195ab23815..195ab23815 100644
--- a/tdb/common/error.c
+++ b/lib/tdb/common/error.c
diff --git a/tdb/common/freelist.c b/lib/tdb/common/freelist.c
index 2f2a4c379b..2f2a4c379b 100644
--- a/tdb/common/freelist.c
+++ b/lib/tdb/common/freelist.c
diff --git a/tdb/common/freelistcheck.c b/lib/tdb/common/freelistcheck.c
index efc050df9c..efc050df9c 100644
--- a/tdb/common/freelistcheck.c
+++ b/lib/tdb/common/freelistcheck.c
diff --git a/tdb/common/io.c b/lib/tdb/common/io.c
index 661f761489..661f761489 100644
--- a/tdb/common/io.c
+++ b/lib/tdb/common/io.c
diff --git a/tdb/common/lock.c b/lib/tdb/common/lock.c
index f156c0fa7b..f156c0fa7b 100644
--- a/tdb/common/lock.c
+++ b/lib/tdb/common/lock.c
diff --git a/tdb/common/open.c b/lib/tdb/common/open.c
index b19e4cea29..b19e4cea29 100644
--- a/tdb/common/open.c
+++ b/lib/tdb/common/open.c
diff --git a/tdb/common/tdb.c b/lib/tdb/common/tdb.c
index c7cec297f6..c7cec297f6 100644
--- a/tdb/common/tdb.c
+++ b/lib/tdb/common/tdb.c
diff --git a/tdb/common/tdb_private.h b/lib/tdb/common/tdb_private.h
index ffac89ff0e..ffac89ff0e 100644
--- a/tdb/common/tdb_private.h
+++ b/lib/tdb/common/tdb_private.h
diff --git a/tdb/common/transaction.c b/lib/tdb/common/transaction.c
index 7acda640c8..7acda640c8 100644
--- a/tdb/common/transaction.c
+++ b/lib/tdb/common/transaction.c
diff --git a/tdb/common/traverse.c b/lib/tdb/common/traverse.c
index 69c81e6e98..69c81e6e98 100644
--- a/tdb/common/traverse.c
+++ b/lib/tdb/common/traverse.c
diff --git a/tdb/config.guess b/lib/tdb/config.guess
index 354dbe175a..354dbe175a 100755
--- a/tdb/config.guess
+++ b/lib/tdb/config.guess
diff --git a/tdb/config.mk b/lib/tdb/config.mk
index 90c9ba2863..90c9ba2863 100644
--- a/tdb/config.mk
+++ b/lib/tdb/config.mk
diff --git a/tdb/config.sub b/lib/tdb/config.sub
index 23cd6fd75c..23cd6fd75c 100755
--- a/tdb/config.sub
+++ b/lib/tdb/config.sub
diff --git a/tdb/configure.ac b/lib/tdb/configure.ac
index eaf70d30b4..eaf70d30b4 100644
--- a/tdb/configure.ac
+++ b/lib/tdb/configure.ac
diff --git a/tdb/docs/README b/lib/tdb/docs/README
index 63fcf5e049..63fcf5e049 100644
--- a/tdb/docs/README
+++ b/lib/tdb/docs/README
diff --git a/tdb/docs/tdb.magic b/lib/tdb/docs/tdb.magic
index f5619e7327..f5619e7327 100644
--- a/tdb/docs/tdb.magic
+++ b/lib/tdb/docs/tdb.magic
diff --git a/tdb/include/tdb.h b/lib/tdb/include/tdb.h
index 0008085de5..0008085de5 100644
--- a/tdb/include/tdb.h
+++ b/lib/tdb/include/tdb.h
diff --git a/tdb/install-sh b/lib/tdb/install-sh
index 58719246f0..58719246f0 100755
--- a/tdb/install-sh
+++ b/lib/tdb/install-sh
diff --git a/tdb/libtdb.m4 b/lib/tdb/libtdb.m4
index 1e17a7a4f2..252e0b0be3 100644
--- a/tdb/libtdb.m4
+++ b/lib/tdb/libtdb.m4
@@ -1,7 +1,7 @@
 dnl find the tdb sources. This is meant to work both for 
 dnl tdb standalone builds, and builds of packages using tdb
 tdbdir=""
-tdbpaths="$srcdir $srcdir/lib/tdb $srcdir/tdb $srcdir/../tdb"
+tdbpaths="$srcdir $srcdir/lib/tdb $srcdir/tdb $srcdir/../tdb $srcdir/../lib/tdb"
 for d in $tdbpaths; do
 	if test -f "$d/common/tdb.c"; then
 		tdbdir="$d"		
diff --git a/tdb/python.mk b/lib/tdb/python.mk
index 12e8217df9..12e8217df9 100644
--- a/tdb/python.mk
+++ b/lib/tdb/python.mk
diff --git a/tdb/python/tdbdump.py b/lib/tdb/python/tdbdump.py
index d759d771c8..d759d771c8 100644
--- a/tdb/python/tdbdump.py
+++ b/lib/tdb/python/tdbdump.py
diff --git a/tdb/python/tests/simple.py b/lib/tdb/python/tests/simple.py
index 7147718c91..7147718c91 100644
--- a/tdb/python/tests/simple.py
+++ b/lib/tdb/python/tests/simple.py
diff --git a/tdb/rules.mk b/lib/tdb/rules.mk
index 7b765625df..7b765625df 100644
--- a/tdb/rules.mk
+++ b/lib/tdb/rules.mk
diff --git a/tdb/tdb.i b/lib/tdb/tdb.i
index 3d8b697732..3d8b697732 100644
--- a/tdb/tdb.i
+++ b/lib/tdb/tdb.i
diff --git a/tdb/tdb.mk b/lib/tdb/tdb.mk
index fa8db6d34c..fa8db6d34c 100644
--- a/tdb/tdb.mk
+++ b/lib/tdb/tdb.mk
diff --git a/tdb/tdb.pc.in b/lib/tdb/tdb.pc.in
index 6f8f553736..6f8f553736 100644
--- a/tdb/tdb.pc.in
+++ b/lib/tdb/tdb.pc.in
diff --git a/tdb/tdb.py b/lib/tdb/tdb.py
index 9f306bab8c..9f306bab8c 100644
--- a/tdb/tdb.py
+++ b/lib/tdb/tdb.py
diff --git a/tdb/tdb_wrap.c b/lib/tdb/tdb_wrap.c
index 32665d79fd..32665d79fd 100644
--- a/tdb/tdb_wrap.c
+++ b/lib/tdb/tdb_wrap.c
diff --git a/tdb/tools/tdbbackup.c b/lib/tdb/tools/tdbbackup.c
index 6f3ca48314..6f3ca48314 100644
--- a/tdb/tools/tdbbackup.c
+++ b/lib/tdb/tools/tdbbackup.c
diff --git a/tdb/tools/tdbdump.c b/lib/tdb/tools/tdbdump.c
index 8d930383b0..8d930383b0 100644
--- a/tdb/tools/tdbdump.c
+++ b/lib/tdb/tools/tdbdump.c
diff --git a/tdb/tools/tdbtest.c b/lib/tdb/tools/tdbtest.c
index 416bc50a5b..416bc50a5b 100644
--- a/tdb/tools/tdbtest.c
+++ b/lib/tdb/tools/tdbtest.c
diff --git a/tdb/tools/tdbtool.c b/lib/tdb/tools/tdbtool.c
index d104ccd7c4..d104ccd7c4 100644
--- a/tdb/tools/tdbtool.c
+++ b/lib/tdb/tools/tdbtool.c
diff --git a/tdb/tools/tdbtorture.c b/lib/tdb/tools/tdbtorture.c
index 9265cf07aa..9265cf07aa 100644
--- a/tdb/tools/tdbtorture.c
+++ b/lib/tdb/tools/tdbtorture.c
diff --git a/tdb/web/index.html b/lib/tdb/web/index.html
index a53da6b8f7..a53da6b8f7 100644
--- a/tdb/web/index.html
+++ b/lib/tdb/web/index.html
diff --git a/source3/Makefile.in b/source3/Makefile.in
index d4a4914825..032efd53a3 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -249,7 +249,7 @@ LIBNDR_DRSUAPI_OBJ = librpc/ndr/ndr_drsuapi.o \
 		     librpc/gen_ndr/ndr_drsuapi.o \
 		     librpc/gen_ndr/ndr_drsblobs.o
 
-COMPRESSION_OBJ = ../compression/mszip.o
+COMPRESSION_OBJ = ../lib/compression/mszip.o
 
 DRSUAPI_OBJ = $(LIBNDR_DRSUAPI_OBJ) \
 	      $(COMPRESSION_OBJ)
diff --git a/source3/autogen.sh b/source3/autogen.sh
index e27e817d61..deed774b39 100755
--- a/source3/autogen.sh
+++ b/source3/autogen.sh
@@ -53,7 +53,7 @@ echo "$0: running script/mkversion.sh"
 rm -rf autom4te*.cache
 rm -f configure include/config.h*
 
-IPATHS="-Im4 -I../replace -I../source4"
+IPATHS="-Im4 -I../lib/replace -I../source4"
 
 echo "$0: running $AUTOHEADER $IPATHS"
 $AUTOHEADER $IPATHS || exit 1
diff --git a/source3/configure.in b/source3/configure.in
index fd0ea4361a..294092e721 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -23,7 +23,7 @@ m4_include(m4/check_path.m4)
 
 AC_LIBREPLACE_CC_CHECKS
 
-m4_include(../talloc/libtalloc.m4)
+m4_include(../lib/talloc/libtalloc.m4)
 
 LIBTALLOC_OBJ0=""
 for obj in ${TALLOC_OBJ}; do
@@ -33,7 +33,7 @@ AC_SUBST(LIBTALLOC_OBJ0)
 
 # TODO: These should come from m4_include(lib/tdb/libtdb.m4)
 # but currently this fails: things have to get merged from s4.
-tdbdir="../tdb"
+tdbdir="../lib/tdb"
 AC_SUBST(tdbdir)
 TDB_CFLAGS="-I${srcdir-.}/$tdbdir/include"
 AC_SUBST(TDB_CFLAGS)
@@ -48,13 +48,13 @@ done
 
 AC_SUBST(LIBTDB_OBJ0)
 SAMBA_CPPFLAGS="-Iinclude -I${srcdir-.}/include  -I. -I${srcdir-.}"
-SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/../replace"
+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/../lib/replace"
 SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TALLOC_CFLAGS}"
 SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TDB_CFLAGS}"
 SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/libaddns"
 SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/librpc"
 
-SAMBA_CONFIGURE_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/../popt"
+SAMBA_CONFIGURE_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/../lib/popt"
 
 ## cleanup the $(srcdir) in the Makefile if we are outside of the tree
 if test "x${srcdir-.}" != "x."; then
@@ -131,8 +131,8 @@ else
 	CFLAGS="-O"
 fi
 
-m4_include(../socket_wrapper/config.m4)
-m4_include(../nss_wrapper/config.m4)
+m4_include(../lib/socket_wrapper/config.m4)
+m4_include(../lib/nss_wrapper/config.m4)
 
 m4_include(m4/swat.m4)
 
@@ -5872,7 +5872,7 @@ if test x"$INCLUDED_POPT" = x"yes"; then
     AC_MSG_RESULT(yes)
     BUILD_POPT='$(POPT_OBJ)'
     POPTLIBS='$(POPT_OBJ)'
-    FLAGS1="-I\$(srcdir)/../popt"
+    FLAGS1="-I\$(srcdir)/../lib/popt"
 else
     AC_MSG_RESULT(no)
 	BUILD_POPT=""
diff --git a/source3/m4/aclocal.m4 b/source3/m4/aclocal.m4
index beeabbba78..aae729c825 100644
--- a/source3/m4/aclocal.m4
+++ b/source3/m4/aclocal.m4
@@ -886,4 +886,4 @@ int main(void)
 	])
 ])
 
-m4_include(../replace/libreplace.m4)
+m4_include(../lib/replace/libreplace.m4)
diff --git a/source3/samba4.m4 b/source3/samba4.m4
index 19d3cc141b..8ac9372ff3 100644
--- a/source3/samba4.m4
+++ b/source3/samba4.m4
@@ -31,19 +31,19 @@ AC_CONFIG_FILES(../source4/librpc/dcerpc_atsvc.pc)
 SMB_EXT_LIB_FROM_PKGCONFIG(LIBTALLOC, talloc >= 1.2.0,
 	[],
 	[
-		SMB_INCLUDE_MK(../talloc/config.mk)
+		SMB_INCLUDE_MK(../lib/talloc/config.mk)
 	]
 )
 
 SMB_EXT_LIB_FROM_PKGCONFIG(LIBTDB, tdb >= 1.1.0,
 	[],
 	[
-		m4_include(../tdb/libtdb.m4)
-		SMB_INCLUDE_MK(../tdb/config.mk)
+		m4_include(../lib/tdb/libtdb.m4)
+		SMB_INCLUDE_MK(../lib/tdb/config.mk)
 	]
 )
 
-SMB_INCLUDE_MK(../tdb/python.mk) 
+SMB_INCLUDE_MK(../lib/tdb/python.mk) 
 
 SMB_EXT_LIB_FROM_PKGCONFIG(LIBLDB, ldb >= 0.9.1,
 	[
diff --git a/source4/Makefile b/source4/Makefile
index 04f0ae9457..91390d833f 100644
--- a/source4/Makefile
+++ b/source4/Makefile
@@ -62,7 +62,7 @@ libsrcdir := lib
 libsocketsrcdir := lib/socket
 libcharsetsrcdir := lib/charset
 ldb_sambasrcdir := lib/ldb-samba
-tdbsrcdir := ../tdb
+tdbsrcdir := ../lib/tdb
 ldbsrcdir := lib/ldb
 libtlssrcdir := lib/tls
 libregistrysrcdir := lib/registry
@@ -70,9 +70,9 @@ smbreadlinesrcdir := lib/smbreadline
 libmessagingsrcdir := lib/messaging
 libeventssrcdir := lib/events
 libcmdlinesrcdir := lib/cmdline
-poptsrcdir := ../popt
-socketwrappersrcdir := ../socket_wrapper
-nsswrappersrcdir := ../nss_wrapper
+poptsrcdir := ../lib/popt
+socketwrappersrcdir := ../lib/socket_wrapper
+nsswrappersrcdir := ../lib/nss_wrapper
 appwebsrcdir := lib/appweb
 libstreamsrcdir := lib/stream
 libutilsrcdir := lib/util
@@ -81,7 +81,7 @@ libdbwrapsrcdir := lib/dbwrap
 libcryptosrcdir := lib/crypto
 libtorturesrcdir := lib/torture
 smb_serversrcdir := smb_server
-libcompressionsrcdir := ../compression
+libcompressionsrcdir := ../lib/compression
 libgencachesrcdir := lib
 paramsrcdir := param
 rpc_serversrcdir := rpc_server
@@ -103,7 +103,7 @@ pyscriptsrcdir := $(srcdir)/scripting/python
 kdcsrcdir := kdc
 ntp_signdsrcdir := ntp_signd
 wmisrcdir := lib/wmi
-tallocsrcdir := ../talloc
+tallocsrcdir := ../lib/talloc
 
 include data.mk
 
diff --git a/source4/aclocal.m4 b/source4/aclocal.m4
index 0e75fa51f5..240a994f9d 100644
--- a/source4/aclocal.m4
+++ b/source4/aclocal.m4
@@ -53,7 +53,7 @@ AC_DEFUN(LIB_REMOVE_USR_LIB,[
   $1=[$]ac_new_flags
 ])
 
-m4_include(../replace/libreplace.m4)
+m4_include(../lib/replace/libreplace.m4)
 m4_include(build/m4/ax_cflags_gcc_option.m4)
 m4_include(build/m4/ax_cflags_irix_option.m4)
 m4_include(build/m4/public.m4)
diff --git a/source4/autogen.sh b/source4/autogen.sh
index 89f5abeb96..a56c5a2238 100755
--- a/source4/autogen.sh
+++ b/source4/autogen.sh
@@ -53,7 +53,7 @@ echo "$0: running script/mkversion.sh"
 rm -rf autom4te*.cache
 rm -f configure include/config_tmp.h*
 
-IPATHS="-I. -I../replace"
+IPATHS="-I. -I../lib/replace"
 
 echo "$0: running $AUTOHEADER $IPATHS"
 $AUTOHEADER $IPATHS || exit 1
diff --git a/source4/configure.ac b/source4/configure.ac
index 357121a43b..099da400e7 100644
--- a/source4/configure.ac
+++ b/source4/configure.ac
@@ -11,7 +11,7 @@ AC_DEFINE(CONFIG_H_IS_FROM_SAMBA,1,[Marker for samba's config.h])
 
 # Configuration rules.
 m4_include(build/m4/env.m4)
-m4_include(../replace/samba.m4)
+m4_include(../lib/replace/samba.m4)
 m4_include(lib/smbreadline/readline.m4)
 m4_include(heimdal_build/config.m4)
 m4_include(lib/util/fault.m4)
@@ -21,7 +21,7 @@ m4_include(lib/util/fsusage.m4)
 m4_include(lib/util/xattr.m4)
 m4_include(lib/util/capability.m4)
 m4_include(lib/util/time.m4)
-m4_include(../popt/samba.m4)
+m4_include(../lib/popt/samba.m4)
 m4_include(lib/charset/config.m4)
 m4_include(lib/socket/config.m4)
 m4_include(lib/zlib.m4)
@@ -41,20 +41,20 @@ AC_CONFIG_FILES(librpc/dcerpc_atsvc.pc)
 SMB_EXT_LIB_FROM_PKGCONFIG(LIBTALLOC, talloc >= 1.2.0,
 	[],
 	[
-		m4_include(../talloc/libtalloc.m4)
-		SMB_INCLUDE_MK(../talloc/config.mk)
+		m4_include(../lib/talloc/libtalloc.m4)
+		SMB_INCLUDE_MK(../lib/talloc/config.mk)
 	]
 )
 
 SMB_EXT_LIB_FROM_PKGCONFIG(LIBTDB, tdb >= 1.1.0,
 	[],
 	[
-		m4_include(../tdb/libtdb.m4)
-		SMB_INCLUDE_MK(../tdb/config.mk)
+		m4_include(../lib/tdb/libtdb.m4)
+		SMB_INCLUDE_MK(../lib/tdb/config.mk)
 	]
 )
 
-SMB_INCLUDE_MK(../tdb/python.mk) 
+SMB_INCLUDE_MK(../lib/tdb/python.mk) 
 
 SMB_EXT_LIB_FROM_PKGCONFIG(LIBLDB, ldb >= 0.9.1,
 	[
@@ -99,8 +99,8 @@ m4_include(auth/gensec/config.m4)
 m4_include(smbd/process_model.m4)
 m4_include(ntvfs/posix/config.m4)
 m4_include(ntvfs/unixuid/config.m4)
-m4_include(../socket_wrapper/config.m4)
-m4_include(../nss_wrapper/config.m4)
+m4_include(../lib/socket_wrapper/config.m4)
+m4_include(../lib/nss_wrapper/config.m4)
 m4_include(auth/config.m4)
 m4_include(kdc/config.m4)
 m4_include(ntvfs/sysdep/config.m4)
@@ -159,7 +159,7 @@ then
 	builddir_headers="-I\$(builddir)/include -I\$(builddir) -I\$(builddir)/lib ";
 fi
 
-CPPFLAGS="$builddir_headers-I\$(srcdir)/include -I\$(srcdir) -I\$(srcdir)/lib -I\$(srcdir)/../replace -I\$(srcdir)/../talloc -D_SAMBA_BUILD_=4 -DHAVE_CONFIG_H $CPPFLAGS"
+CPPFLAGS="$builddir_headers-I\$(srcdir)/include -I\$(srcdir) -I\$(srcdir)/lib -I\$(srcdir)/../lib/replace -I\$(srcdir)/../lib/talloc -D_SAMBA_BUILD_=4 -DHAVE_CONFIG_H $CPPFLAGS"
 
 SMB_WRITE_PERLVARS(build/smb_build/config.pm)
 
diff --git a/source4/librpc/ndr/ndr_compression.c b/source4/librpc/ndr/ndr_compression.c
index 92c5b049df..05a80e20b2 100644
--- a/source4/librpc/ndr/ndr_compression.c
+++ b/source4/librpc/ndr/ndr_compression.c
@@ -21,7 +21,7 @@
 */
 
 #include "includes.h"
-#include "lib/compression/lzxpress.h"
+#include "../lib/compression/lzxpress.h"
 #include "librpc/ndr/libndr.h"
 #include "librpc/ndr/ndr_compression.h"
 #include <zlib.h>
diff --git a/source4/main.mk b/source4/main.mk
index 5ab9f95c05..ddeb4baf2e 100644
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -16,8 +16,8 @@ mkinclude lib/registry/config.mk
 mkinclude lib/messaging/config.mk
 mkinclude lib/events/config.mk
 mkinclude lib/cmdline/config.mk
-mkinclude ../socket_wrapper/config.mk
-mkinclude ../nss_wrapper/config.mk
+mkinclude ../lib/socket_wrapper/config.mk
+mkinclude ../lib/nss_wrapper/config.mk
 mkinclude lib/appweb/config.mk
 mkinclude lib/stream/config.mk
 mkinclude lib/util/config.mk
diff --git a/source4/torture/local/config.mk b/source4/torture/local/config.mk
index 54cbdae837..4cd9f6c865 100644
--- a/source4/torture/local/config.mk
+++ b/source4/torture/local/config.mk
@@ -20,23 +20,23 @@ PRIVATE_DEPENDENCIES = \
 
 TORTURE_LOCAL_OBJ_FILES = \
 		$(torturesrcdir)/../lib/charset/tests/iconv.o \
-		$(torturesrcdir)/../../talloc/testsuite.o \
-		$(torturesrcdir)/../../replace/test/getifaddrs.o \
-		$(torturesrcdir)/../../replace/test/os2_delete.o \
-		$(torturesrcdir)/../../replace/test/strptime.o \
-		$(torturesrcdir)/../../replace/test/testsuite.o \
+		$(torturesrcdir)/../../lib/talloc/testsuite.o \
+		$(torturesrcdir)/../../lib/replace/test/getifaddrs.o \
+		$(torturesrcdir)/../../lib/replace/test/os2_delete.o \
+		$(torturesrcdir)/../../lib/replace/test/strptime.o \
+		$(torturesrcdir)/../../lib/replace/test/testsuite.o \
 		$(torturesrcdir)/../lib/messaging/tests/messaging.o \
 		$(torturesrcdir)/../lib/messaging/tests/irpc.o \
 		$(torturesrcdir)/../librpc/tests/binding_string.o \
 		$(torturesrcdir)/../lib/util/tests/idtree.o \
 		$(torturesrcdir)/../lib/socket/testsuite.o \
-		$(torturesrcdir)/../../socket_wrapper/testsuite.o \
+		$(torturesrcdir)/../../lib/socket_wrapper/testsuite.o \
 		$(torturesrcdir)/../libcli/resolve/testsuite.o \
 		$(torturesrcdir)/../lib/util/tests/strlist.o \
 		$(torturesrcdir)/../lib/util/tests/str.o \
 		$(torturesrcdir)/../lib/util/tests/file.o \
 		$(torturesrcdir)/../lib/util/tests/genrand.o \
-		$(torturesrcdir)/../../compression/testsuite.o \
+		$(torturesrcdir)/../../lib/compression/testsuite.o \
 		$(torturesrcdir)/../lib/charset/tests/charset.o \
 		$(torturesrcdir)/../libcli/security/tests/sddl.o \
 		$(torturesrcdir)/../lib/tdr/testsuite.o \