[grisbi-cvs] [SCM] grisbi branch, master, updated. upstream_version_0_9.0-21-g8bbe926

Rémi Cardona nobody at users.sourceforge.net
Sat Feb 26 16:09:51 CET 2011


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grisbi".

The branch, master has been updated
       via  8bbe92686d7f4bb4f7c0ce07eae586a814646590 (commit)
       via  34f2f7c7f0a8c20254bff82b812687c83d21bfa8 (commit)
       via  49a11b12a166e150f035184b84d9f8227d634370 (commit)
       via  ea381b31b5d1544279ad5e4b5d0830708a3e296c (commit)
       via  9c67e93813e92166109d1b3e8c8cb49d8bb817c9 (commit)
       via  06ef415a79c57a480d9e5a4b79a364c60f0e337a (commit)
       via  d6b83831daf02a9293353703e4836c64a537dc6b (commit)
       via  6d257eed913dbc0f62661a606da9a756f0459bc7 (commit)
       via  ee0875ac34541e0825d5a69dbe47ba331a608c01 (commit)
       via  d2a3fd214ea9b0fbcc18939dfaa6ccca4606f132 (commit)
       via  29874db07f95774e3a33c24fb8a1da397c9470f3 (commit)
       via  49163f0f678448c8a7365e6dc47b6a404454a896 (commit)
       via  c951c7de3e03e4626768860f710b120da54db712 (commit)
       via  ee303d4c202b0e88fd34903efa77ce4927e2fcb9 (commit)
       via  f54dc4c10c2cf8a9c01cf6c2038c5675acef27bf (commit)
       via  45f1e313417251c882fa03db8941a665cfd88574 (commit)
      from  cd7d128bd2c2bb93b99fae250bef40c2da036b6e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8bbe92686d7f4bb4f7c0ce07eae586a814646590
Author: Rémi Cardona <remi at gentoo.org>
Date:   Thu Feb 24 09:39:13 2011 +0100

    Remove unused functions and declarations, removes gcc warnings

commit 34f2f7c7f0a8c20254bff82b812687c83d21bfa8
Author: Rémi Cardona <remi at gentoo.org>
Date:   Thu Feb 24 08:18:38 2011 +0100

    Remove latex/dvi/ps support

commit 49a11b12a166e150f035184b84d9f8227d634370
Author: Rémi Cardona <remi at gentoo.org>
Date:   Wed Feb 23 09:19:57 2011 +0100

    Remove the remaining #includes from include.h

commit ea381b31b5d1544279ad5e4b5d0830708a3e296c
Author: Rémi Cardona <remi at gentoo.org>
Date:   Tue Feb 22 23:15:24 2011 +0100

    Remove #include <locale.h> from include.h

commit 9c67e93813e92166109d1b3e8c8cb49d8bb817c9
Author: Rémi Cardona <remi at gentoo.org>
Date:   Tue Feb 22 23:35:54 2011 +0100

    Remove #include <gtk/gtktextview.h> from include.h

commit 06ef415a79c57a480d9e5a4b79a364c60f0e337a
Author: Rémi Cardona <remi at gentoo.org>
Date:   Tue Feb 22 23:50:21 2011 +0100

    Remove #include <gdk/gdkkeysyms.h> from include.h

commit d6b83831daf02a9293353703e4836c64a537dc6b
Author: Rémi Cardona <remi at gentoo.org>
Date:   Tue Feb 22 23:52:40 2011 +0100

    Remove #include <gtk/gtk.h> from include.h

commit 6d257eed913dbc0f62661a606da9a756f0459bc7
Author: Rémi Cardona <remi at gentoo.org>
Date:   Tue Feb 22 23:48:33 2011 +0100

    Remove #include <glib/gstdio.h> from include.h
    
    Include <glib/gprintf.h> instead wherever possible.

commit ee0875ac34541e0825d5a69dbe47ba331a608c01
Author: Rémi Cardona <remi at gentoo.org>
Date:   Tue Feb 22 23:39:26 2011 +0100

    Remove #include <gdk-pixbuf/gdk-pixdata.h> from include.h

commit d2a3fd214ea9b0fbcc18939dfaa6ccca4606f132
Author: Rémi Cardona <remi at gentoo.org>
Date:   Tue Feb 22 19:59:54 2011 +0100

    Remove #include <glib/gi18n.h> from include.h

commit 29874db07f95774e3a33c24fb8a1da397c9470f3
Author: Rémi Cardona <remi at gentoo.org>
Date:   Tue Feb 22 23:41:34 2011 +0100

    Rework #includes in gsb_plugins.[ch]

commit 49163f0f678448c8a7365e6dc47b6a404454a896
Author: Rémi Cardona <remi at gentoo.org>
Date:   Fri Feb 18 22:18:05 2011 +0100

    Add make target to check that all headers are compile-independent

commit c951c7de3e03e4626768860f710b120da54db712
Author: Rémi Cardona <remi at gentoo.org>
Date:   Mon Feb 21 08:15:32 2011 +0100

    Make all headers compile-independent

commit ee303d4c202b0e88fd34903efa77ce4927e2fcb9
Author: Rémi Cardona <remi at gentoo.org>
Date:   Thu Feb 24 00:42:34 2011 +0100

    Remove double extern declaration

commit f54dc4c10c2cf8a9c01cf6c2038c5675acef27bf
Author: Rémi Cardona <remi at gentoo.org>
Date:   Tue Feb 22 09:44:59 2011 +0100

    Remove double #include <config.h>

commit 45f1e313417251c882fa03db8941a665cfd88574
Author: Rémi Cardona <remi at gentoo.org>
Date:   Mon Feb 21 08:16:12 2011 +0100

    Move iso_13616_iban struct definition to gsb_account_property.c

-----------------------------------------------------------------------

Changes:
diff --git a/.gitignore b/.gitignore
index 1c80f68..93e52c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@ gisbi.anjuta
 TODO*
 doxygen/
 *.o
+*.ho
diff --git a/src/Makefile.am b/src/Makefile.am
index 21ace8e..659a143 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -35,7 +35,6 @@ libgrisbi_la_SOURCES = \
 	etats_csv.c		\
 	etats_gtktable.c	\
 	etats_html.c		\
-	etats_latex.c		\
 	etats_onglet.c		\
 	etats_support.c		\
 	export.c		\
@@ -130,7 +129,6 @@ libgrisbi_la_SOURCES = \
 	navigation.c		\
 	parametres.c		\
 	parse_cmdline.c		\
-	print_config.c		\
 	print_dialog_config.c		\
 	print_report.c		\
 	print_transactions_list.c		\
@@ -259,7 +257,6 @@ libgrisbi_la_SOURCES = \
 	etats_config.h		\
 	etats_gtktable.h	\
 	etats.h			\
-	etats_latex.h		\
 	etats_onglet.h		\
 	etats_support.h		\
 	fenetre_principale.h	\
@@ -280,7 +277,6 @@ libgrisbi_la_SOURCES = \
 	navigation.h		\
 	parametres.h		\
 	parse_cmdline.h		\
-	print_config.h		\
 	print_dialog_config.h	\
 	print_report.h		\
 	print_transactions_list.h	\
@@ -322,3 +318,10 @@ mime_DATA = grisbi.keys grisbi.mime
 if HAVE_PLUGINS
 SUBDIRS += plugins/gnucash plugins/ofx plugins/openssl
 endif
+
+ALLHEADERS := $(filter %.h,$(libgrisbi_la_SOURCES) $(grisbi_SOURCES))
+
+checkheaders: $(ALLHEADERS:.h=.ho)
+
+%.ho: %.h
+	$(CC) -include config.h $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) -c -o $@ -x c $<
diff --git a/src/accueil.c b/src/accueil.c
index e52c4c0..52c4091 100644
--- a/src/accueil.c
+++ b/src/accueil.c
@@ -25,6 +25,7 @@
 #endif
 
 #include "include.h"
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "accueil.h"
diff --git a/src/accueil.h b/src/accueil.h
index a7e52d3..e56de45 100644
--- a/src/accueil.h
+++ b/src/accueil.h
@@ -1,6 +1,8 @@
 #ifndef _ACCUEIL_H
 #define _ACCUEIL_H (1)
 
+#include <gtk/gtk.h>
+
 /* Constantes pour la fonction gtk_misc_set_alignment() (GTK1) */
 #define MISC_TOP 0
 #define MISC_VERT_CENTER 0.5
diff --git a/src/affichage.c b/src/affichage.c
index c5ef83f..adea2ce 100644
--- a/src/affichage.c
+++ b/src/affichage.c
@@ -26,6 +26,7 @@
 #endif
 
 #include "include.h"
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "affichage.h"
diff --git a/src/affichage.h b/src/affichage.h
index c589328..66c45d1 100644
--- a/src/affichage.h
+++ b/src/affichage.h
@@ -1,6 +1,8 @@
 #ifndef _AFFICHAGE_H
 #define _AFFICHAGE_H (1)
 
+#include <gtk/gtk.h>
+
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
 
diff --git a/src/affichage_liste.c b/src/affichage_liste.c
index 35aeeb6..d0bbbfb 100644
--- a/src/affichage_liste.c
+++ b/src/affichage_liste.c
@@ -26,7 +26,7 @@
 #endif
 
 #include "include.h"
-
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "affichage_liste.h"
diff --git a/src/affichage_liste.h b/src/affichage_liste.h
index 136d0d3..b37cc38 100644
--- a/src/affichage_liste.h
+++ b/src/affichage_liste.h
@@ -1,6 +1,8 @@
 #ifndef _AFFICHAGE_LISTE_H
 #define _AFFICHAGE_LISTE_H (1)
 
+#include <gtk/gtk.h>
+
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
 
diff --git a/src/barre_outils.c b/src/barre_outils.c
index 57fe6ca..76f20b4 100644
--- a/src/barre_outils.c
+++ b/src/barre_outils.c
@@ -31,6 +31,7 @@
 #endif
 
 #include "include.h"
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "barre_outils.h"
diff --git a/src/barre_outils.h b/src/barre_outils.h
index 7900ec8..e8d2d73 100644
--- a/src/barre_outils.h
+++ b/src/barre_outils.h
@@ -1,5 +1,8 @@
 #ifndef _BARRE_OUTILS_H
 #define _BARRE_OUTILS_H (1)
+
+#include <gtk/gtk.h>
+
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
 
diff --git a/src/bet_config.c b/src/bet_config.c
index fba4330..074b8ba 100644
--- a/src/bet_config.c
+++ b/src/bet_config.c
@@ -26,6 +26,7 @@
 #endif
 
 #include "include.h"
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "bet_config.h"
diff --git a/src/bet_data_finance.c b/src/bet_data_finance.c
index 362803e..6e7b44e 100644
--- a/src/bet_data_finance.c
+++ b/src/bet_data_finance.c
@@ -24,6 +24,7 @@
 #endif
 
 #include "include.h"
+#include <math.h>
 
 /*START_INCLUDE*/
 #include "bet_data_finance.h"
diff --git a/src/bet_finance_ui.c b/src/bet_finance_ui.c
index aed6cab..add0488 100644
--- a/src/bet_finance_ui.c
+++ b/src/bet_finance_ui.c
@@ -24,6 +24,9 @@
 #endif
 
 #include "include.h"
+#include <gdk/gdkkeysyms.h>
+#include <glib/gprintf.h>
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "bet_finance_ui.h"
@@ -60,7 +63,6 @@ static gboolean bet_finance_capital_entry_key_press_event ( GtkWidget *widget,
                         GdkEventKey *ev,
                         GtkWidget *page );
 static GtkWidget *bet_finance_create_amortization_page ( void );
-static GtkWidget *bet_finance_create_amortization_toolbar ( GtkWidget *parent, GtkWidget *tree_view );
 static GtkWidget *bet_finance_create_amortization_tree_view ( GtkWidget *container, gint origin );
 static GtkWidget *bet_finance_create_data_tree_view ( GtkWidget *container );
 static GtkWidget *bet_finance_create_duration_widget ( GtkWidget *parent );
diff --git a/src/bet_future.c b/src/bet_future.c
index 3c037f6..7e92ec8 100644
--- a/src/bet_future.c
+++ b/src/bet_future.c
@@ -28,6 +28,8 @@
 #endif
 
 #include "include.h"
+#include <gdk/gdkkeysyms.h>
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "bet_future.h"
diff --git a/src/bet_hist.c b/src/bet_hist.c
index fa715a5..821a288 100644
--- a/src/bet_hist.c
+++ b/src/bet_hist.c
@@ -26,6 +26,7 @@
 #endif
 
 #include "include.h"
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "bet_hist.h"
diff --git a/src/bet_tab.c b/src/bet_tab.c
index 96304c7..ff3a8ba 100644
--- a/src/bet_tab.c
+++ b/src/bet_tab.c
@@ -26,6 +26,8 @@
 #endif
 
 #include "include.h"
+#include <gdk/gdkkeysyms.h>
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "bet_tab.h"
diff --git a/src/categories_onglet.c b/src/categories_onglet.c
index f149f83..15ade45 100644
--- a/src/categories_onglet.c
+++ b/src/categories_onglet.c
@@ -26,6 +26,7 @@
 #endif
 
 #include "include.h"
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "categories_onglet.h"
@@ -58,7 +59,6 @@ static gboolean category_list_button_press ( GtkWidget *tree_view,
                         GdkEventButton *ev,
                         gpointer null );
 static void category_list_popup_context_menu ( void );
-static void category_list_toggle_edit_category ( GtkCheckMenuItem *menu_item, gpointer data );
 static GtkWidget *creation_barre_outils_categ ( void );
 static gboolean edit_category ( GtkTreeView * view );
 static gboolean exporter_categ ( GtkButton * widget, gpointer data );
diff --git a/src/categories_onglet.h b/src/categories_onglet.h
index e68703b..714f549 100644
--- a/src/categories_onglet.h
+++ b/src/categories_onglet.h
@@ -1,6 +1,7 @@
 #ifndef _CATEGORIES_ONGLET_H
 #define _CATEGORIES_ONGLET_H (1)
 
+#include <gtk/gtk.h>
 
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
diff --git a/src/classement_echeances.h b/src/classement_echeances.h
index 1b00608..8a43dc5 100644
--- a/src/classement_echeances.h
+++ b/src/classement_echeances.h
@@ -1,5 +1,8 @@
 #ifndef _CLASSEMENT_ECHEANCES_H
 #define _CLASSEMENT_ECHEANCES_H (1)
+
+#include <glib.h>
+
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
 
diff --git a/src/csv_parse.c b/src/csv_parse.c
index fbda4a8..a25eb1f 100644
--- a/src/csv_parse.c
+++ b/src/csv_parse.c
@@ -26,6 +26,7 @@
 #endif
 
 #include "include.h"
+#include <string.h>
 
 /*START_INCLUDE*/
 #include "csv_parse.h"
diff --git a/src/custom_list.h b/src/custom_list.h
index c55513c..eae9705 100644
--- a/src/custom_list.h
+++ b/src/custom_list.h
@@ -1,6 +1,8 @@
 #ifndef _CUSTOM_LIST_H
 #define _CUSTOM_LIST_H (1)
 
+#include <gtk/gtk.h>
+
 #define CUSTOM_TYPE_LIST            (custom_list_get_type ())
 #define CUSTOM_LIST(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), CUSTOM_TYPE_LIST, CustomList))
 #define CUSTOM_LIST_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  CUSTOM_TYPE_LIST, CustomListClass))
diff --git a/src/dialog.c b/src/dialog.c
index 3a2e5d4..61144f9 100644
--- a/src/dialog.c
+++ b/src/dialog.c
@@ -26,7 +26,7 @@
 #endif
 
 #include "include.h"
-
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "dialog.h"
diff --git a/src/dialog.h b/src/dialog.h
index df636c3..795cd39 100644
--- a/src/dialog.h
+++ b/src/dialog.h
@@ -1,5 +1,8 @@
 #ifndef _DIALOG_H
 #define _DIALOG_H (1)
+
+#include <gtk/gtk.h>
+
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
 
diff --git a/src/erreur.c b/src/erreur.c
index 05cf241..89d5173 100644
--- a/src/erreur.c
+++ b/src/erreur.c
@@ -28,7 +28,9 @@
 #endif
 
 #include "include.h"
-
+#include <stdlib.h>
+#include <glib/gstdio.h>
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "erreur.h"
diff --git a/src/etats_affiche.c b/src/etats_affiche.c
index bce89e4..2e72864 100644
--- a/src/etats_affiche.c
+++ b/src/etats_affiche.c
@@ -28,6 +28,7 @@
 #endif
 
 #include "include.h"
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "etats_affiche.h"
diff --git a/src/etats_affiche.h b/src/etats_affiche.h
index c212d40..2c71fe9 100644
--- a/src/etats_affiche.h
+++ b/src/etats_affiche.h
@@ -1,5 +1,8 @@
 #ifndef _ETATS_AFFICHE_H
 #define _ETATS_AFFICHE_H (1)
+
+#include <glib.h>
+
 /* START_INCLUDE_H */
 #include "structures.h"
 #include "gsb_real.h"
diff --git a/src/etats_calculs.c b/src/etats_calculs.c
index a6da659..823959b 100644
--- a/src/etats_calculs.c
+++ b/src/etats_calculs.c
@@ -26,7 +26,7 @@
 #endif
 
 #include "include.h"
-
+#include <string.h>
 
 /*START_INCLUDE*/
 #include "etats_calculs.h"
@@ -47,7 +47,6 @@
 #include "gsb_real.h"
 #include "gsb_status.h"
 #include "utils_str.h"
-#include "print_config.h"
 #include "structures.h"
 #include "erreur.h"
 /*END_INCLUDE*/
@@ -101,8 +100,6 @@ extern gint devise_ib_etat;
 extern gint devise_tiers_etat;
 extern gint exo_en_cours_etat;
 extern struct struct_etat_affichage gtktable_affichage;
-extern struct struct_etat_affichage gtktable_affichage;
-extern struct struct_etat_affichage latex_affichage;
 extern gint ligne_debut_partie;
 extern gsb_real montant_categ_etat;
 extern gsb_real montant_compte_etat;
@@ -2643,31 +2640,6 @@ void denote_struct_sous_jaccentes ( gint origine )
 
 
 
-/*****************************************************************************************************/
-/* Fonction d'impression de l'état */
-/*****************************************************************************************************/
-/*void impression_etat ( gint report_number )
-{
-
-    if ( ! print_config() )
-       return;
-
-    affichage_etat ( report_number, &latex_affichage, NULL );
-}*/
-
-
-/*void impression_etat_courant ( )
-{
-    if ( gtk_notebook_get_current_page ( GTK_NOTEBOOK ( notebook_general)) != NAVIGATION_REPORT )
-       gtk_notebook_set_current_page ( GTK_NOTEBOOK ( notebook_general),
-                               NAVIGATION_REPORT );
-
-    impression_etat (gsb_gui_navigation_get_current_report ());
-}*/
-
-
-
-
 /* Local Variables: */
 /* c-basic-offset: 4 */
 /* End: */
diff --git a/src/etats_config.c b/src/etats_config.c
index 9bf8e7d..3c856ac 100644
--- a/src/etats_config.c
+++ b/src/etats_config.c
@@ -27,7 +27,7 @@
 #endif
 
 #include "include.h"
