4 files changed, 5 insertions, 60 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index cbf30d6158..438b346445 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -687,7 +687,6 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx);
 #include "mangle.h"
 #include "module.h"
 #include "nsswitch/winbind_client.h"
-#include "rpc_client.h"
 #include "dbwrap.h"
 #include "packet.h"
 #include "ctdbd_conn.h"
diff --git a/source3/include/ntdomain.h b/source3/include/ntdomain.h
index bbe653b8bd..3204e2e64b 100644
--- a/source3/include/ntdomain.h
+++ b/source3/include/ntdomain.h
@@ -28,6 +28,8 @@
  * in the NTDOM branch - it didn't belong there.
  */
 
+#define prs_init_empty( _ps_, _ctx_, _io_ ) (void) prs_init((_ps_), 0, (_ctx_), (_io_))
+
 typedef struct _prs_struct {
 	bool io; /* parsing in or out of data stream */
 	/* 
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 6b68f954e4..9e0f3a28df 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -2089,21 +2089,9 @@ WERROR reg_apply_registry_entry(TALLOC_CTX *mem_ctx,
 #include "librpc/gen_ndr/ndr_svcctl.h"
 #include "librpc/gen_ndr/ndr_winreg.h"
 #include "librpc/gen_ndr/ndr_wkssvc.h"
-
-#include "librpc/gen_ndr/srv_dfs.h"
-#include "librpc/gen_ndr/srv_dssetup.h"
-#include "librpc/gen_ndr/srv_echo.h"
-#include "librpc/gen_ndr/srv_eventlog.h"
-#include "librpc/gen_ndr/srv_initshutdown.h"
-#include "librpc/gen_ndr/srv_lsa.h"
-#include "librpc/gen_ndr/srv_netlogon.h"
-#include "librpc/gen_ndr/srv_ntsvcs.h"
-#include "librpc/gen_ndr/srv_samr.h"
-#include "librpc/gen_ndr/srv_srvsvc.h"
-#include "librpc/gen_ndr/srv_svcctl.h"
-#include "librpc/gen_ndr/srv_winreg.h"
-#include "librpc/gen_ndr/srv_wkssvc.h"
-#include "librpc/gen_ndr/srv_spoolss.h"
+#include "librpc/gen_ndr/ndr_drsuapi.h"
+#include "librpc/gen_ndr/ndr_spoolss.h"
+#include "librpc/gen_ndr/ndr_initshutdown.h"
 
 #include "librpc/ndr/libndr.h"
 
diff --git a/source3/include/rpc_client.h b/source3/include/rpc_client.h
deleted file mode 100644
index 84ac8b17d4..0000000000
--- a/source3/include/rpc_client.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-   SMB parameters and setup
-   Copyright (C) Gerald (Jerry) Carter         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 3 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, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef _RPC_CLIENT_H
-#define _RPC_CLIENT_H
-
-/* autogenerated client stubs */
-
-#include "librpc/gen_ndr/cli_echo.h"
-#include "librpc/gen_ndr/cli_lsa.h"
-#include "librpc/gen_ndr/cli_svcctl.h"
-#include "librpc/gen_ndr/cli_wkssvc.h"
-#include "librpc/gen_ndr/cli_eventlog.h"
-#include "librpc/gen_ndr/cli_dfs.h"
-#include "librpc/gen_ndr/cli_initshutdown.h"
-#include "librpc/gen_ndr/cli_winreg.h"
-#include "librpc/gen_ndr/cli_srvsvc.h"
-#include "librpc/gen_ndr/cli_samr.h"
-#include "librpc/gen_ndr/cli_netlogon.h"
-#include "librpc/gen_ndr/cli_dssetup.h"
-#include "librpc/gen_ndr/cli_ntsvcs.h"
-#include "librpc/gen_ndr/cli_epmapper.h"
-#include "librpc/gen_ndr/cli_drsuapi.h"
-#include "librpc/gen_ndr/cli_spoolss.h"
-
-#define prs_init_empty( _ps_, _ctx_, _io_ ) (void) prs_init((_ps_), 0, (_ctx_), (_io_))
-
-#endif /* _RPC_CLIENT_H */