r14542: Remove librpc, libndr and libnbt from includes.h

diff --git a/source/auth/gensec/gensec.c b/source/auth/gensec/gensec.c
index 3ed5c9907e0bd4f0448278464623d02a5868ad39..0328d0dfea37ca20ae2d503096dbaa276340926f 100644 (file)
--- a/source/auth/gensec/gensec.c
+++ b/source/auth/gensec/gensec.c
@@ -25,6 +25,7 @@
 #include "auth/auth.h"
 #include "lib/events/events.h"
 #include "build.h"
+#include "librpc/rpc/dcerpc.h"
 
 /* the list of currently registered GENSEC backends */
 static struct gensec_security_ops **generic_security_ops;

diff --git a/source/auth/gensec/gensec_gssapi.c b/source/auth/gensec/gensec_gssapi.c
index 8d1cef1cbdfeb0e37abe7c22b99d8aa2db6826aa..c08b96083ce24e313134973d3a875289c96029e3 100644 (file)
--- a/source/auth/gensec/gensec_gssapi.c
+++ b/source/auth/gensec/gensec_gssapi.c
@@ -29,6 +29,7 @@
 #include "auth/auth.h"
 #include "lib/ldb/include/ldb.h"
 #include "auth/auth_sam.h"
+#include "librpc/rpc/dcerpc.h"
 
 enum gensec_gssapi_sasl_state 
 {

diff --git a/source/auth/gensec/gensec_krb5.c b/source/auth/gensec/gensec_krb5.c
index 48f748cb19e466b85d32f296905d5758078ff9ad..9f5d38a01b4a34164c591c985651777533c72518 100644 (file)
--- a/source/auth/gensec/gensec_krb5.c
+++ b/source/auth/gensec/gensec_krb5.c
@@ -33,6 +33,7 @@
 #include "auth/auth_sam.h"
 #include "system/network.h"
 #include "lib/socket/socket.h"
+#include "librpc/rpc/dcerpc.h"
 
 enum GENSEC_KRB5_STATE {
        GENSEC_KRB5_SERVER_START,

diff --git a/source/auth/gensec/schannel.c b/source/auth/gensec/schannel.c
index 8c9b1d8acceeec2a44bf21c5601dfc9a55c1cb04..983b76eafcbcfa86c3b08136ab268dd6f8050643 100644 (file)
--- a/source/auth/gensec/schannel.c
+++ b/source/auth/gensec/schannel.c
@@ -27,6 +27,7 @@
 #include "auth/gensec/schannel.h"
 #include "auth/gensec/schannel_state.h"
 #include "auth/gensec/schannel_proto.h"
+#include "librpc/rpc/dcerpc.h"
 
 static size_t schannel_sig_size(struct gensec_security *gensec_security, size_t data_size)
 {

diff --git a/source/auth/gensec/spnego.c b/source/auth/gensec/spnego.c
index 9d97e3d7091c3c21cacb479301d406bb20c22647..6ede774cc83abaa46cdeb654481fabea6e0c711a 100644 (file)
--- a/source/auth/gensec/spnego.c
+++ b/source/auth/gensec/spnego.c
@@ -25,6 +25,7 @@
 #include "includes.h"
 #include "auth/auth.h"
 #include "auth/gensec/spnego_proto.h"
+#include "librpc/gen_ndr/ndr_dcerpc.h"
 
 enum spnego_state_position {
        SPNEGO_SERVER_START,

diff --git a/source/auth/ntlmssp/ntlmssp.c b/source/auth/ntlmssp/ntlmssp.c
index fbca803d3bb04990c874435fefe47454ec67f825..dfef8929761b88a96ddd0ee826b88b8af6065033 100644 (file)
--- a/source/auth/ntlmssp/ntlmssp.c
+++ b/source/auth/ntlmssp/ntlmssp.c
@@ -26,6 +26,7 @@
 #include "auth/auth.h"
 #include "auth/ntlmssp/ntlmssp.h"
 #include "auth/ntlmssp/msrpc_parse.h"
+#include "librpc/gen_ndr/ndr_dcerpc.h"
 
 /**
  * Callbacks for NTLMSSP - for both client and server operating modes

diff --git a/source/cldap_server/netlogon.c b/source/cldap_server/netlogon.c
index d2a9390a609d5334f91d97c50b22e5d2e4d30c7f..e29cdfe505b818d21576bd361c54b087d6730f3f 100644 (file)
--- a/source/cldap_server/netlogon.c
+++ b/source/cldap_server/netlogon.c
@@ -26,6 +26,7 @@
 #include "lib/socket/socket.h"
 #include "smbd/service_task.h"
 #include "cldap_server/cldap_server.h"
+#include "librpc/gen_ndr/ndr_misc.h"
 #include "dsdb/samdb/samdb.h"
 #include "auth/auth.h"
 #include "db_wrap.h"

diff --git a/source/dsdb/samdb/cracknames.c b/source/dsdb/samdb/cracknames.c
index 8ccab1df3da199311c1383dc67ec05086d1c9335..2f27dc6aeed7b763f0a96fa459da6a269faca7c0 100644 (file)
--- a/source/dsdb/samdb/cracknames.c
+++ b/source/dsdb/samdb/cracknames.c
@@ -33,6 +33,7 @@
 #include "auth/auth.h"
 #include "db_wrap.h"
 #include "dsdb/samdb/samdb.h"
+#include "librpc/gen_ndr/ndr_security.h"
 
 static WERROR DsCrackNameOneFilter(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
                                   struct smb_krb5_context *smb_krb5_context,

diff --git a/source/dsdb/samdb/samdb.h b/source/dsdb/samdb/samdb.h
index ea6c124699d9d2e6f9cb9c904df960d683abf5e9..292307f423a47579fc7239f0a14ab9e7c504b472 100644 (file)
--- a/source/dsdb/samdb/samdb.h
+++ b/source/dsdb/samdb/samdb.h
@@ -26,6 +26,7 @@
 struct auth_session_info;
 struct drsuapi_DsNameInfo1;
 
+#include "librpc/gen_ndr/security.h"
 #include "lib/ldb/include/ldb.h"
 #include "dsdb/samdb/samdb_proto.h"
 

diff --git a/source/gtk/common/gtk-smb.c b/source/gtk/common/gtk-smb.c
index 3f818dae76f8f8133199228ad0b20547b6f65b79..f5830cc8d73e664981527d4f89f631376e644405 100644 (file)
--- a/source/gtk/common/gtk-smb.c
+++ b/source/gtk/common/gtk-smb.c
@@ -23,6 +23,8 @@
 #include "gtk/common/gtk-smb.h"
 #include "gtk/common/select.h"
 #include "version.h"
+#include "librpc/rpc/dcerpc.h"
+#include "auth/credentials/credentials.h"
 
 void gtk_show_werror(GtkWidget *win, const char *message, WERROR err) 
 {

diff --git a/source/gtk/common/gtk-smb.h b/source/gtk/common/gtk-smb.h
index 98916d19ec8bdf5587bb0470b27395798c5db51d..16dbfaf5d679a834f82f46745d9bbbb397cf20aa 100644 (file)
--- a/source/gtk/common/gtk-smb.h
+++ b/source/gtk/common/gtk-smb.h
@@ -71,6 +71,7 @@ int gtk_event_loop(void);
 struct event_context;
 struct event_context *gtk_event_context(void);
 
+struct cli_credentials;
 void cli_credentials_set_gtk_callbacks(struct cli_credentials *creds);
 
 #endif

diff --git a/source/gtk/tools/gregedit.c b/source/gtk/tools/gregedit.c
index 6a05b5ef0c4160c7be9ccfe44119059e60260424..76c7dfa08a9dcd7dd951f0fffcab2ad566e9e64a 100644 (file)
--- a/source/gtk/tools/gregedit.c
+++ b/source/gtk/tools/gregedit.c
@@ -21,8 +21,9 @@
 
 #include "includes.h"
 #include "lib/registry/registry.h"
-#include "lib/registry/reg_backend_rpc.h"
 #include "gtk/common/gtk-smb.h"
+#include "lib/events/events.h"
+#include "lib/registry/reg_backend_rpc.h"
 #include "auth/credentials/credentials.h"
 
 static GtkTreeStore *store_keys;

diff --git a/source/include/includes.h b/source/include/includes.h
index 22dc922d1bfe17d6a7cb88e258ed7a1f86bc2649..b87e6acff7b5f5b0b1e3dd2206aed02437604cb7 100644 (file)
--- a/source/include/includes.h
+++ b/source/include/includes.h
@@ -106,9 +106,9 @@ _PUBLIC_ void smb_panic(const char *why) NORETURN_ATTRIBUTE;
 #include "param/param.h"
 #include "libcli/util/nterr.h"
 #include "libcli/util/doserr.h"
-#include "librpc/ndr/libndr.h"
-#include "librpc/rpc/dcerpc.h"
-#include "libcli/nbt/libnbt.h"
+#include "librpc/gen_ndr/misc.h"
+
+struct smbcli_tree;
 #include "libcli/util/proto.h"
 
 /* String routines */

diff --git a/source/kdc/kdc.h b/source/kdc/kdc.h
index df6c5889e69c25db43e9facd0aeb57a23168a86e..f0d2479a251ebbfa28c9a08e03d058d462593b06 100644 (file)
--- a/source/kdc/kdc.h
+++ b/source/kdc/kdc.h
@@ -28,6 +28,7 @@
 #include "kdc/pac-glue.h"
 
 struct kdc_server;
+struct socket_address;
 
 NTSTATUS kdc_hdb_ldb_create(TALLOC_CTX *mem_ctx, 
                            krb5_context context, struct HDB **db, const char *arg);

diff --git a/source/lib/com/dcom/dcom.h b/source/lib/com/dcom/dcom.h
index 438bf8b9f7372bbb96ed9853e9b227f151f89b38..65a4d0f6e944a825d60231a04b4113bd21df2a96 100644 (file)
--- a/source/lib/com/dcom/dcom.h
+++ b/source/lib/com/dcom/dcom.h
@@ -21,6 +21,9 @@
 #ifndef _DCOM_H /* _DCOM_H */
 #define _DCOM_H 
 
+struct cli_credentials;
+struct dcerpc_pipe;
+
 #include "lib/com/com.h"
 #include "librpc/gen_ndr/orpc.h"
 #include "lib/com/dcom/proto.h"

diff --git a/source/lib/com/tables.c b/source/lib/com/tables.c
index 661f5d0b377480249741fbf4206173a161737778..d9989ecdbe677f4617d6a3d313273aa752b10278 100644 (file)
--- a/source/lib/com/tables.c
+++ b/source/lib/com/tables.c
@@ -21,6 +21,7 @@
 #include "includes.h"
 #include "dlinklist.h"
 #include "lib/com/com.h"
+#include "librpc/gen_ndr/ndr_misc.h"
 
 /* Specific implementation of one or more interfaces */
 struct com_class

diff --git a/source/lib/db_wrap.h b/source/lib/db_wrap.h
index 2d7a7b72443ff009bd13c922207bc6373bd8fee6..cf60494b927fe82ba2a8fe19ea7b976f5cebb537 100644 (file)
--- a/source/lib/db_wrap.h
+++ b/source/lib/db_wrap.h
@@ -31,5 +31,6 @@ struct tdb_wrap {
 struct auth_session_info;
 struct ldb_message;
 struct ldb_dn;
+struct cli_credentials;
 
 #include "db_wrap_proto.h"

diff --git a/source/lib/events/events.h b/source/lib/events/events.h
index 3570229715e856bfab79b8446ee544eef660a417..8c1b7cda2149ff0bf5ac35d55d0bbaba9801ec7e 100644 (file)
--- a/source/lib/events/events.h
+++ b/source/lib/events/events.h
@@ -20,6 +20,9 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#ifndef __EVENTS_H__
+#define __EVENTS_H__
+
 struct event_context;
 struct event_ops;
 struct fd_event;
@@ -64,3 +67,5 @@ struct event_context *event_context_find(TALLOC_CTX *mem_ctx);
        event_set_fd_flags(fde, event_get_fd_flags(fde) & ~EVENT_FD_WRITE)
 #define EVENT_FD_NOT_READABLE(fde) \
        event_set_fd_flags(fde, event_get_fd_flags(fde) & ~EVENT_FD_READ)
+
+#endif /* __EVENTS_H__ */

diff --git a/source/lib/messaging/messaging.c b/source/lib/messaging/messaging.c
index 8432eadf5eb0bb065cdf997b463e8cd4e7b9da95..5680060ee48d188ab9c1a7b15e9fce2fd286b27d 100644 (file)
--- a/source/lib/messaging/messaging.c
+++ b/source/lib/messaging/messaging.c
@@ -31,6 +31,7 @@
 #include "db_wrap.h"
 #include "lib/tdb/include/tdbutil.h"
 #include "util/unix_privs.h"
+#include "librpc/rpc/dcerpc.h"
 
 /* change the message version with any incompatible changes in the protocol */
 #define MESSAGING_VERSION 1

diff --git a/source/lib/registry/registry.h b/source/lib/registry/registry.h
index 7f57a9244d22822ead891be8e87e14c7eae53b23..efe22573c27cc7415983215cbafc62e1fad86fc7 100644 (file)
--- a/source/lib/registry/registry.h
+++ b/source/lib/registry/registry.h
@@ -22,6 +22,9 @@
 #ifndef _REGISTRY_H /* _REGISTRY_H */
 #define _REGISTRY_H 
 
+#include "librpc/gen_ndr/security.h"
+#include "auth/credentials/credentials.h"
+
 /* Handles for the predefined keys */
 #define HKEY_CLASSES_ROOT               0x80000000
 #define HKEY_CURRENT_USER               0x80000001

diff --git a/source/lib/registry/tools/regdiff.c b/source/lib/registry/tools/regdiff.c
index f1c5db1598d650bf25fffe28d097f5d582ff1662..ae617bbe846d991b73cc556c7d764cbcc15bf289 100644 (file)
--- 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/events/events.h"
 #include "lib/registry/reg_backend_rpc.h"
 #include "lib/cmdline/popt_common.h"
 

diff --git a/source/lib/registry/tools/regpatch.c b/source/lib/registry/tools/regpatch.c
index 713d4b32cc9df0ca83c27a743d152e958ec38391..9392e66192d11536127832cfb1ba7abea6b0517e 100644 (file)
--- a/source/lib/registry/tools/regpatch.c
+++ b/source/lib/registry/tools/regpatch.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "lib/events/events.h"
 #include "lib/registry/registry.h"
 #include "lib/cmdline/popt_common.h"
 #include "lib/registry/reg_backend_rpc.h"

diff --git a/source/lib/registry/tools/regshell.c b/source/lib/registry/tools/regshell.c
index c0bffa78e56243de8420d74f52de019c5aeb493c..0812cad73f0597100b622607d60c918d52b94f1c 100644 (file)
--- 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/events/events.h"
 #include "lib/registry/reg_backend_rpc.h"
 #include "system/time.h"
 #include "lib/replace/readline.h"

diff --git a/source/lib/registry/tools/regtree.c b/source/lib/registry/tools/regtree.c
index ccdb24a4cc26b68aeacda24868709417c4f6e264..a4fb69f0735cb90b64ab1b01075f801b4775e6b9 100644 (file)
--- 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/events/events.h"
 #include "lib/registry/reg_backend_rpc.h"
 #include "lib/cmdline/popt_common.h"
 

diff --git a/source/lib/socket/socket.h b/source/lib/socket/socket.h
index f3e3ba83418f0814865e5a86bb06746e755330e8..a50fb876193182aa9f46528f267b3c63b846e78a 100644 (file)
--- a/source/lib/socket/socket.h
+++ b/source/lib/socket/socket.h
@@ -21,6 +21,8 @@
 #ifndef _SAMBA_SOCKET_H
 #define _SAMBA_SOCKET_H
 
+#include "lib/events/events.h"
+
 struct socket_context;
 
 enum socket_type {

diff --git a/source/libcli/composite/composite.c b/source/libcli/composite/composite.c
index c8d6cd136a3f385cb49e9db0d9b2dc5affac3845..9a745e3013e2579f0f69a0d46fd749819610c747 100644 (file)
--- a/source/libcli/composite/composite.c
+++ b/source/libcli/composite/composite.c
@@ -26,6 +26,8 @@
 #include "libcli/raw/libcliraw.h"
 #include "libcli/composite/composite.h"
 #include "lib/messaging/irpc.h"
+#include "librpc/rpc/dcerpc.h"
+#include "libcli/nbt/libnbt.h"
 
 /*
   block until a composite function has completed, then return the status

diff --git a/source/libcli/composite/composite.h b/source/libcli/composite/composite.h
index 6210b2b2271786b2e94aac9f2a793ec10eb591d9..dc04f5a8833b47544331816cad6daf9dbd699a7f 100644 (file)
--- a/source/libcli/composite/composite.h
+++ b/source/libcli/composite/composite.h
@@ -63,5 +63,7 @@ struct composite_context {
 
 struct irpc_request;
 struct smbcli_request;
+struct rpc_request;
+struct nbt_name_request;
 
 #include "libcli/composite/proto.h"

diff --git a/source/libcli/config.mk b/source/libcli/config.mk
index 465146ec17f728ce82309db517be3eff89afda25..dbeae51807a860c3aa36800a4de1b3a0d207e82d 100644 (file)
--- a/source/libcli/config.mk
+++ b/source/libcli/config.mk
@@ -80,7 +80,7 @@ OBJ_FILES = \
 REQUIRED_SUBSYSTEMS = NDR_WINSREPL SOCKET LIBEVENTS
 
 [SUBSYSTEM::LIBCLI_RESOLVE]
-PRIVATE_PROTO_HEADER = resolve/resolve.h
+PRIVATE_PROTO_HEADER = resolve/proto.h
 OBJ_FILES = \
        resolve/resolve.o \
        resolve/nbtlist.o \

diff --git a/source/libcli/ldap/ldap.h b/source/libcli/ldap/ldap.h
index 1deabf0b10221b97a2cb3463ff90abfd2a6a873a..ba0f8018326bd8f98a04ecc7f8559e343f6e406c 100644 (file)
--- a/source/libcli/ldap/ldap.h
+++ b/source/libcli/ldap/ldap.h
@@ -247,6 +247,10 @@ struct ldap_message {
        struct ldb_control    **controls;
 };
 
+struct event_context;
+struct cli_credentials;
+struct dom_sid;
+
 #include "libcli/ldap/ldap_proto.h"
 
 #endif

diff --git a/source/libcli/raw/libcliraw.h b/source/libcli/raw/libcliraw.h
index 21d0b0dcdb4077ccc878b5047f8300f1843d63b7..2b856aa52b21cf6a6cb78cf26eedcad8b9cfafcf 100644 (file)
--- a/source/libcli/raw/libcliraw.h
+++ b/source/libcli/raw/libcliraw.h
@@ -31,6 +31,8 @@ struct smbcli_request;  /* forward declare */
 struct smbcli_session;  /* forward declare */
 struct smbcli_transport;  /* forward declare */
 
+struct cli_credentials;
+
 /* default timeout for all smb requests */
 #define SMB_REQUEST_TIMEOUT 60
 

diff --git a/source/libcli/resolve/nbtlist.c b/source/libcli/resolve/nbtlist.c
index 7188faba7b07620e648f2296a78d1c819857bdae..a8ca2ced8b81d3aceab7da05a7ea4d9b7e9b2671 100644 (file)
--- a/source/libcli/resolve/nbtlist.c
+++ b/source/libcli/resolve/nbtlist.c
@@ -29,6 +29,7 @@
 #include "system/network.h"
 #include "netif/netif.h"
 #include "librpc/gen_ndr/ndr_nbt.h"
+#include "libcli/nbt/libnbt.h"
 
 struct nbtlist_state {
        struct nbt_name name;

diff --git a/source/libcli/resolve/resolve.h b/source/libcli/resolve/resolve.h
new file mode 100644 (file)
index 0000000..ad479ba
--- /dev/null
+++ b/source/libcli/resolve/resolve.h
@@ -0,0 +1,29 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   general name resolution interface
+
+   Copyright (C) Andrew Tridgell 2005
+   
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef __RESOLVE_H__
+#define __RESOLVE_H__
+
+#include "libcli/nbt/libnbt.h"
+#include "libcli/resolve/proto.h"
+
+#endif /* __RESOLVE_H__ */

diff --git a/source/libcli/resolve/wins.c b/source/libcli/resolve/wins.c
index f11033ae4f53ccef6318e6b339c460e24465b052..647871068244b67366b31562e938e7648a92d19f 100644 (file)
--- a/source/libcli/resolve/wins.c
+++ b/source/libcli/resolve/wins.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "libcli/nbt/libnbt.h"
 #include "libcli/resolve/resolve.h"
 
 /*

diff --git a/source/libcli/security/access_check.c b/source/libcli/security/access_check.c
index 9d565363e6c857749862cd66623bcf54d9ed004e..1617963998c2b512c6c8d2642a52aa2591668460 100644 (file)
--- a/source/libcli/security/access_check.c
+++ b/source/libcli/security/access_check.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/security.h"
 #include "libcli/security/proto.h"
 
 

diff --git a/source/libcli/security/dom_sid.c b/source/libcli/security/dom_sid.c
index b5ced9fcc26096b47db47a21779c176774aaf59a..131d1afa9c55ec27cc9a96dd6be644158c2bb247 100644 (file)
--- a/source/libcli/security/dom_sid.c
+++ b/source/libcli/security/dom_sid.c
@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/security.h"
 
 /*****************************************************************
  Compare the auth portion of two sids.

diff --git a/source/libcli/security/privilege.c b/source/libcli/security/privilege.c
index fec8c1278c01ad8ef58d918dd560a9cf77d16401..202a418f6ba6283c86a6a9f4556528d29378e24b 100644 (file)
--- a/source/libcli/security/privilege.c
+++ b/source/libcli/security/privilege.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/security.h" 
 
 
 static const struct {

diff --git a/source/libcli/security/sddl.c b/source/libcli/security/sddl.c
index 862a25e20d1f2db33c1f4716f26ce029718c181a..38192fc60cee93e5f6de10cb76c2a5ff80935519 100644 (file)
--- a/source/libcli/security/sddl.c
+++ b/source/libcli/security/sddl.c
@@ -22,8 +22,8 @@
 
 #include "includes.h"
 #include "system/iconv.h"
-#include "libcli/security/proto.h"
 #include "librpc/gen_ndr/ndr_security.h"
+#include "libcli/security/proto.h"
 
 struct flag_map {
        const char *name;

diff --git a/source/libcli/security/security_descriptor.c b/source/libcli/security/security_descriptor.c
index 20cdeb0ba7cfde0e86b3aef97d4e66332e2d1c92..1da3e2e7508e5187cc00b537c4b7ff1c2058e0c7 100644 (file)
--- a/source/libcli/security/security_descriptor.c
+++ b/source/libcli/security/security_descriptor.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/security.h"
 #include "libcli/security/proto.h"
 
 /*

diff --git a/source/libcli/smb2/smb2_calls.h b/source/libcli/smb2/smb2_calls.h
index af1730aeeeb7bb8738c26ccd68c4ac3ba9fcc611..b6f8fdef71e7450adc198f084217b40e7238632f 100644 (file)
--- a/source/libcli/smb2/smb2_calls.h
+++ b/source/libcli/smb2/smb2_calls.h
@@ -363,4 +363,6 @@ struct smb2_flush {
        } in;
 };
 
+struct cli_credentials;
+struct event_context;
 #include "libcli/smb2/smb2_proto.h"

diff --git a/source/libnet/libnet_samsync_ldb.c b/source/libnet/libnet_samsync_ldb.c
index 4f75d784f69ac2a57842899b67f42fda7ced1d21..5985a4864f982b831f172d4ad3590ec78f42c5c9 100644 (file)
--- a/source/libnet/libnet_samsync_ldb.c
+++ b/source/libnet/libnet_samsync_ldb.c
@@ -32,6 +32,7 @@
 #include "db_wrap.h"
 #include "libcli/security/proto.h"
 #include "librpc/gen_ndr/ndr_security.h"
+#include "librpc/rpc/dcerpc.h"
 
 struct samsync_ldb_secret {
        struct samsync_ldb_secret *prev, *next;

diff --git a/source/libnet/libnet_site.c b/source/libnet/libnet_site.c
index 75efc0562dbc228ca341d5657acbf46ae179ca74..444a9ba485851354ad53d545a268b48fd03f3e3d 100644 (file)
--- a/source/libnet/libnet_site.c
+++ b/source/libnet/libnet_site.c
@@ -23,6 +23,7 @@
 #include "libcli/cldap/cldap.h"
 #include "lib/ldb/include/ldb.h"
 #include "lib/ldb/include/ldb_errors.h"
+#include "librpc/rpc/dcerpc.h"
 
 /*
  * 1. Setup a CLDAP socket.

diff --git a/source/libnet/libnet_vampire.c b/source/libnet/libnet_vampire.c
index 8f229c04e10dd9ad8b74b01c40e5f045df61a491..5c5407df3e915028d122396f034c44a7b3cae082 100644 (file)
--- a/source/libnet/libnet_vampire.c
+++ b/source/libnet/libnet_vampire.c
@@ -24,6 +24,7 @@
 #include "includes.h"
 #include "libnet/libnet.h"
 #include "libcli/auth/libcli_auth.h"
+#include "auth/gensec/gensec.h"
 #include "auth/gensec/schannel_proto.h"
 #include "librpc/gen_ndr/ndr_netlogon.h"
 #include "librpc/gen_ndr/ndr_netlogon_c.h"

diff --git a/source/libnet/userinfo.c b/source/libnet/userinfo.c
index 5fcdd614e2e66c39c78e991c67cca00c9e54707a..444a18845705d9a0620b27fae33ef387f3e01b07 100644 (file)
--- a/source/libnet/userinfo.c
+++ b/source/libnet/userinfo.c
@@ -24,6 +24,7 @@
 
 #include "includes.h"
 #include "libcli/composite/composite.h"
+#include "librpc/gen_ndr/security.h"
 #include "libcli/security/proto.h"
 #include "libnet/composite.h"
 #include "libnet/userinfo.h"

diff --git a/source/librpc/ndr/ndr.c b/source/librpc/ndr/ndr.c
index 1f626df13b3e10329e0071ddd74bb319c97b7c9d..68252fbc72f2cb2ac8aa15d0d85c26d21f853900 100644 (file)
--- a/source/librpc/ndr/ndr.c
+++ b/source/librpc/ndr/ndr.c
@@ -28,7 +28,9 @@
 */
 
 #include "includes.h"
+#include "librpc/ndr/libndr.h"
 #include "dlinklist.h"
+#include "librpc/gen_ndr/dcerpc.h"
 
 #define NDR_BASE_MARSHALL_SIZE 1024
 

diff --git a/source/librpc/ndr/ndr_basic.c b/source/librpc/ndr/ndr_basic.c
index 780931efb137f2759e967712c00d4cce859f09ce..4b0444f00b56c11149d7423f332cd9d2246790f9 100644 (file)
--- a/source/librpc/ndr/ndr_basic.c
+++ b/source/librpc/ndr/ndr_basic.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "system/network.h"
+#include "librpc/ndr/libndr.h"
 
 #define NDR_SVAL(ndr, ofs) (NDR_BE(ndr)?RSVAL(ndr->data,ofs):SVAL(ndr->data,ofs))
 #define NDR_IVAL(ndr, ofs) (NDR_BE(ndr)?RIVAL(ndr->data,ofs):IVAL(ndr->data,ofs))

diff --git a/source/librpc/ndr/ndr_compression.c b/source/librpc/ndr/ndr_compression.c
index fb04a1799a4fa424ae28f3d12a719d75be450cc7..fabfd73704a93d5398461dd1d73edef742980e8d 100644 (file)
--- a/source/librpc/ndr/ndr_compression.c
+++ b/source/librpc/ndr/ndr_compression.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "lib/compression/mszip.h"
+#include "librpc/ndr/libndr.h"
 
 static NTSTATUS ndr_pull_compression_mszip_chunk(struct ndr_pull *ndrpull,
                                                 struct ndr_push *ndrpush,

diff --git a/source/librpc/ndr/ndr_misc.c b/source/librpc/ndr/ndr_misc.c
index 5cffd33b46ef5c23ad9d84786ed2ab9c452f0208..8f131c471e458b00cc3f5a56822577193d612e17 100644 (file)
--- a/source/librpc/ndr/ndr_misc.c
+++ b/source/librpc/ndr/ndr_misc.c
@@ -25,6 +25,7 @@
 
 #include "includes.h"
 #include "system/network.h"
+#include "librpc/ndr/libndr.h"
 
 _PUBLIC_ void ndr_print_ipv4_addr(struct ndr_print *ndr, const char *name, const struct ipv4_addr *_ip)
 {

diff --git a/source/librpc/ndr/ndr_obfuscate.c b/source/librpc/ndr/ndr_obfuscate.c
index 3b10e172b77eb9ca8ddddcb2c6d28c23a2695561..242b6dc074e1260e2fed8082b574ba1e755a8767 100644 (file)
--- a/source/librpc/ndr/ndr_obfuscate.c
+++ b/source/librpc/ndr/ndr_obfuscate.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "librpc/ndr/libndr.h"
 
 /*
   handle obfuscated subcontext buffers, which in midl land are user-marshalled, but

diff --git a/source/librpc/ndr/ndr_string.c b/source/librpc/ndr/ndr_string.c
index 164c6d4a03dbeeafdee5c121d9130e3d43bae8bd..84c08b9656ce6e5d4667d2bdd98c0608c0080824 100644 (file)
--- a/source/librpc/ndr/ndr_string.c
+++ b/source/librpc/ndr/ndr_string.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "librpc/ndr/libndr.h"
 
 /**
   pull a general string from the wire

diff --git a/source/librpc/rpc/dcerpc.c b/source/librpc/rpc/dcerpc.c
index 796511ef002cae9293b91c059273e19b2df08e19..16721b4b03a292a4f97098f60a4f32d12f46a53b 100644 (file)
--- a/source/librpc/rpc/dcerpc.c
+++ b/source/librpc/rpc/dcerpc.c
@@ -24,8 +24,9 @@
 #include "includes.h"
 #include "dlinklist.h"
 #include "lib/events/events.h"
-#include "librpc/gen_ndr/ndr_dcerpc.h"
+#include "librpc/rpc/dcerpc.h"
 #include "librpc/gen_ndr/ndr_misc.h"
+#include "librpc/gen_ndr/ndr_dcerpc.h"
 #include "libcli/composite/composite.h"
 #include "auth/gensec/gensec.h"
 

diff --git a/source/librpc/rpc/dcerpc.h b/source/librpc/rpc/dcerpc.h
index 24f8df7d8bf262fda6dcc75175a362c1d21cd3fa..7fcaa9d92269f1f930f50f73b9900a9d389f8819 100644 (file)
--- a/source/librpc/rpc/dcerpc.h
+++ b/source/librpc/rpc/dcerpc.h
@@ -26,6 +26,7 @@
 
 #include "core.h"
 #include "librpc/gen_ndr/dcerpc.h"
+#include "librpc/ndr/libndr.h"
 
 enum dcerpc_transport_t {
        NCACN_NP, NCACN_IP_TCP, NCACN_IP_UDP, NCACN_VNS_IPC, NCACN_VNS_SPP, 

diff --git a/source/librpc/rpc/dcerpc_auth.c b/source/librpc/rpc/dcerpc_auth.c
index 4f11667365d09372a33c6b93e57d2a464fd95551..88132b15fecc121362c8314e4ab34b2a949b79cd 100644 (file)
--- a/source/librpc/rpc/dcerpc_auth.c
+++ b/source/librpc/rpc/dcerpc_auth.c
@@ -25,6 +25,7 @@
 #include "includes.h"
 #include "libcli/composite/composite.h"
 #include "auth/gensec/gensec.h"
+#include "librpc/rpc/dcerpc.h"
 
 /*
   do a non-athenticated dcerpc bind

diff --git a/source/librpc/rpc/dcerpc_connect.c b/source/librpc/rpc/dcerpc_connect.c
index 6e0fc0c743db5e8de4df34c06fdb493a7eae7d88..2b40935be6cdd96bf19e46b491f4239d689f2277 100644 (file)
--- a/source/librpc/rpc/dcerpc_connect.c
+++ b/source/librpc/rpc/dcerpc_connect.c
@@ -31,6 +31,7 @@
 #include "libcli/smb2/smb2.h"
 #include "libcli/smb2/smb2_calls.h"
 #include "auth/credentials/credentials.h"
+#include "librpc/rpc/dcerpc.h"
 
 
 struct dcerpc_pipe_connect;

diff --git a/source/librpc/rpc/dcerpc_error.c b/source/librpc/rpc/dcerpc_error.c
index d5a456c22183acd76b208db9ceb3e245f7102b58..1b77c2d9d3fa172c014e647e37d297482bfd6342 100644 (file)
--- a/source/librpc/rpc/dcerpc_error.c
+++ b/source/librpc/rpc/dcerpc_error.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "librpc/rpc/dcerpc.h"
 
 struct dcerpc_fault_table {
        const char *errstr;

diff --git a/source/librpc/rpc/dcerpc_smb.c b/source/librpc/rpc/dcerpc_smb.c
index 6700e2f2432b0e43b49c93e751042f1add9e6987..e16142d5c230fef53f621de137e57864875b8e80 100644 (file)
--- a/source/librpc/rpc/dcerpc_smb.c
+++ b/source/librpc/rpc/dcerpc_smb.c
@@ -24,6 +24,7 @@
 #include "includes.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/composite/composite.h"
+#include "librpc/rpc/dcerpc.h"
 
 /* transport private information used by SMB pipe transport */
 struct smb_private {

diff --git a/source/librpc/rpc/dcerpc_smb2.c b/source/librpc/rpc/dcerpc_smb2.c
index d22ef6a9f24ef45621228df64a23208ceb4f6f5c..01fd783e6f9443f1af4157d9199d97d7e7f24c0c 100644 (file)
--- a/source/librpc/rpc/dcerpc_smb2.c
+++ b/source/librpc/rpc/dcerpc_smb2.c
@@ -26,6 +26,7 @@
 #include "libcli/smb2/smb2.h"
 #include "libcli/smb2/smb2_calls.h"
 #include "libcli/raw/ioctl.h"
+#include "librpc/rpc/dcerpc.h"
 
 /* transport private information used by SMB2 pipe transport */
 struct smb2_private {

diff --git a/source/librpc/rpc/dcerpc_sock.c b/source/librpc/rpc/dcerpc_sock.c
index 7b6b45d2dd00b6ea10c6002cf75e080a19cc104a..0385a70d3cfa65431f31551365d3c6ed37b082b2 100644 (file)
--- a/source/librpc/rpc/dcerpc_sock.c
+++ b/source/librpc/rpc/dcerpc_sock.c
@@ -27,6 +27,7 @@
 #include "lib/socket/socket.h"
 #include "lib/stream/packet.h"
 #include "libcli/composite/composite.h"
+#include "librpc/rpc/dcerpc.h"
 
 /* transport private information used by general socket pipe transports */
 struct sock_private {

diff --git a/source/librpc/rpc/table.c b/source/librpc/rpc/table.c
index 21809ccc1ce75b77999589827e36bbe985dd6015..9492b2b925ed133ccfd728c9d5c0e961e1f4d293 100644 (file)
--- a/source/librpc/rpc/table.c
+++ b/source/librpc/rpc/table.c
@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "dlinklist.h"
+#include "librpc/rpc/dcerpc.h"
 #include "librpc/rpc/dcerpc_table.h"
 
 struct dcerpc_interface_list *dcerpc_pipes = NULL;

diff --git a/source/librpc/tables.pl b/source/librpc/tables.pl
index 9f30674de8b0b5a2602f4117c1d8632ed4e328d2..3dbb58853de1327c27c78f1ad4b87c29905a3831 100644 (file)
--- a/source/librpc/tables.pl
+++ b/source/librpc/tables.pl
@@ -75,6 +75,7 @@ print TABLEC <<EOF;
 /* Automatically generated by tables.pl. DO NOT EDIT */
 
 #include "includes.h"
+#include "librpc/rpc/dcerpc.h"
 #include "librpc/rpc/dcerpc_table.h"
 EOF
 

diff --git a/source/main.mk b/source/main.mk
index f3c79277ea08b4382408bd5a26075b1efc8d3b10..26bcab103931f2854efcc6b73dd23586df0862ca 100644 (file)
--- a/source/main.mk
+++ b/source/main.mk
@@ -234,14 +234,11 @@ lib/charset/charset.h: lib/charset/charset_proto.h
 
 include/includes.h: \
                include/config.h \
-               librpc/ndr/libndr.h \
-               librpc/rpc/dcerpc.h \
-               auth/credentials/credentials_proto.h \
-               libcli/nbt/libnbt.h \
                lib/util/util_proto.h \
                lib/charset/charset.h \
                param/proto.h \
-               libcli/util/proto.h
+               libcli/util/proto.h \
+               librpc/gen_ndr/misc.h
 
 clean_pch: 
        -rm -f include/includes.h.gch

diff --git a/source/ntvfs/ipc/ipc_rap.c b/source/ntvfs/ipc/ipc_rap.c
index f683082d589d9df83ab33cf3949b4c4779f5836d..3f415c92937f5daff8e51a233af91d580f9e5016 100644 (file)
--- a/source/ntvfs/ipc/ipc_rap.c
+++ b/source/ntvfs/ipc/ipc_rap.c
@@ -23,6 +23,7 @@
 #include "smb.h"
 #include "libcli/rap/rap.h"
 #include "ntvfs/ipc/proto.h"
+#include "librpc/ndr/libndr.h"
 
 #define NERR_Success 0
 #define NERR_badpass 86

diff --git a/source/ntvfs/ntvfs.h b/source/ntvfs/ntvfs.h
index 13147d5c19ded4fb06381657a54f9a19f0f46892..cfb5515203dc17d5343d60ad954874e027c7221a 100644 (file)
--- a/source/ntvfs/ntvfs.h
+++ b/source/ntvfs/ntvfs.h
@@ -265,5 +265,5 @@ struct ntvfs_critical_sizes {
 };
 
 struct messaging_context;
-
+#include "librpc/gen_ndr/security.h"
 #include "ntvfs/ntvfs_proto.h"

diff --git a/source/pidl/lib/Parse/Pidl/Samba4/EJS.pm b/source/pidl/lib/Parse/Pidl/Samba4/EJS.pm
index d5e1405c3004bb68daf59545c5f3d78576363555..e24fb54b96c8cea3ccd50a135165064aa5a76186 100644 (file)
--- a/source/pidl/lib/Parse/Pidl/Samba4/EJS.pm
+++ b/source/pidl/lib/Parse/Pidl/Samba4/EJS.pm
@@ -797,6 +797,7 @@ sub Parse($$)
     pidl "
 /* EJS wrapper functions auto-generated by pidl */
 #include \"includes.h\"
+#include \"librpc/rpc/dcerpc.h\"
 #include \"lib/appweb/ejs/ejs.h\"
 #include \"scripting/ejs/ejsrpc.h\"
 #include \"scripting/ejs/smbcalls.h\"

diff --git a/source/rpc_server/dcerpc_server.h b/source/rpc_server/dcerpc_server.h
index 9ee553b92862e818eb288c3ff3773d858b4cc64a..f2b92c346a52a371e82405a298b9e1d246716c0b 100644 (file)
--- a/source/rpc_server/dcerpc_server.h
+++ b/source/rpc_server/dcerpc_server.h
@@ -26,7 +26,7 @@
 
 #include "core.h"
 #include "librpc/gen_ndr/misc.h"
-#include "librpc/gen_ndr/dcerpc.h"
+#include "librpc/rpc/dcerpc.h"
 #include "librpc/ndr/libndr.h"
 
 /* modules can use the following to determine if the interface has changed

diff --git a/source/scripting/ejs/ejsrpc.h b/source/scripting/ejs/ejsrpc.h
index 80674fc43bdc6e8d09a9b2adfe328bff29213524..a320392201f5a535dc83a42f9d1a4785abf6cce7 100644 (file)
--- a/source/scripting/ejs/ejsrpc.h
+++ b/source/scripting/ejs/ejsrpc.h
@@ -20,6 +20,9 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#include "librpc/gen_ndr/security.h"
+#include "librpc/rpc/dcerpc.h"
+
 struct ejs_rpc {
        int eid;
        const char *callname;

diff --git a/source/scripting/ejs/smbcalls.h b/source/scripting/ejs/smbcalls.h
index 5954d2385e18f09bbdf19739890358c501084f1c..5d5f6841d96e77208e6ae238ea436b9b10bbf88b 100644 (file)
--- a/source/scripting/ejs/smbcalls.h
+++ b/source/scripting/ejs/smbcalls.h
@@ -31,5 +31,6 @@ void mprSetStringCFunction(struct MprVar *obj, const char *name, MprStringCFunct
 
 struct ldb_context;
 struct ldb_message;
+struct cli_credentials;
 
 #include "scripting/ejs/proto.h"

diff --git a/source/scripting/ejs/smbcalls_rand.c b/source/scripting/ejs/smbcalls_rand.c
index 043b9cca09a33b4a03e4d076373c1cc5fac0514a..9920c06958cba7f2cec99ab0492d7ad37fbf8a7d 100644 (file)
--- a/source/scripting/ejs/smbcalls_rand.c
+++ b/source/scripting/ejs/smbcalls_rand.c
@@ -24,6 +24,7 @@
 #include "scripting/ejs/smbcalls.h"
 #include "lib/appweb/ejs/ejs.h"
 #include "system/passwd.h"
+#include "librpc/gen_ndr/ndr_misc.h"
 
 /*
   usage:

diff --git a/source/scripting/ejs/smbcalls_rpc.c b/source/scripting/ejs/smbcalls_rpc.c
index 0d2d34a478d6819fe4f46afce77aebb598144ab5..29346f2586ec20ce87b6d87f089a002bb7bf6257 100644 (file)
--- a/source/scripting/ejs/smbcalls_rpc.c
+++ b/source/scripting/ejs/smbcalls_rpc.c
@@ -31,6 +31,7 @@
 #include "lib/events/events.h"
 #include "librpc/rpc/dcerpc_table.h"
 #include "auth/credentials/credentials.h"
+#include "librpc/rpc/dcerpc.h"
 
 /*
   state of a irpc 'connection'

diff --git a/source/smb_server/smb/sesssetup.c b/source/smb_server/smb/sesssetup.c
index 29589ce07414ac9f917b64df304ecacc83edde71..0edee86a60ae17b7bf12774fe8902383285a5b5b 100644 (file)
--- a/source/smb_server/smb/sesssetup.c
+++ b/source/smb_server/smb/sesssetup.c
@@ -28,6 +28,7 @@
 #include "auth/auth.h"
 #include "smb_server/smb_server.h"
 #include "smbd/service_stream.h"
+#include "librpc/gen_ndr/nbt.h"
 
 /*
   setup the OS, Lanman and domain portions of a session setup reply

diff --git a/source/torture/com/simple.c b/source/torture/com/simple.c
index d2bb4ad4e3f278feafea0be022dea5ea17b0bafa..e4a18d7cbda231ce05277e71144809b7f8a77acc 100644 (file)
--- a/source/torture/com/simple.c
+++ b/source/torture/com/simple.c
@@ -24,6 +24,7 @@
 #include "lib/com/dcom/dcom.h"
 #include "librpc/gen_ndr/com_dcom.h"
 #include "lib/cmdline/popt_common.h"
+#include "librpc/rpc/dcerpc.h"
 #include "torture/torture.h"
 
 #define DEFAULT_TRANS 4096

diff --git a/source/torture/libnet/libnet_lookup.c b/source/torture/libnet/libnet_lookup.c
index 6011d5492c8e42184b05bdb149f692b719364b70..eed8541f9a69ee1da0ee74af4da6b6d72600a73d 100644 (file)
--- a/source/torture/libnet/libnet_lookup.c
+++ b/source/torture/libnet/libnet_lookup.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "lib/cmdline/popt_common.h"
 #include "libnet/libnet.h"
+#include "librpc/gen_ndr/nbt.h"
 
 
 BOOL torture_lookup(void)

diff --git a/source/torture/libnet/libnet_rpc.c b/source/torture/libnet/libnet_rpc.c
index 4f9348ee4b5ead6f8ba2010b933f71059ca815ec..b3efa35b463ffb865947b4cffc97c49b8e1576ba 100644 (file)
--- a/source/torture/libnet/libnet_rpc.c
+++ b/source/torture/libnet/libnet_rpc.c
@@ -24,6 +24,7 @@
 #include "libnet/libnet.h"
 #include "librpc/gen_ndr/ndr_lsa.h"
 #include "librpc/gen_ndr/ndr_samr.h"
+#include "librpc/rpc/dcerpc.h"
 
 
 static BOOL test_lsa_connect(struct libnet_context *ctx)

diff --git a/source/torture/local/binding_string.c b/source/torture/local/binding_string.c
index 12637608c6ba6ff3d0f67b5f0bdaba672f643192..2d180a09ef7f136cb69b696443be1fdd6c67d90d 100644 (file)
--- a/source/torture/local/binding_string.c
+++ b/source/torture/local/binding_string.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/epmapper.h"
+#include "librpc/rpc/dcerpc.h"
 
 static BOOL test_BindingString(TALLOC_CTX *mem_ctx, const char *binding)
 {

diff --git a/source/torture/local/iconv.c b/source/torture/local/iconv.c
index 4a91997817627675d17816b344d8323d9dff60c0..324ee489c1f7d75a49f0aef5de8c58743c3def24 100644 (file)
--- a/source/torture/local/iconv.c
+++ b/source/torture/local/iconv.c
@@ -25,6 +25,7 @@
 #include "torture/torture.h"
 #include "system/iconv.h"
 #include "system/time.h"
+#include "libcli/raw/libcliraw.h"
 #include "torture/util.h"
 
 #if HAVE_NATIVE_ICONV

diff --git a/source/torture/local/ndr.c b/source/torture/local/ndr.c
index d1570dda68dd30f7f8ec0fb389492bccc8e38396..305f75f9c002365a933240914285050aa4994502 100644 (file)
--- a/source/torture/local/ndr.c
+++ b/source/torture/local/ndr.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "torture/torture.h"
+#include "librpc/ndr/libndr.h"
 
 BOOL test_check_string_terminator(TALLOC_CTX *mem_ctx)
 {

diff --git a/source/torture/local/sddl.c b/source/torture/local/sddl.c
index 5f956808d1fba3c5f55ebb86f08e771935b9563f..11e6ae1fd524e9c53a4d8d68d0d741ec3aba697b 100644 (file)
--- a/source/torture/local/sddl.c
+++ b/source/torture/local/sddl.c
@@ -21,8 +21,8 @@
 */
 
 #include "includes.h"
-#include "libcli/security/proto.h"
 #include "librpc/gen_ndr/ndr_security.h"
+#include "libcli/security/proto.h"
 
 
 /*

diff --git a/source/torture/rap/rap.c b/source/torture/rap/rap.c
index 78edf218202fff3332ba66afcce4b42c3609d0dc..bdc2d0d764016d56588b2303e6183c84272b09c3 100644 (file)
--- a/source/torture/rap/rap.c
+++ b/source/torture/rap/rap.c
@@ -25,6 +25,7 @@
 #include "libcli/rap/rap.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/libcli.h"
+#include "librpc/ndr/libndr.h"
 
 struct rap_call {
        uint16_t callno;

diff --git a/source/torture/raw/composite.c b/source/torture/raw/composite.c
index 237136c3f7eb7a23f4e23e70c137249a3e0f7aa4..53b21c2829b030569203a66f8b81a3be64502fee 100644 (file)
--- a/source/torture/raw/composite.c
+++ b/source/torture/raw/composite.c
@@ -28,6 +28,7 @@
 #include "libcli/security/proto.h"
 #include "libcli/composite/composite.h"
 #include "libcli/smb_composite/smb_composite.h"
+#include "librpc/gen_ndr/ndr_misc.h"
 #include "lib/cmdline/popt_common.h"
 #include "librpc/gen_ndr/security.h"
 #include "torture/util.h"

diff --git a/source/torture/rpc/alter_context.c b/source/torture/rpc/alter_context.c
index 62cfcf758d3b708072c45c5389ff530a9f3f6da9..5333dddd3e84d8f7925d603a5335d8689f50b13e 100644 (file)
--- a/source/torture/rpc/alter_context.c
+++ b/source/torture/rpc/alter_context.c
@@ -24,6 +24,7 @@
 #include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_lsa.h"
 #include "librpc/gen_ndr/ndr_dssetup.h"
+#include "librpc/rpc/dcerpc.h"
 #include "torture/rpc/rpc.h"
 
 BOOL torture_rpc_alter_context(void)

diff --git a/source/torture/rpc/bind.c b/source/torture/rpc/bind.c
index 2a6cb53979f73f68633138b6bcd49febd03a3890..a9ea255a0291b17e424bde57e3e5b7b7a02bcdb8 100644 (file)
--- a/source/torture/rpc/bind.c
+++ b/source/torture/rpc/bind.c
@@ -25,6 +25,7 @@
 #include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_lsa.h"
 #include "lib/cmdline/popt_common.h"
+#include "librpc/rpc/dcerpc.h"
 #include "torture/rpc/rpc.h"
 
 /*

diff --git a/source/torture/rpc/countcalls.c b/source/torture/rpc/countcalls.c
index 8ad5241ada3cdcf5e4d0400c266b4b5750f08b8c..1290b53dc64ac01775a9dc336158087a580603cd 100644 (file)
--- a/source/torture/rpc/countcalls.c
+++ b/source/torture/rpc/countcalls.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "torture/torture.h"
+#include "librpc/rpc/dcerpc.h"
 #include "librpc/rpc/dcerpc_table.h"
 #include "torture/rpc/rpc.h"
 

diff --git a/source/torture/rpc/lsa_lookup.c b/source/torture/rpc/lsa_lookup.c
index eb0efc906ba63bec0022795d52e5e1b766b5fa84..0dc3c38916b7c176fb973a48affacb2e22ba998a 100644 (file)
--- a/source/torture/rpc/lsa_lookup.c
+++ b/source/torture/rpc/lsa_lookup.c
@@ -22,11 +22,11 @@
 #include "includes.h"
 #include "torture/torture.h"
 #include "lib/events/events.h"
-#include "libcli/security/proto.h"
 #include "libnet/libnet_join.h"
 #include "torture/rpc/rpc.h"
 #include "librpc/gen_ndr/ndr_lsa_c.h"
 #include "librpc/gen_ndr/ndr_security.h"
+#include "libcli/security/proto.h"
 
 static BOOL open_policy(TALLOC_CTX *mem_ctx, struct dcerpc_pipe *p,
                        struct policy_handle **handle)

diff --git a/source/torture/rpc/rpc.c b/source/torture/rpc/rpc.c
index be3ce283cce3153b943722032d45482af7a83f6d..34bd05e008cd4666d64037431c428d3dd08cd7f2 100644 (file)
--- a/source/torture/rpc/rpc.c
+++ b/source/torture/rpc/rpc.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "auth/credentials/credentials.h"
 #include "lib/cmdline/popt_common.h"
+#include "librpc/rpc/dcerpc.h"
 #include "torture/rpc/rpc.h"
 #include "torture/torture.h"
 #include "librpc/rpc/dcerpc_table.h"

diff --git a/source/torture/rpc/rpc.h b/source/torture/rpc/rpc.h
index e85128721873998c8d148fd2ca6e124ba6fbc278..78d0860f2341c425d53a0adcbc2a791455b64de2 100644 (file)
--- a/source/torture/rpc/rpc.h
+++ b/source/torture/rpc/rpc.h
@@ -25,6 +25,7 @@
 #include "auth/credentials/credentials.h"
 #include "torture/rpc/drsuapi.h"
 #include "libnet/libnet_join.h"
+#include "librpc/rpc/dcerpc.h"
 #include "torture/rpc/proto.h"
 
 #endif /* __TORTURE_RPC_H__ */

diff --git a/source/torture/smb2/connect.c b/source/torture/smb2/connect.c
index 747249389481905df41da688963b2724181ff9fe..10b7046375db3f7ddac1ced1cbca76d7aad7f173 100644 (file)
--- a/source/torture/smb2/connect.c
+++ b/source/torture/smb2/connect.c
@@ -22,9 +22,9 @@
 
 #include "includes.h"
 #include "smb.h"
+#include "librpc/gen_ndr/security.h"
 #include "libcli/smb2/smb2.h"
 #include "libcli/smb2/smb2_calls.h"
-
 #include "torture/smb2/proto.h"
 
 /*

diff --git a/source/torture/smbtorture.c b/source/torture/smbtorture.c
index e7079293f7d6cdd45cd95d94d562eecfa4ccb058..c2f4f84fac9afc39725b96ce8dafa7884b0e526b 100644 (file)
--- a/source/torture/smbtorture.c
+++ b/source/torture/smbtorture.c
@@ -37,6 +37,7 @@
 #include "torture/torture.h"
 #include "build.h"
 #include "dlinklist.h"
+#include "librpc/rpc/dcerpc.h"
 
 #define MAX_COLS 80 /* FIXME: Determine this at run-time */
 

diff --git a/source/torture/torture.c b/source/torture/torture.c
index a663a03bebccc87a0292c6f5d2e7edfff71c78e6..47b031f677f01d1f6fbcde5eefcfc994b2599b94 100644 (file)
--- a/source/torture/torture.c
+++ b/source/torture/torture.c
@@ -35,6 +35,7 @@
 #include "librpc/gen_ndr/ndr_nbt.h"
 
 #include "torture/raw/proto.h"
+#include "libcli/smb2/smb2.h"
 #include "torture/smb2/proto.h"
 #include "torture/rap/proto.h"
 #include "torture/auth/proto.h"

diff --git a/source/utils/ndrdump.c b/source/utils/ndrdump.c
index 3c3e7f733bdadb5349cdbc574dc25897cd676fdf..b923209ed85b13d95f0098050f40ca454d3cd48a 100644 (file)
--- a/source/utils/ndrdump.c
+++ b/source/utils/ndrdump.c
@@ -22,6 +22,7 @@
 #include "lib/cmdline/popt_common.h"
 #include "system/iconv.h"
 #include "system/filesys.h"
+#include "librpc/rpc/dcerpc.h"
 #include "librpc/rpc/dcerpc_table.h"
 
 static const struct dcerpc_interface_call *find_function(

diff --git a/source/utils/net/net.c b/source/utils/net/net.c
index 303449c7428551adcaf2d0817f3c623918a18a80..a6015f7c34d709fca6fbeeb77e2d394c39fa3cc1 100644 (file)
--- a/source/utils/net/net.c
+++ b/source/utils/net/net.c
@@ -45,6 +45,7 @@
 #include "utils/net/net.h"
 #include "lib/cmdline/popt_common.h"
 #include "lib/ldb/include/ldb.h"
+#include "librpc/rpc/dcerpc.h"
 
 /*
   run a function from a function table. If not found then

diff --git a/source/utils/nmblookup.c b/source/utils/nmblookup.c
index 938fb02966c5e7db3e1a2eec9ab6d6d8f9dd18b9..400201f08344ebc7607e15af91ee274d6aaf5ab6 100644 (file)
--- a/source/utils/nmblookup.c
+++ b/source/utils/nmblookup.c
@@ -28,6 +28,8 @@
 #include "lib/socket/socket.h"
 #include "system/network.h"
 #include "netif/netif.h"
+#include "librpc/gen_ndr/nbt.h"
+#include "libcli/nbt/libnbt.h"
 
 /* command line options */
 static struct {

diff --git a/source/winbind/wb_cmd_userdomgroups.c b/source/winbind/wb_cmd_userdomgroups.c
index b118f9c9c5af7a4a4daae7eeb20a47f45d5eeda1..65c709345549dd90c890cdf8c526f66b8b53284b 100644 (file)
--- a/source/winbind/wb_cmd_userdomgroups.c
+++ b/source/winbind/wb_cmd_userdomgroups.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "libcli/composite/composite.h"
+#include "librpc/gen_ndr/security.h"
 #include "libcli/security/proto.h"
 #include "winbind/wb_server.h"
 #include "winbind/wb_helper.h"

diff --git a/source/wrepl_server/wrepl_server.h b/source/wrepl_server/wrepl_server.h
index c8dfcc64bd8a3d263173b59e455551cc01803943..d244887602e07a50570b6cafe2469aa0b5985a8e 100644 (file)
--- a/source/wrepl_server/wrepl_server.h
+++ b/source/wrepl_server/wrepl_server.h
@@ -310,5 +310,6 @@ struct wreplsrv_service {
        } scavenging;
 };
 
+struct socket_context;
 #include "wrepl_server/wrepl_out_helpers.h"
 #include "wrepl_server/wrepl_server_proto.h"