12 files changed, 15 insertions, 5 deletions
diff --git a/source4/lib/db_wrap.c b/source4/lib/db_wrap.c
index 854f772717..6028159377 100644
--- a/source4/lib/db_wrap.c
+++ b/source4/lib/db_wrap.c
@@ -29,6 +29,7 @@
 
 #include "includes.h"
 #include "dlinklist.h"
+#include "lib/tdb/include/tdb.h"
 #include "lib/ldb/include/ldb.h"
 
 static struct ldb_wrap *ldb_list;
diff --git a/source4/lib/events/events.c b/source4/lib/events/events.c
index 64cf8f41bf..140e3ff067 100644
--- a/source4/lib/events/events.c
+++ b/source4/lib/events/events.c
@@ -66,8 +66,6 @@
 #endif
 
 #if WITH_EPOLL
-/* this #undef is needed on my SuSE 9.2 Box with glibc-devel-2.3.3-118 */
-#undef u32
 #include <sys/epoll.h>
 #endif
 
diff --git a/source4/lib/gencache.c b/source4/lib/gencache.c
index 160367cfe9..8688683e8d 100644
--- a/source4/lib/gencache.c
+++ b/source4/lib/gencache.c
@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "lib/tdb/include/tdbutil.h"
 #include "system/time.h"
 
 #undef  DBGC_CLASS
diff --git a/source4/lib/ldb/ldb_tdb/ldb_tdb.h b/source4/lib/ldb/ldb_tdb/ldb_tdb.h
index 49052550d0..0c644ffe5e 100644
--- a/source4/lib/ldb/ldb_tdb/ldb_tdb.h
+++ b/source4/lib/ldb/ldb_tdb/ldb_tdb.h
@@ -1,5 +1,7 @@
 
-#ifndef _SAMBA_BUILD_
+#ifdef _SAMBA_BUILD_
+#include "lib/tdb/include/tdb.h"
+#else
 #include "tdb.h"
 #endif
 
diff --git a/source4/lib/tdb/common/spinlock.c b/source4/lib/tdb/common/spinlock.c
index 30bfd77962..001f0c3bc1 100644
--- a/source4/lib/tdb/common/spinlock.c
+++ b/source4/lib/tdb/common/spinlock.c
@@ -38,11 +38,11 @@
 #include <time.h>
 #include <signal.h>
 #include "tdb.h"
-#include "spinlock.h"
 
 #define DEBUG
 #else
 #include "includes.h"
+#include "lib/tdb/include/tdb.h"
 #endif
 
 #ifdef USE_SPINLOCKS
diff --git a/source4/lib/tdb/common/tdb.c b/source4/lib/tdb/common/tdb.c
index 46b2499179..134ee8a4ea 100644
--- a/source4/lib/tdb/common/tdb.c
+++ b/source4/lib/tdb/common/tdb.c
@@ -63,9 +63,9 @@
 #include <sys/stat.h>
 #include <signal.h>
 #include "tdb.h"
-#include "spinlock.h"
 #else
 #include "includes.h"
+#include "lib/tdb/include/tdb.h"
 #include "system/time.h"
 #include "system/shmem.h"
 #include "system/filesys.h"
diff --git a/source4/lib/tdb/common/tdbutil.c b/source4/lib/tdb/common/tdbutil.c
index b5187162cf..02a1d66cbe 100644
--- a/source4/lib/tdb/common/tdbutil.c
+++ b/source4/lib/tdb/common/tdbutil.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "lib/tdb/include/tdbutil.h"
 #include "system/glob.h"
 #include "system/wait.h"
 #include "dlinklist.h"
diff --git a/source4/lib/tdb/include/tdb.h b/source4/lib/tdb/include/tdb.h
index f53503a1d6..1de5517d91 100644
--- a/source4/lib/tdb/include/tdb.h
+++ b/source4/lib/tdb/include/tdb.h
@@ -154,4 +154,6 @@ extern TDB_DATA tdb_null;
 }
 #endif
 
+#include "spinlock.h"
+
 #endif /* tdb.h */
diff --git a/source4/lib/tdb/include/tdbutil.h b/source4/lib/tdb/include/tdbutil.h
index cfa83bd937..80d93b7984 100644
--- a/source4/lib/tdb/include/tdbutil.h
+++ b/source4/lib/tdb/include/tdbutil.h
@@ -21,6 +21,8 @@
 #ifndef __TDBUTIL_H__
 #define __TDBUTIL_H__
 
+#include "tdb.h"
+
 
 /* single node of a list returned by tdb_search_keys */
 typedef struct keys_node 
diff --git a/source4/lib/tdb/tools/tdbdump.c b/source4/lib/tdb/tools/tdbdump.c
index dd018af6f5..8aa573ca9b 100644
--- a/source4/lib/tdb/tools/tdbdump.c
+++ b/source4/lib/tdb/tools/tdbdump.c
@@ -37,6 +37,7 @@
 #else
 
 #include "includes.h"
+#include "lib/tdb/include/tdb.h"
 #include "system/iconv.h"
 
 #endif
diff --git a/source4/lib/tdb/tools/tdbtest.c b/source4/lib/tdb/tools/tdbtest.c
index f4854b5931..0a2185d6b8 100644
--- a/source4/lib/tdb/tools/tdbtest.c
+++ b/source4/lib/tdb/tools/tdbtest.c
@@ -16,6 +16,7 @@
 #else
 
 #include "includes.h"
+#include "lib/tdb/include/tdb.h"
 
 #endif
 
diff --git a/source4/lib/tdb/tools/tdbtorture.c b/source4/lib/tdb/tools/tdbtorture.c
index bb2313369b..63b3b0d381 100644
--- a/source4/lib/tdb/tools/tdbtorture.c
+++ b/source4/lib/tdb/tools/tdbtorture.c
@@ -21,6 +21,7 @@
 #else
 
 #include "includes.h"
+#include "lib/tdb/include/tdb.h"
 #include "system/time.h"
 #include "system/wait.h"