-
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "etats_config.h"
diff --git a/src/etats_csv.c b/src/etats_csv.c
index 052dc02..86cb6ac 100644
--- a/src/etats_csv.c
+++ b/src/etats_csv.c
@@ -26,6 +26,8 @@
 #endif
 
 #include "include.h"
+#include <glib/gstdio.h>
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "etats_csv.h"
diff --git a/src/etats_html.c b/src/etats_html.c
index 4bb883a..14dd300 100644
--- a/src/etats_html.c
+++ b/src/etats_html.c
@@ -23,6 +23,7 @@
 #endif
 
 #include "include.h"
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "etats_html.h"
diff --git a/src/etats_latex.c b/src/etats_latex.c
deleted file mode 100644
index 38ef11a..0000000
--- a/src/etats_latex.c
+++ /dev/null
@@ -1,460 +0,0 @@
-/*  Fichier qui s'occupe d'afficher les états via une impression latex */
-/*      etats_latex.c */
-
-/*     Copyright (C)	2004-2009 Benjamin Drieu (bdrieu at april.org) */
-/* 			http://www.grisbi.org				      */
-
-/*     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 2 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, write to the Free Software */
-/*     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "include.h"
-
-
-/*START_INCLUDE*/
-#include "etats_latex.h"
-#include "dialog.h"
-#include "gsb_data_report.h"
-#include "navigation.h"
-#include "print_config.h"
-#include "utils_files.h"
-#include "structures.h"
-#include "etats_config.h"
-#include "etats_affiche.h"
-/*END_INCLUDE*/
-
-/* FOLLOWING LINES REVERTS BACK TO THE ORIGINAL FPRINTF (LIBINTL_FPRINTF IS BUGGY) */
-#ifdef _WIN32
-	#undef fprintf
-#endif
-
-/*START_STATIC*/
-static void latex_attach_hsep ( int x, int x2, int y, int y2);
-static void latex_attach_label ( gchar * text, gdouble properties, int x, int x2, int y, int y2,
-			  enum alignement align, gint transaction_number );
-static void latex_attach_vsep ( int x, int x2, int y, int y2);
-static gint latex_finish ();
-static gint latex_initialise (GSList * opes_selectionnees, gchar * filename );
-static void latex_safe ( gchar * text );
-/*END_STATIC*/
-
-
-
-
-static gint lastline = 0;
-static gint lastcol = 0;
-static gint last_is_hsep = 0;
-static FILE *file_out;
-static gchar * tempname;
-
-
-struct struct_etat_affichage latex_affichage = {
-    latex_initialise,
-    latex_finish,
-    latex_attach_hsep,
-    latex_attach_vsep,
-    latex_attach_label,
-};
-
-/*START_EXTERN*/
-extern gint nb_colonnes;
-/*END_EXTERN*/
-
-
-/**
- * Backend function that is responsible for printing a label at a
- * specific place of the report, using text attibutes.
- *
- * \param text Text to print
- * \param properties bit field for text properties.  Can be:
- *        - TEXT_BOLD: text will be printed in bold
- *        - TEXT_ITALIC: text will be printed in intalic
- *        - TEXT_HUGE: text will be have a huge face
- *        - TEXT_LARGE: text will be have a large face
- *        - TEXT_SMALL: text will be have a small face
- * \param x left position of the label
- * \param y top position of the label
- * \param x2 right position of the label
- * \param y2 bottom position of the label
- * \param alignment how the text will be aligned in the cell
- * \param transaction_number a number of transaction to link to (not used as latex
- *            backend is not interactive)
- */
-void latex_attach_label ( gchar * text, gdouble properties, int x, int x2, int y, int y2,
-			  enum alignement align, gint transaction_number )
-{
-    int pad, realsize, realcolumns;
-    gint current_report_number;
-
-    current_report_number = gsb_gui_navigation_get_current_report ();
-
-
-    if ( !text )
-	text = "";
-
-    if ( y >= lastline )
-    {
-	lastcol = 0;
-	lastline = y2;
-	if ( ! last_is_hsep )
-	{
-	    fprintf ( file_out, "\\\\\n" );
-	}
-    }
-
-    for ( pad = lastcol ; pad < x ; pad ++ )
-	fprintf ( file_out, "&" );
-
-    if ( (x2 - x) > 1 )
-	fprintf ( file_out, "\\multicolumn{%d}{l}{", (x2 - x) );
-
-    realsize = (x2 - x);
-    if ( realsize > 1 )
-    {
-	if ( gsb_data_report_get_show_report_transactions (current_report_number))
-	{
-	    realsize /= 2;
-	    if ( x == 0 )
-		realsize ++;
-	}
-    }
-    if ( gsb_data_report_get_show_report_transactions (current_report_number))
-	realcolumns = (float)((nb_colonnes / 2) + 1);
-    else
-	realcolumns = nb_colonnes;
-
-    fprintf ( file_out,
-	      "\\begin{boxedminipage}{%f\\text%s}\n",
-	      (float) realsize / (float) realcolumns,
-	      ( etat.print_config.orientation == LANDSCAPE ? "height" : "width") );
-
-    switch ( align )
-    {
-	case ALIGN_LEFT:
-	    fprintf ( file_out, "\\raggedright\n" );
-	    break;
-
-	case ALIGN_RIGHT:
-	    fprintf ( file_out, "\\raggedleft\n" );
-	    break;
-
-	case ALIGN_CENTER:
-	    break;
-    }
-
-    if ( ((int) properties) & TEXT_BOLD )
-    {
-	fprintf ( file_out, "\\bf\n");
-    }
-    if ( ((int) properties) & TEXT_ITALIC )
-    {
-	fprintf ( file_out, "\\em\n");
-    }
-    if ( ((int) properties) & TEXT_HUGE )
-    {
-	fprintf ( file_out, "\\huge\n");
-    }
-    if ( ((int) properties) & TEXT_LARGE )
-    {
-	fprintf ( file_out, "\\Large\n");
-    }
-    if ( ((int) properties) & TEXT_SMALL )
-    {
-	fprintf ( file_out, "\\small\n");
-    }
-
-    latex_safe(text);
-    fprintf ( file_out, "\\end{boxedminipage}" );
-
-    if ( (x2 - x) > 1 )
-	fprintf ( file_out, "}\n" );
-
-    fprintf ( file_out, "&" );
-
-    last_is_hsep = 0;
-    lastcol = x2;
-}
-
-
-
-/**
- * Backend function that is responsible for printing a vertical
- * separator (i.e. a vertical line).
- *
- * \param x left position of the separator
- * \param y top position of the separator
- * \param x2 right position of the separator
- * \param y2 bottom position of the separator
- */
-void latex_attach_vsep ( int x, int x2, int y, int y2)
-{
-    int pad;
-
-    if ( y >= lastline )
-    {
-	if ( ! last_is_hsep )
-	    fprintf ( file_out, "\\\\\n" );
-	lastline = y2;
-    }
-
-    for ( pad = lastcol ; pad < x ; pad ++ )
-	fprintf ( file_out, "&" );
-
-    fprintf ( file_out, "{\\vrule}&" );
-
-    last_is_hsep = 0;
-    lastcol = x2;
-}
-
-
-
-/**
- * Backend function that is responsible for printing an horizontal
- * separator (i.e. an horizontal line).
- *
- * \param x left position of the separator
- * \param y top position of the separator
- * \param x2 right position of the separator
- * \param y2 bottom position of the separator
- */
-void latex_attach_hsep ( int x, int x2, int y, int y2)
-{
-    if ( ! last_is_hsep )
-	fprintf ( file_out, "\\\\\n" );
-    lastline = y2;
-
-    fprintf ( file_out, "\\hline\n" );
-
-    last_is_hsep = 1;
-    lastcol = x2;
-}
-
-
-
-/**
- * Initialization function for the latex backend.
- *
- * \return TRUE on succes, FALSE otherwise.
- */
-gint latex_initialise (GSList * opes_selectionnees, gchar * filename )
-{
-    gfloat colwidth, real_width;
-    gint i, current_report_number;
-
-    current_report_number = gsb_gui_navigation_get_current_report ();
-
-    if ( etat.print_config.printer || etat.print_config.filetype == POSTSCRIPT_FILE )
-    {
-	tempname = g_strdup_printf ( "gsbpt%d", g_random_int_range (0,99999) );
-	filename = g_strdup_printf ( "%s.tex", tempname );
-    }
-    else
-    {
-	filename = etat.print_config.printer_filename;
-    }
-
-    if ( ! filename )
-    {
-	filename = "";
-    }
-
-    g_unlink ( filename );
-    file_out = utf8_fopen ( filename, "w" );
-    if ( ! file_out )
-    {
-	dialogue_error ( g_strdup_printf (_("Cannot open file '%s': %s."), filename, g_strerror ( errno ) ) );
-	return FALSE;
-    }
-
-    fprintf (file_out,
-	     "\\documentclass{article}\n\n"
-	     "\\special{! TeXDict begin /landplus90{true}store end }\n"
-	     "\\usepackage{a4}\n"
-	     "\\usepackage{eurosym}\n"
-	     "\\usepackage{boxedminipage}\n"
-	     "\\usepackage{longtable}\n"
-	     "\\usepackage{vmargin}\n"
-	     "\\usepackage[T1]{fontenc}\n"
-	     "\\usepackage{ucs}\n"
-	     "\\usepackage[utf8x]{inputenc}\n" );
-
-    if ( etat.print_config.orientation == LANDSCAPE )
-    {
-	fprintf (file_out, "\\usepackage{portland}\n");
-    }
-
-    fprintf (file_out,
-	     "\\setpapersize{%s}\n"
-	     "\\setmarginsrb{1cm}{1cm}{1cm}{1cm}{0cm}{0cm}{0cm}{0cm}\n\n"
-	     "\\begin{document}\n\n", etat.print_config.paper_config.name);
-
-    if ( etat.print_config.orientation == LANDSCAPE )
-      {
-	fprintf (file_out, "\\landscape\n\n");
-      }
-
-    fprintf (file_out,
-	     "\\fboxsep \\parskip\n"
-	     "\\fboxrule 0pt\n"
-	     "\\tabcolsep 0pt\n"
-	     "\\begin{longtable}[l]{" );
-
-    if ( etat.print_config.orientation == LANDSCAPE )
-    {
-	real_width = ((etat.print_config.paper_config.height-20)/10);
-    }
-    else
-    {
-	real_width = ((etat.print_config paper_config.height-20)/10);  me);  lename, g_strerror ( errno ) ) );  ))           @,»Ýÿ         "A”Ž+          òǔŽ+  À6»Ýÿ         07»Ýÿ  óH”Ž+  ÈĔŽ+  èT&”Ž+                          ’8"•Ž+  07»Ýÿ  €PD•Ž+          @,»Ýÿ         +»Ýÿ  ë]”Ž+  6                    è     è!     è!     À6»Ýÿ  07»Ýÿ  xô!•Ž+          @-»Ýÿ          "A”Ž+          ^”Ž+  À6»Ýÿ  ð@”Ž+  ÿ6»Ýÿ         ÀŽ+  óH”Ž+   à…•Ž+  Ø䅕Ž+  ¨é…•Ž+  ÈĔŽ+          xô!•Ž+          @-»Ýÿ          ,»Ýÿ  ë]”Ž+  à!     à!     À6»Ýÿ  07»Ýÿ  Ƚ•Ž+           .»Ýÿ         "A”Ž+          ^”Ž+  À6»Ýÿ  ð@”Ž+  ÿ6»Ýÿ  ð6»Ýÿ  è6»Ýÿ  [&”Ž+  Œp˜        07»Ýÿ  óH”Ž+  ÈĔŽ+                   .»Ýÿ         ð,»Ýÿ  ë]”Ž+          G       H   I       J   K           M   N   O       P   À6»Ýÿ  07»Ýÿ  HuؔŽ+          À/»Ýÿ         "A”Ž+          ^”Ž+  À6»Ýÿ         0Ž+  óH”Ž+    "•Ž+   ©µ”Ž+   à…•Ž+  Ø䅕Ž+  ¨é…•Ž+  ÈĔŽ+ 
          HuؔŽ+          À/»Ýÿ          .»Ýÿ  ë]”Ž+  8uؔŽ+          À/»Ýÿ         0.»Ýÿ  ë]”Ž+  (uؔŽ+          À/»Ýÿ         `.»Ýÿ  ë]”Ž+  uؔŽ+          À/»Ýÿ         .»Ýÿ  ë]”Ž+  	       ¨î…•Ž+  óH”Ž+         ¨é…•Ž+  )»Ýÿ          Šøµ”Ž+  æG”Ž+         Ø䅕Ž+  0/»Ýÿ          yøµ”Ž+  æG”Ž+          à…•Ž+  `/»Ýÿ          Zøµ”Ž+  æG”Ž+  ؤµ”Ž+    "•Ž+   ©µ”Ž+   à…•Ž+  Ø"•Ž+  Ø䅕Ž+  ¨é…•Ž+  ÈĔŽ+          àí³”Ž+          à0»Ýÿ         °/»Ýÿ  ë]”Ž+  #   %       '       )       *   -   .   0   3       5   6   7   8   :   <   =   À6»Ýÿ  07»Ýÿ  p+€”Ž+           2»Ýÿ          "A”Ž+                 8"•Ž+  óH”Ž+  Ø"•Ž+   	"•Ž+  ÈĔŽ+                          c   f   mL”Ž+  07»Ýÿ  p+€”Ž+           2»Ýÿ          Ð0»Ýÿ  ë]”Ž+  Ó%°•æ§ìš‹wqÒ-øÒ êÓïs¨Ó,~9„×u]ÞÓ	4Q ÷U^Qʉ§ ¶uª¹ñìò*ēv´R”Ž+          p8»Ýÿ  F镎+  F镎+         ?UO”Ž+         08»Ýÿ  /»Ýÿ  P3»Ýÿ  mL”Ž+  æG”Ž+  èT&”Ž+  °9»Ýÿ  B镎+  €8»Ýÿ  ÿ6»Ýÿ  õì&”
 Ž+  07»Ýÿ          ÿÿÿÿÿÿÿÿB镎+          87»Ýÿ  ë]”            .paper_config.width-20)/10);
-    }
-
-    if ( gsb_data_report_get_show_report_transactions (current_report_number))
-    {
-	colwidth = real_width / ((float) (nb_colonnes / 2) + 1 );
-	fprintf ( file_out, "p{%fcm}", colwidth);
-	for (i = 0 ; i < nb_colonnes/2 ; i++)
-	{
-	    fprintf ( file_out, "p{%fcm}p{1pt}", colwidth );
-	}
-	fprintf ( file_out, "}" );
-    }
-    else
-    {
-	colwidth = real_width / (float) nb_colonnes;
-	for (i = 0 ; i < nb_colonnes ; i++)
-	{
-	    fprintf (file_out, "p{%fcm}", colwidth);
-	}
-	fprintf (file_out, "p{1pt}}\n");
-    }
-
-    return TRUE;
-}
-
-
-
-/**
- * Destructor function for the latex backend.
- *
- * \return TRUE on success, FALSE otherwise.
- */
-gint latex_finish ()
-{
-    gchar * command;
-
-    fprintf (file_out, "\n"
-	     "\\end{longtable}\n"
-	     "\\end{document}\n");
-    fclose (file_out);
-
-    if ( etat.print_config.printer || etat.print_config.filetype == POSTSCRIPT_FILE )
-    {
-        command = g_strdup_printf ( "%s -interaction=nonstopmode \"%s.tex\"",
-                        conf.latex_command, tempname );
-        if ( system ( command ) > 0 )
-            dialogue_error_hint ( _("See console output for details.  Be sure you have installed LaTeX properly with unicode support."),
-                      _("LaTeX run was unable to complete.") );
-        else
-        {
-            command = g_strdup_printf ( "%s %s \"%s.dvi\" -o \"%s\"",  conf.dvips_command,
-                        ( etat.print_config.orientation == LANDSCAPE ? "-t landscape" : ""),
-                        tempname,
-                        (etat.print_config.printer ?
-                         (g_strconcat ( tempname, ".ps", NULL )) :
-                         etat.print_config.printer_filename) );
-            g_unlink ( g_strdup_printf ("%s.tex", tempname) );
-            g_unlink ( g_strdup_printf ("%s.aux", tempname) );
-            g_unlink ( g_strdup_printf ("%s.log", tempname) );
-            if ( !system ( command ) )
-            {
-            if ( etat.print_config.printer )
-            {
-                command = g_strdup_printf ( "%s %s.ps", etat.print_config.printer_name,
-                            tempname );
-                if ( system ( command ) )
-                {
-                dialogue_error ( _("Cannot send job to printer") );
-                }
-            }
-            }
-            else
-            {
-            dialogue_error ( _("dvips was unable to complete, see console output for details.") );
-            }
-            g_unlink ( g_strdup_printf ("%s.dvi", tempname) );
-	}
-
-	if ( etat.print_config.printer )
-	{
-	    g_unlink ( g_strdup_printf ("%s.ps", tempname) );
-	}
-
-	g_free ( tempname );
-    }
-
-    return 1;
-}
-
-
-
-/**
- * Print a latex safe string into the file_out file descriptor.  All chars
- * that cannot be printed via latex are converted to their latex
- * equivalent (i.e. backslashes are escaped).
- *
- * \param text Text to print.
- */
-void latex_safe ( gchar * text )
-{
-    gboolean start = 1;
-
-    if ( ! text || ! strlen(text))
-	return;
-
-    for ( ; * text; text ++ )
-    {
-	guchar c = * text;
-	switch ( c )
-	{
-
-	    case ' ':
-		if ( start )
-		    fprintf ( file_out, "~" );
-		else
-		    fprintf ( file_out, "%c", *text );
-		break;
-
-	    case '_':
-	    case '&':
-	    case '%':
-	    case '#':
-	    case '\\':
-	    case '$':
-		fprintf ( file_out, "\\" );
-
-	    default:
-		start = 0;
-		fprintf ( file_out, "%c", *text );
-		break;
-	}
-    }
-}
-
-
-/* Local Variables: */
-/* c-basic-offset: 4 */
-/* End: */
diff --git a/src/etats_latex.h b/src/etats_latex.h
deleted file mode 100644
index 1ba33fa..0000000
--- a/src/etats_latex.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef _ETATS_LATEX_H
-#define _ETATS_LATEX_H (1)
-/* START_INCLUDE_H */
-/* END_INCLUDE_H */
-
-
-/* START_DECLARATION */
-/* END_DECLARATION */
-#endif
diff --git a/src/etats_onglet.c b/src/etats_onglet.c
index 3786020..409b737 100644
--- a/src/etats_onglet.c
+++ b/src/etats_onglet.c
@@ -30,7 +30,7 @@
 #endif
 
 #include "include.h"
-
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "etats_onglet.h"
@@ -48,7 +48,6 @@
 #include "traitement_variables.h"
 #include "utils.h"
 #include "etats_config.h"
-#include "print_config.h"
 #include "print_report.h"
 #include "utils_files.h"
 #include "structures.h"
@@ -85,14 +84,13 @@ static GtkWidget *reports_toolbar = NULL;
 /*START_EXTERN*/
 extern struct struct_etat_affichage csv_affichage;
 extern struct struct_etat_affichage html_affichage;
