diff --git a/source/cldap_server/cldap_server.h b/source/cldap_server/cldap_server.h
index 003835456de..a83b11d5394 100644
--- a/source/cldap_server/cldap_server.h
+++ b/source/cldap_server/cldap_server.h
@@ -29,3 +29,5 @@ struct cldapd_server {
 	struct task_server *task;
 	struct ldb_context *samctx;
 };
+
+#include "cldap_server/proto.h"
diff --git a/source/cldap_server/config.mk b/source/cldap_server/config.mk
index 9a2bef094cb..e167ab75ffd 100644
--- a/source/cldap_server/config.mk
+++ b/source/cldap_server/config.mk
@@ -3,6 +3,7 @@
 #######################
 # Start SUBSYSTEM CLDAPD
 [SUBSYSTEM::CLDAPD]
+PRIVATE_PROTO_HEADER = proto.h
 OBJ_FILES = \
 		cldap_server.o \
 		netlogon.o
diff --git a/source/client/client.c b/source/client/client.c
index 83a2b750b69..b154b557d4a 100644
--- a/source/client/client.c
+++ b/source/client/client.c
@@ -28,6 +28,7 @@
 #include "librpc/gen_ndr/ndr_srvsvc.h"
 #include "librpc/gen_ndr/ndr_lsa.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/util/clilsa.h"
 #include "system/dir.h"
 #include "system/filesys.h"
 #include "dlinklist.h"
diff --git a/source/gtk/tools/gregedit.c b/source/gtk/tools/gregedit.c
index 5dd5ec1a92a..72ba5f992b2 100644
--- a/source/gtk/tools/gregedit.c
+++ b/source/gtk/tools/gregedit.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "lib/registry/registry.h"
+#include "lib/registry/reg_backend_rpc.h"
 #include "gtk/common/gtk-smb.h"
 
 static GtkTreeStore *store_keys;
diff --git a/source/lib/appweb/mpr/miniMpr.h b/source/lib/appweb/mpr/miniMpr.h
index 0f668ab1d4e..d92e50fe891 100644
--- a/source/lib/appweb/mpr/miniMpr.h
+++ b/source/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/source/lib/basic.mk b/source/lib/basic.mk
index 50ed8cc02f1..43e838967bd 100644
--- a/source/lib/basic.mk
+++ b/source/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/source/lib/cmdline/config.mk b/source/lib/cmdline/config.mk
index 9380de53be2..2dc957cc4d1 100644
--- a/source/lib/cmdline/config.mk
+++ b/source/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/source/lib/messaging/messaging.c b/source/lib/messaging/messaging.c
index 6f00ba30ede..8432eadf5eb 100644
--- a/source/lib/messaging/messaging.c
+++ b/source/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/source/lib/registry/config.mk b/source/lib/registry/config.mk
index 29a59011257..5c68bacd944 100644
--- a/source/lib/registry/config.mk
+++ b/source/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/source/lib/registry/tools/regdiff.c b/source/lib/registry/tools/regdiff.c
index 5b876ca0250..f1c5db1598d 100644
--- a/source/lib/registry/tools/regdiff.c
+++ b/source/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/source/lib/registry/tools/regpatch.c b/source/lib/registry/tools/regpatch.c
index 6f5c79bc0eb..713d4b32cc9 100644
--- a/source/lib/registry/tools/regpatch.c
+++ b/source/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/source/lib/registry/tools/regshell.c b/source/lib/registry/tools/regshell.c
index 89493c761e0..4d1bb95f351 100644
--- a/source/lib/registry/tools/regshell.c
+++ b/source/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/source/lib/registry/tools/regtree.c b/source/lib/registry/tools/regtree.c
index d8f5d68a947..ccdb24a4cc2 100644
--- a/source/lib/registry/tools/regtree.c
+++ b/source/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/source/lib/util/config.mk b/source/lib/util/config.mk
index 0ab0b5f8094..2b2c440e4b6 100644
--- a/source/lib/util/config.mk
+++ b/source/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
diff --git a/source/libcli/config.mk b/source/libcli/config.mk
index 7dfa4717d89..548b7e8e401 100644
--- a/source/libcli/config.mk
+++ b/source/libcli/config.mk
@@ -13,6 +13,7 @@ OBJ_FILES = util/asn1.o \
 		util/smbdes.o
 
 [SUBSYSTEM::LIBCLI_LSA]
+PRIVATE_PROTO_HEADER = util/clilsa.h
 OBJ_FILES = util/clilsa.o
 REQUIRED_SUBSYSTEMS = RPC_NDR_LSA
 
diff --git a/source/ntvfs/posix/pvfs_xattr.c b/source/ntvfs/posix/pvfs_xattr.c
index e9cb077c068..d0894a735e8 100644
--- a/source/ntvfs/posix/pvfs_xattr.c
+++ b/source/ntvfs/posix/pvfs_xattr.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "vfs_posix.h"
+#include "util/unix_privs.h"
 
 /*
   pull a xattr as a blob
diff --git a/source/scripting/ejs/config.mk b/source/scripting/ejs/config.mk
index 729b8782b63..1376234d51a 100644
--- a/source/scripting/ejs/config.mk
+++ b/source/scripting/ejs/config.mk
@@ -59,7 +59,6 @@ REQUIRED_SUBSYSTEMS = \
 # Start BINARY SMBSCRIPT
 [BINARY::smbscript]
 INSTALLDIR = BINDIR
-NOPROTO = NO
 OBJ_FILES = \
 		smbscript.o
 REQUIRED_SUBSYSTEMS = EJS LIBBASIC SMBCALLS CONFIG 
diff --git a/source/smbd/server.c b/source/smbd/server.c
index 8488a37f5a7..b23a91769e4 100644
--- a/source/smbd/server.c
+++ b/source/smbd/server.c
@@ -37,6 +37,7 @@
 #include "smbd/process_model.h"
 #include "smbd/service.h"
 #include "passdb/secrets.h"
+#include "util/pidfile.h"
 
 /*
   recursively delete a directory tree
diff --git a/source/torture/raw/acls.c b/source/torture/raw/acls.c
index 470477165f3..5abe9f23c41 100644
--- a/source/torture/raw/acls.c
+++ b/source/torture/raw/acls.c
@@ -24,6 +24,7 @@
 #include "torture/torture.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/libcli.h"
+#include "libcli/util/clilsa.h"
 #include "libcli/security/proto.h"
 
 #define BASEDIR "\\testsd"