r12696: Reduce the size of include/structs.h

(This used to be commit 63917616016133c623fc6ff59454bc313ee7dd8f)

37 files changed, 77 insertions, 250 deletions

diff --git a/source4/gtk/config.mk b/source4/gtk/config.mk
index dfd42a174e..9378f85d5c 100644
--- a/source4/gtk/config.mk
+++ b/source4/gtk/config.mk
@@ -1,8 +1,6 @@
 # LIB GTK SMB subsystem
 
-##############################
-# Start SUBSYSTEM GTKSMB
-[LIBRARY::GTKSMB]
+[LIBRARY::GTK_SAMBA]
 MAJOR_VERSION = 0
 DESCRIPTION = Common Samba-related widgets for GTK+ applications
 MINOR_VERSION = 0
@@ -14,15 +12,13 @@ OBJ_FILES = common/gtk-smb.o \
 		common/gtk_events.o \
 		common/credentials.o
 REQUIRED_SUBSYSTEMS = CHARSET LIBBASIC EXT_LIB_gtk RPC_NDR_SAMR
-# End SUBSYSTEM GTKSMB
-##############################
 
 ################################################
 # Start BINARY gregedit
 [BINARY::gregedit]
 INSTALLDIR = BINDIR
 OBJ_FILES = tools/gregedit.o
-REQUIRED_SUBSYSTEMS = CONFIG REGISTRY GTKSMB
+REQUIRED_SUBSYSTEMS = CONFIG REGISTRY GTK_SAMBA
 MANPAGE = man/gregedit.1
 # End BINARY gregedit
 ################################################
@@ -32,7 +28,7 @@ MANPAGE = man/gregedit.1
 [BINARY::gepdump]
 INSTALLDIR = BINDIR
 OBJ_FILES = tools/gepdump.o
-REQUIRED_SUBSYSTEMS = CONFIG GTKSMB RPC_NDR_EPMAPPER RPC_NDR_MGMT
+REQUIRED_SUBSYSTEMS = CONFIG GTK_SAMBA RPC_NDR_EPMAPPER RPC_NDR_MGMT
 # End BINARY gepdump 
 ################################################
 
@@ -41,7 +37,7 @@ REQUIRED_SUBSYSTEMS = CONFIG GTKSMB RPC_NDR_EPMAPPER RPC_NDR_MGMT
 [BINARY::gwcrontab]
 INSTALLDIR = BINDIR
 OBJ_FILES = tools/gwcrontab.o
-REQUIRED_SUBSYSTEMS = CONFIG GTKSMB RPC_NDR_ATSVC
+REQUIRED_SUBSYSTEMS = CONFIG GTK_SAMBA RPC_NDR_ATSVC
 # End BINARY gwcrontab
 ################################################
 
@@ -50,6 +46,6 @@ REQUIRED_SUBSYSTEMS = CONFIG GTKSMB RPC_NDR_ATSVC
 [BINARY::gwsam]
 INSTALLDIR = BINDIR
 OBJ_FILES = tools/gwsam.o tools/gwsam_user.o
-REQUIRED_SUBSYSTEMS = CONFIG RPC_NDR_SAMR GTKSMB
+REQUIRED_SUBSYSTEMS = CONFIG RPC_NDR_SAMR GTK_SAMBA
 # End BINARY gwsam
 ################################################
diff --git a/source4/heimdal/lib/krb5/krb5-private.h b/source4/heimdal/lib/krb5/krb5-private.h
index 3602c89ec6..c308287a36 100644
--- a/source4/heimdal/lib/krb5/krb5-private.h
+++ b/source4/heimdal/lib/krb5/krb5-private.h
@@ -12,6 +12,9 @@
 #endif
 #endif
 
