4 files changed, 5 insertions, 13 deletions
diff --git a/source4/gtk/tools/gepdump.c b/source4/gtk/tools/gepdump.c
index ea77b19385..eab3987a9a 100644
--- a/source4/gtk/tools/gepdump.c
+++ b/source4/gtk/tools/gepdump.c
@@ -24,7 +24,6 @@
 #include "librpc/gen_ndr/ndr_mgmt.h"
 #include "gtk/common/gtk-smb.h"
 #include "auth/gensec/gensec.h"
-#include "smb_build.h"
 
 /* 
  * Show: 
@@ -461,7 +460,7 @@ static GtkWidget* create_mainwindow (void)
 
 int main(int argc, char **argv)
 {
-	gepdump_init_subsystems;
+	dcerpc_init();
 	lp_load();
 	setup_logging(argv[0], DEBUG_STDERR);
 
diff --git a/source4/gtk/tools/gregedit.c b/source4/gtk/tools/gregedit.c
index 8c243873ca..5dd5ec1a92 100644
--- a/source4/gtk/tools/gregedit.c
+++ b/source4/gtk/tools/gregedit.c
@@ -22,7 +22,6 @@
 #include "includes.h"
 #include "lib/registry/registry.h"
 #include "gtk/common/gtk-smb.h"
-#include "smb_build.h"
 
 static GtkTreeStore *store_keys;
 static GtkListStore *store_vals;
@@ -964,8 +963,8 @@ int main(int argc, char *argv[])
 {
 	int ret;
 
-	gregedit_init_subsystems;
 	registry_init();
+
 	lp_load();
 	setup_logging(argv[0], DEBUG_STDERR);
 
diff --git a/source4/gtk/tools/gwcrontab.c b/source4/gtk/tools/gwcrontab.c
index f294e84392..9ebc7f43fd 100644
--- a/source4/gtk/tools/gwcrontab.c
+++ b/source4/gtk/tools/gwcrontab.c
@@ -22,7 +22,6 @@
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_atsvc.h"
 #include "gtk/common/gtk-smb.h"
-#include "smb_build.h"
 
 static struct dcerpc_pipe *at_pipe = NULL;
 static GtkWidget *mainwin;
@@ -489,10 +488,9 @@ static GtkWidget*create_new_job_dialog (void)
 }
 
 
-
- int main(int argc, char **argv)
+int main(int argc, char **argv)
 {
-	gwcrontab_init_subsystems;
+	dcerpc_init();
 	lp_load();
 	setup_logging(argv[0], DEBUG_STDERR);
 
diff --git a/source4/gtk/tools/gwsam.c b/source4/gtk/tools/gwsam.c
index 963397810c..3764afe046 100644
--- a/source4/gtk/tools/gwsam.c
+++ b/source4/gtk/tools/gwsam.c
@@ -23,7 +23,6 @@
 #include "librpc/gen_ndr/ndr_samr.h"
 #include "gtk/common/select.h"
 #include "gtk/common/gtk-smb.h"
-#include "smb_build.h"
 
 struct policy_handle sam_handle;
 struct dcerpc_pipe *sam_pipe = NULL;
@@ -398,11 +397,8 @@ static GtkWidget* create_mainwindow (void)
 	return mainwin;
 }
 
-
-
- int main(int argc, char **argv)
+int main(int argc, char **argv)
 {
-	gwsam_init_subsystems;
 	lp_load();
 	setup_logging(argv[0], DEBUG_STDERR);