This one isn't as big, as it looks.

I just added #include "rpc_client.h" to 50 files.
and #include "rpcclient.h" to some in rpcclient/.
Oh, and made the readline-function in dfs_cmds.c static

If we're lucky, we can remove the rpc_client-prototypes
from the normal proto.h

51 files changed, 61 insertions, 3 deletions

diff --git a/source/include/proto.h b/source/include/proto.h
index 3129651378e..30fafe79953 100644
--- a/source/include/proto.h
+++ b/source/include/proto.h
@@ -3821,7 +3821,6 @@ void add_at_commands(void);
 
 /*The following definitions come from  rpcclient/dfs_cmds.c  */
 
-char *complete_dfsenum(char *text, int state);
 void add_dfs_commands(void);
 
 /*The following definitions come from  rpcclient/display_at.c  */
diff --git a/source/lib/cmd_interp.c b/source/lib/cmd_interp.c
index a173367fb13..6a96fc4e970 100644
--- a/source/lib/cmd_interp.c
+++ b/source/lib/cmd_interp.c
@@ -25,6 +25,7 @@
 
 #include "includes.h"
 #include "rpc_parse.h"
+#include "rpc_client.h"
 
 #ifndef REGISTER
 #define REGISTER 0
diff --git a/source/lib/domain_namemap.c b/source/lib/domain_namemap.c
index 33e7fd41589..17180fa90a6 100644
--- a/source/lib/domain_namemap.c
+++ b/source/lib/domain_namemap.c
@@ -48,6 +48,7 @@
 
 
 #include "includes.h"
+#include "rpc_client.h"
 #include "sids.h"
 
 extern int DEBUGLEVEL;
diff --git a/source/lib/sids.c b/source/lib/sids.c
index f9496ee1879..32cb71149de 100644
--- a/source/lib/sids.c
+++ b/source/lib/sids.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "rpc_client.h"
 #include "sids.h"
 
 
diff --git a/source/lsarpcd/lsarpcd.c b/source/lsarpcd/lsarpcd.c
index db543f550dc..76628729c99 100644
--- a/source/lsarpcd/lsarpcd.c
+++ b/source/lsarpcd/lsarpcd.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "rpc_client.h"
 #include "nterr.h"
 
 fstring pipe_name;
diff --git a/source/lsarpcd/secret_db.c b/source/lsarpcd/secret_db.c
index 68ae3e707ec..d560d7fcaf4 100644
--- a/source/lsarpcd/secret_db.c
+++ b/source/lsarpcd/secret_db.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "rpc_parse.h"
+#include "rpc_client.h"
 
 extern int DEBUGLEVEL;
 
diff --git a/source/lsarpcd/srv_lsa_samdb.c b/source/lsarpcd/srv_lsa_samdb.c
index 3b66fe8161d..bfb71433497 100644
--- a/source/lsarpcd/srv_lsa_samdb.c
+++ b/source/lsarpcd/srv_lsa_samdb.c
@@ -26,6 +26,7 @@
 
 #include "includes.h"
 #include "rpc_parse.h"
+#include "rpc_client.h"
 #include "nterr.h"
 #include "sids.h"
 
diff --git a/source/netlogond/srv_netlogon_nt.c b/source/netlogond/srv_netlogon_nt.c
index b1dd9f5c67a..0e34c7f5bd7 100644
--- a/source/netlogond/srv_netlogon_nt.c
+++ b/source/netlogond/srv_netlogon_nt.c
@@ -27,6 +27,7 @@
 #include "nterr.h"
 #include "sids.h"
 #include "rpc_parse.h"
+#include "rpc_client.h"
 
 extern int DEBUGLEVEL;
 
diff --git a/source/rpc_client/cli_atsvc.c b/source/rpc_client/cli_atsvc.c
index 1abb9e83037..4085f2b7b89 100644
--- a/source/rpc_client/cli_atsvc.c
+++ b/source/rpc_client/cli_atsvc.c
@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "rpc_parse.h"
+#include "rpc_client.h"
 
 extern int DEBUGLEVEL;
 
diff --git a/source/rpc_client/cli_brs.c b/source/rpc_client/cli_brs.c
index 14920042251..b3a75b59a55 100644
--- a/source/rpc_client/cli_brs.c
+++ b/source/rpc_client/cli_brs.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "rpc_parse.h"
+#include "rpc_client.h"
 
 extern int DEBUGLEVEL;
 
diff --git a/source/rpc_client/cli_connect.c b/source/rpc_client/cli_connect.c
index 39b161ae7a9..030101c5784 100644
--- a/source/rpc_client/cli_connect.c
+++ b/source/rpc_client/cli_connect.c
@@ -24,6 +24,7 @@
 
 #include "includes.h"
 #include "rpc_parse.h"
