10 files changed, 14 insertions, 2 deletions
diff --git a/source4/lib/appweb/mpr/miniMpr.h b/source4/lib/appweb/mpr/miniMpr.h
index 0f668ab1d4..d92e50fe89 100644
--- a/source4/lib/appweb/mpr/miniMpr.h
+++ b/source4/lib/appweb/mpr/miniMpr.h
@@ -274,6 +274,9 @@ extern int 		mprMemcpy(char *dest, int destMax, const char *src, int nbytes);
 extern void mprSetCtx(void *ctx);
 extern void *mprMemCtx(void);
 
+/* This function needs to be provided by anyone using ejs */
+void ejs_exception(const char *reason);
+
 #define mprStrCmpAnyCase(s1, s2) strcasecmp_m(s1, s2)
 
 #ifdef __cplusplus
diff --git a/source4/lib/basic.mk b/source4/lib/basic.mk
index 50ed8cc02f..43e838967b 100644
--- a/source4/lib/basic.mk
+++ b/source4/lib/basic.mk
@@ -45,6 +45,7 @@ OBJ_FILES = \
 ################################################
 # Start SUBSYSTEM LIBCOMPRESSION
 [SUBSYSTEM::LIBCOMPRESSION]
+NOPROTO = YES
 OBJ_FILES = \
 		compression/mszip.o
 # End SUBSYSTEM LIBCOMPRESION
diff --git a/source4/lib/cmdline/config.mk b/source4/lib/cmdline/config.mk
index 9380de53be..2dc957cc4d 100644
--- a/source4/lib/cmdline/config.mk
+++ b/source4/lib/cmdline/config.mk
@@ -7,5 +7,6 @@ REQUIRED_SUBSYSTEMS = CREDENTIALS
 OBJ_FILES = popt_common.o
 
 [SUBSYSTEM::POPT_CREDENTIALS]
+PRIVATE_PROTO_HEADER = popt_credentials.h
 OBJ_FILES = popt_credentials.o
 REQUIRED_SUBSYSTEMS = CREDENTIALS LIBCMDLINE_CREDENTIALS
diff --git a/source4/lib/messaging/messaging.c b/source4/lib/messaging/messaging.c
index 6f00ba30ed..8432eadf5e 100644
--- a/source4/lib/messaging/messaging.c
+++ b/source4/lib/messaging/messaging.c
@@ -30,6 +30,7 @@
 #include "lib/messaging/irpc.h"
 #include "db_wrap.h"
 #include "lib/tdb/include/tdbutil.h"
+#include "util/unix_privs.h"
 
 /* change the message version with any incompatible changes in the protocol */
 #define MESSAGING_VERSION 1
diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk
index 29a5901125..5c68bacd94 100644
--- a/source4/lib/registry/config.mk
+++ b/source4/lib/registry/config.mk
@@ -46,7 +46,7 @@ OBJ_FILES = \
 # Start MODULE registry_rpc
 [MODULE::registry_rpc]
 INIT_FUNCTION = registry_rpc_init
-NOPROTO = NO
+PRIVATE_PROTO_HEADER = reg_backend_rpc.h
 OUTPUT_TYPE = MERGEDOBJ
 SUBSYSTEM = REGISTRY
 OBJ_FILES = \
diff --git a/source4/lib/registry/tools/regdiff.c b/source4/lib/registry/tools/regdiff.c
index 5b876ca025..f1c5db1598 100644
--- a/source4/lib/registry/tools/regdiff.c
+++ b/source4/lib/registry/tools/regdiff.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "lib/registry/registry.h"
+#include "lib/registry/reg_backend_rpc.h"
 #include "lib/cmdline/popt_common.h"
 
 int main(int argc, char **argv)
diff --git a/source4/lib/registry/tools/regpatch.c b/source4/lib/registry/tools/regpatch.c
index 6f5c79bc0e..713d4b32cc 100644
--- a/source4/lib/registry/tools/regpatch.c
+++ b/source4/lib/registry/tools/regpatch.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "lib/registry/registry.h"
 #include "lib/cmdline/popt_common.h"
+#include "lib/registry/reg_backend_rpc.h"
 
 int main(int argc, char **argv)
 {
diff --git a/source4/lib/registry/tools/regshell.c b/source4/lib/registry/tools/regshell.c
index 89493c761e..4d1bb95f35 100644
--- a/source4/lib/registry/tools/regshell.c
+++ b/source4/lib/registry/tools/regshell.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "lib/registry/registry.h"
 #include "lib/cmdline/popt_common.h"
+#include "lib/registry/reg_backend_rpc.h"
 #include "system/time.h"
 
 /* 
diff --git a/source4/lib/registry/tools/regtree.c b/source4/lib/registry/tools/regtree.c
index d8f5d68a94..ccdb24a4cc 100644
--- a/source4/lib/registry/tools/regtree.c
+++ b/source4/lib/registry/tools/regtree.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "lib/registry/registry.h"
+#include "lib/registry/reg_backend_rpc.h"
 #include "lib/cmdline/popt_common.h"
 
 static void print_tree(int l, struct registry_key *p, int fullpath, int novals)
diff --git a/source4/lib/util/config.mk b/source4/lib/util/config.mk
index 0ab0b5f809..2b2c440e4b 100644
--- a/source4/lib/util/config.mk
+++ b/source4/lib/util/config.mk
@@ -3,7 +3,7 @@ MAJOR_VERSION = 0
 MINOR_VERSION = 0
 RELEASE_VERSION = 1
 DESCRIPTION = Generic utility functions
-PRIVATE_PROTO_HEADER = util_proto.h
+PUBLIC_PROTO_HEADER = util_proto.h
 PUBLIC_HEADERS = util.h \
 				 byteorder.h \
 				 debug.h \
@@ -39,7 +39,9 @@ REQUIRED_SUBSYSTEMS = \
 		LIBLDB 
 
 [SUBSYSTEM::PIDFILE]
+PRIVATE_PROTO_HEADER = pidfile.h
 OBJ_FILES = pidfile.o
 
 [SUBSYSTEM::UNIX_PRIVS]
+PRIVATE_PROTO_HEADER = unix_privs.h
 OBJ_FILES = unix_privs.o