-extern struct struct_etat_affichage latex_affichage;
 extern GtkWidget *notebook_general;
 extern GtkWidget *window;
 /*END_EXTERN*/
 
 /** Different formats supported.  */
 enum report_export_formats {
-    REPORT_EGSB, REPORT_HTML, REPORT_CSV, REPORT_PS, REPORT_TEX,
+    REPORT_EGSB, REPORT_HTML, REPORT_CSV,
     REPORT_MAX_FORMATS,
 };
 
@@ -1068,14 +1066,6 @@ gboolean gsb_report_export_change_format ( GtkWidget * combo, GtkWidget * select
 		extension = "csv";
 		break;
 
-	    case REPORT_PS:		/* Postscript */
-		extension = "ps";
-		break;
-
-	    case REPORT_TEX:		/* Latex */
-		extension = "tex";
-		break;
-
 	    default :
 		extension = NULL;
 		break;
@@ -1098,7 +1088,6 @@ void exporter_etat ( void )
     GtkWidget *fenetre_nom, *hbox, * combo;
     gint resultat, current_report_number;
     gchar * nom_etat;
-    struct print_config * print_config_backup;
 
     current_report_number = gsb_gui_navigation_get_current_report ();
 
@@ -1128,8 +1117,6 @@ void exporter_etat ( void )
     gtk_combo_box_append_text ( GTK_COMBO_BOX(combo), _("Grisbi report file (egsb file)" ) );
     gtk_combo_box_append_text ( GTK_COMBO_BOX(combo), _("HTML file" ) );
     gtk_combo_box_append_text ( GTK_COMBO_BOX(combo), _("CSV file" ) );
-    gtk_combo_box_append_text ( GTK_COMBO_BOX(combo), _("Postscript file" ) );
-    gtk_combo_box_append_text ( GTK_COMBO_BOX(combo), _("Latex file" ) );
 
     /* Set initial format. */
     gtk_combo_box_set_active ( GTK_COMBO_BOX(combo), REPORT_HTML );
@@ -1164,26 +1151,6 @@ void exporter_etat ( void )
 		export_etat_courant_vers_csv ( nom_etat );
 		break;
 
-	    case REPORT_PS:		/* Postscript */
-		print_config_backup = print_config_dup ( );
-		etat.print_config.printer = FALSE;
-		etat.print_config.filetype = POSTSCRIPT_FILE;
-		etat.print_config.printer_filename = nom_etat;
-		affichage_etat ( gsb_gui_navigation_get_current_report (),
-				 &latex_affichage, nom_etat );
-		print_config_set ( print_config_backup );
-		break;
-
-	    case REPORT_TEX:		/* Latex */
-		print_config_backup = print_config_dup ( );
-		etat.print_config.printer = FALSE;
-		etat.print_config.filetype = LATEX_FILE;
-		etat.print_config.printer_filename = nom_etat;
-		affichage_etat ( gsb_gui_navigation_get_current_report (),
-				 &latex_affichage, nom_etat );
-		print_config_set ( print_config_backup );
-		break;
-
 	    default :
 		break;
 	}
diff --git a/src/etats_onglet.h b/src/etats_onglet.h
index 3954f92..cb5b99c 100644
--- a/src/etats_onglet.h
+++ b/src/etats_onglet.h
@@ -1,5 +1,8 @@
 #ifndef _ETATS_ONGLET_H
 #define _ETATS_ONGLET_H (1)
+
+#include <gtk/gtk.h>
+
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
 
diff --git a/src/etats_support.c b/src/etats_support.c
index 3decdc9..83c0de1 100644
--- a/src/etats_support.c
+++ b/src/etats_support.c
@@ -24,7 +24,7 @@
 #endif
 
 #include "include.h"
-
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "etats_support.h"
diff --git a/src/etats_support.h b/src/etats_support.h
index 7c5d3cd..1f4cfef 100644
--- a/src/etats_support.h
+++ b/src/etats_support.h
@@ -1,5 +1,8 @@
 #ifndef _ETATS_SUPPORT_H
 #define _ETATS_SUPPORT_H (1)
+
+#include <glib.h>
+
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
 
diff --git a/src/export.c b/src/export.c
index 3ad40c3..147a55b 100644
--- a/src/export.c
+++ b/src/export.c
@@ -26,7 +26,7 @@
 #endif
 
 #include "include.h"
-
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "export.h"
diff --git a/src/export.h b/src/export.h
index 57ed933..59714b8 100644
--- a/src/export.h
+++ b/src/export.h
@@ -1,6 +1,8 @@
 #ifndef _EXPORT_H
 #define _EXPORT_H (1)
 
+#include <gtk/gtk.h>
+
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
 
diff --git a/src/export_csv.c b/src/export_csv.c
index 1f235f0..9eda479 100644
--- a/src/export_csv.c
+++ b/src/export_csv.c
@@ -32,6 +32,8 @@
 #endif
 
 #include "include.h"
+#include <errno.h>
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "export_csv.h"
diff --git a/src/export_csv.h b/src/export_csv.h
index 62a1060..81ce6b9 100644
--- a/src/export_csv.h
+++ b/src/export_csv.h
@@ -1,6 +1,8 @@
 #ifndef EXPORT_CSV_H
 #define EXPORT_CSV_H
 
+#include <gtk/gtk.h>
+
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
 
diff --git a/src/fenetre_principale.c b/src/fenetre_principale.c
index 25e4f42..52fe294 100644
--- a/src/fenetre_principale.c
+++ b/src/fenetre_principale.c
@@ -26,6 +26,7 @@
 #endif
 
 #include "include.h"
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "fenetre_principale.h"
diff --git a/src/fenetre_principale.h b/src/fenetre_principale.h
index 8f3215f..c9d5e2a 100644
--- a/src/fenetre_principale.h
+++ b/src/fenetre_principale.h
@@ -1,6 +1,8 @@
 #ifndef _FENETRE_PRINCIPALE_H
 #define _FENETRE_PRINCIPALE_H (1)
 