+#include "rpc_client.h"
 
 struct user_creds *usr_creds = NULL;
 vuser_key *user_key = NULL;
diff --git a/source/rpc_client/cli_dfs.c b/source/rpc_client/cli_dfs.c
index 308b94b3be8..59209264f37 100644
--- a/source/rpc_client/cli_dfs.c
+++ b/source/rpc_client/cli_dfs.c
@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "rpc_parse.h"
+#include "rpc_client.h"
 #include "nterr.h"
 
 extern int DEBUGLEVEL;  
diff --git a/source/rpc_client/cli_eventlog.c b/source/rpc_client/cli_eventlog.c
index 968b7b5ef24..640e902d4fa 100644
--- a/source/rpc_client/cli_eventlog.c
+++ b/source/rpc_client/cli_eventlog.c
@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "rpc_parse.h"
+#include "rpc_client.h"
 
 extern int DEBUGLEVEL;
 
diff --git a/source/rpc_client/cli_login.c b/source/rpc_client/cli_login.c
index 1916ab5eb47..6c970800dc2 100644
--- a/source/rpc_client/cli_login.c
+++ b/source/rpc_client/cli_login.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "rpc_parse.h"
+#include "rpc_client.h"
 #include "nterr.h"
 
 extern int DEBUGLEVEL;
diff --git a/source/rpc_client/cli_lsarpc.c b/source/rpc_client/cli_lsarpc.c
index 7c645b43c4a..d5b573fa6cc 100644
--- a/source/rpc_client/cli_lsarpc.c
+++ b/source/rpc_client/cli_lsarpc.c
@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "rpc_parse.h"
+#include "rpc_client.h"
 #include "nterr.h"
 
 extern int DEBUGLEVEL;
diff --git a/source/rpc_client/cli_netlogon.c b/source/rpc_client/cli_netlogon.c
index b882eaa493a..68e1e034ee2 100644
--- a/source/rpc_client/cli_netlogon.c
+++ b/source/rpc_client/cli_netlogon.c
@@ -24,6 +24,7 @@
 
 #include "includes.h"
 #include "rpc_parse.h"
+#include "rpc_client.h"
 #include "nterr.h"
 
 extern int DEBUGLEVEL;
diff --git a/source/rpc_client/cli_netlogon_sync.c b/source/rpc_client/cli_netlogon_sync.c
index 8ed88672bde..e9d6e75abbe 100644
--- a/source/rpc_client/cli_netlogon_sync.c
+++ b/source/rpc_client/cli_netlogon_sync.c
@@ -22,6 +22,7 @@
  */
 
 #include "includes.h"
+#include "rpc_client.h"
 
 extern int DEBUGLEVEL;
 extern pstring global_myname;
diff --git a/source/rpc_client/cli_pipe_netsec.c b/source/rpc_client/cli_pipe_netsec.c
index 58b48416089..1657e3c5956 100644
--- a/source/rpc_client/cli_pipe_netsec.c
+++ b/source/rpc_client/cli_pipe_netsec.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "rpc_parse.h"
+#include "rpc_client.h"
 
 extern int DEBUGLEVEL;
 
diff --git a/source/rpc_client/cli_pipe_noauth.c b/source/rpc_client/cli_pipe_noauth.c
index 0ca9ef7e82f..98b189285f3 100644
--- a/source/rpc_client/cli_pipe_noauth.c
+++ b/source/rpc_client/cli_pipe_noauth.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "rpc_parse.h"
+#include "rpc_client.h"
 
 extern int DEBUGLEVEL;
 extern pstring global_myname;
diff --git a/source/rpc_client/cli_pipe_ntlmssp.c b/source/rpc_client/cli_pipe_ntlmssp.c
index 12f988f4f1e..0fda507a7f2 100644
--- a/source/rpc_client/cli_pipe_ntlmssp.c
+++ b/source/rpc_client/cli_pipe_ntlmssp.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "rpc_parse.h"
+#include "rpc_client.h"
 
 extern int DEBUGLEVEL;
 extern pstring global_myname;
diff --git a/source/rpc_client/cli_reg.c b/source/rpc_client/cli_reg.c
index 1ba96819ba2..8a1b907dcf4 100644
--- a/source/rpc_client/cli_reg.c
+++ b/source/rpc_client/cli_reg.c
@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "rpc_parse.h"
+#include "rpc_client.h"
 
 extern int DEBUGLEVEL;
 
