5 files changed, 5 insertions, 6 deletions
diff --git a/source4/lib/events/events.c b/source4/lib/events/events.c
index 555a5092cc..969abeae46 100644
--- a/source4/lib/events/events.c
+++ b/source4/lib/events/events.c
@@ -58,9 +58,6 @@
 #include "lib/events/events_internal.h"
 #include "lib/util/dlinklist.h"
 #include "param/param.h"
-#if _SAMBA_BUILD_
-#include "build.h"
-#endif
 
 struct event_ops_list {
 	struct event_ops_list *next, *prev;
@@ -102,6 +99,9 @@ void event_set_default_backend(const char *backend)
 static void event_backend_init(void)
 {
 #if _SAMBA_BUILD_
+	NTSTATUS s4_events_standard_init(void);
+	NTSTATUS s4_events_select_init(void);
+	NTSTATUS s4_events_epoll_init(void);
 	init_module_fn static_init[] = { STATIC_LIBEVENTS_MODULES };
 	if (event_backends) return;
 	run_init_functions(static_init);
diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 18070bdb86..a3bf71d0d8 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -35,7 +35,6 @@
 
 #if (_SAMBA_BUILD_ >= 4)
 #include "includes.h"
-#include "build.h"
 #endif
 
 #define LDB_MODULE_PREFIX	"modules:"
diff --git a/source4/lib/ldb/include/ldb_private.h b/source4/lib/ldb/include/ldb_private.h
index d9f2defdc9..61d5f5148a 100644
--- a/source4/lib/ldb/include/ldb_private.h
+++ b/source4/lib/ldb/include/ldb_private.h
@@ -173,6 +173,7 @@ int ldb_should_b64_encode(const struct ldb_val *val);
 int ldb_objectclass_init(void);
 int ldb_operational_init(void);
 int ldb_paged_results_init(void);
+int ldb_paged_searches_init(void);
 int ldb_rdn_name_init(void);
 int ldb_schema_init(void);
 int ldb_asq_init(void);
@@ -180,6 +181,7 @@ int ldb_sort_init(void);
 int ldb_ldap_init(void);
 int ldb_ildap_init(void);
 int ldb_tdb_init(void);
+int ldb_skel_init(void);
 int ldb_sqlite3_init(void);
 
 int ldb_match_msg(struct ldb_context *ldb,
diff --git a/source4/lib/registry/interface.c b/source4/lib/registry/interface.c
index a18fd2c28c..ff3ddf0a35 100644
--- a/source4/lib/registry/interface.c
+++ b/source4/lib/registry/interface.c
@@ -21,7 +21,6 @@
 #include "lib/util/dlinklist.h"
 #include "lib/registry/registry.h"
 #include "system/filesys.h"
-#include "build.h"
 
 
 /**
diff --git a/source4/lib/registry/local.c b/source4/lib/registry/local.c
index 3e463100c9..b2cdec9cdf 100644
--- a/source4/lib/registry/local.c
+++ b/source4/lib/registry/local.c
@@ -22,7 +22,6 @@
 #include "lib/util/dlinklist.h"
 #include "lib/registry/registry.h"
 #include "system/filesys.h"
-#include "build.h"
 
 struct reg_key_path {
 	uint32_t predefined_key;