2 files changed, 3 insertions, 40 deletions
diff --git a/source4/librpc/ndr/libndr.h b/source4/librpc/ndr/libndr.h
index 42238fd17b..8440e9c1a0 100644
--- a/source4/librpc/ndr/libndr.h
+++ b/source4/librpc/ndr/libndr.h
@@ -231,25 +231,8 @@ typedef void (*ndr_print_fn_t)(struct ndr_print *, const char *, void *);
 typedef void (*ndr_print_function_t)(struct ndr_print *, const char *, int, void *);
 typedef void (*ndr_print_union_fn_t)(struct ndr_print *, const char *, uint32, void *);
 
-/* now pull in the individual parsers */
 #include "librpc/ndr/ndr_basic.h"
 #include "librpc/ndr/ndr_sec.h"
-#include "librpc/gen_ndr/ndr_dcerpc.h"
-#include "librpc/gen_ndr/ndr_misc.h"
-#include "librpc/gen_ndr/ndr_echo.h"
-#include "librpc/gen_ndr/ndr_lsa.h"
-#include "librpc/gen_ndr/ndr_dfs.h"
-#include "librpc/gen_ndr/ndr_spoolss.h"
-#include "librpc/gen_ndr/ndr_samr.h"
-#include "librpc/gen_ndr/ndr_wkssvc.h"
-#include "librpc/gen_ndr/ndr_srvsvc.h"
-#include "librpc/gen_ndr/ndr_atsvc.h"
-#include "librpc/gen_ndr/ndr_eventlog.h"
-#include "librpc/gen_ndr/ndr_epmapper.h"
-#include "librpc/gen_ndr/ndr_winreg.h"
-#include "librpc/gen_ndr/ndr_mgmt.h"
-
-/* this can be used to loop over all pipes - please extend the table
-   in librpc/ndr/ndr.c 
-*/
-extern const struct dcerpc_interface_table *dcerpc_pipes[];
+
+/* now pull in the individual parsers */
+#include "librpc/gen_ndr/tables.h"
diff --git a/source4/librpc/ndr/ndr.c b/source4/librpc/ndr/ndr.c
index 9915ba4212..3f6d968cd2 100644
--- a/source4/librpc/ndr/ndr.c
+++ b/source4/librpc/ndr/ndr.c
@@ -32,26 +32,6 @@
 #define NDR_BASE_MARSHALL_SIZE 1024
 
 /*
-  only include interfaces that contain callable dcerpc functions here
-*/
-const struct dcerpc_interface_table *dcerpc_pipes[] = {
-	&dcerpc_table_samr,
-	&dcerpc_table_lsarpc,
-	&dcerpc_table_netdfs,
-	&dcerpc_table_atsvc,
-	&dcerpc_table_rpcecho,
-	&dcerpc_table_epmapper,
-	&dcerpc_table_eventlog,
-	&dcerpc_table_spoolss,
-	&dcerpc_table_srvsvc,
-	&dcerpc_table_winreg,
-	&dcerpc_table_wkssvc,
-	&dcerpc_table_mgmt,
-	NULL
-};
-
-
-/*
   work out the number of bytes needed to align on a n byte boundary
 */
 size_t ndr_align_size(uint32 offset, size_t n)