diff --git a/source/rpc_client/cli_samr.c b/source/rpc_client/cli_samr.c
index e4efcd3fc66..8e576ce55fc 100644
--- a/source/rpc_client/cli_samr.c
+++ b/source/rpc_client/cli_samr.c
@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "rpc_parse.h"
+#include "rpc_client.h"
 #include "nterr.h"
 
 extern int DEBUGLEVEL;
diff --git a/source/rpc_client/cli_spoolss.c b/source/rpc_client/cli_spoolss.c
index 8107837ce69..c6d28d5325c 100644
--- a/source/rpc_client/cli_spoolss.c
+++ b/source/rpc_client/cli_spoolss.c
@@ -24,6 +24,7 @@
 
 #include "includes.h"
 #include "rpc_parse.h"
+#include "rpc_client.h"
 #include "nterr.h"
 
 extern int DEBUGLEVEL;
diff --git a/source/rpc_client/cli_svcctl.c b/source/rpc_client/cli_svcctl.c
index 93d9d4adc59..032daf16f96 100644
--- a/source/rpc_client/cli_svcctl.c
+++ b/source/rpc_client/cli_svcctl.c
@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "rpc_parse.h"
+#include "rpc_client.h"
 
 extern int DEBUGLEVEL;
 
diff --git a/source/rpc_client/cli_use.c b/source/rpc_client/cli_use.c
index a76bb16b744..0e965ba8ab1 100644
--- a/source/rpc_client/cli_use.c
+++ b/source/rpc_client/cli_use.c
@@ -24,6 +24,7 @@
 
 #include "includes.h"
 #include "trans2.h"
+#include "rpc_client.h"
 
 extern int DEBUGLEVEL;
 extern pstring scope;
diff --git a/source/rpc_client/cli_wkssvc.c b/source/rpc_client/cli_wkssvc.c
index fc41650ba07..db75b36378e 100644
--- a/source/rpc_client/cli_wkssvc.c
+++ b/source/rpc_client/cli_wkssvc.c
@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "rpc_parse.h"
+#include "rpc_client.h"
 
 extern int DEBUGLEVEL;
 
diff --git a/source/rpc_client/msrpc_lsarpc.c b/source/rpc_client/msrpc_lsarpc.c
index 1fddd2a178b..7d18b9031d4 100644
--- a/source/rpc_client/msrpc_lsarpc.c
+++ b/source/rpc_client/msrpc_lsarpc.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "rpc_client.h"
 #include "nterr.h"
 
 extern int DEBUGLEVEL;
diff --git a/source/rpc_client/msrpc_netlogon.c b/source/rpc_client/msrpc_netlogon.c
index ced282f4bb8..480414fbaa9 100644
--- a/source/rpc_client/msrpc_netlogon.c
+++ b/source/rpc_client/msrpc_netlogon.c
@@ -22,6 +22,7 @@
  */
 
 #include "includes.h"
+#include "rpc_client.h"
 #include "nterr.h"
 
 extern int DEBUGLEVEL;
diff --git a/source/rpc_client/msrpc_samr.c b/source/rpc_client/msrpc_samr.c
index c1a55cf2759..58bd20e8305 100644
--- a/source/rpc_client/msrpc_samr.c
+++ b/source/rpc_client/msrpc_samr.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "rpc_parse.h"
+#include "rpc_client.h"
 #include "nterr.h"
 
 extern int DEBUGLEVEL;
diff --git a/source/rpc_client/ncacn_np_use.c b/source/rpc_client/ncacn_np_use.c
index b3d7ad585a6..cbc659ed2a3 100644
--- a/source/rpc_client/ncacn_np_use.c
+++ b/source/rpc_client/ncacn_np_use.c
@@ -24,6 +24,7 @@
 
 #include "includes.h"
 #include "rpc_parse.h"
+#include "rpc_client.h"
 #include "trans2.h"
 
 extern int DEBUGLEVEL;
diff --git a/source/rpc_parse/parse_samr.c b/source/rpc_parse/parse_samr.c
index d671bd98f9c..fb555d46578 100644
--- a/source/rpc_parse/parse_samr.c
+++ b/source/rpc_parse/parse_samr.c
@@ -25,6 +25,7 @@
 
 #include "includes.h"
 #include "rpc_parse.h"
+#include "rpc_client.h"
 #include "nterr.h"
 
 extern int DEBUGLEVEL;
diff --git a/source/rpc_server/srv_lookup.c b/source/rpc_server/srv_lookup.c
index 096ce1ea79c..8b6887acdd9 100644
--- a/source/rpc_server/srv_lookup.c
+++ b/source/rpc_server/srv_lookup.c
@@ -44,6 +44,7 @@
  */
 
 #include "includes.h"