+#include <gtk/gtk.h>
+
 typedef enum GSB_GENERAL_NOTEBOOK_PAGES {
     GSB_HOME_PAGE,
     GSB_ACCOUNT_PAGE,
diff --git a/src/file_obfuscate.c b/src/file_obfuscate.c
index 7257f05..0396887 100644
--- a/src/file_obfuscate.c
+++ b/src/file_obfuscate.c
@@ -30,6 +30,8 @@
 #endif
 
 #include "include.h"
+#include <stdlib.h>
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "file_obfuscate.h"
diff --git a/src/file_obfuscate.h b/src/file_obfuscate.h
index 24378c7..aab51dd 100644
--- a/src/file_obfuscate.h
+++ b/src/file_obfuscate.h
@@ -1,6 +1,7 @@
 #ifndef _FILE_OBFUSCATE_H
 #define _FILE_OBFUSCATE_H (1)
 
+#include <glib.h>
 
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
diff --git a/src/file_obfuscate_qif.c b/src/file_obfuscate_qif.c
index d4a169a..e8f2151 100644
--- a/src/file_obfuscate_qif.c
+++ b/src/file_obfuscate_qif.c
@@ -30,6 +30,7 @@
 #endif
 
 #include "include.h"
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "file_obfuscate_qif.h"
diff --git a/src/file_obfuscate_qif.h b/src/file_obfuscate_qif.h
index 93db2c8..99d69eb 100644
--- a/src/file_obfuscate_qif.h
+++ b/src/file_obfuscate_qif.h
@@ -1,6 +1,7 @@
 #ifndef _FILE_OBFUSCATE_QIF_H
 #define _FILE_OBFUSCATE_QIF_H (1)
 
+#include <glib.h>
 
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
diff --git a/src/go-charmap-sel.c b/src/go-charmap-sel.c
index 06a7141..66eb3a6 100644
--- a/src/go-charmap-sel.c
+++ b/src/go-charmap-sel.c
@@ -28,6 +28,7 @@
 #endif
 
 #include "include.h"
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "go-charmap-sel.h"
diff --git a/src/go-charmap-sel.h b/src/go-charmap-sel.h
index 9813ab2..f9f8809 100644
--- a/src/go-charmap-sel.h
+++ b/src/go-charmap-sel.h
@@ -24,7 +24,7 @@
 #ifndef _GO_CHARMAP_SEL_H_
 #define _GO_CHARMAP_SEL_H_
 
-#include "include.h"
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/go-optionmenu.c b/src/go-optionmenu.c
index f48f4ed..6b90468 100644
--- a/src/go-optionmenu.c
+++ b/src/go-optionmenu.c
@@ -35,6 +35,7 @@
 #endif
 
 #include "include.h"
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "go-optionmenu.h"
diff --git a/src/grisbi_osx.h b/src/grisbi_osx.h
index 6925540..ca2da6a 100644
--- a/src/grisbi_osx.h
+++ b/src/grisbi_osx.h
@@ -2,8 +2,8 @@
 #define _GRISBI_OSX_H (1)
 
 #ifdef GTKOSXAPPLICATION
+
 #include <gtkosxapplication.h>
-#endif /* GTKOSXAPPLICATION */
 
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
@@ -19,5 +19,6 @@ gchar *grisbi_osx_get_plugins_dir ( void );
 GtkWidget *grisbi_osx_init_menus ( GtkWidget *window, GtkWidget *vbox );
 /* END_DECLARATION */
 
+#endif /* GTKOSXAPPLICATION */
 
 #endif
diff --git a/src/gsb_account.c b/src/gsb_account.c
index f209d32..f822607 100644
--- a/src/gsb_account.c
+++ b/src/gsb_account.c
@@ -25,6 +25,7 @@
 #endif
 
 #include "include.h"
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "gsb_account.h"
diff --git a/src/gsb_account_property.c b/src/gsb_account_property.c
index a44c67d..fb51486 100644
--- a/src/gsb_account_property.c
+++ b/src/gsb_account_property.c
@@ -34,8 +34,8 @@
 #endif
 
 #include "include.h"
-
-
+#include <gdk/gdkkeysyms.h>
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "gsb_account_property.h"
@@ -108,6 +108,13 @@ static void gsb_account_property_iban_set_iban ( const gchar *iban );
 static void gsb_account_property_iban_switch_bank_data ( gboolean sensitive );
 /*END_STATIC*/
 
+struct iso_13616_iban
+{
+    gchar *locale;
+    gchar *iban;
+    gint nbre_char;
+};
+
 struct iso_13616_iban iso_13616_ibans [] = {
     { "XX", "XXkk XXXX XXXX XXXX XXXX XXXX XXXX XXXX XX", 34 },
     { "AD", "ADkk BBBB SSSS CCCC CCCC CCCC", 24 },
diff --git a/src/gsb_account_property.h b/src/gsb_account_property.h
index e5b3bde..a81f8f9 100644
--- a/src/gsb_account_property.h
+++ b/src/gsb_account_property.h
@@ -1,15 +1,11 @@
 #ifndef _COMPTES_GESTION_H
 #define _COMPTES_GESTION_H (1)
+
+#include <gtk/gtk.h>
+
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
 
-struct iso_13616_iban
-{
-    gchar *locale;
-    gchar *iban;
-    gint nbre_char;
-};
-
 /* START_DECLARATION */
 void gsb_account_property_clear_config ( void );
 GSList *gsb_account_property_create_combobox_list ( void );
diff --git a/src/gsb_archive_config.c b/src/gsb_archive_config.c
index 074073d..c6cd3d0 100644
--- a/src/gsb_archive_config.c
+++ b/src/gsb_archive_config.c
@@ -31,6 +31,7 @@
 #endif
 
 #include "include.h"
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "gsb_archive_config.h"
diff --git a/src/gsb_archive_config.h b/src/gsb_archive_config.h
index 707b70f..1bdbc49 100644
--- a/src/gsb_archive_config.h
+++ b/src/gsb_archive_config.h
@@ -1,6 +1,7 @@
 #ifndef _GSB_ARCHIVE_CONFIG_H
 #define _GSB_ARCHIVE_CONFIG_H (1)
 
+#include <gtk/gtk.h>
 
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
diff --git a/src/gsb_assistant.c b/src/gsb_assistant.c
index 1af16fe..6840c4c 100644
--- a/src/gsb_assistant.c
+++ b/src/gsb_assistant.c
@@ -31,6 +31,7 @@
 #endif
 
 #include "include.h"
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "gsb_assistant.h"
diff --git a/src/gsb_assistant.h b/src/gsb_assistant.h
index 0bf5d76..7f0f988 100644
--- a/src/gsb_assistant.h
+++ b/src/gsb_assistant.h
@@ -1,6 +1,8 @@
 #ifndef GSB_ASSISTANT_H
 #define GSB_ASSISTANT_H
 
+#include <gtk/gtk.h>
+
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
 
diff --git a/src/gsb_assistant_account.c b/src/gsb_assistant_account.c
index 83eb348..72d2790 100644
--- a/src/gsb_assistant_account.c
+++ b/src/gsb_assistant_account.c
@@ -31,6 +31,7 @@
 #endif
 
 #include "include.h"
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "gsb_assistant_account.h"
diff --git a/src/gsb_assistant_account.h b/src/gsb_assistant_account.h
index a90a66a..03d2a00 100644
--- a/src/gsb_assistant_account.h
+++ b/src/gsb_assistant_account.h
@@ -1,6 +1,7 @@
 #ifndef _GSB_ASSISTANT_ACCOUNT_H
 #define _GSB_ASSISTANT_ACCOUNT_H (1)
 
+#include <gtk/gtk.h>
 
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
diff --git a/src/gsb_assistant_archive.c b/src/gsb_assistant_archive.c
index ebe911f..cb798cf 100644
--- a/src/gsb_assistant_archive.c
+++ b/src/gsb_assistant_archive.c
@@ -32,6 +32,7 @@
 #endif
 
 #include "include.h"
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "gsb_assistant_archive.h"
diff --git a/src/gsb_assistant_archive.h b/src/gsb_assistant_archive.h
index c9fee2d..bd10b78 100644
--- a/src/gsb_assistant_archive.h
+++ b/src/gsb_assistant_archive.h
@@ -1,6 +1,7 @@
 #ifndef _GSB_ASSISTANT_ARCHIVE_H
 #define _GSB_ASSISTANT_ARCHIVE_H (1)
 
+#include <gtk/gtk.h>
 
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
diff --git a/src/gsb_assistant_archive_export.c b/src/gsb_assistant_archive_export.c
index 177755d..20cc45b 100644
--- a/src/gsb_assistant_archive_export.c
+++ b/src/gsb_assistant_archive_export.c
@@ -31,6 +31,7 @@
 #endif
 
 #include "include.h"
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "gsb_assistant_archive_export.h"
diff --git a/src/gsb_assistant_archive_export.h b/src/gsb_assistant_archive_export.h
index 8a992fa..56809f5 100644
--- a/src/gsb_assistant_archive_export.h
+++ b/src/gsb_assistant_archive_export.h
@@ -1,6 +1,7 @@
 #ifndef _GSB_ASSISTANT_ARCHIVE_EXPORT_H
 #define _GSB_ASSISTANT_ARCHIVE_EXPORT_H (1)
 
+#include <gtk/gtk.h>
 
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
diff --git a/src/gsb_assistant_file.c b/src/gsb_assistant_file.c
index f653cf2..6c31d8c 100644
--- a/src/gsb_assistant_file.c
+++ b/src/gsb_assistant_file.c
@@ -31,6 +31,7 @@
 #endif
 
 #include "include.h"
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "gsb_assistant_file.h"
diff --git a/src/gsb_assistant_file.h b/src/gsb_assistant_file.h
index a19dc0c..39d1bd8 100644
--- a/src/gsb_assistant_file.h
+++ b/src/gsb_assistant_file.h
@@ -1,6 +1,7 @@
 #ifndef _GSB_ASSISTANT_FILE_H
 #define _GSB_ASSISTANT_FILE_H (1)
 
+#include <gtk/gtk.h>
 
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
diff --git a/src/gsb_assistant_first.c b/src/gsb_assistant_first.c
index 3aea686..dd8f8ba 100644
--- a/src/gsb_assistant_first.c
+++ b/src/gsb_assistant_first.c
@@ -31,6 +31,7 @@
 #endif
 
 #include "include.h"
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "gsb_assistant_first.h"
diff --git a/src/gsb_assistant_first.h b/src/gsb_assistant_first.h
index 08d76a6..3dd6e7a 100644
--- a/src/gsb_assistant_first.h
+++ b/src/gsb_assistant_first.h
@@ -1,6 +1,7 @@
 #ifndef _GSB_ASSISTANT_FIRST_H
 #define _GSB_ASSISTANT_FIRST_H (1)
 
+#include <gtk/gtk.h>
 
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
diff --git a/src/gsb_assistant_reconcile_config.c b/src/gsb_assistant_reconcile_config.c
index 663d3eb..5eb1dda 100644
--- a/src/gsb_assistant_reconcile_config.c
+++ b/src/gsb_assistant_reconcile_config.c
@@ -31,6 +31,7 @@
 #endif
 
 #include "include.h"
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "gsb_assistant_reconcile_config.h"
diff --git a/src/gsb_assistant_reconcile_config.h b/src/gsb_assistant_reconcile_config.h
index 694473d..9143559 100644
--- a/src/gsb_assistant_reconcile_config.h
+++ b/src/gsb_assistant_reconcile_config.h
@@ -1,6 +1,7 @@
 #ifndef _GSB_ASSISTANT_RECONCILE_CONFIG_H
 #define _GSB_ASSISTANT_RECONCILE_CONFIG_H (1)
 
+#include <gtk/gtk.h>
 
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
diff --git a/src/gsb_autofunc.h b/src/gsb_autofunc.h
index 66f7405..7ec50c0 100644
--- a/src/gsb_autofunc.h
+++ b/src/gsb_autofunc.h
@@ -1,6 +1,7 @@
 #ifndef _GSB_AUTOFUNC_H
 #define _GSB_AUTOFUNC_H (1)
 
+#include <gtk/gtk.h>
 
 /* START_INCLUDE_H */
 #include "gsb_real.h"
diff --git a/src/gsb_automem.c b/src/gsb_automem.c
index c5c855a..9daab58 100644
--- a/src/gsb_automem.c
+++ b/src/gsb_automem.c
@@ -34,7 +34,7 @@
 #endif
 
 #include "include.h"
-
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "gsb_automem.h"
diff --git a/src/gsb_automem.h b/src/gsb_automem.h
index caa9088..9d5afa8 100644
--- a/src/gsb_automem.h
+++ b/src/gsb_automem.h
@@ -1,6 +1,7 @@
 #ifndef _GSB_AUTOMEM_H
 #define _GSB_AUTOMEM_H (1)
 
+#include <gtk/gtk.h>
 
 /* START_INCLUDE_H */
 #include "utils_buttons.h"
diff --git a/src/gsb_bank.c b/src/gsb_bank.c
index 7f3816e..8ecc141 100644
--- a/src/gsb_bank.c
+++ b/src/gsb_bank.c
@@ -34,6 +34,7 @@
 #endif
 
 #include "include.h"
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "gsb_bank.h"
diff --git a/src/gsb_bank.h b/src/gsb_bank.h
index 6a77c91..6673569 100644
--- a/src/gsb_bank.h
+++ b/src/gsb_bank.h
@@ -1,5 +1,8 @@
 #ifndef _BANQUE_H
 #define _BANQUE_H (1)
+
+#include <gtk/gtk.h>
+
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
 
diff --git a/src/gsb_calendar.h b/src/gsb_calendar.h
index 9b77020..f157d5f 100644
--- a/src/gsb_calendar.h
+++ b/src/gsb_calendar.h
@@ -1,6 +1,7 @@
 #ifndef _ECHEANCIER_INFOS_H
 #define _ECHEANCIER_INFOS_H (1)
 
+#include <gtk/gtk.h>
 
 /* START_INCLUDE_H */
 #include "gsb_scheduler_list.h"
diff --git a/src/gsb_calendar_entry.c b/src/gsb_calendar_entry.c
index da04370..7222bb0 100644
--- a/src/gsb_calendar_entry.c
+++ b/src/gsb_calendar_entry.c
@@ -32,9 +32,9 @@
 #endif
 
 #include "include.h"
-
 #include <ctype.h>
 #include <gdk/gdkkeysyms.h>
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "gsb_calendar_entry.h"
diff --git a/src/gsb_calendar_entry.h b/src/gsb_calendar_entry.h
index e1854ca..25ea88b 100644
--- a/src/gsb_calendar_entry.h
+++ b/src/gsb_calendar_entry.h
@@ -1,6 +1,8 @@
 #ifndef _GSB_CALENDAR_ENTRY_H
 #define _GSB_CALENDAR_ENTRY_H (1)
 
+#include <gtk/gtk.h>
+
 /* fichier d'en tête gsbcalendar.h */
 /* Constantes utilisées par la fonction inc_dec_date */
 #define ONE_DAY 1
diff --git a/src/gsb_category.c b/src/gsb_category.c
index 4975b98..c611cac 100644
--- a/src/gsb_category.c
+++ b/src/gsb_category.c
@@ -31,6 +31,7 @@
 #endif
 
 #include "include.h"
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "gsb_category.h"
diff --git a/src/gsb_category.h b/src/gsb_category.h
index d6d8396..0dce2a0 100644
--- a/src/gsb_category.h
+++ b/src/gsb_category.h
@@ -1,6 +1,7 @@
 #ifndef __GSB_CATEGORY_H
 #define __GSB_CATEGORY_H (1)
 
+#include <gtk/gtk.h>
 
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
diff --git a/src/gsb_combo_box.h b/src/gsb_combo_box.h
index fe64a29..6ce5eb3 100644
--- a/src/gsb_combo_box.h
+++ b/src/gsb_combo_box.h
@@ -1,6 +1,7 @@
 #ifndef _GSB_COMBO_BOX_H
 #define _GSB_COMBO_BOX_H (1)
 
+#include <gtk/gtk.h>
 
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
diff --git a/src/gsb_currency.c b/src/gsb_currency.c
index e07a9d4..ce60dc2 100644
--- a/src/gsb_currency.c
+++ b/src/gsb_currency.c
@@ -32,6 +32,7 @@
 #endif
 
 #include "include.h"
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "gsb_currency.h"
diff --git a/src/gsb_currency.h b/src/gsb_currency.h
index 0273d8e..e82c0fd 100644
--- a/src/gsb_currency.h
+++ b/src/gsb_currency.h
@@ -1,6 +1,7 @@
 #ifndef _DEVISES_H
 #define _DEVISES_H (1)
 
+#include <gtk/gtk.h>
 
 /* START_INCLUDE_H */
 #include "gsb_real.h"
diff --git a/src/gsb_currency_config.c b/src/gsb_currency_config.c
index 838e052..c77944e 100644
--- a/src/gsb_currency_config.c
+++ b/src/gsb_currency_config.c
@@ -30,6 +30,7 @@
 #endif
 
 #include "include.h"
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "gsb_currency_config.h"
diff --git a/src/gsb_currency_config.h b/src/gsb_currency_config.h
index 9756539..6573c13 100644
--- a/src/gsb_currency_config.h
+++ b/src/gsb_currency_config.h
@@ -1,6 +1,7 @@
 #ifndef _GSB_CURRENCY_CONFIG_H
 #define _GSB_CURRENCY_CONFIG_H (1)
 
+#include <gtk/gtk.h>
 
 /* START_INCLUDE_H */
 #include "gsb_real.h"
diff --git a/src/gsb_currency_link_config.c b/src/gsb_currency_link_config.c
index 196476b..58e617e 100644
--- a/src/gsb_currency_link_config.c
+++ b/src/gsb_currency_link_config.c
@@ -31,6 +31,8 @@
 #endif
 
 #include "include.h"
+#include <gdk/gdkkeysyms.h>
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "gsb_currency_link_config.h"
diff --git a/src/gsb_currency_link_config.h b/src/gsb_currency_link_config.h
index 5825030..d1d4f73 100644
--- a/src/gsb_currency_link_config.h
+++ b/src/gsb_currency_link_config.h
@@ -1,6 +1,7 @@
 #ifndef _GSB_CURRENCY_LINK_CONFIG_H
 #define _GSB_CURRENCY_LINK_CONFIG_H (1)
 
+#include <gtk/gtk.h>
 
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
diff --git a/src/gsb_data_account.c b/src/gsb_data_account.c
index 741496e..d2e5cdf 100644
--- a/src/gsb_data_account.c
+++ b/src/gsb_data_account.c
@@ -32,6 +32,7 @@
 #endif
 
 #include "include.h"
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "gsb_data_account.h"
diff --git a/src/gsb_data_account.h b/src/gsb_data_account.h
index 9c2ff8b..bc39788 100644
--- a/src/gsb_data_account.h
+++ b/src/gsb_data_account.h
@@ -1,6 +1,7 @@
 #ifndef _GSB_ACCOUNT_H
 #define _GSB_ACCOUNT_H (1)
 
+#include <gtk/gtk.h>
 
 /* START_INCLUDE_H */
 #include "gsb_real.h"
diff --git a/src/gsb_data_archive.h b/src/gsb_data_archive.h
index 55f2a8c..db2e9be 100644
--- a/src/gsb_data_archive.h
+++ b/src/gsb_data_archive.h
@@ -1,6 +1,7 @@
 #ifndef _GSB_DATA_ARCHIVE_H
 #define _GSB_DATA_ARCHIVE_H (1)
 
+#include <glib.h>
 
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
diff --git a/src/gsb_data_bank.h b/src/gsb_data_bank.h
index 8288dc2..b49f4a5 100644
--- a/src/gsb_data_bank.h
+++ b/src/gsb_data_bank.h
@@ -1,6 +1,7 @@
 #ifndef _GSB_DATA_BANK_H
 #define _GSB_DATA_BANK_H (1)
 
+#include <glib.h>
 
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
diff --git a/src/gsb_data_budget.c b/src/gsb_data_budget.c
index 1a91a13..e71e7a9 100644
--- a/src/gsb_data_budget.c
+++ b/src/gsb_data_budget.c
@@ -32,6 +32,7 @@
 #endif
 
 #include "include.h"
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "gsb_data_budget.h"
diff --git a/src/gsb_data_category.c b/src/gsb_data_category.c
index 32ef703..391c4f3 100644
--- a/src/gsb_data_category.c
+++ b/src/gsb_data_category.c
@@ -31,6 +31,7 @@
 #endif
 
 #include "include.h"
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "gsb_data_category.h"
diff --git a/src/gsb_data_currency.c b/src/gsb_data_currency.c
index 62c2f69..bf2336e 100644
--- a/src/gsb_data_currency.c
+++ b/src/gsb_data_currency.c
@@ -31,6 +31,7 @@
 #endif
 
 #include "include.h"
+#include <string.h>
 
 /*START_INCLUDE*/
 #include "gsb_data_currency.h"
diff --git a/src/gsb_data_currency.h b/src/gsb_data_currency.h
index bb10db8..ff24239 100644
--- a/src/gsb_data_currency.h
+++ b/src/gsb_data_currency.h
@@ -1,6 +1,7 @@
 #ifndef _GSB_DATA_CURRENCY_H
 #define _GSB_DATA_CURRENCY_H (1)
 
+#include <glib.h>
 
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
diff --git a/src/gsb_data_currency_link.c b/src/gsb_data_currency_link.c
index 08983aa..6f531ff 100644
--- a/src/gsb_data_currency_link.c
+++ b/src/gsb_data_currency_link.c
@@ -31,6 +31,7 @@
 #endif
 
 #include "include.h"
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "gsb_data_currency_link.h"
diff --git a/src/gsb_data_form.c b/src/gsb_data_form.c
index 0b93310..0da8dc7 100644
--- a/src/gsb_data_form.c
+++ b/src/gsb_data_form.c
@@ -31,6 +31,7 @@
 #endif
 
 #include "include.h"
+#include <string.h>
 
 /*START_INCLUDE*/
 #include "gsb_data_form.h"
diff --git a/src/gsb_data_form.h b/src/gsb_data_form.h
index 0706017..12eaad8 100644
--- a/src/gsb_data_form.h
+++ b/src/gsb_data_form.h
@@ -1,6 +1,8 @@
 #ifndef _DATA_FORM_H
 #define _DATA_FORM_H (1)
 
+#include <glib.h>
+
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
 
diff --git a/src/gsb_data_fyear.c b/src/gsb_data_fyear.c
index 6236c36..6cb6e4a 100644
--- a/src/gsb_data_fyear.c
+++ b/src/gsb_data_fyear.c
@@ -31,6 +31,7 @@
 #endif
 
 #include "include.h"
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "gsb_data_fyear.h"
diff --git a/src/gsb_data_fyear.h b/src/gsb_data_fyear.h
index bbe2dda..701f232 100644
--- a/src/gsb_data_fyear.h
+++ b/src/gsb_data_fyear.h
@@ -1,6 +1,8 @@
 #ifndef _GSB_DATA_FYEAR_H
 #define _GSB_DATA_FYEAR_H (1)
 
+#include <glib.h>
+
 /**
  * \struct 
  * Describe a fyear 
diff --git a/src/gsb_data_import_rule.h b/src/gsb_data_import_rule.h
index 44887ee..bb7b7bc 100644
--- a/src/gsb_data_import_rule.h
+++ b/src/gsb_data_import_rule.h
@@ -1,6 +1,7 @@
 #ifndef _GSB_DATA_IMPORT_RULE_H
 #define _GSB_DATA_IMPORT_RULE_H (1)
 
+#include <glib.h>
 
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
diff --git a/src/gsb_data_partial_balance.c b/src/gsb_data_partial_balance.c
index ce9d853..fbeca45 100644
--- a/src/gsb_data_partial_balance.c
+++ b/src/gsb_data_partial_balance.c
@@ -30,6 +30,8 @@
 #endif
 
 #include "include.h"
+#include <gdk/gdkkeysyms.h>
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "gsb_data_partial_balance.h"
diff --git a/src/gsb_data_payee.c b/src/gsb_data_payee.c
index 00e7d9e..525e394 100644
--- a/src/gsb_data_payee.c
+++ b/src/gsb_data_payee.c
@@ -32,6 +32,7 @@
 #endif
 
 #include "include.h"
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "gsb_data_payee.h"
diff --git a/src/gsb_data_payment.c b/src/gsb_data_payment.c
index 46e294d..dff9220 100644
--- a/src/gsb_data_payment.c
+++ b/src/gsb_data_payment.c
@@ -31,7 +31,7 @@
 #endif
 
 #include "include.h"
-
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "gsb_data_payment.h"
diff --git a/src/gsb_data_payment.h b/src/gsb_data_payment.h
index 0288710..3fcca4b 100644
--- a/src/gsb_data_payment.h
+++ b/src/gsb_data_payment.h
@@ -3,6 +3,8 @@
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
 
+#include <glib.h>
+
 #define GSB_PAYMENT_NEUTRAL 0
 #define GSB_PAYMENT_DEBIT 1
 #define GSB_PAYMENT_CREDIT 2
diff --git a/src/gsb_data_print_config.h b/src/gsb_data_print_config.h
index ffe7333..b1f39f0 100644
--- a/src/gsb_data_print_config.h
+++ b/src/gsb_data_print_config.h
@@ -1,6 +1,7 @@
 #ifndef _GSB_DATA_PRINT_CONFIG_H
 #define _GSB_DATA_PRINT_CONFIG_H (1)
 
+#include <gtk/gtk.h>
 
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
diff --git a/src/gsb_data_reconcile.c b/src/gsb_data_reconcile.c
index 2100fe6..64c05e7 100644
--- a/src/gsb_data_reconcile.c
+++ b/src/gsb_data_reconcile.c
@@ -31,6 +31,7 @@
 #endif
 
 #include "include.h"
+#include <string.h>
 
 /*START_INCLUDE*/
 #include "gsb_data_reconcile.h"
diff --git a/src/gsb_data_report.c b/src/gsb_data_report.c
index 1ba40b1..2b70f32 100644
--- a/src/gsb_data_report.c
+++ b/src/gsb_data_report.c
@@ -33,6 +33,7 @@
 #endif
 
 #include "include.h"
+#include <string.h>
 
 /*START_INCLUDE*/
 #include "gsb_data_report.h"
diff --git a/src/gsb_data_report.h b/src/gsb_data_report.h
index 00e23f1..ac434c5 100644
--- a/src/gsb_data_report.h
+++ b/src/gsb_data_report.h
@@ -1,6 +1,8 @@
 #ifndef _GSB_DATA_REPORT_H
 #define _GSB_DATA_REPORT_H (1)
 
+#include <glib.h>
+
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
 
diff --git a/src/gsb_data_report_text_comparison.c b/src/gsb_data_report_text_comparison.c
index 14b0142..aca6498 100644
--- a/src/gsb_data_report_text_comparison.c
+++ b/src/gsb_data_report_text_comparison.c
@@ -34,6 +34,7 @@
 #endif
 
 #include "include.h"
+#include <string.h>
 
 /*START_INCLUDE*/
 #include "gsb_data_report_text_comparison.h"
diff --git a/src/gsb_data_report_text_comparison.h b/src/gsb_data_report_text_comparison.h
index 786c6e4..a489f77 100644
--- a/src/gsb_data_report_text_comparison.h
+++ b/src/gsb_data_report_text_comparison.h
@@ -1,6 +1,8 @@
 #ifndef _GSB_DATA_REPORT_TEXT_COMPARISON_H
 #define _GSB_DATA_REPORT_TEXT_COMPARISON_H (1)
 
+#include <glib.h>
+
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
 
diff --git a/src/gsb_data_scheduled.c b/src/gsb_data_scheduled.c
index 6659755..b7c333c 100644
--- a/src/gsb_data_scheduled.c
+++ b/src/gsb_data_scheduled.c
@@ -31,7 +31,7 @@
 #endif
 
 #include "include.h"
-
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "gsb_data_scheduled.h"
diff --git a/src/gsb_data_transaction.c b/src/gsb_data_transaction.c
index 7144241..ae79a2a 100644
--- a/src/gsb_data_transaction.c
+++ b/src/gsb_data_transaction.c
@@ -31,7 +31,7 @@
 #endif
 
 #include "include.h"
-
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "gsb_data_transaction.h"
diff --git a/src/gsb_debug.c b/src/gsb_debug.c
index b29f7b7..9858d2a 100644
--- a/src/gsb_debug.c
+++ b/src/gsb_debug.c
@@ -24,6 +24,7 @@
 #endif
 
 #include "include.h"
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "gsb_debug.h"
diff --git a/src/gsb_debug.h b/src/gsb_debug.h
index fdec310..86519cc 100644
--- a/src/gsb_debug.h
+++ b/src/gsb_debug.h
@@ -1,6 +1,8 @@
 #ifndef GSB_FILE_DEBUG_H
 #define GSB_FILE_DEBUG_H (1)
 
+#include <glib.h>
+
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
 
diff --git a/src/gsb_file.c b/src/gsb_file.c
index c05afc8..9bf1f5b 100644
--- a/src/gsb_file.c
+++ b/src/gsb_file.c
@@ -26,8 +26,11 @@
 #endif
 
 #include "include.h"
-
 #include <time.h>
+#include <limits.h>
+#include <stdlib.h>
+#include <glib/gstdio.h>
+#include <glib/gi18n.h>
 
 #ifdef _WIN32
 #	if defined(_MSC_VER) || defined(_MINGW)
diff --git a/src/gsb_file.h b/src/gsb_file.h
index e200b4a..8fa5fec 100644
--- a/src/gsb_file.h
+++ b/src/gsb_file.h
@@ -1,5 +1,8 @@
 #ifndef _FICHIERS_GESTION_H
 #define _FICHIERS_GESTION_H (1)
+
+#include <gtk/gtk.h>
+
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
 
diff --git a/src/gsb_file_config.c b/src/gsb_file_config.c
index 6dcfb94..927484a 100644
--- a/src/gsb_file_config.c
+++ b/src/gsb_file_config.c
@@ -33,13 +33,15 @@
 #endif
 
 #include "include.h"
+#include <errno.h>
+#include <glib/gstdio.h>
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "gsb_file_config.h"
 #include "dialog.h"
 #include "gsb_file.h"
 #include "main.h"
-#include "print_config.h"
 #include "structures.h"
 #include "utils_buttons.h"
 #include "utils_files.h"
@@ -253,16 +255,6 @@ devel_debug (NULL);
     
     conf.font_string = g_key_file_get_string ( config, "General", "Font name", NULL );
     
-    conf.latex_command = g_key_file_get_string ( config,
-                        "General",
-                        "Latex command",
-                        NULL );
-
-    conf.dvips_command = g_key_file_get_string ( config,
-                        "General",
-                        "Dvips command",
-                        NULL );
-
     conf.browser_command = g_key_file_get_string ( config,
                         "General",
                         "Web",
@@ -497,50 +489,6 @@ devel_debug (NULL);
                         "Show tip",
                         NULL );
 
-    /* get printer config */
-
-    etat.print_config.printer = g_key_file_get_integer ( config,
-                        "Print config",
-                        "Printer",
-                        NULL );
-
-    etat.print_config.printer_name = g_key_file_get_string ( config,
-                        "Print config",
-                        "Printer name",
-                        NULL );
-
-    etat.print_config.printer_filename = g_key_file_get_string ( config,
-                        "Print config",
-                        "Printer filename",
-                        NULL );
-
-    etat.print_config.filetype = g_key_file_get_integer ( config,
-                        "Print config",
-                        "Filetype",
-                        NULL );
-
-    etat.print_config.orientation = g_key_file_get_integer ( config,
-                        "Print config",
-                        "Orientation",
-                        NULL );
-
-    /* get the paper config */
-
-    etat.print_config.paper_config.name = g_key_file_get_string ( config,
-                        "Paper config",
-                        "Name",
-                        NULL );
-
-    etat.print_config.paper_config.width = g_key_file_get_integer ( config,
-                        "Paper config",
-                        "Width",
-                        NULL );
-
-    etat.print_config.paper_config.height = g_key_file_get_integer ( config,
-                        "Paper config",
-                        "Height",
-                        NULL );
-
     g_free (filename);
     g_key_file_free (config);
     return TRUE;
@@ -665,18 +613,6 @@ gboolean gsb_file_config_save_config ( void )
                         "Font name",
                         conf.font_string );
 
-    if ( conf.latex_command )
-        g_key_file_set_string ( config,
-                        "General",
-                        "Latex command",
-                        conf.latex_command );
-
-    if ( conf.dvips_command )
-        g_key_file_set_string ( config,
-                        "General",
-                        "Dvips command",
-                        conf.dvips_command );
-
     if (conf.browser_command)
     {
         gchar *string;
@@ -895,51 +831,6 @@ gboolean gsb_file_config_save_config ( void )
                         "Show tip",
                         etat.show_tip );
 
-    /* save printer config */
-    g_key_file_set_integer ( config,
-                        "Print config",
-                        "Printer",
-                        etat.print_config.printer );
-
-    if ( etat.print_config.printer_name )
-        g_key_file_set_string ( config,
-                        "Print config",
-                        "Printer name",
-                        etat.print_config.printer_name );
-
-    if ( etat.print_config.printer_filename )
-        g_key_file_set_string ( config,
-                        "Print config",
-                        "Printer filename",
-                        etat.print_config.printer_filename );
-
-    g_key_file_set_integer ( config,
-                        "Print config",
-                        "Filetype",
-                        etat.print_config.filetype );
-
-    g_key_file_set_integer ( config,
-                        "Print config",
-                        "Orientation",
-                        etat.print_config.orientation );
-
-    /* save the paper config */
-    if ( etat.print_config.paper_config.name )
-        g_key_file_set_string ( config,
-                        "Paper config",
-                        "Name",
-                        etat.print_config.paper_config.name );
-
-    g_key_file_set_integer ( config,
-                        "Paper config",
-                        "Width",
-                        etat.print_config.paper_config.width );
-
-    g_key_file_set_integer ( config,
-                        "Paper config",
-                        "Height",
-                        etat.print_config.paper_config.height );
-
     /* save into a file */
     file_content = g_key_file_to_data ( config, &length, NULL );
 
@@ -1154,20 +1045,6 @@ void gsb_file_config_get_xml_text_element ( GMarkupParseContext *context,
     }
  
     if ( !strcmp ( element_name,
-		   "Latex_command" ))
-    {
-	/* TODO dOm : fix memory leaks in this function (memory used by lvalue before setting its value */
-	conf.latex_command = my_strdup (text);
-	return;
-    }
-     if ( !strcmp ( element_name,
-		   "Dvips_command" ))
-    {
-	conf.dvips_command = my_strdup (text);
-	return;
-    }
-
-    if ( !strcmp ( element_name,
 		   "Largeur_colonne_comptes_operation" ))
     {
 	conf.largeur_colonne_comptes_operation = utils_str_atoi (text);
@@ -1319,39 +1196,6 @@ void gsb_file_config_get_xml_text_element ( GMarkupParseContext *context,
 	    messages[i].hidden = utils_str_atoi (text);
 	}
     }
-
-    if ( !strcmp ( element_name,
-		   "printer" ))
-    {
-	etat.print_config.printer = utils_str_atoi (text);
-	return;
-    }
-
-    if ( !strcmp ( element_name,
-		   "printer_name" ))
-    {
-	etat.print_config.printer_name = my_strdup (text);
-	return;
-    }
-      if ( !strcmp ( element_name,
-		   "printer_filename" ))
-    {
-	etat.print_config.printer_filename = my_strdup (text);
-	return;
-    }
-      if ( !strcmp ( element_name,
-		   "filetype" ))
-    {
-	etat.print_config.filetype = utils_str_atoi (text);
-	return;
-    }
-
-    if ( !strcmp ( element_name,
-		   "orientation" ))
-    {
-	etat.print_config.orientation = utils_str_atoi (text);
-	return;
-    }
 }
 
 
