1 files changed, 6 insertions, 12 deletions

diff --git a/src/core/main.c b/src/core/main.c
index 6bf5225e..3f3c8cea 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -19,16 +19,13 @@
 */
 
 /**
- * @file src/main.c
+ * @file src/core/main.c
  * @brief Main function of gnunet-gtk
  * @author Christian Grothoff
  */
 
-#include "config.h"
-#include "gettext.h"
-
-#include <GNUnet/gnunet_util.h>
-#include "helper.h"
+#include "platform.h"
+#include "gnunetgtk_common.h"
 
 /**
  * Prints the usage information for this command if the user errs.
@@ -200,9 +197,7 @@ int main(int argc,
                          &parseOptions))
     return 0;
   startCron();
-  gtkInitSaveCalls();
-
-  initGlade();
+  initGNUnetGTKCommon();
   root
     = glade_xml_get_widget(getMainXML(),
                            "mainWindow");
@@ -237,9 +232,8 @@ int main(int argc,
     unloadPlugin(plugin);
     plugin = next;
   }
-  
-  gtkDoneSaveCalls();
-  doneGlade();
+ 
+  doneGNUnetGTKCommon();
   doneUtil();
   
   return 0;