5 files changed, 12 insertions, 2 deletions
diff --git a/source4/lib/events/config.mk b/source4/lib/events/config.mk
index 0a1a3bf0f9..1268c6f518 100644
--- a/source4/lib/events/config.mk
+++ b/source4/lib/events/config.mk
@@ -32,6 +32,7 @@ INIT_FUNCTION = events_standard_init
 # Start SUBSYSTEM LIBEVENTS
 [SUBSYSTEM::LIBEVENTS]
 OBJ_FILES = events.o events_timed.o events_signal.o
+PUBLIC_HEADERS = events.h events_internal.h
 PUBLIC_DEPENDENCIES = LIBTALLOC
 # End SUBSYSTEM LIBEVENTS
 ##############################
diff --git a/source4/lib/events/events.h b/source4/lib/events/events.h
index 4177087fb7..85c4527273 100644
--- a/source4/lib/events/events.h
+++ b/source4/lib/events/events.h
@@ -23,6 +23,9 @@
 #ifndef __EVENTS_H__
 #define __EVENTS_H__
 
+#include "talloc.h"
+#include <stdlib.h>
+
 struct event_context;
 struct event_ops;
 struct fd_event;
diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk
index 89a77c231e..8d6761e6c7 100644
--- a/source4/lib/registry/config.mk
+++ b/source4/lib/registry/config.mk
@@ -52,7 +52,7 @@ PUBLIC_DEPENDENCIES = LIBTALLOC
 # Start MODULE registry_rpc
 [MODULE::registry_rpc]
 INIT_FUNCTION = registry_rpc_init
-PRIVATE_PROTO_HEADER = reg_backend_rpc.h
+PUBLIC_PROTO_HEADER = reg_backend_rpc.h
 OUTPUT_TYPE = INTEGRATED
 SUBSYSTEM = registry
 OBJ_FILES = \
@@ -99,7 +99,7 @@ OBJ_FILES = \
 		patchfile.o
 PUBLIC_DEPENDENCIES = \
 		LIBSAMBA-UTIL CHARSET
-PRIVATE_PROTO_HEADER = registry_proto.h
+PUBLIC_PROTO_HEADER = registry_proto.h
 PUBLIC_HEADERS = registry.h
 # End MODULE registry_ldb
 ################################################
diff --git a/source4/lib/registry/registry.h b/source4/lib/registry/registry.h
index 4c1eb8f39e..d67f1c2be8 100644
--- a/source4/lib/registry/registry.h
+++ b/source4/lib/registry/registry.h
@@ -22,6 +22,8 @@
 #ifndef _REGISTRY_H /* _REGISTRY_H */
 #define _REGISTRY_H 
 
+#include "core.h"
+#include "talloc.h"
 #include "librpc/gen_ndr/security.h"
 
 /* Handles for the predefined keys */
diff --git a/source4/lib/talloc/talloc.h b/source4/lib/talloc/talloc.h
index 75c130a275..628490faa6 100644
--- a/source4/lib/talloc/talloc.h
+++ b/source4/lib/talloc/talloc.h
@@ -26,6 +26,10 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdarg.h>
+
 /* this is only needed for compatibility with the old talloc */
 typedef void TALLOC_CTX;