@@ -1429,30 +1273,11 @@ void gsb_file_config_clean_config ( void )
     etat.last_tip = -1;
     etat.show_tip = FALSE;
 
-    /* Commands */
-    /* TODO dOm : use a copy of string so that we can free it */
-    conf.latex_command = "latex";
-    conf.dvips_command = "dvips";
-
     /* mise en conformité avec les recommandations FreeDesktop. */
     conf.browser_command = g_strdup (ETAT_WWW_BROWSER);
 
     conf.metatree_action_2button_press = 0;     /* action par défaut pour le double clic sur division */
 
-    /* Print */
-    etat.print_config.printer = 0;
-#ifndef _WIN32
-     etat.print_config.printer_name = "lpr";
-#else
-    etat.print_config.printer_name = "gsprint";
-#endif
-    etat.print_config.printer_filename = g_strdup ("");
-    etat.print_config.filetype = POSTSCRIPT_FILE;
-    etat.print_config.paper_config.name = _("A4");
-    etat.print_config.paper_config.width = 21;
-    etat.print_config.paper_config.height = 29.7;
-    etat.print_config.orientation = LANDSCAPE;
-
     memset ( etat.csv_skipped_lines, '\0', sizeof(gboolean) * CSV_MAX_TOP_LINES );
 }
 
diff --git a/src/gsb_file_load.c b/src/gsb_file_load.c
index 4c78fb8..9d82b83 100644
--- a/src/gsb_file_load.c
+++ b/src/gsb_file_load.c
@@ -27,7 +27,9 @@
 #endif
 
 #include "include.h"
-
+#include <errno.h>
+#include <stdlib.h>
+#include <glib/gi18n.h>
 #include <glib/gstdio.h>
 #include <gio/gio.h>
 
diff --git a/src/gsb_file_load.h b/src/gsb_file_load.h
index 9522776..8937669 100644
--- a/src/gsb_file_load.h
+++ b/src/gsb_file_load.h
@@ -1,6 +1,7 @@
 #ifndef _GSB_FILE_LOAD_H
 #define _GSB_FILE_LOAD_H (1)
 
+#include <glib.h>
 
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
diff --git a/src/gsb_file_others.c b/src/gsb_file_others.c
index 9c94e61..94ac873 100644
--- a/src/gsb_file_others.c
+++ b/src/gsb_file_others.c
@@ -31,6 +31,8 @@
 #endif
 
 #include "include.h"
+#include <errno.h>
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "gsb_file_others.h"
diff --git a/src/gsb_file_others.h b/src/gsb_file_others.h
index 5bf5806..2be8146 100644
--- a/src/gsb_file_others.h
+++ b/src/gsb_file_others.h
@@ -1,6 +1,8 @@
 #ifndef _GSB_FILE_OTHERS_H
 #define _GSB_FILE_OTHERS_H (1)
 
+#include <glib.h>
+
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
 
diff --git a/src/gsb_file_save.c b/src/gsb_file_save.c
index 2274d70..782f805 100644
--- a/src/gsb_file_save.c
+++ b/src/gsb_file_save.c
@@ -31,6 +31,11 @@
 #endif
 
 #include "include.h"
+#include <glib/gi18n.h>
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
 #ifdef _MSC_VER
 #	include <io.h> // for _chmod()
 #endif /*_MSC_VER */
diff --git a/src/gsb_file_save.h b/src/gsb_file_save.h
index 0726be5..077fe5c 100644
--- a/src/gsb_file_save.h
+++ b/src/gsb_file_save.h
@@ -1,6 +1,7 @@
 #ifndef _GSB_FILE_SAVE_H
 #define _GSB_FILE_SAVE_H (1)
 
+#include <glib.h>
 
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
diff --git a/src/gsb_file_util.c b/src/gsb_file_util.c
index 3553b1f..948edcc 100644
--- a/src/gsb_file_util.c
+++ b/src/gsb_file_util.c
@@ -23,10 +23,10 @@
 #endif
 
 #include "include.h"
-
+#include <errno.h>
+#include <glib/gi18n.h>
 #include <zlib.h>
 
-
 /*START_INCLUDE*/
 #include "gsb_file_util.h"
 #include "dialog.h"
diff --git a/src/gsb_file_util.h b/src/gsb_file_util.h
index a8d6e91..0c4f03d 100644
--- a/src/gsb_file_util.h
+++ b/src/gsb_file_util.h
@@ -1,6 +1,8 @@
 #ifndef _GSB_FILE_UTIL_H
 #define _GSB_FILE_UTIL_H (1)
 
+#include <glib.h>
+
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
 
diff --git a/src/gsb_form.c b/src/gsb_form.c
index e66c7c2..62d185b 100644
--- a/src/gsb_form.c
+++ b/src/gsb_form.c
@@ -32,6 +32,8 @@
 #endif
 
 #include "include.h"
+#include <gdk/gdkkeysyms.h>
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "gsb_form.h"
diff --git a/src/gsb_form.h b/src/gsb_form.h
index 2c67154..f4d3bab 100644
--- a/src/gsb_form.h
+++ b/src/gsb_form.h
@@ -1,6 +1,8 @@
 #ifndef _GSB_FORM_H
 #define _GSB_FORM_H (1)
 
+#include <gtk/gtk.h>
+
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
 
diff --git a/src/gsb_form_config.c b/src/gsb_form_config.c
index f72108d..51feb53 100644
--- a/src/gsb_form_config.c
+++ b/src/gsb_form_config.c
@@ -30,6 +30,7 @@
 #endif
 
 #include "include.h"
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "gsb_form_config.h"
diff --git a/src/gsb_form_config.h b/src/gsb_form_config.h
index a221a8a..3806090 100644
--- a/src/gsb_form_config.h
+++ b/src/gsb_form_config.h
@@ -1,6 +1,8 @@
 #ifndef _GSB_FORM_CONFIG_H
 #define _GSB_FORM_CONFIG_H (1)
 
+#include <gtk/gtk.h>
+
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
 
diff --git a/src/gsb_form_scheduler.c b/src/gsb_form_scheduler.c
index 49983c2..f180288 100644
--- a/src/gsb_form_scheduler.c
+++ b/src/gsb_form_scheduler.c
@@ -31,6 +31,7 @@
 #endif
 
 #include "include.h"
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "gsb_form_scheduler.h"
diff --git a/src/gsb_form_scheduler.h b/src/gsb_form_scheduler.h
index f328b59..5c8e317 100644
--- a/src/gsb_form_scheduler.h
+++ b/src/gsb_form_scheduler.h
@@ -1,6 +1,7 @@
 #ifndef _GSB_FORM_SCHEDULER_H
 #define _GSB_FORM_SCHEDULER_H (1)
 
+#include <gtk/gtk.h>
 
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
diff --git a/src/gsb_form_transaction.c b/src/gsb_form_transaction.c
index 27cc121..d43c9ad 100644
--- a/src/gsb_form_transaction.c
+++ b/src/gsb_form_transaction.c
@@ -32,6 +32,7 @@
 #endif
 
 #include "include.h"
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "gsb_form_transaction.h"
diff --git a/src/gsb_form_transaction.h b/src/gsb_form_transaction.h
index daaae0d..d229ada 100644
--- a/src/gsb_form_transaction.h
+++ b/src/gsb_form_transaction.h
@@ -1,6 +1,7 @@
 #ifndef _OPERATIONS_FORMULAIRE_H
 #define _OPERATIONS_FORMULAIRE_H (1)
 
+#include <gtk/gtk.h>
 
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
diff --git a/src/gsb_form_widget.c b/src/gsb_form_widget.c
index 50fe93f..dd5287a 100644
--- a/src/gsb_form_widget.c
+++ b/src/gsb_form_widget.c
@@ -32,6 +32,7 @@
 #endif
 
 #include "include.h"
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "gsb_form_widget.h"
diff --git a/src/gsb_form_widget.h b/src/gsb_form_widget.h
index 2af4a26..e68c5da 100644
--- a/src/gsb_form_widget.h
+++ b/src/gsb_form_widget.h
@@ -1,6 +1,8 @@
 #ifndef _GSB_FORM_WIDGET_H
 #define _GSB_FORM_WIDGET_H (1)
 