+#include "rpc_client.h"
 #include "nterr.h"
 #include "sids.h"
 
diff --git a/source/rpc_server/srv_pipe_hnd.c b/source/rpc_server/srv_pipe_hnd.c
index af4343edf5c..0460d6528df 100644
--- a/source/rpc_server/srv_pipe_hnd.c
+++ b/source/rpc_server/srv_pipe_hnd.c
@@ -24,7 +24,7 @@
 
 #include "includes.h"
 #include "rpc_parse.h"
-
+#include "rpc_client.h"
 
 #define	PIPE		"\\PIPE\\"
 #define	PIPELEN		strlen(PIPE)
diff --git a/source/rpc_server/srv_pipe_ntlmssp.c b/source/rpc_server/srv_pipe_ntlmssp.c
index f69e9c37653..7a8da5a84d3 100644
--- a/source/rpc_server/srv_pipe_ntlmssp.c
+++ b/source/rpc_server/srv_pipe_ntlmssp.c
@@ -22,6 +22,7 @@
  */
 
 #include "includes.h"
+#include "rpc_client.h"
 #include "nterr.h"
 
 extern int DEBUGLEVEL;
diff --git a/source/rpcclient/cmd_atsvc.c b/source/rpcclient/cmd_atsvc.c
index bc1557742d7..da92b8ad4c1 100644
--- a/source/rpcclient/cmd_atsvc.c
+++ b/source/rpcclient/cmd_atsvc.c
@@ -22,6 +22,8 @@
 */
 
 #include "includes.h"
+#include "rpc_client.h"
+#include "rpcclient.h"
 #include "nterr.h"
 
 extern int DEBUGLEVEL;
diff --git a/source/rpcclient/cmd_brs.c b/source/rpcclient/cmd_brs.c
index d2b3ab68ea7..8d4fd7c25ef 100644
--- a/source/rpcclient/cmd_brs.c
+++ b/source/rpcclient/cmd_brs.c
@@ -22,6 +22,8 @@
 
 #include "includes.h"
 #include "rpc_brs.h"
+#include "rpc_client.h"
+#include "rpcclient.h"
 #include "nterr.h"
 
 extern int DEBUGLEVEL;
diff --git a/source/rpcclient/cmd_dfs.c b/source/rpcclient/cmd_dfs.c
index d804bf36eae..2af9b9139d0 100644
--- a/source/rpcclient/cmd_dfs.c
+++ b/source/rpcclient/cmd_dfs.c
@@ -24,6 +24,8 @@
 #include "includes.h"
 #include "nterr.h"
 #include "rpc_parse.h"
+#include "rpc_client.h"
+#include "rpcclient.h"
 
 extern int DEBUGLEVEL;
 
diff --git a/source/rpcclient/cmd_eventlog.c b/source/rpcclient/cmd_eventlog.c
index a3b7eea16e2..43a5da5d94e 100644
--- a/source/rpcclient/cmd_eventlog.c
+++ b/source/rpcclient/cmd_eventlog.c
@@ -21,6 +21,8 @@
 */
 
 #include "includes.h"
+#include "rpc_client.h"
+#include "rpcclient.h"
 #include "nterr.h"
 
 extern int DEBUGLEVEL;
diff --git a/source/rpcclient/cmd_lsarpc.c b/source/rpcclient/cmd_lsarpc.c
index 8c7e075f363..fe665785e99 100644
--- a/source/rpcclient/cmd_lsarpc.c
+++ b/source/rpcclient/cmd_lsarpc.c
@@ -21,6 +21,8 @@
 */
 
 #include "includes.h"
+#include "rpc_client.h"
+#include "rpcclient.h"
 #include "nterr.h"
 
 extern int DEBUGLEVEL;
diff --git a/source/rpcclient/cmd_netlogon.c b/source/rpcclient/cmd_netlogon.c
index 75478756ba9..f3c4de7b6bb 100644
--- a/source/rpcclient/cmd_netlogon.c
+++ b/source/rpcclient/cmd_netlogon.c
@@ -21,6 +21,8 @@
 */
 
 #include "includes.h"
+#include "rpc_client.h"
+#include "rpcclient.h"
 #include "nterr.h"
 
 extern int DEBUGLEVEL;
diff --git a/source/rpcclient/cmd_reg.c b/source/rpcclient/cmd_reg.c
index 643483bb9be..fea29e382e3 100644
--- a/source/rpcclient/cmd_reg.c
+++ b/source/rpcclient/cmd_reg.c
@@ -22,6 +22,8 @@
 
 #include "includes.h"
 #include "rpc_parse.h"
