4 files changed, 14 insertions, 18 deletions
diff --git a/source4/lib/replace/libreplace.m4 b/source4/lib/replace/libreplace.m4
index 2fe58bf1e8..6a24c053e3 100644
--- a/source4/lib/replace/libreplace.m4
+++ b/source4/lib/replace/libreplace.m4
@@ -1,11 +1,3 @@
-dnl needed before AC_TRY_COMPILE
-AC_ISC_POSIX
-AC_USE_SYSTEM_EXTENSIONS
-
-AC_C_INLINE
-
-LIBREPLACE_C99_STRUCT_INIT([],[])
-
 dnl find the libreplace sources. This is meant to work both for 
 dnl libreplace standalone builds, and builds of packages using libreplace
 libreplacedir=""
@@ -19,6 +11,14 @@ done
 LIBREPLACEOBJ="dlfcn.o getpass.o replace.o snprintf.o timegm.o"
 AC_SUBST(LIBREPLACEOBJ)
 
+dnl needed before AC_TRY_COMPILE
+AC_ISC_POSIX
+AC_USE_SYSTEM_EXTENSIONS
+AC_C_INLINE
+AC_PROG_CC
+
+LIBREPLACE_C99_STRUCT_INIT([],[])
+
 AC_SYS_LARGEFILE
 
 dnl Add #include for broken IRIX header files
@@ -30,6 +30,10 @@ esac
 AC_C_BIGENDIAN
 AC_HEADER_STDC
 
+AC_CHECK_SIZEOF(off_t,cross)
+AC_CHECK_SIZEOF(size_t,cross)
+AC_CHECK_SIZEOF(ssize_t,cross)
+AC_FUNC_MMAP
 
 AC_CHECK_HEADERS([stdint.h inttypes.h])
 AC_CHECK_TYPE(uint_t, unsigned int)
diff --git a/source4/lib/tdb/configure.ac b/source4/lib/tdb/configure.ac
index 09cc353e39..9da1d85ae2 100644
--- a/source4/lib/tdb/configure.ac
+++ b/source4/lib/tdb/configure.ac
@@ -5,12 +5,6 @@ AC_DEFUN([SMB_ENABLE], [echo -n ""])
 AC_INIT(include/tdb.h)
 AC_CONFIG_SRCDIR([common/tdb.c])
 AC_CONFIG_HEADER(include/config.h)
-AC_PROG_CC
-AC_SYS_LARGEFILE
-AC_CHECK_SIZEOF(off_t,cross)
-AC_CHECK_SIZEOF(size_t,cross)
-AC_CHECK_SIZEOF(ssize_t,cross)
-AC_FUNC_MMAP
 m4_include(libreplace.m4)
 m4_include(libtdb.m4)
 AC_OUTPUT(Makefile tdb.pc)
diff --git a/source4/libcli/libcli.h b/source4/libcli/libcli.h
index c104fcf80e..aee22e2693 100644
--- a/source4/libcli/libcli.h
+++ b/source4/libcli/libcli.h
@@ -22,7 +22,7 @@
 #ifndef __LIBCLI_H__
 #define __LIBCLI_H__
 
-#include <core.h>
+#include "core.h"
 #include "librpc/gen_ndr/nbt.h"
 
 /* 
diff --git a/source4/rpc_server/unixinfo/dcesrv_unixinfo.c b/source4/rpc_server/unixinfo/dcesrv_unixinfo.c
index 1f682a6d5a..ab7a61c64e 100644
--- a/source4/rpc_server/unixinfo/dcesrv_unixinfo.c
+++ b/source4/rpc_server/unixinfo/dcesrv_unixinfo.c
@@ -26,9 +26,7 @@
 #include "librpc/gen_ndr/ndr_unixinfo.h"
 #include "lib/events/events.h"
 #include "dsdb/samdb/samdb.h"
-
-#include <sys/types.h>
-#include <pwd.h>
+#include "system/passwd.h"
 
 static NTSTATUS unixinfo_SidToUid(struct dcesrv_call_state *dce_call,
 				  TALLOC_CTX *mem_ctx,