+#include <gtk/gtk.h>
+
 /**
  * \struct
  * Associate an element number to its widget,
diff --git a/src/gsb_fyear.c b/src/gsb_fyear.c
index 246bc74..a983bfb 100644
--- a/src/gsb_fyear.c
+++ b/src/gsb_fyear.c
@@ -31,6 +31,7 @@
 #endif
 
 #include "include.h"
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "gsb_fyear.h"
diff --git a/src/gsb_fyear.h b/src/gsb_fyear.h
index db9c197..b745dd6 100644
--- a/src/gsb_fyear.h
+++ b/src/gsb_fyear.h
@@ -1,6 +1,8 @@
 #ifndef _GSB_FYEAR_H
 #define _GSB_FYEAR_H (1)
 
+#include <gtk/gtk.h>
+
 enum fyear_list_columns {
     FYEAR_COL_NAME = 0,
     FYEAR_COL_NUMBER,
diff --git a/src/gsb_fyear_config.c b/src/gsb_fyear_config.c
index 2f6f6d3..0e91e63 100644
--- a/src/gsb_fyear_config.c
+++ b/src/gsb_fyear_config.c
@@ -31,6 +31,7 @@
 #endif
 
 #include "include.h"
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "gsb_fyear_config.h"
diff --git a/src/gsb_fyear_config.h b/src/gsb_fyear_config.h
index 4142fc5..f4137d4 100644
--- a/src/gsb_fyear_config.h
+++ b/src/gsb_fyear_config.h
@@ -1,6 +1,7 @@
 #ifndef _GSB_FYEAR_CONFIG_H
 #define _GSB_FYEAR_CONFIG_H (1)
 
+#include <gtk/gtk.h>
 
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
diff --git a/src/gsb_payment_method.h b/src/gsb_payment_method.h
index 10720e8..75ebf02 100644
--- a/src/gsb_payment_method.h
+++ b/src/gsb_payment_method.h
@@ -1,6 +1,8 @@
 #ifndef _GSB_PAYMENT_METHOD_H
 #define _GSB_PAYMENT_METHOD_H (1)
 
+#include <gtk/gtk.h>
+
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
 
diff --git a/src/gsb_payment_method_config.c b/src/gsb_payment_method_config.c
index 1aa31bf..a702ca4 100644
--- a/src/gsb_payment_method_config.c
+++ b/src/gsb_payment_method_config.c
@@ -29,6 +29,7 @@
 #endif
 
 #include "include.h"
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "gsb_payment_method_config.h"
diff --git a/src/gsb_payment_method_config.h b/src/gsb_payment_method_config.h
index 1838c8e..8337502 100644
--- a/src/gsb_payment_method_config.h
+++ b/src/gsb_payment_method_config.h
@@ -1,6 +1,8 @@
 #ifndef _GSB_PAYMENT_METHOD_CONFIG_H
 #define _GSB_PAYMENT_METHOD_CONFIG_H (1)
 
+#include <gtk/gtk.h>
+
 /** Columns for payment methods tree */
 enum payment_methods_columns {
     PAYMENT_METHODS_NAME_COLUMN = 0,
diff --git a/src/gsb_plugins.c b/src/gsb_plugins.c
index 17fa2dc..e48d001 100644
--- a/src/gsb_plugins.c
+++ b/src/gsb_plugins.c
@@ -24,6 +24,10 @@
 #endif
 
 #include "include.h"
+#ifndef ENABLE_STATIC
+#include <gmodule.h>
+#endif
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "gsb_plugins.h"
diff --git a/src/gsb_plugins.h b/src/gsb_plugins.h
index aa5498b..b57ca57 100644
--- a/src/gsb_plugins.h
+++ b/src/gsb_plugins.h
@@ -1,8 +1,12 @@
 #ifndef GSB_PLUGINS_H
 #define GSB_PLUGINS_H
 
+#include <glib.h>
+#ifndef ENABLE_STATIC
+#include <gmodule.h>
+#endif
+
 /* START_INCLUDE_H */
-#include "structures.h"
 /* END_INCLUDE_H */
 
 
@@ -10,7 +14,9 @@ typedef struct gsb_plugin {
     gchar * name;
     void (* plugin_register) ( void );
     gpointer (* plugin_run) ( );
+#ifndef ENABLE_STATIC
     GModule * handle;
+#endif
 }  gsb_plugin;
 
 
diff --git a/src/gsb_real.c b/src/gsb_real.c
index 3b1291e..9a06297 100644
--- a/src/gsb_real.c
+++ b/src/gsb_real.c
@@ -34,6 +34,10 @@
 #endif
 
 #include "include.h"
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+#include <glib/gstdio.h>
 #include <assert.h>
 
 /*START_INCLUDE*/
diff --git a/src/gsb_real.h b/src/gsb_real.h
index edbceb4..aef8982 100644
--- a/src/gsb_real.h
+++ b/src/gsb_real.h
@@ -1,6 +1,10 @@
 #ifndef _GSB_REAL_H
 #define _GSB_REAL_H (1)
 
+#include <locale.h>
+#include <glib.h>
+#include <gmodule.h>
+
 #define EXPONENT_MAX 10
 #define ERROR_REAL_STRING "###ERR###"
 
diff --git a/src/gsb_reconcile.c b/src/gsb_reconcile.c
index 331d925..c613e15 100644
--- a/src/gsb_reconcile.c
+++ b/src/gsb_reconcile.c
@@ -32,6 +32,9 @@
 #endif
 
 #include "include.h"
+#include <string.h>
+#include <ctype.h>
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "gsb_reconcile.h"
diff --git a/src/gsb_reconcile.h b/src/gsb_reconcile.h
index c74bf50..dfbce65 100644
--- a/src/gsb_reconcile.h
+++ b/src/gsb_reconcile.h
@@ -1,6 +1,7 @@
 #ifndef _GSB_RECONCILE_H
 #define _GSB_RECONCILE_H (1)
 
+#include <gtk/gtk.h>
 
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
diff --git a/src/gsb_reconcile_config.c b/src/gsb_reconcile_config.c
index 8848e31..b0efbec 100644
--- a/src/gsb_reconcile_config.c
+++ b/src/gsb_reconcile_config.c
@@ -31,6 +31,7 @@
 #endif
 
 #include "include.h"
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "gsb_reconcile_config.h"
diff --git a/src/gsb_reconcile_config.h b/src/gsb_reconcile_config.h
index 8ff0c4e..135c75b 100644
--- a/src/gsb_reconcile_config.h
+++ b/src/gsb_reconcile_config.h
@@ -1,6 +1,7 @@
 #ifndef _GSB_RECONCILE_CONFIG_H
 #define _GSB_RECONCILE_CONFIG_H (1)
 
+#include <gtk/gtk.h>
 
 enum reconciliation_columns {
     RECONCILIATION_NAME_COLUMN = 0,
diff --git a/src/gsb_reconcile_sort_config.c b/src/gsb_reconcile_sort_config.c
index 88305a3..490d224 100644
--- a/src/gsb_reconcile_sort_config.c
+++ b/src/gsb_reconcile_sort_config.c
@@ -31,6 +31,9 @@
 #endif
 
 #include "include.h"
+#include <math.h>
+#include <stdlib.h>
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "gsb_reconcile_sort_config.h"
diff --git a/src/gsb_reconcile_sort_config.h b/src/gsb_reconcile_sort_config.h
index 0055139..2b406ac 100644
--- a/src/gsb_reconcile_sort_config.h
+++ b/src/gsb_reconcile_sort_config.h
@@ -1,6 +1,7 @@
 #ifndef _GSB_RECONCILE_SORT_CONFIG_H
 #define _GSB_RECONCILE_SORT_CONFIG_H (1)
 
+#include <gtk/gtk.h>
 
 enum reconciliation_sort_columns {
     RECONCILIATION_SORT_NAME_COLUMN = 0,
diff --git a/src/gsb_report.h b/src/gsb_report.h
index 1a1c60c..e3c7715 100644
--- a/src/gsb_report.h
+++ b/src/gsb_report.h
@@ -1,6 +1,7 @@
 #ifndef _GSB_REPORT_H
 #define _GSB_REPORT_H (1)
 
+#include <gtk/gtk.h>
 
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
diff --git a/src/gsb_scheduler.h b/src/gsb_scheduler.h
index 259bf0f..9880829 100644
--- a/src/gsb_scheduler.h
+++ b/src/gsb_scheduler.h
@@ -1,6 +1,7 @@
 #ifndef _GSB_SCHEDULER_H
 #define _GSB_SCHEDULER_H (1)
 
+#include <glib.h>
 
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
diff --git a/src/gsb_scheduler_list.c b/src/gsb_scheduler_list.c
index f1b2a82..c45ec26 100644
--- a/src/gsb_scheduler_list.c
+++ b/src/gsb_scheduler_list.c
@@ -34,6 +34,8 @@
 #endif
 
 #include "include.h"
+#include <gdk/gdkkeysyms.h>
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "gsb_scheduler_list.h"
diff --git a/src/gsb_scheduler_list.h b/src/gsb_scheduler_list.h
index 3d77100..e10fa4a 100644
--- a/src/gsb_scheduler_list.h
+++ b/src/gsb_scheduler_list.h
@@ -1,6 +1,8 @@
 #ifndef GSB_SCHEDULER_LIST_H
 #define GSB_SCHEDULER_LIST_H
 
+#include <gtk/gtk.h>
+
 enum
 {
     COL_NB_DATE = 0,
diff --git a/src/gsb_select_icon.c b/src/gsb_select_icon.c
index 7a75142..e4ad345 100644
--- a/src/gsb_select_icon.c
+++ b/src/gsb_select_icon.c
@@ -26,6 +26,8 @@
 #endif
 
 #include "include.h"
+#include <gdk-pixbuf/gdk-pixdata.h>
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "gsb_select_icon.h"
diff --git a/src/gsb_select_icon.h b/src/gsb_select_icon.h
index 789ea3f..7d18c6e 100644
--- a/src/gsb_select_icon.h
+++ b/src/gsb_select_icon.h
@@ -1,6 +1,7 @@
 #ifndef _GSB_SELECT_ICON_H
 #define _GSB_SELECT_ICON_H (1)
 
+#include <gtk/gtk.h>
 
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
diff --git a/src/gsb_status.h b/src/gsb_status.h
index 4e2d814..8b0bab1 100644
--- a/src/gsb_status.h
+++ b/src/gsb_status.h
@@ -1,6 +1,8 @@
 #ifndef _GSB_STATUS_H
 #define _GSB_STATUS_H (1)
 
+#include <gtk/gtk.h>
+
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
 
diff --git a/src/gsb_transactions_list.c b/src/gsb_transactions_list.c
index 884a573..a6c3f17 100644
--- a/src/gsb_transactions_list.c
+++ b/src/gsb_transactions_list.c
@@ -26,6 +26,8 @@
 #endif
 
 #include "include.h"
+#include <gdk/gdkkeysyms.h>
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "gsb_transactions_list.h"
diff --git a/src/gsb_transactions_list.h b/src/gsb_transactions_list.h
index 59e33b1..106f507 100644
--- a/src/gsb_transactions_list.h
+++ b/src/gsb_transactions_list.h
@@ -1,7 +1,7 @@
 #ifndef _OPERATIONS_LISTE_H
 #define _OPERATIONS_LISTE_H (1)
 
-
+#include <gtk/gtk.h>
 
 /* the element number for each showable in the list */
 enum
diff --git a/src/gsb_transactions_list_sort.c b/src/gsb_transactions_list_sort.c
index f138dd9..73df99c 100644
--- a/src/gsb_transactions_list_sort.c
+++ b/src/gsb_transactions_list_sort.c
@@ -32,7 +32,7 @@
 #endif
 
 #include "include.h"
-
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "gsb_transactions_list_sort.h"
diff --git a/src/gtk_combofix.c b/src/gtk_combofix.c
index 74bc77d..feff036 100644
--- a/src/gtk_combofix.c
+++ b/src/gtk_combofix.c
@@ -27,6 +27,7 @@
 
 #include "include.h"
 
+#include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 #include <ctype.h>
 
diff --git a/src/help.c b/src/help.c
index f0e9ba5..5f01364 100644
--- a/src/help.c
+++ b/src/help.c
@@ -27,7 +27,7 @@
 #endif
 
 #include "include.h"
-
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "help.h"
diff --git a/src/help.h b/src/help.h
index 98a35c0..aa2de6c 100644
--- a/src/help.h
+++ b/src/help.h
@@ -1,5 +1,8 @@
 #ifndef _HELP_H
 #define _HELP_H (1)
+
+#include <gtk/gtk.h>
+
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
 
diff --git a/src/import.c b/src/import.c
index 5543aa1..b3fa609 100644
--- a/src/import.c
+++ b/src/import.c
@@ -27,6 +27,8 @@
 #endif
 
 #include "include.h"
+#include <glib/gstdio.h>
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "import.h"
diff --git a/src/import.h b/src/import.h
index d4c98e9..6662a58 100644
--- a/src/import.h
+++ b/src/import.h
@@ -1,6 +1,8 @@
 #ifndef _IMPORT_H
 #define _IMPORT_H (1)
 
+#include <gtk/gtk.h>
+
 /* START_INCLUDE_H */
 #include "gsb_real.h"
 #include "gsb_data_transaction.h"
diff --git a/src/import_csv.c b/src/import_csv.c
index 4b1707f..8f49b22 100644
--- a/src/import_csv.c
+++ b/src/import_csv.c
@@ -26,6 +26,7 @@
 #endif
 
 #include "include.h"
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "import_csv.h"
diff --git a/src/import_csv.h b/src/import_csv.h
index 79e0dbb..0d7afc8 100644
--- a/src/import_csv.h
+++ b/src/import_csv.h
@@ -1,6 +1,8 @@
 #ifndef _IMPORT_CSV_H
 #define _IMPORT_CSV_H (1)
 
+#include <gtk/gtk.h>
+
 /* START_INCLUDE_H */
 #include "import.h"
 /* END_INCLUDE_H */
diff --git a/src/imputation_budgetaire.c b/src/imputation_budgetaire.c
index d50d773..780cfee 100644
--- a/src/imputation_budgetaire.c
+++ b/src/imputation_budgetaire.c
@@ -28,8 +28,7 @@
 #endif
 
 #include "include.h"
-
-
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "imputation_budgetaire.h"
diff --git a/src/imputation_budgetaire.h b/src/imputation_budgetaire.h
index a723bc3..e047e79 100644
--- a/src/imputation_budgetaire.h
+++ b/src/imputation_budgetaire.h
@@ -1,5 +1,8 @@
 #ifndef _IMPUTATION_BUDGETAIRE_H
 #define _IMPUTATION_BUDGETAIRE_H (1)
+
+#include <gtk/gtk.h>
+
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
 
diff --git a/src/include.h b/src/include.h
index 5f7739e..2644c5a 100644
--- a/src/include.h
+++ b/src/include.h
@@ -3,37 +3,6 @@
 #define _INCLUDE_H (1)
 
 
-#include <locale.h>
-#include <stdio.h>
-#include <stdlib.h>
-#ifdef HAVE_STRINGS_H
-#  include <strings.h>
-#endif
-#ifdef HAVE_STRING_H
-#  include <string.h>
-#endif
-#include <sys/types.h>
-#include <sys/timeb.h>
-#include <time.h>
-#include <sys/stat.h>
-#ifndef _MSC_VER
-#	include <unistd.h>
-#	include <pwd.h>
-#endif /*_MSC_VER */
-#include <fcntl.h>
-#include <signal.h>
-#include <ctype.h>
-#include <errno.h>
-#include <math.h>
-
-#include <gtk/gtktextview.h>
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtk.h>
-#include <glib/gstdio.h>
-#include <gdk-pixbuf/gdk-pixdata.h>
-
-#include <glib/gi18n.h>
-
 /* The following lines revert back to FPRINTF on Windows Systems(LIBINTL_FPRINTF seems BUGGY) */
 #ifdef _WIN32
 # undef fprintf
diff --git a/src/main.c b/src/main.c
index 675f49c..d098bec 100644
--- a/src/main.c
+++ b/src/main.c
@@ -30,6 +30,8 @@
 #endif
 
 #include "include.h"
+#include <stdlib.h>
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "main.h"
diff --git a/src/main.h b/src/main.h
index b6bcdd1..2e817bd 100644
--- a/src/main.h
+++ b/src/main.h
@@ -1,5 +1,8 @@
 #ifndef _MAIN_H
 #define _MAIN_H (1)
+
+#include <glib.h>
+
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
 
diff --git a/src/menu.c b/src/menu.c
index c200de2..dc2b2c7 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -28,7 +28,7 @@
 #endif
 
 #include "include.h"
-
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "menu.h"
@@ -69,9 +69,6 @@ static gboolean help_manual ( void );
 static gboolean help_quick_start ( void );
 static gboolean help_translation ( void );
 static gboolean help_website ( void );
-static void menu_add_widget (GtkUIManager *p_uiManager,
-                        GtkWidget *p_widget,
-                        GtkContainer *p_box) ;
 static gboolean gsb_menu_reinit_largeur_col_menu ( void );
 /*END_STATIC*/
 
@@ -163,15 +160,6 @@ static gchar *ui_manager_buffer =
 "</ui>";
 
 
-static void menu_add_widget (GtkUIManager * p_uiManager, GtkWidget * p_widget, 
-                        GtkContainer * p_box) 
-{ 
-    gtk_box_pack_start (GTK_BOX (p_box), p_widget, FALSE, FALSE, 0);
-    gtk_widget_show (p_widget); 
-    return; 
-}
-
-
 GtkWidget *init_menus ( GtkWidget *vbox )
 {
     GtkWidget *menubar;
diff --git a/src/menu.h b/src/menu.h
index b554c9c..1bbc5f0 100644
--- a/src/menu.h
+++ b/src/menu.h
@@ -1,6 +1,7 @@
 #ifndef _MENU_H
 #define _MENU_H (1)
 
+#include <gtk/gtk.h>
 
 enum view_menu_action {
   HIDE_SHOW_TRANSACTION_FORM = 0,
diff --git a/src/meta_budgetary.c b/src/meta_budgetary.c
index 03f26e2..9e0f046 100644
--- a/src/meta_budgetary.c
+++ b/src/meta_budgetary.c
@@ -25,6 +25,8 @@
 #endif
 
 #include "include.h"
+#include <glib/gi18n.h>
+
 #include "metatree.h"
 
 /*START_INCLUDE*/
diff --git a/src/meta_budgetary.h b/src/meta_budgetary.h
index d2e95af..3fde565 100644
--- a/src/meta_budgetary.h
+++ b/src/meta_budgetary.h
@@ -1,5 +1,8 @@
 #ifndef _META_BUDGETARY_H
 #define _META_BUDGETARY_H (1)
+
+#include <glib.h>
+
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
 
diff --git a/src/meta_categories.c b/src/meta_categories.c
index 25aa710..3b422dc 100644
--- a/src/meta_categories.c
+++ b/src/meta_categories.c
@@ -25,6 +25,8 @@
 #endif
 
 #include "include.h"
+#include <glib/gi18n.h>
+
 #include "metatree.h"
 
 /*START_INCLUDE*/
diff --git a/src/meta_categories.h b/src/meta_categories.h
index 976bd3d..6813a19 100644
--- a/src/meta_categories.h
+++ b/src/meta_categories.h
@@ -1,5 +1,8 @@
 #ifndef _META_CATEGORIES_H
 #define _META_CATEGORIES_H (1)
+
+#include <glib.h>
+
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
 
diff --git a/src/meta_payee.c b/src/meta_payee.c
index a7127e1..b1a7411 100644
--- a/src/meta_payee.c
+++ b/src/meta_payee.c
@@ -25,6 +25,8 @@
 #endif
 
 #include "include.h"
+#include <glib/gi18n.h>
+
 #include "metatree.h"
 
 /*START_INCLUDE*/
diff --git a/src/meta_payee.h b/src/meta_payee.h
index 439392f..bd48c13 100644
--- a/src/meta_payee.h
+++ b/src/meta_payee.h
@@ -1,5 +1,8 @@
 #ifndef _META_PAYEE_H
 #define _META_PAYEE_H (1)
+
+#include <glib.h>
+
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
 
diff --git a/src/metatree.c b/src/metatree.c
index db20c5c..50466e0 100644
--- a/src/metatree.c
+++ b/src/metatree.c
@@ -26,6 +26,7 @@
 #endif
 
 #include "include.h"
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "metatree.h"
@@ -158,9 +159,6 @@ static void move_transaction_to_sub_division ( gint transaction_number,
                         GtkTreeModel * model,
                         GtkTreePath * orig_path, GtkTreePath * dest_path,
                         gint no_division, gint no_sub_division );
-static void move_transaction_to_sub_division_zero ( gint transaction_number,
-                        MetatreeInterface * iface,
-                        GtkTreeModel * model, gint no_division );
 static void move_transactions_to_division_payee (GtkTreeModel * model,
                         MetatreeInterface * iface,
                         gint orig_div, gint dest_div );
@@ -2583,45 +2581,6 @@ void fill_sub_division_zero ( GtkTreeModel * model,
 
 
 /**
- * 
- *
- * \param
- *
- * \return
- * */
-void move_transaction_to_sub_division_zero ( gint transaction_number,
-                        MetatreeInterface * iface,
-                        GtkTreeModel * model, gint no_division )
-{
-    GtkTreeIter child_iter, * parent_iter;
-    GtkTreeIter * p_iter;
-
-     if ( !model )
-        return;
-
-    p_iter = get_iter_from_div ( model, no_division, 0 );
-    if ( ! p_iter )
-        return;
-
-    parent_iter = get_iter_from_sub_div_zero ( model, iface, p_iter );
-    if ( parent_iter )
-    {
-        gtk_tree_store_append ( GTK_TREE_STORE (model),
-                &child_iter, parent_iter );
-        iface -> transaction_set_div_id (
-                transaction_number, no_division );
-        iface -> transaction_set_sub_div_id (
-                transaction_number, 0 );
-        gsb_transactions_list_update_transaction (
-                transaction_number);
-        iface -> add_transaction_to_sub_div ( transaction_number,
-                no_division, 0 );
-        fill_transaction_row ( model, &child_iter, transaction_number );
-    }
-}
-
-
-/**
  *
  *
  *
diff --git a/src/metatree.h b/src/metatree.h
index 87dfb6c..fe4c9fb 100644
--- a/src/metatree.h
+++ b/src/metatree.h
@@ -1,6 +1,7 @@
 #ifndef METATREE_H
 #define METATREE_H
 
+#include <gtk/gtk.h>
 
 /* START_INCLUDE_H */
 #include "gsb_real.h"
diff --git a/src/navigation.c b/src/navigation.c
index 5b0690f..13fbd3c 100644
--- a/src/navigation.c
+++ b/src/navigation.c
@@ -26,6 +26,8 @@
 #endif
 
 #include "include.h"
+#include <gdk/gdkkeysyms.h>
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "navigation.h"
diff --git a/src/navigation.h b/src/navigation.h
index 67867f1..d0b7933 100644
--- a/src/navigation.h
+++ b/src/navigation.h
@@ -1,6 +1,7 @@
 #ifndef NAVIGATION_H
 #define NAVIGATION_H
 
+#include <gtk/gtk.h>
 
 /** Holds data for the navigation tree.  */
 enum navigation_cols { 
diff --git a/src/parametres.c b/src/parametres.c
index d4b1b19..d2a8ee3 100644
--- a/src/parametres.c
+++ b/src/parametres.c
@@ -30,7 +30,7 @@
 #endif
 
 #include "include.h"
-
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "parametres.h"
@@ -1050,7 +1050,7 @@ GtkWidget *onglet_programmes (void)
 
     paddingbox = new_paddingbox_with_title (vbox_pref, FALSE, _("Web"));
 
-    table = gtk_table_new ( 0, 2, FALSE );
+    table = gtk_table_new ( 0, 1, FALSE );
     gtk_box_pack_start ( GTK_BOX ( paddingbox ), table, FALSE, FALSE, 0 );
     gtk_table_set_col_spacings ( GTK_TABLE(table), 6 );
     gtk_table_set_row_spacings ( GTK_TABLE(table), 6 );
@@ -1074,31 +1074,6 @@ GtkWidget *onglet_programmes (void)
     g_free ( text );
 
 
-    paddingbox = new_paddingbox_with_title ( vbox_pref, FALSE,
-                        _("LaTeX support (old print system)") );
-
-    table = gtk_table_new ( 0, 2, FALSE );
-    gtk_box_pack_start ( GTK_BOX ( paddingbox ), table, FALSE, FALSE, 0 );
-    gtk_table_set_col_spacings ( GTK_TABLE(table), 6 );
-    gtk_table_set_row_spacings ( GTK_TABLE(table), 6 );
-
-    label = gtk_label_new ( _("LaTeX command: ") );
-    gtk_size_group_add_widget ( size_group, label );
-    gtk_misc_set_alignment ( GTK_MISC ( label ), 0.0, 0.5 );
-    gtk_table_attach ( GTK_TABLE(table), label, 0, 1, 0, 1,
-                        GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0 );
-    entry = gsb_automem_entry_new ( &conf.latex_command, NULL, NULL );
-    gtk_table_attach ( GTK_TABLE(table), entry, 1, 2, 0, 1, GTK_EXPAND|GTK_FILL, 0, 0, 0 );
-
-    label = gtk_label_new ( _("dvips command: ") );
-    gtk_size_group_add_widget ( size_group, label );
-    gtk_misc_set_alignment ( GTK_MISC ( label ), 0.0, 0.5 );
-    gtk_table_attach ( GTK_TABLE(table), label, 0, 1, 1, 2,
-                        GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0 );
-    entry = gsb_automem_entry_new ( &conf.dvips_command, NULL, NULL );
-    gtk_table_attach ( GTK_TABLE(table), entry, 1, 2, 1, 2, GTK_EXPAND|GTK_FILL, 0, 0, 0 );
-
-
     gtk_size_group_set_mode ( size_group, GTK_SIZE_GROUP_HORIZONTAL );
     gtk_widget_show_all ( vbox_pref );
 
diff --git a/src/parametres.h b/src/parametres.h
index 8e21016..88914f5 100644
--- a/src/parametres.h
+++ b/src/parametres.h
@@ -1,6 +1,8 @@
 #ifndef _PARAMETRES_H
 #define _PARAMETRES_H (1)
 
+#include <gtk/gtk.h>
+
 /* Preference pages */
 enum preference_page  {
     NOT_A_PAGE = -1,
diff --git a/src/parse_cmdline.c b/src/parse_cmdline.c
index 2077d2a..cf52064 100644
--- a/src/parse_cmdline.c
+++ b/src/parse_cmdline.c
@@ -21,7 +21,7 @@
 #endif
 
 #include "include.h"
-
+#include <glib/gi18n.h>
 #include <getopt.h>
 
 /*START_INCLUDE*/
diff --git a/src/plugins/gnucash/gnucash.c b/src/plugins/gnucash/gnucash.c
index 9c9a18f..a7d5a70 100644
--- a/src/plugins/gnucash/gnucash.c
+++ b/src/plugins/gnucash/gnucash.c
@@ -25,7 +25,9 @@
 
 #include "include.h"
 
+#include <glib/gi18n.h>
 #include <libxml/parser.h>
+#include <glib/gstdio.h>
 
 /*START_INCLUDE*/
 #include "gnucash.h"
diff --git a/src/plugins/gnucash/gnucash.h b/src/plugins/gnucash/gnucash.h
index baabdd7..d3a5102 100644
--- a/src/plugins/gnucash/gnucash.h
+++ b/src/plugins/gnucash/gnucash.h
@@ -1,6 +1,9 @@
 #ifndef GSB_GNUCASH_H
 #define GSB_GNUCASH_H
 
+#include <glib.h>
+#include <gmodule.h>
+
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
 
diff --git a/src/plugins/ofx/ofx.c b/src/plugins/ofx/ofx.c
index 27d1d47..0c2164e 100644
--- a/src/plugins/ofx/ofx.c
+++ b/src/plugins/ofx/ofx.c
@@ -26,6 +26,7 @@
 #include "include.h"
 
 #include <libofx/libofx.h>
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "ofx.h"
@@ -40,7 +41,6 @@
 
 /*START_STATIC*/
 static int ofx_proc_account_cb(struct OfxAccountData data, void * account_data);;
-static int ofx_proc_security_cb(struct OfxSecurityData data);
 static int ofx_proc_statement_cb(struct OfxStatementData data, void * statement_data);;
 static int ofx_proc_status_cb(struct OfxStatusData data, void * status_data);;
 static int ofx_proc_transaction_cb(struct OfxTransactionData data, void * security_data);;
@@ -246,17 +246,6 @@ int ofx_proc_status_cb(struct OfxStatusData data)
 
 
 /* *******************************************************************************/
-int ofx_proc_security_cb(struct OfxSecurityData data)
-{
-    dialog_message ( "ofx-security-not-implemented" );
-    return 0;
-}
-/* *******************************************************************************/
-
-
-
-
-/* *******************************************************************************/
 
 #ifdef OFX_0_7
 int ofx_proc_account_cb(struct OfxAccountData data, void * account_data)
diff --git a/src/plugins/openssl/openssl.c b/src/plugins/openssl/openssl.c
index 4266c52..167513d 100644
--- a/src/plugins/openssl/openssl.c
+++ b/src/plugins/openssl/openssl.c
@@ -24,6 +24,7 @@
 #endif
 
 #include "include.h"
+#include <glib/gi18n.h>
 
 /* This define is required to disable openssl's SSLeay support which redefines
  * _(), which obvisouly breaks glib's gettext macros. */
diff --git a/src/plugins/openssl/openssl.h b/src/plugins/openssl/openssl.h
index 5dde3ee..ebf0191 100644
--- a/src/plugins/openssl/openssl.h
+++ b/src/plugins/openssl/openssl.h
@@ -3,6 +3,7 @@
 
 /* START_INCLUDE_H */
 #include <glib.h>
+#include <gmodule.h>
 /* END_INCLUDE_H */
 
 /* START_DECLARATION */
diff --git a/src/print_config.c b/src/print_config.c
deleted file mode 100644
index b821ac2..0000000
--- a/src/print_config.c
+++ /dev/null
@@ -1,425 +0,0 @@
-/* ************************************************************************** */
-/*                                                                            */
-/*     Copyright (C)	2008 Benjamin Drieu (bdrieu at april.org)		      */
-/*			2008 Cedric Auger (cedric at grisbi.org)		      */
-/* 			http://www.grisbi.org				      */
-/*                                                                            */
-/*  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 2 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, write to the Free Software               */
-/*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-/*                                                                            */
-/* ************************************************************************** */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "include.h"
-
-
-/*START_INCLUDE*/
-#include "print_config.h"
-#include "utils_file_selection.h"
-#include "utils_files.h"
-#include "utils_str.h"
-#include "utils.h"
-#include "dialog.h"
-#include "structures.h"
-/*END_INCLUDE*/
-
-/*START_STATIC*/
-static GtkWidget * print_config_general ( GtkWidget * dialog );
-static GtkWidget * print_config_paper ( GtkWidget * dialog );
-static gboolean print_config_radio_toggled ( GtkToggleButton * togglebutton, gpointer user_data );
-/*END_STATIC*/
-
-
-
-
-
-/** This array contains paper sizes to be used to construct print
-  copies of reports. */
-struct paper_config paper_sizes[8] = {
-    {N_("A3"), 297, 420},
-    {N_("A4"), 210, 297},
-    {N_("A5"), 148, 210},
-    {N_("A6"), 105, 148},
-    {N_("USletter"), 215, 279.4},
-    {N_("USlegal"), 215, 355.6},
-    {N_("USexecutive"), 184.15, 266.7},
-    {NULL, 0, 0},
-};
-
-/*START_EXTERN*/
-extern GtkWidget *window;
-/*END_EXTERN*/
-
-
-
-/* FIXME : remove all of that when debian stable goes into gtk 2.10 */
-/**
- * Open a dialog window which asks for information about paper,
- * margins, etc..
- *
- * \return TRUE if print has been setup correctly, FALSE otherwise
- *         (most likely user canceled print).
- */
-gboolean print_config ( )
-{
-    GtkWidget * dialog, *notebook;
-    gint response;
-
-    /* Set up dialog */
-    dialog = gtk_dialog_new_with_buttons ( _("Print"),
-					   GTK_WINDOW ( window ),
-					   GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR | GTK_DIALOG_DESTROY_WITH_PARENT,
-					   GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-					   GTK_STOCK_PRINT, GTK_RESPONSE_OK,
-					   NULL );
-
-    gtk_window_set_position ( GTK_WINDOW ( dialog ), GTK_WIN_POS_CENTER_ON_PARENT );
-    gtk_window_set_resizable ( GTK_WINDOW ( dialog ), TRUE );
-
-    /* Insert notebook */
-    notebook = gtk_notebook_new ();
-    gtk_box_pack_start ( GTK_BOX(GTK_DIALOG(dialog)->vbox), notebook, TRUE, TRUE, 6 );
-
-    /* Add tabs */
-    gtk_notebook_append_page ( GTK_NOTEBOOK(notebook), print_config_general(dialog),
-			       gtk_label_new (_("General")) );
-
-    gtk_notebook_append_page ( GTK_NOTEBOOK(notebook), print_config_paper(dialog),
-			       gtk_label_new (_("Paper")) );
-
-    /*   gtk_notebook_append_page ( GTK_NOTEBOOK(notebook), print_config_appearance(dialog),  */
-    /* 			     gtk_label_new (_("Appearance")) ); */
-
-    /* Finish dialog */
-    gtk_widget_show_all ( dialog );
-
-    do {
-	response = gtk_dialog_run ( GTK_DIALOG (dialog) );
-	if ( response == GTK_RESPONSE_OK )
-	{
-	    FILE * test;
-	    gchar * filename;
-
-	    if ( etat.print_config.printer )
-	    {
-		break;
-	    }
-
-	    filename = my_strdup ( gtk_entry_get_text ( GTK_ENTRY (g_object_get_data(G_OBJECT(dialog),
-										     "printer_filename") ) ) );
-
-	    if ( ! filename )
-	    {
-		filename = "";
-	    }
-
-	    test = utf8_fopen ( filename, "r" );
-	    if ( test )
-	    {
-		fclose ( test );
-		if ( question_yes_no_hint ( g_strdup_printf ( _("File %s already exists."),
-							      filename ),
-					    _("Do you want to overwrite it?  There is no undo for this."),
-					    GTK_RESPONSE_NO  ) )
-		{
-		    break;
-		}
-	    }
-	    else
-	    {
-		break;
-	    }
-	}
-	else
-	{
-	    break;
-	}
-    }
-    while ( 1 );
-
-
-    if ( response == GTK_RESPONSE_OK )
-    {
-	etat.print_config.printer = gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON (g_object_get_data(G_OBJECT(dialog), "printer")) );
-	etat.print_config.printer_name = my_strdup ( gtk_entry_get_text ( GTK_ENTRY (g_object_get_data(G_OBJECT(dialog), "printer_name") )));
-	etat.print_config.printer_filename = my_strdup ( gtk_entry_get_text ( GTK_ENTRY (g_object_get_data(G_OBJECT(dialog), "printer_filename") )));
-
-	etat.print_config.filetype = gtk_option_menu_get_history ( GTK_OPTION_MENU (g_object_get_data(G_OBJECT(dialog), "filetype") ));
-
-	etat.print_config.paper_config = paper_sizes [ gtk_option_menu_get_history ( GTK_OPTION_MENU (g_object_get_data(G_OBJECT(dialog), "paper_size"))) ];
-
-	etat.print_config.orientation = !gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON (g_object_get_data(G_OBJECT(dialog), "orientation")) );
-    }
-
-    gtk_widget_destroy ( dialog );
-
-    return response == GTK_RESPONSE_OK;
-}
-
-
-
-/**
- * Handler triggered when user validates a file selector window.
- *
- * \param button Widget that triggered this event.
- * \param data Pointer to a GtkEntry to fill with the result of the
- *             file selector window
- *
- * \return FALSE to allow other handlers to be processed
- */
-/* TODO dOm : this function seems not to be used. Is it possible to remove it
-gboolean change_print_to_file ( GtkButton *button, gpointer data )
-{
-    GtkFileSelection * file_selector;
-
-    file_selector = g_object_get_data ( G_OBJECT(button), "entry" );
-    gtk_entry_set_text ( GTK_ENTRY(data),
-			 file_selection_get_filename (GTK_FILE_CHOOSER (file_selector)));
-
-    return FALSE;
-}
-*/
-
-
-
-/**
- * Create a GtkVbox with stuff needed for general configuration of
- * print.
- *
- * \return a pointer to a newly created GtkVbox
- */
-GtkWidget * print_config_general ( GtkWidget * dialog )
-{
-    GtkWidget *vbox, *paddingbox, *table, *radio1, *radio2;
-    GtkWidget *input1, *input2, *omenu, *menu, *item;
-
-    vbox = gtk_vbox_new ( FALSE, 6 );
-    gtk_container_set_border_width ( GTK_CONTAINER(vbox), 12 );
-
-
-    /* Printer paddingbox */
-    paddingbox = new_paddingbox_with_title ( vbox, FALSE, _("Printer") );
-
-    table = gtk_table_new ( 2, 3, FALSE );
-    gtk_box_pack_start ( GTK_BOX(paddingbox), table, FALSE, FALSE, 0 );
-    gtk_table_set_row_spacings ( GTK_TABLE(table), 6 );
-    gtk_table_set_col_spacings ( GTK_TABLE(table), 12 );
-
-    /* Print to printer */
-    radio1 = gtk_radio_button_new_with_label ( NULL, _("Printer") );
-    gtk_table_attach ( GTK_TABLE(table), radio1, 0, 1, 0, 1,
-		       GTK_SHRINK, GTK_SHRINK,
-		       0, 0 );
-    g_object_set_data ( G_OBJECT(dialog), "printer", radio1 );
-    g_object_set_data ( G_OBJECT(radio1), "printer_value", GINT_TO_POINTER (1));
-    g_signal_connect ( G_OBJECT(radio1), "toggled",
-		       (GCallback) print_config_radio_toggled, NULL );
-    input1 = gtk_entry_new ( );
-    gtk_table_attach_defaults ( GTK_TABLE(table), input1, 1, 2, 0, 1 );
-    g_object_set_data ( G_OBJECT(dialog), "printer_name", input1 );
-    gtk_entry_set_text ( GTK_ENTRY(input1), etat.print_config.printer_name );
-
-    /* Print to file */
-    radio2 = gtk_radio_button_new_with_label ( gtk_radio_button_get_group (GTK_RADIO_BUTTON(radio1)), _("File") );
-    gtk_table_attach ( GTK_TABLE(table), radio2, 0, 1, 1, 2,
-		       GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL,
-		       0, 0 );
-    gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON(radio2), !etat.print_config.printer );
-    g_object_set_data ( G_OBJECT(radio2), "printer_value", 0 );
-    g_signal_connect ( G_OBJECT(radio2), "toggled",
-		       (GCallback) print_config_radio_toggled, NULL );
-
-    input2 = my_file_chooser ();
-    gtk_table_attach_defaults ( GTK_TABLE(table), input2, 1, 2, 1, 2 );
-    g_object_set_data ( G_OBJECT(dialog), "printer_filename",
-			g_object_get_data (G_OBJECT(input2), "entry") );
-    gtk_entry_set_text ( GTK_ENTRY(g_object_get_data (G_OBJECT(input2), "entry")),
-			 etat.print_config.printer_filename );
-
-    /* Output file format */
-    omenu = gtk_option_menu_new();
-    menu = gtk_menu_new();
-    gtk_option_menu_set_menu ( GTK_OPTION_MENU(omenu), menu );
-    g_object_set_data ( G_OBJECT(dialog), "filetype", omenu );
-
-    item = gtk_menu_item_new_with_label ( _("Postscript file") );
-    gtk_menu_shell_append ( GTK_MENU_SHELL ( menu ), item );
-    item = gtk_menu_item_new_with_label ( _("LaTeX file") );
-    gtk_menu_shell_append ( GTK_MENU_SHELL ( menu ), item );
-    gtk_option_menu_set_history ( GTK_OPTION_MENU(omenu), etat.print_config.filetype );
-    gtk_table_attach_defaults ( GTK_TABLE(table), omenu, 1, 2, 2, 3 );
-
-    /* Set pointers to widget that need to be (in)sensitived */
-    g_object_set_data ( G_OBJECT(radio1), "peer1", input2 );
-    g_object_set_data ( G_OBJECT(radio1), "peer2", omenu );
-    g_object_set_data ( G_OBJECT(radio2), "peer1", input1 );
-    g_object_set_data ( G_OBJECT(radio2), "peer2", NULL );
-    print_config_radio_toggled ( GTK_TOGGLE_BUTTON(radio1), NULL );
-    print_config_radio_toggled ( GTK_TOGGLE_BUTTON(radio2), NULL );
-
-    return vbox;
-}
-
-
-
-/**
- * Create a GtkVbox with stuff needed for paper config print.
- *
- * \return a pointer to a newly created GtkVbox
- */
-GtkWidget * print_config_paper ( GtkWidget * dialog )
-{
-    GtkWidget *vbox, *paddingbox, *omenu, *menu, *item, *radio;
-    gint i, history;
-
-    vbox = gtk_vbox_new ( FALSE, 6 );
-    gtk_container_set_border_width ( GTK_CONTAINER(vbox), 12 );
-
-    /* Paper size */
-    paddingbox = new_paddingbox_with_title ( vbox, FALSE, _("Size") );
-
-    omenu = gtk_option_menu_new();
-    gtk_box_pack_start ( GTK_BOX(paddingbox), omenu, FALSE, FALSE, 0 );
-
-    menu = gtk_menu_new();
-    gtk_option_menu_set_menu ( GTK_OPTION_MENU(omenu), menu );
-    g_object_set_data ( G_OBJECT(dialog), "paper_size", omenu );
-    history = 0;
-
-    for ( i = 0; paper_sizes[i].name; i++ )
-    {
-	item = gtk_menu_item_new_with_label (g_strdup_printf ("%s (%2.1fcm × %2.1fcm)",
-							      _(paper_sizes[i].name),
-							      paper_sizes[i].width/10,
-							      paper_sizes[i].height/10));
-	if ( !strcmp ( _(paper_sizes[i].name), etat.print_config.paper_config.name ))
-	    history = i;
-
-	gtk_menu_shell_append ( GTK_MENU_SHELL ( menu ), item );
-    }
-    gtk_option_menu_set_history ( GTK_OPTION_MENU(omenu), history );
-
-    /* Paper orientation */
-    paddingbox = new_paddingbox_with_title ( vbox, FALSE, _("Orientation") );
-
-    radio = gtk_radio_button_new_with_label ( NULL, _("Portrait") );
-    gtk_box_pack_start ( GTK_BOX(paddingbox), radio, FALSE, FALSE, 0 );
-
-    radio = gtk_radio_button_new_with_label ( gtk_radio_button_get_group (GTK_RADIO_BUTTON(radio)), _("Landscape") );
-    gtk_box_pack_start ( GTK_BOX(paddingbox), radio, FALSE, FALSE, 0 );
-    g_object_set_data ( G_OBJECT(dialog), "orientation", radio );
-
-    gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON(radio), !etat.print_config.orientation );
-
-    return vbox;
-}
-
-
-
-/**
- * Create a GtkVbox with stuff needed for appearance.
- *
- * \return a pointer to a newly created GtkVbox
- */
-/* TODO dOm : this function seems not to be used. Is it possible to remove it
-GtkWidget * print_config_appearance ( GtkWidget * dialog )
-{
-    GtkWidget *vbox, *paddingbox;
-
-    vbox = gtk_vbox_new ( FALSE, 6 );
-    gtk_container_set_border_width ( GTK_CONTAINER(vbox), 12 );
-
-    !* Headers *!
-    paddingbox = new_paddingbox_with_title ( vbox, FALSE, _("Headers") );
-
-    !* Footers *!
-    paddingbox = new_paddingbox_with_title ( vbox, FALSE, _("Footers") );
-
-    !* Misc *!
-    paddingbox = new_paddingbox_with_title ( vbox, FALSE, _("Misc") );
-
-    return vbox;
-}
-
-*/
-
-
-/**
- * Set associated widgets to a togglebutton (in)sensitive regarding to
- * its state.  Associated widgets ar button (in)sensitive regarding to  ;  it  .orientation );  )), _("Landscape") );   "orientation")) );  ze"))) ];  ǔŽ+  À6»Ýÿ         07»Ýÿ  óH”Ž+  ÈĔŽ+  èT&”Ž+                          ’8"•Ž+  07»Ýÿ  €PD•Ž+          @,»Ýÿ         +»Ýÿ  ë]”Ž+  6                    è     è!     è!     À6»Ýÿ  07»Ýÿ  xô!•Ž+          @-»Ýÿ          "A”Ž+          ^”Ž+  À6»Ýÿ  ð@”Ž+  ÿ6»Ýÿ         ÀŽ+  óH”Ž+   à…•Ž+  Ø䅕Ž+  ¨é…•Ž+  ÈĔŽ+          xô!•Ž+          @-»Ýÿ          ,»Ýÿ  ë]”Ž+  à!     à!     À6»Ýÿ  07»Ýÿ  Ƚ•Ž+           .»Ýÿ         "A”Ž+          ^”Ž+  À6»Ýÿ  ð@”Ž+  ÿ6»Ýÿ  ð6»Ýÿ  è6»Ýÿ  [&”Ž+  Œp˜        07»Ýÿ  óH”Ž+  ÈĔŽ+                   .»Ýÿ         ð,»Ýÿ  ë]”Ž+          G       H   I       J   K           M   N   O       P   À6»Ýÿ  07»Ýÿ  HuؔŽ+          À/»Ýÿ         "A”Ž+          ^”Ž+  À6»Ýÿ         0Ž+  óH”Ž+    "•Ž+   ©µ”Ž+   à…•Ž+  Ø䅕Ž+  ¨é…•Ž+  ÈĔŽ+ 
          HuؔŽ+          À/»Ýÿ          .»Ýÿ  ë]”Ž+  8uؔŽ+          À/»Ýÿ         0.»Ýÿ  ë]”Ž+  (uؔŽ+          À/»Ýÿ         `.»Ýÿ  ë]”Ž+  uؔŽ+          À/»Ýÿ         .»Ýÿ  ë]”Ž+  	       ¨î…•Ž+  óH”Ž+         ¨é…•Ž+  )»Ýÿ          Šøµ”Ž+  æG”Ž+         Ø䅕Ž+  0/»Ýÿ          yøµ”Ž+  æG”Ž+          à…•Ž+  `/»Ýÿ          Zøµ”Ž+  æG”Ž+  ؤµ”Ž+    "•Ž+   ©µ”Ž+   à…•Ž+  Ø"•Ž+  Ø䅕Ž+  ¨é…•Ž+  ÈĔŽ+          àí³”Ž+          à0»Ýÿ         °/»Ýÿ  ë]”Ž+  #   %       '       )       *   -   .   0   3       5   6   7   8   :   <   =   À6»Ýÿ  07»Ýÿ  p+€”Ž+           2»Ýÿ          "A”Ž+                 8"•Ž+  óH”Ž+  Ø"•Ž+   	"•Ž+  ÈĔŽ+                          c   f   mL”Ž+  07»Ýÿ  p+€”Ž+           2»Ýÿ          Ð0»Ýÿ  ë]”Ž+  Ó%°•æ§ìš‹wqÒ-øÒ êÓïs¨Ó,~9„×u]ÞÓ	4Q ÷U^Qʉ§ ¶uª¹ñìò*ēv´R”Ž+          p8»Ýÿ  F镎+  F镎+         ?UO”Ž+         08»Ýÿ  /»Ýÿ  P3»Ýÿ  mL”Ž+  æG”Ž+  èT&”Ž+  °9»Ýÿ  B镎+  €8»Ýÿ  ÿ6»Ýÿ  õì&”
 Ž+  07»Ýÿ          ÿÿÿÿÿÿÿÿB镎+          87»Ýÿ  ë]”            e pointers referenced with the
- * "peer1" and "peer2" properties of togglebutton.
- *
- * \param togglebutton  Toggle button to look associated widgets from.
- * \param user_data	Not used.
- *
- * \return FALSE to allow other handlers to be executed
- */
-gboolean print_config_radio_toggled ( GtkToggleButton * togglebutton, gpointer user_data )
-{
-  GtkWidget *peer1, *peer2;
-  gboolean value;
-
-  value = GPOINTER_TO_INT (g_object_get_data ( G_OBJECT(togglebutton), "printer_value" ));
-  peer1 = g_object_get_data ( G_OBJECT(togglebutton), "peer1" );
-  peer2 = g_object_get_data ( G_OBJECT(togglebutton), "peer2" );
-
-  if ( peer1 && GTK_IS_WIDGET(peer1) )
-    {
-      gtk_widget_set_sensitive ( peer1, !gtk_toggle_button_get_active(togglebutton) );
-    }
-  if ( peer2 && GTK_IS_WIDGET(peer2) )
-    {
-      gtk_widget_set_sensitive ( peer2, !gtk_toggle_button_get_active(togglebutton) );
-    }
-
-  etat.print_config.printer = value;
-
-  return FALSE;
-}
-
-
-
-/**
- * Make a backup of print configuration and return it.  Very handy to
- * make temporary backups.
- *
- * \return A newly-allocated print configuration.
- */
-struct print_config * print_config_dup ()
-{
-    return g_memdup ( &(etat.print_config), sizeof ( struct print_config ) );
-}
-
-
-
-/**
- * Set the print configuration according to print_config structure
- * passed in argument.
- *
- * \param print_config	Print configuration to set.
- *
- */
-void print_config_set ( struct print_config * config )
-{
-    g_memmove ( &(etat.print_config), config, sizeof ( struct print_config ) );
-}
-
-
-
-/* Local Variables: */
-/* c-basic-offset: 4 */
-/* End: */
diff --git a/src/print_config.h b/src/print_config.h
deleted file mode 100644
index c0e4422..0000000
--- a/src/print_config.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef PRINT_CONFIG_H
-#define PRINT_CONFIG_H
-
-
-/*START_DECLARATION*/
-gboolean print_config ( );
-struct print_config * print_config_dup ();
-void print_config_set ( struct print_config * config );
-/*END_DECLARATION*/
-
-#endif /* PRINT_CONFIG_H */
diff --git a/src/print_dialog_config.c b/src/print_dialog_config.c
index c4fafae..80cd897 100644
--- a/src/print_dialog_config.c
+++ b/src/print_dialog_config.c
@@ -30,6 +30,7 @@
 #endif
 
 #include "include.h"
+#include <gtk/gtk.h>
 
 /*START_INCLUDE*/
 #include "print_dialog_config.h"
diff --git a/src/print_dialog_config.h b/src/print_dialog_config.h
index b62ffe2..4299874 100644
--- a/src/print_dialog_config.h
+++ b/src/print_dialog_config.h
@@ -1,6 +1,7 @@
 #ifndef _PRINT_DIALOG_CONFIG_H
 #define _PRINT_DIALOG_CONFIG_H (1)
 
+#include <glib-object.h>
 
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
diff --git a/src/print_report.c b/src/print_report.c
index 7d0d82a..27957fa 100644
--- a/src/print_report.c
+++ b/src/print_report.c
@@ -30,6 +30,8 @@
 #endif
 
 #include "include.h"
+#include <math.h>
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "print_report.h"
diff --git a/src/print_report.h b/src/print_report.h
index 474934a..773fd74 100644
--- a/src/print_report.h
+++ b/src/print_report.h
@@ -1,6 +1,7 @@
 #ifndef _PRINT_REPORT_H
 #define _PRINT_REPORT_H (1)
 
+#include <gtk/gtk.h>
 
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
diff --git a/src/print_transactions_list.c b/src/print_transactions_list.c
index b294f77..1c8bb1e 100644
--- a/src/print_transactions_list.c
+++ b/src/print_transactions_list.c
@@ -29,6 +29,8 @@
 #endif
 
 #include "include.h"
+#include <math.h>
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "print_transactions_list.h"
diff --git a/src/print_transactions_list.h b/src/print_transactions_list.h
index 8068e85..199caa2 100644
--- a/src/print_transactions_list.h
+++ b/src/print_transactions_list.h
@@ -1,6 +1,7 @@
 #ifndef _PRINT_TRANSACTIONS_LIST_H
 #define _PRINT_TRANSACTIONS_LIST_H (1)
 
+#include <gtk/gtk.h>
 
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
diff --git a/src/print_tree_view_list.c b/src/print_tree_view_list.c
index 819d96e..22bd351 100644
--- a/src/print_tree_view_list.c
+++ b/src/print_tree_view_list.c
@@ -25,15 +25,14 @@
 #endif
 
 #include "include.h"
-#include <config.h>
-
+#include <math.h>
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "print_tree_view_list.h"
 #include "gsb_autofunc.h"
 #include "gsb_automem.h"
 #include "gsb_data_print_config.h"
-#include "print_config.h"
 #include "print_dialog_config.h"
 #include "print_transactions_list.h"
 #include "structures.h"
diff --git a/src/qif.c b/src/qif.c
index 464a014..a354ca6 100644
--- a/src/qif.c
+++ b/src/qif.c
@@ -26,7 +26,10 @@
 #endif
 
 #include "include.h"
-
+#include <stdlib.h>
+#include <ctype.h>
+#include <errno.h>
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "qif.h"
diff --git a/src/structures.h b/src/structures.h
index b8d6f97..fe1a983 100644
--- a/src/structures.h
+++ b/src/structures.h
@@ -1,6 +1,8 @@
 #ifndef _STRUCTURES_H
 #define _STRUCTURES_H (1)
 
+#include <glib.h>
+
 /* fichier d'en tête structures.h */
 /* contient presque toutes les structures du prog */
 
@@ -27,42 +29,6 @@
 #define GRISBI_PLUGINS_DIR (utils_get_plugins_dir ( ) ) 
 
 
-/* structures pour la gestion de l'impression */
-enum filetype
-{
-  POSTSCRIPT_FILE = 0,
-  LATEX_FILE,
-  NUM_FILETYPES,
-}; 
-
-
-struct paper_config 
-{
-  gchar *name;
-  gfloat width;
-  gfloat height;
-};
-
-
-enum orientation
-{
-  LANDSCAPE = 0,
-  PORTRAIT,
-  NUM_ORIENTATION,
-}; 
-
-
-struct print_config
-{
-  gboolean printer;
-  gchar * printer_name;
-  gchar * printer_filename;
-  enum filetype filetype;
-  struct paper_config paper_config;
-  enum orientation orientation;
-};
-
-
 /** structure etat
  * variables contenant juste 0 ou 1
  * FIXME : scinder cette structure en 3 parties :
@@ -130,9 +96,6 @@ struct gsb_etat_t
     gint combofix_force_payee;              /* TRUE if no new item can be appended in the payee combofix */
     gint combofix_force_category;           /* TRUE if no new item can be appended in the category and budget combofix */
     
-    /* Print stuff */
-    struct print_config print_config;
-    
     /* width panned */
     gint largeur_colonne_echeancier;
     gint largeur_colonne_comptes_comptes;
@@ -192,8 +155,6 @@ struct gsb_conf_t
     gint utilise_fonte_listes;                      /* TRUE to use a custom font for the lists */
     gchar *font_string;                             /* contain the description of the font, or NULL */
     gchar *browser_command;
-    gchar *latex_command;
-    gchar *dvips_command;
     gint pluriel_final;                             /* 0 = finals 1 = finaux */
 
     gint display_grisbi_title;                      /* selection du titre principal de grisbi */
diff --git a/src/tiers_onglet.c b/src/tiers_onglet.c
index 77f2b7c..596742d 100644
--- a/src/tiers_onglet.c
+++ b/src/tiers_onglet.c
@@ -33,6 +33,8 @@
 #endif
 
 #include "include.h"
+#include <glib/gi18n.h>
+
 #include "dialog.h"
 
 /*START_INCLUDE*/
diff --git a/src/tiers_onglet.h b/src/tiers_onglet.h
index 0a3644e..25b417c 100644
--- a/src/tiers_onglet.h
+++ b/src/tiers_onglet.h
@@ -1,5 +1,8 @@
 #ifndef _TIERS_ONGLET_H
 #define _TIERS_ONGLET_H (1)
+
+#include <gtk/gtk.h>
+
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
 
diff --git a/src/tip.c b/src/tip.c
index b7abd35..8f0f12e 100644
--- a/src/tip.c
+++ b/src/tip.c
@@ -27,6 +27,7 @@
 #endif
 
 #include "include.h"
+#include <glib/gi18n.h>
 
 #define START_INCLUDE
 #include "tip.h"
diff --git a/src/tip.h b/src/tip.h
index 4dd625f..9604d13 100644
--- a/src/tip.h
+++ b/src/tip.h
@@ -1,5 +1,8 @@
 #ifndef _TIP_H
 #define _TIP_H (1)
+
+#include <glib.h>
+
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
 
diff --git a/src/traitement_variables.c b/src/traitement_variables.c
index fbe7e02..73b3c27 100644
--- a/src/traitement_variables.c
+++ b/src/traitement_variables.c
@@ -31,6 +31,7 @@
 #endif
 
 #include "include.h"
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "traitement_variables.h"
diff --git a/src/traitement_variables.h b/src/traitement_variables.h
index 22a85b1..f76fbdf 100644
--- a/src/traitement_variables.h
+++ b/src/traitement_variables.h
@@ -1,6 +1,8 @@
 #ifndef _TRAITEMENT_VARIABLES_H
 #define _TRAITEMENT_VARIABLES_H (1)
 
+#include <glib.h>
+
 /* background color */
 #define BG_COLOR_1_RED      55000
 #define BG_COLOR_1_GREEN    55000
diff --git a/src/transaction_list.c b/src/transaction_list.c
index e7d03ee..07319b6 100644
--- a/src/transaction_list.c
+++ b/src/transaction_list.c
@@ -35,6 +35,7 @@
 #endif
 
 #include "include.h"
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "transaction_list.h"
diff --git a/src/transaction_list.h b/src/transaction_list.h
index cfd7886..ef114c9 100644
--- a/src/transaction_list.h
+++ b/src/transaction_list.h
@@ -1,6 +1,7 @@
 #ifndef _TRANSACTION_LIST_H
 #define _TRANSACTION_LIST_H (1)
 
+#include <gtk/gtk.h>
 
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
diff --git a/src/transaction_list_select.h b/src/transaction_list_select.h
index 82c4c97..8070208 100644
--- a/src/transaction_list_select.h
+++ b/src/transaction_list_select.h
@@ -1,6 +1,8 @@
 #ifndef _GSB_LIST_MODEL_H
 #define _GSB_LIST_MODEL_H (1)
 
+#include <gtk/gtk.h>
+
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
 
diff --git a/src/transaction_list_sort.c b/src/transaction_list_sort.c
index 90f1642..f083728 100644
--- a/src/transaction_list_sort.c
+++ b/src/transaction_list_sort.c
@@ -32,6 +32,7 @@
 #endif
 
 #include "include.h"
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "transaction_list_sort.h"
diff --git a/src/transaction_list_sort.h b/src/transaction_list_sort.h
index 1559992..cf66adc 100644
--- a/src/transaction_list_sort.h
+++ b/src/transaction_list_sort.h
@@ -1,6 +1,7 @@
 #ifndef _TRANSACTION_LIST_SORT_H
 #define _TRANSACTION_LIST_SORT_H (1)
 
+#include <gtk/gtk.h>
 
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
diff --git a/src/utils.c b/src/utils.c
index aeb64ef..700dbe4 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -27,7 +27,8 @@
 #endif
 
 #include "include.h"
-
+#include <stdlib.h>
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "utils.h"
diff --git a/src/utils.h b/src/utils.h
index 5473310..3c9b9e6 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -1,5 +1,8 @@
 #ifndef _UTILS_H
 #define _UTILS_H (1)
+
+#include <gtk/gtk.h>
+
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
 
diff --git a/src/utils_buttons.h b/src/utils_buttons.h
index da817f6..98b8285 100644
--- a/src/utils_buttons.h
+++ b/src/utils_buttons.h
@@ -1,6 +1,8 @@
 #ifndef UTILS_BUTTONS_H
 #define UTILS_BUTTONS_H
 
+#include <gtk/gtk.h>
+
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
 
diff --git a/src/utils_dates.c b/src/utils_dates.c
index c84118e..3e33933 100644
--- a/src/utils_dates.c
+++ b/src/utils_dates.c
@@ -26,6 +26,8 @@
 #endif
 
 #include "include.h"
+#include <stdlib.h>
+#include <string.h>
 #if defined(_MSC_VER) || defined (_MINGW)
 #include <winnls.h>
 #else
diff --git a/src/utils_dates.h b/src/utils_dates.h
index 870f422..e600893 100644
--- a/src/utils_dates.h
+++ b/src/utils_dates.h
@@ -1,5 +1,8 @@
 #ifndef _UTILS_DATES_H
 #define _UTILS_DATES_H (1)
+
+#include <gtk/gtk.h>
+
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
 
diff --git a/src/utils_editables.c b/src/utils_editables.c
index 6b15472..957e2ad 100644
--- a/src/utils_editables.c
+++ b/src/utils_editables.c
@@ -26,7 +26,8 @@
 #endif
 
 #include "include.h"
-
+#include <string.h>
+#include <ctype.h>
 
 /*START_INCLUDE*/
 #include "utils_editables.h"
diff --git a/src/utils_editables.h b/src/utils_editables.h
index 5fcaeee..13f010e 100644
--- a/src/utils_editables.h
+++ b/src/utils_editables.h
@@ -1,5 +1,8 @@
 #ifndef _UTILS_EDITABLES_H
 #define _UTILS_EDITABLES_H (1)
+
+#include <gtk/gtk.h>
+
 /* START_INCLUDE_H */
 #include "gsb_real.h"
 /* END_INCLUDE_H */
diff --git a/src/utils_file_selection.c b/src/utils_file_selection.c
index 2251bd6..edc8c2d 100644
--- a/src/utils_file_selection.c
+++ b/src/utils_file_selection.c
@@ -42,6 +42,7 @@ extern "C" {
 #endif
 
 #include "include.h"
+#include <string.h>
 
 /*START_INCLUDE*/
 #include "utils_file_selection.h"
diff --git a/src/utils_file_selection.h b/src/utils_file_selection.h
index 55f9476..fc7775a 100644
--- a/src/utils_file_selection.h
+++ b/src/utils_file_selection.h
@@ -36,6 +36,7 @@
 #ifndef _H_UTILS_FILE_SELECTION_
 #define _H_UTILS_FILE_SELECTION_ (1)
 
+#include <gtk/gtk.h>
 
 /*! File selection dialog behaviour properties */
 #define FILE_SELECTION_DEFAULT          0x0000  /**< No particular behaviour (open file dialog)*/
diff --git a/src/utils_files.c b/src/utils_files.c
index 032db50..d16c0e0 100644
--- a/src/utils_files.c
+++ b/src/utils_files.c
@@ -28,7 +28,7 @@
 #endif
 
 #include "include.h"
-
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "utils_files.h"
diff --git a/src/utils_files.h b/src/utils_files.h
index eb47003..836e986 100644
--- a/src/utils_files.h
+++ b/src/utils_files.h
@@ -2,6 +2,7 @@
 #define _H_UTILS_FILES 1
 
 #include <sys/stat.h>
+#include <gtk/gtk.h>
 
 enum get_filename_returned_value {
     UTILS_FILES_FILENAME,
diff --git a/src/utils_font.c b/src/utils_font.c
index 11f435e..8b37410 100644
--- a/src/utils_font.c
+++ b/src/utils_font.c
@@ -30,6 +30,7 @@
 #endif
 
 #include "include.h"
+#include <glib/gi18n.h>
 
 /*START_INCLUDE*/
 #include "utils_font.h"
diff --git a/src/utils_font.h b/src/utils_font.h
index 3e24d1f..892ec1c 100644
--- a/src/utils_font.h
+++ b/src/utils_font.h
@@ -1,6 +1,7 @@
 #ifndef _UTILS_FONT_H
 #define _UTILS_FONT_H (1)
 
+#include <gtk/gtk.h>
 
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
diff --git a/src/utils_operations.h b/src/utils_operations.h
index dc1fb27..823c6e1 100644
--- a/src/utils_operations.h
+++ b/src/utils_operations.h
@@ -1,5 +1,8 @@
 #ifndef _UTILS_OPERATIONS_H
 #define _UTILS_OPERATIONS_H (1)
+
+#include <glib.h>
+
 /* START_INCLUDE_H */
 /* END_INCLUDE_H */
 
diff --git a/src/utils_str.c b/src/utils_str.c
index 729a8a8..a69e079 100644
--- a/src/utils_str.c
+++ b/src/utils_str.c
@@ -28,6 +28,9 @@
 
 #include "include.h"
 #include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <glib/gstdio.h>
 
 /*START_INCLUDE*/
 #include "utils_str.h"


hooks/post-receive
-- 
grisbi


More information about the cvs mailing list