few cleanups to bring in line with 2.2

source/lib/cmd_interp.c

@@ -27,7 +27,6 @@
 
 #include "includes.h"
 #include "rpc_parse.h"
-#include "rpc_client.h"
 
 #ifndef REGISTER
 #define REGISTER 0

source/passdb/pdb_smbpasswd.c

@@ -1160,8 +1160,6 @@ Error was %s\n", pwd->smb_name, pfile2, strerror(errno)));
  ********************************************************************/
 static BOOL build_smb_pass (struct smb_passwd *smb_pw, SAM_ACCOUNT *sampass)
 {
-	uint8	*ptr;
-	
         if (sampass == NULL) 
 		return False;
 

source/rpc_client/cli_connect.c

@@ -24,7 +24,6 @@
 
 #include "includes.h"
 #include "rpc_parse.h"
-#include "rpc_client.h"
 
 
 static struct cli_connection **con_list = NULL;

source/rpc_client/cli_spoolss.c

@@ -24,7 +24,6 @@
 
 #include "includes.h"
 #include "rpc_parse.h"
-#include "rpc_client.h"
 #include "nterr.h"
 
 extern int DEBUGLEVEL;

source/rpc_client/cli_spoolss_notify.c

@@ -22,7 +22,6 @@
 
 #include "includes.h"
 #include "rpc_parse.h"
-#include "rpc_client.h"
 #include "nterr.h"
 
 extern int DEBUGLEVEL;

source/rpc_client/cli_use.c

@@ -24,7 +24,6 @@
 
 #include "includes.h"
 #include "trans2.h"
-#include "rpc_client.h"
 
 extern int DEBUGLEVEL;
 extern pstring scope;

source/rpc_client/msrpc_spoolss.c

@@ -24,7 +24,6 @@
 #include "includes.h"
 #include "nterr.h"
 #include "rpc_parse.h"
-#include "rpc_client.h"
 #include "rpcclient.h"
 
 extern int DEBUGLEVEL;

source/rpc_client/ncacn_np_use.c

@@ -25,7 +25,6 @@
 
 #include "includes.h"
 #include "rpc_parse.h"
-#include "rpc_client.h"
 #include "trans2.h"
 
 extern int DEBUGLEVEL;

source/rpc_parse/parse_samr.c

@@ -26,7 +26,6 @@
 
 #include "includes.h"
 #include "rpc_parse.h"
-#include "rpc_client.h"
 #include "nterr.h"
 
 extern int DEBUGLEVEL;