+#include "rpc_client.h"
+#include "rpcclient.h"
 
 extern int DEBUGLEVEL;
 
diff --git a/source/rpcclient/cmd_samr.c b/source/rpcclient/cmd_samr.c
index d684488ba6b..80eb9baeeef 100644
--- a/source/rpcclient/cmd_samr.c
+++ b/source/rpcclient/cmd_samr.c
@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "rpc_parse.h"
+#include "rpc_client.h"
 #include "nterr.h"
 #include "rpcclient.h"
 
diff --git a/source/rpcclient/cmd_spoolss.c b/source/rpcclient/cmd_spoolss.c
index e94ef2e760e..fc55101dbf3 100644
--- a/source/rpcclient/cmd_spoolss.c
+++ b/source/rpcclient/cmd_spoolss.c
@@ -24,6 +24,8 @@
 #include "includes.h"
 #include "nterr.h"
 #include "rpc_parse.h"
+#include "rpc_client.h"
+#include "rpcclient.h"
 
 extern int DEBUGLEVEL;
 
diff --git a/source/rpcclient/cmd_svcctl.c b/source/rpcclient/cmd_svcctl.c
index c975cd14d80..588c0e2e736 100644
--- a/source/rpcclient/cmd_svcctl.c
+++ b/source/rpcclient/cmd_svcctl.c
@@ -21,6 +21,8 @@
 */
 
 #include "includes.h"
+#include "rpc_client.h"
+#include "rpcclient.h"
 #include "nterr.h"
 
 extern int DEBUGLEVEL;
diff --git a/source/rpcclient/cmd_wkssvc.c b/source/rpcclient/cmd_wkssvc.c
index 605a9bee4fe..2404f1b03af 100644
--- a/source/rpcclient/cmd_wkssvc.c
+++ b/source/rpcclient/cmd_wkssvc.c
@@ -21,6 +21,8 @@
 */
 
 #include "includes.h"
+#include "rpc_client.h"
+#include "rpcclient.h"
 #include "nterr.h"
 
 extern int DEBUGLEVEL;
diff --git a/source/rpcclient/dfs_cmds.c b/source/rpcclient/dfs_cmds.c
index 7d7a6f2a80d..37dec09cae2 100644
--- a/source/rpcclient/dfs_cmds.c
+++ b/source/rpcclient/dfs_cmds.c
@@ -25,11 +25,12 @@
 #include "ntdomain.h"
 #include "rpcclient.h"
 #include "rpc_parse.h"
+#include "rpc_client.h"
 
 extern struct client_info cli_info;
 
 /* DFS command completion function */
-char *complete_dfsenum(char *text, int state)
+static char *complete_dfsenum(char *text, int state)
 {
   static uint32 i=0;
   DFS_INFO_CTR ctr;
diff --git a/source/smbd/lanman.c b/source/smbd/lanman.c
index b6ccbd3f418..f75fc314915 100644
--- a/source/smbd/lanman.c
+++ b/source/smbd/lanman.c
@@ -29,6 +29,7 @@
    */
 
 #include "includes.h"
+#include "rpc_client.h"
 #include "nterr.h"
 
 #ifdef CHECK_TYPES
diff --git a/source/smbd/password.c b/source/smbd/password.c
index e75f304c475..53a74e150e2 100644
--- a/source/smbd/password.c
+++ b/source/smbd/password.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "rpc_client.h"
 
 extern int DEBUGLEVEL;
 extern int Protocol;
diff --git a/source/smbd/process.c b/source/smbd/process.c
index 4a5f3eb03b8..476ddf9a7bd 100644
--- a/source/smbd/process.c
+++ b/source/smbd/process.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "rpc_client.h"
 
 extern int DEBUGLEVEL;
 
diff --git a/source/smbd/reply.c b/source/smbd/reply.c
index 16d03608d44..c5d58e7072d 100644
--- a/source/smbd/reply.c
+++ b/source/smbd/reply.c
@@ -25,6 +25,7 @@
 
 
 #include "includes.h"
+#include "rpc_client.h"
 #include "trans2.h"
 #include "nterr.h"
 
diff --git a/source/utils/rpctorture.c b/source/utils/rpctorture.c
index 6980fb3d33a..93f2a8def7f 100644
--- a/source/utils/rpctorture.c
+++ b/source/utils/rpctorture.c
@@ -25,6 +25,7 @@
 #endif
 
 #include "includes.h"
+#include "rpc_client.h"
 
 #ifndef REGISTER
 #define REGISTER 0