+struct krb5_dh_moduli;
+struct _krb5_krb_auth_data;
+
 krb5_error_code KRB5_LIB_FUNCTION
 _krb5_PKCS5_PBKDF2 (
 	krb5_context /*context*/,
diff --git a/source4/include/structs.h b/source4/include/structs.h
index 83f742b30e..29386c2899 100644
--- a/source4/include/structs.h
+++ b/source4/include/structs.h
@@ -40,94 +40,40 @@ union spoolss_PrintProcessorInfo;
 
 struct spoolss_GetPrinterData;
 struct spoolss_SetPrinterData;
-struct spoolss_OpenPrinterEx;
-struct spoolss_EnumPrinterData;
-struct spoolss_DeletePrinterData;
-struct spoolss_AddForm;
-struct spoolss_GetForm;
-struct spoolss_SetForm;
-struct spoolss_DeleteForm;
-struct spoolss_AddPrinterDriver;
-struct spoolss_DeletePrinterDriver;
-struct spoolss_GetPrinterDriverDirectory;
-struct spoolss_AddPrinter;
-struct spoolss_GetPrinter;
-struct spoolss_SetPrinter;
-struct spoolss_DeletePrinter;
-struct spoolss_GetPrinterDriver;
-struct spoolss_EnumPrinterData;
-struct spoolss_DeletePrinterData;
-struct spoolss_AddForm;
-struct spoolss_GetForm;
-struct spoolss_SetForm;
-struct spoolss_DeleteForm;
-struct spoolss_AddJob;
-struct spoolss_ScheduleJob;
-struct spoolss_GetJob;
-struct spoolss_SetJob;
-struct spoolss_StartDocPrinter;
-struct spoolss_EndDocPrinter;
-struct spoolss_StartPagePrinter;
-struct spoolss_EndPagePrinter;
-struct spoolss_WritePrinter;
-struct spoolss_ReadPrinter;
 
 struct spoolss_DeviceMode;
 
-struct ntptr_context;
-struct ntptr_GenericHandle;
-
-struct drsuapi_DsCrackNames;
 struct drsuapi_DsNameInfo1;
+struct drsuapi_DsCrackNames;
 struct drsuapi_DsReplicaObjectListItem;
 struct drsuapi_DsReplicaObjectListItemEx;
 
 struct DsPrivate;
 
-struct MULTI_QI;
-struct COSERVERINFO;
-
-
-struct epm_floor;
-struct epm_tower;
-
-struct PAC_BUFFER;
+struct PAC_LOGON_INFO;
 struct PAC_DATA;
+struct PAC_BUFFER;
 
 struct samr_ChangePasswordUser;
 struct samr_OemChangePasswordUser2;
 struct samr_ChangePasswordUser3;
 struct samr_ChangePasswordUser2;
-struct samr_Password;
 struct samr_CryptPassword;
 struct samr_CryptPasswordEx;
-struct samr_LogonHours;
 struct samr_DomInfo1;
 
 struct netr_Credential;
 struct netr_Authenticator;
 union netr_Validation;
-struct netr_SamBaseInfo;
-struct netr_SamInfo3;
-struct netr_UserSessionKey;
-struct netr_LogonSamLogon;
 
 struct iface_struct;
 
-struct tm;
 struct utimbuf;
 
-
-struct auth_usersupplied_info;
 struct auth_serversupplied_info;
 struct auth_session_info;
 
-struct creds_CredentialState;
-struct auth_methods;
-struct schannel_state;
 struct spnego_data;
-struct gensec_security;
-struct gensec_security_ops;
 struct gensec_ntlmssp_state;
 
 struct asn1_data;
@@ -135,232 +81,73 @@ struct asn1_data;
 struct ldapsrv_call;
 struct ldapsrv_connection;
 struct ldap_connection;
-struct ldap_message;
-struct ldap_Result;
-struct rw_buffer;
 
 struct rap_NetShareEnum;
 struct rap_NetServerEnum2;
 
-struct auth_context;
-struct auth_method_context;
-
-struct smb_signing_context;
-
-struct smbsrv_session;
 struct smbsrv_tcon;
 struct smbsrv_connection;
 
 struct smbsrv_request;
-struct request_buffer;
-
-struct smb2srv_request;
-struct smb2_request_buffer;
 
 struct ntvfs_module_context;
 
-struct pvfs_dir;
-struct pvfs_filename;
-struct pvfs_state;
-struct pvfs_file;
-struct pvfs_file_handle;
-
-struct stat;
-
 struct dcesrv_context;
-struct dcesrv_interface;
-struct dcesrv_connection;
-struct dcesrv_connection_context;
-struct dcesrv_endpoint;
 struct dcesrv_call_state;
-struct dcesrv_auth;
 
 struct libnet_context;
-struct libnet_Join;
 struct libnet_JoinDomain;
-union libnet_ChangePassword;
-union libnet_SetPassword;
-union libnet_RemoteTOD;
-struct libnet_RpcConnect;
-struct libnet_CreateUser;
-struct libnet_ListShares;
-struct libnet_AddShare;
-struct libnet_DelShare;
-struct libnet_Lookup;
-struct libnet_SamDump;
-struct libnet_SamDump_keytab;
-struct libnet_SamSync;
-struct libnet_samsync_ldb;
-struct net_functable;
-struct net_context;
 
 struct clilist_file_info;
 
-struct xattr_DosEAs;
-struct xattr_DosStreams;
-struct xattr_NTACL;
-
-struct test_join;
-
-struct test_join_ads_dc;
-
 struct netr_LMSessionKey;
 
-struct ldb_val;
 struct ldb_dn;
 struct ldb_message;
 struct ldb_context;
 struct ldb_parse_tree;
-struct ldb_message_element;
-struct ldap_mod;
-
-struct dom_sid;
-struct security_token;
-struct security_acl;
-struct security_ace;
 
 struct lsa_RightSet;
 
-struct composite_context;
-struct monitor_msg;
 struct irpc_request;
-struct rpc_request;
 
 struct smb_composite_loadfile;
 struct smb_composite_savefile;
 struct smb_composite_connect;
-struct smb_composite_connectmulti;
 struct smb_composite_sesssetup;
 struct smb_composite_fetchfile;
 struct smb_composite_appendacl;
 struct smb_composite_fsinfo;
-struct libnet_rpc_userinfo;
-struct libnet_rpc_useradd;
-struct libnet_rpc_userdel;
-struct libnet_rpc_usermod;
-struct libnet_rpc_domain_open;
-
-struct nbt_name;
-struct nbt_name_packet;
-struct nbt_name_socket;
-struct nbt_name_query;
-struct nbt_name_status;
-struct nbt_name_register;
-struct nbt_name_refresh;
-struct nbt_name_release;
-struct nbt_name_register_bcast;
-struct nbt_name_refresh_wins;
-struct nbt_name_register_wins;
-struct nbt_name_request;
-
-struct nbt_peer_socket;
-
-struct nbt_dgram_packet;
+
 struct nbt_dgram_socket;
 struct dgram_mailslot_handler;
 
 struct messaging_context;
-struct irpc_message;
 struct stream_connection;
 struct task_server;
-struct model_ops;
 struct stream_server_ops;
 
-struct wins_server;
-struct nbtd_proxy_wins_challenge;
-struct nbtd_proxy_wins_release_demand;
-
 struct nbt_dc_name;
 struct wb_sid_object;
-struct wb_dom_info;
 
 struct cldap_socket;
 struct cldapd_server;
 
 struct mutex_ops;
 
-struct ads_struct;
-
-struct wreplsrv_service;
-struct wreplsrv_partner;
-struct wreplsrv_owner;
-struct wreplsrv_in_connection;
-struct wreplsrv_in_call;
-struct wreplsrv_out_connection;
-struct wreplsrv_pull_table_io;
-struct wreplsrv_pull_names_io;
-struct wreplsrv_pull_cycle_io;
-struct wreplsrv_push_notify_io;
-
-struct winsdb_record;
-
-struct wrepl_packet;
-struct wrepl_send_ctrl;
-struct wrepl_associate;
-struct wrepl_associate_stop;
-struct wrepl_pull_table;
-struct wrepl_pull_names;
-struct wrepl_table;
-
-struct arcfour_state;
-
 struct websrv_context;
-struct EspRequest;
-struct PAC_LOGON_INFO;
-struct kdc_server;
-struct smb_krb5_context;
-
-struct samba3_samaccount;
-struct samba3_idmapdb;
-struct samba3_groupdb;
-struct samba3_winsdb_entry;
-struct samba3_policy;
-struct samba3_regdb;
-struct samba3_secrets;
-struct samba3_share_info;
-struct samba3;
-
-struct wbsrv_service;
-struct wbsrv_domain;
-struct wbsrv_protocol_ops;
-struct wbsrv_listen_socket;
-struct wbsrv_connection;
+
 struct wbsrv_call;
-struct wbsrv_samba3_call;
 
 struct ldb_map_attribute;
 struct ldb_map_objectclass;
 
 struct param_context;
-struct param_section;
-struct param;
 
-struct socket_context;
-struct packet_context;
-
-struct smbcli_socket;
 struct smbcli_request;
 struct smbcli_tree;
 
-struct _krb5_krb_auth_data;
-
-struct smb2_request;
-struct smb2_transport;
-struct smb2_session;
-struct smb2_negprot;
-struct smb2_session_setup;
 struct smb2_tree;
-struct smb2_tree_connect;
-struct smb2_create;
-struct smb2_close;
-struct smb2_getinfo;
-struct smb2_setinfo;
-struct smb2_read;
-struct smb2_write;
-struct smb2_find;
-struct smb2_ioctl;
-struct smb2_flush;
-struct smb2_handle;
 
 struct com_context;
 struct IUnknown;
@@ -370,8 +157,8 @@ struct MprVar;
 
 struct registry_context;
 struct nbtd_interface;
-struct nbtd_iface_name;
-struct nbtd_server;
 struct smbcli_session;
 struct smbcli_state;
+
 struct substitute_context;
+
diff --git a/source4/kdc/kdc.h b/source4/kdc/kdc.h
index f9dbbefb9a..9356879415 100644
--- a/source4/kdc/kdc.h
+++ b/source4/kdc/kdc.h
@@ -27,6 +27,8 @@
 #include "heimdal/lib/hdb/hdb.h"
 #include "kdc/pac-glue.h"
 
+struct kdc_server;
+
 NTSTATUS hdb_ldb_create(TALLOC_CTX *mem_ctx, 
 			krb5_context context, struct HDB **db, const char *arg);
 BOOL kpasswdd_process(struct kdc_server *kdc,
diff --git a/source4/lib/samba3/config.mk b/source4/lib/samba3/config.mk
index 76d3f50e4b..fc741ced0d 100644
--- a/source4/lib/samba3/config.mk
+++ b/source4/lib/samba3/config.mk
@@ -5,6 +5,7 @@ MAJOR_VERSION = 0
 MINOR_VERSION = 0
 RELEASE_VERSION = 1
 DESCRIPTION = Library for reading Samba3 data files
+PRIVATE_PROTO_HEADER = samba3_proto.h
 PUBLIC_HEADERS = samba3.h
 OBJ_FILES = smbpasswd.o tdbsam.o policy.o \
 		idmap.o winsdb.o samba3.o group.o \
diff --git a/source4/lib/samba3/samba3.h b/source4/lib/samba3/samba3.h
index a5f60bf1c2..e66be625e0 100644
--- a/source4/lib/samba3/samba3.h
+++ b/source4/lib/samba3/samba3.h
@@ -210,4 +210,6 @@ struct samba3
 	struct samba3_regdb registry;
 };
 
+#include "samba3/samba3_proto.h"
+
 #endif /* _SAMBA3_H */
diff --git a/source4/libcli/cldap/cldap.h b/source4/libcli/cldap/cldap.h
index e1f59464e5..0baaec02df 100644
--- a/source4/libcli/cldap/cldap.h
+++ b/source4/libcli/cldap/cldap.h
@@ -23,6 +23,8 @@
 #include "libcli/util/asn_1.h"
 #include "librpc/gen_ndr/ndr_nbt.h"
 
+struct ldap_message;
+
 enum cldap_request_state {CLDAP_REQUEST_SEND, 
 			  CLDAP_REQUEST_WAIT, 
 			  CLDAP_REQUEST_DONE,
diff --git a/source4/libcli/smb2/keepalive.c b/source4/libcli/smb2/keepalive.c
index 99d9dd3ae9..b800bdb3b1 100644
--- a/source4/libcli/smb2/keepalive.c
+++ b/source4/libcli/smb2/keepalive.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "libcli/smb2/smb2.h"
+#include "libcli/smb2/smb2_calls.h"
 
 /*
   send a keepalive request
diff --git a/source4/libcli/smb2/logoff.c b/source4/libcli/smb2/logoff.c
index ba0e691e8b..977c1e57af 100644
--- a/source4/libcli/smb2/logoff.c
+++ b/source4/libcli/smb2/logoff.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "libcli/smb2/smb2.h"
+#include "libcli/smb2/smb2_calls.h"
 
 /*
   send a logoff request
diff --git a/source4/libcli/smb2/smb2.h b/source4/libcli/smb2/smb2.h
index cf84f34442..913d58409b 100644
--- a/source4/libcli/smb2/smb2.h
+++ b/source4/libcli/smb2/smb2.h
@@ -199,5 +199,3 @@ struct smb2_request {
 		return NT_STATUS_INVALID_PARAMETER; \
 	} \
 } while (0)
-
-#include "libcli/smb2/smb2_proto.h"
diff --git a/source4/libcli/smb2/smb2_calls.h b/source4/libcli/smb2/smb2_calls.h
index 08e765ad60..7349b609cb 100644
--- a/source4/libcli/smb2/smb2_calls.h
+++ b/source4/libcli/smb2/smb2_calls.h
@@ -361,3 +361,5 @@ struct smb2_flush {
 		struct smb2_handle handle;
 	} in;
 };
+
+#include "libcli/smb2/smb2_proto.h"
diff --git a/source4/libcli/smb2/tdis.c b/source4/libcli/smb2/tdis.c
index 7d1f7aee4e..9ea58113b3 100644
--- a/source4/libcli/smb2/tdis.c
+++ b/source4/libcli/smb2/tdis.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "libcli/smb2/smb2.h"
+#include "libcli/smb2/smb2_calls.h"
 
 /*
   send a tdis request
diff --git a/source4/libcli/smb2/transport.c b/source4/libcli/smb2/transport.c
index 60dd5d2ba6..d5591fa11c 100644
--- a/source4/libcli/smb2/transport.c
+++ b/source4/libcli/smb2/transport.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/smb2/smb2.h"
+#include "libcli/smb2/smb2_calls.h"
 #include "lib/socket/socket.h"
 #include "lib/events/events.h"
 #include "lib/stream/packet.h"
diff --git a/source4/libnet/libnet.h b/source4/libnet/libnet.h
index 3044b5a95f..7b379b1fc6 100644
--- a/source4/libnet/libnet.h
+++ b/source4/libnet/libnet.h
@@ -47,4 +47,5 @@ struct libnet_context {
 #include "libnet/libnet_user.h"
 #include "libnet/libnet_share.h"
 #include "libnet/libnet_lookup.h"
+#include "libnet/composite.h"
 #include "libnet/libnet_proto.h"
diff --git a/source4/libnet/libnet_samdump.c b/source4/libnet/libnet_samdump.c
index a5d060c5eb..52513fa1b1 100644
--- a/source4/libnet/libnet_samdump.c
+++ b/source4/libnet/libnet_samdump.c
@@ -24,6 +24,7 @@
 #include "includes.h"
 #include "libnet/libnet.h"
 #include "dlinklist.h"
+#include "samba3/samba3.h"
 
 
 struct samdump_secret {
diff --git a/source4/libnet/libnet_user.c b/source4/libnet/libnet_user.c
index c8e497a08e..629fbf8e05 100644
--- a/source4/libnet/libnet_user.c
+++ b/source4/libnet/libnet_user.c
@@ -21,7 +21,6 @@
 
 #include "includes.h"
 #include "libnet/libnet.h"
-#include "libnet/composite.h"
 
 
 NTSTATUS libnet_CreateUser(struct libnet_context *ctx, TALLOC_CTX *mem_ctx, struct libnet_CreateUser *r)
diff --git a/source4/librpc/rpc/dcerpc.h b/source4/librpc/rpc/dcerpc.h
index 4129fb25d8..cbfe8478b2 100644
--- a/source4/librpc/rpc/dcerpc.h
+++ b/source4/librpc/rpc/dcerpc.h
@@ -245,6 +245,9 @@ struct rpc_request {
 	} async;
 };
 
+struct epm_tower;
+struct epm_floor;
+
 #include "librpc/rpc/dcerpc_proto.h"
 
 #endif /* __DCERPC_H__ */
diff --git a/source4/librpc/rpc/dcerpc_connect.c b/source4/librpc/rpc/dcerpc_connect.c
index 4fbb74dd6b..3ad19ef991 100644
--- a/source4/librpc/rpc/dcerpc_connect.c
+++ b/source4/librpc/rpc/dcerpc_connect.c
@@ -28,6 +28,7 @@
 #include "libcli/composite/composite.h"
 #include "libcli/smb_composite/smb_composite.h"
 #include "libcli/smb2/smb2.h"
+#include "libcli/smb2/smb2_calls.h"
 
 
 struct dcerpc_pipe_connect;
diff --git a/source4/main.mk b/source4/main.mk
index 018ab0ebbb..a032e85197 100644
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -32,7 +32,7 @@ include kdc/config.mk
 include passdb/config.mk
 
 DEFAULT_HEADERS = $(srcdir)/include/nterr.h $(srcdir)/include/nt_status.h \
-				  $(srcdir)/include/smb.h
+				  $(srcdir)/include/smb.h $(srcdir)/include/core.h
 
 binaries: $(BINARIES)
 libraries: $(STATIC_LIBS) $(SHARED_LIBS)
diff --git a/source4/ntptr/ntptr.h b/source4/ntptr/ntptr.h
index 86cf2eeac6..b8ef366022 100644
--- a/source4/ntptr/ntptr.h
+++ b/source4/ntptr/ntptr.h
@@ -40,6 +40,33 @@ struct ntptr_GenericHandle {
 	void *private_data;
 };
 
+struct spoolss_OpenPrinterEx;
+struct spoolss_EnumPrinterData;
+struct spoolss_DeletePrinterData;
+struct spoolss_AddForm;
+struct spoolss_GetForm;
+struct spoolss_SetForm;
+struct spoolss_DeleteForm;
+struct spoolss_AddPrinterDriver;
+struct spoolss_DeletePrinterDriver;
+struct spoolss_GetPrinterDriverDirectory;
+struct spoolss_AddPrinter;
+struct spoolss_GetPrinter;
+struct spoolss_SetPrinter;
+struct spoolss_DeletePrinter;
+struct spoolss_GetPrinterDriver;
+struct spoolss_AddJob;
+struct spoolss_EnumJobs;
+struct spoolss_SetJob;
+struct spoolss_GetJob;
+struct spoolss_ScheduleJob;
+struct spoolss_ReadPrinter;
+struct spoolss_WritePrinter;
+struct spoolss_StartDocPrinter;
+struct spoolss_EndDocPrinter;
+struct spoolss_StartPagePrinter;
+struct spoolss_EndPagePrinter;
+
 /* the ntptr operations structure - contains function pointers to 
    the backend implementations of each operation */
 struct ntptr_ops {
diff --git a/source4/ntvfs/posix/pvfs_xattr.c b/source4/ntvfs/posix/pvfs_xattr.c
index e67253e657..e9cb077c06 100644
--- a/source4/ntvfs/posix/pvfs_xattr.c
+++ b/source4/ntvfs/posix/pvfs_xattr.c
@@ -22,7 +22,6 @@
 
 #include "includes.h"
 #include "vfs_posix.h"
-#include "librpc/gen_ndr/ndr_xattr.h"
 
 /*
   pull a xattr as a blob
diff --git a/source4/ntvfs/posix/vfs_posix.h b/source4/ntvfs/posix/vfs_posix.h
index 3028053f5e..3219631ebb 100644
--- a/source4/ntvfs/posix/vfs_posix.h
+++ b/source4/ntvfs/posix/vfs_posix.h
@@ -23,6 +23,7 @@
 #ifndef _VFS_POSIX_H_
 #define _VFS_POSIX_H_
 
+#include "librpc/gen_ndr/ndr_xattr.h"
 #include "system/filesys.h"
 #include "smb_server/smb_server.h"
 #include "ntvfs/ntvfs.h"
diff --git a/source4/rpc_server/dcerpc_server.h b/source4/rpc_server/dcerpc_server.h
index 783cdb58b1..d6111c51ef 100644
--- a/source4/rpc_server/dcerpc_server.h
+++ b/source4/rpc_server/dcerpc_server.h
@@ -34,6 +34,7 @@
 struct dcesrv_connection;
 struct dcesrv_call_state;
 struct dcesrv_auth;
+struct dcesrv_connection_context;
 
 struct dcesrv_interface {
 	const char *name;
diff --git a/source4/script/installmodules.sh b/source4/script/installmodules.sh
index ec5691992d..fb0ad90c14 100644
--- a/source4/script/installmodules.sh
+++ b/source4/script/installmodules.sh
@@ -1,21 +1,18 @@
 #!/bin/sh
 
 INSTALLPERMS=$1
-BASEDIR=$2
-LIBDIR=$3
+LIBDIR=$2
 shift
 shift
 shift
 
-for d in $BASEDIR $LIBDIR; do
-if [ ! -d $d ]; then
-mkdir $d
-if [ ! -d $d ]; then
-  echo Failed to make directory $d
+if [ ! -d $LIBDIR ]; then
+mkdir $LIBDIR
+if [ ! -d $LIBDIR ]; then
+  echo Failed to make directory $LIBDIR
   exit 1
 fi
 fi
-done
 
 for p in $*; do
  p2=`basename $p`
diff --git a/source4/smb_server/smb2/receive.c b/source4/smb_server/smb2/receive.c
index f0e21473ba..a1f12f84c0 100644
--- a/source4/smb_server/smb2/receive.c
+++ b/source4/smb_server/smb2/receive.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "system/time.h"
 #include "libcli/smb2/smb2.h"
+#include "libcli/smb2/smb2_calls.h"
 #include "smb_server/smb_server.h"
 #include "smb_server/smb2/smb2_server.h"
 #include "lib/stream/packet.h"
diff --git a/source4/torture/auth/pac.c b/source4/torture/auth/pac.c
index 0ea31a24d1..2554295af9 100644
--- a/source4/torture/auth/pac.c
+++ b/source4/torture/auth/pac.c
@@ -26,6 +26,7 @@
 #include "auth/auth.h"
 #include "auth/kerberos/kerberos.h"
 #include "librpc/gen_ndr/ndr_krb5pac.h"
+#include "samba3/samba3.h"
 
 static BOOL torture_pac_self_check(void) 
 {
diff --git a/source4/torture/libnet/domain.c b/source4/torture/libnet/domain.c
index 1e2ed956ed..79c3ccd9fd 100644
--- a/source4/torture/libnet/domain.c
+++ b/source4/torture/libnet/domain.c
@@ -21,7 +21,6 @@
 
 #include "includes.h"
 #include "torture/torture.h"
-#include "libnet/composite.h"
 #include "libnet/libnet.h"
 
 static BOOL test_domainopen(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
diff --git a/source4/torture/libnet/userinfo.c b/source4/torture/libnet/userinfo.c
index 91bd5b58c6..744059760e 100644
--- a/source4/torture/libnet/userinfo.c
+++ b/source4/torture/libnet/userinfo.c
@@ -22,7 +22,6 @@
 #include "includes.h"
 #include "torture/torture.h"
 #include "libnet/libnet.h"
-#include "libnet/composite.h"
 #include "libnet/userinfo.h"
 
 #define TEST_USERNAME  "libnetuserinfotest"
diff --git a/source4/torture/libnet/userman.c b/source4/torture/libnet/userman.c
index e942be9341..e9528f4598 100644
--- a/source4/torture/libnet/userman.c
+++ b/source4/torture/libnet/userman.c
@@ -21,7 +21,6 @@
 
 #include "includes.h"
 #include "torture/torture.h"
-#include "libnet/composite.h"
 #include "libnet/userman.h"
 #include "libnet/libnet.h"
 
diff --git a/source4/torture/smb2/setinfo.c b/source4/torture/smb2/setinfo.c
index d659af329d..bf63d26dbb 100644
--- a/source4/torture/smb2/setinfo.c
+++ b/source4/torture/smb2/setinfo.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "system/time.h"
 #include "libcli/smb2/smb2.h"
+#include "libcli/smb2/smb2_calls.h"
 
 #define BASEDIR ""
 
diff --git a/source4/winbind/wb_server.h b/source4/winbind/wb_server.h
index d64ca93a33..8e044a003b 100644
--- a/source4/winbind/wb_server.h
+++ b/source4/winbind/wb_server.h
@@ -158,4 +158,8 @@ struct wbsrv_call {
 	void *private_data;
 };
 
+struct wbsrv_samba3_call;
+struct netr_LMSessionKey;
+struct netr_UserSessionKey;
+
 #include "winbind/wb_proto.h"
diff --git a/source4/wrepl_server/wrepl_apply_records.c b/source4/wrepl_server/wrepl_apply_records.c
index 6035041f11..0ee5857e66 100644
--- a/source4/wrepl_server/wrepl_apply_records.c
+++ b/source4/wrepl_server/wrepl_apply_records.c
@@ -26,7 +26,6 @@
 #include "librpc/gen_ndr/ndr_irpc.h"
 #include "librpc/gen_ndr/ndr_winsrepl.h"
 #include "wrepl_server/wrepl_server.h"
-#include "wrepl_server/wrepl_out_helpers.h"
 #include "nbt_server/wins/winsdb.h"
 #include "libcli/wrepl/winsrepl.h"
 #include "system/time.h"
diff --git a/source4/wrepl_server/wrepl_in_call.c b/source4/wrepl_server/wrepl_in_call.c
index 693c87424a..27428106d4 100644
--- a/source4/wrepl_server/wrepl_in_call.c
+++ b/source4/wrepl_server/wrepl_in_call.c
@@ -26,7 +26,6 @@
 #include "smbd/service_stream.h"
 #include "libcli/wrepl/winsrepl.h"
 #include "wrepl_server/wrepl_server.h"
-#include "wrepl_server/wrepl_out_helpers.h"
 #include "libcli/composite/composite.h"
 #include "nbt_server/wins/winsdb.h"
 #include "lib/ldb/include/ldb.h"
diff --git a/source4/wrepl_server/wrepl_out_helpers.c b/source4/wrepl_server/wrepl_out_helpers.c
index 738d89a55b..b0cf039281 100644
--- a/source4/wrepl_server/wrepl_out_helpers.c
+++ b/source4/wrepl_server/wrepl_out_helpers.c
@@ -27,7 +27,6 @@
 #include "smbd/service_stream.h"
 #include "librpc/gen_ndr/ndr_winsrepl.h"
 #include "wrepl_server/wrepl_server.h"
-#include "wrepl_server/wrepl_out_helpers.h"
 #include "libcli/composite/composite.h"
 #include "libcli/wrepl/winsrepl.h"
 
diff --git a/source4/wrepl_server/wrepl_out_pull.c b/source4/wrepl_server/wrepl_out_pull.c
index 88b251a5a1..ada86cc3d4 100644
--- a/source4/wrepl_server/wrepl_out_pull.c
+++ b/source4/wrepl_server/wrepl_out_pull.c
@@ -24,7 +24,6 @@
 #include "librpc/gen_ndr/ndr_winsrepl.h"
 #include "wrepl_server/wrepl_server.h"
 #include "libcli/composite/composite.h"
-#include "wrepl_server/wrepl_out_helpers.h"
 
 static void wreplsrv_out_pull_reschedule(struct wreplsrv_partner *partner, uint32_t interval)
 {
diff --git a/source4/wrepl_server/wrepl_out_push.c b/source4/wrepl_server/wrepl_out_push.c
index d227a31346..a9a7826f00 100644
--- a/source4/wrepl_server/wrepl_out_push.c
+++ b/source4/wrepl_server/wrepl_out_push.c
@@ -24,7 +24,6 @@
 #include "librpc/gen_ndr/ndr_winsrepl.h"
 #include "wrepl_server/wrepl_server.h"
 #include "libcli/composite/composite.h"
-#include "wrepl_server/wrepl_out_helpers.h"
 #include "nbt_server/wins/winsdb.h"
 
 static void wreplsrv_out_partner_push(struct wreplsrv_partner *partner, BOOL propagate);
diff --git a/source4/wrepl_server/wrepl_server.h b/source4/wrepl_server/wrepl_server.h
index 1480d2799a..8f0b5a0fa1 100644
--- a/source4/wrepl_server/wrepl_server.h
+++ b/source4/wrepl_server/wrepl_server.h
@@ -314,4 +314,5 @@ struct wreplsrv_service {
 	} scavenging;
 };
 
+#include "wrepl_server/wrepl_out_helpers.h"
 #include "wrepl_server/wrepl_server_proto.h"