diff --git a/ChangeLog b/ChangeLog
index 00fba8a9b1..3b6a100822 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2001-06-15  Dave Peticolas  <dave@krondo.com>
 
+	* src/gnome/dialog-account-picker.c: use libglade
+
 	* src/gnome/dialog-print-check.c: use libglade
 
 	* src/gnome/dialog-find-transactions.c: use libglade
diff --git a/src/gnome/Makefile.am b/src/gnome/Makefile.am
index 03d78ec228..223c4f8ac3 100644
--- a/src/gnome/Makefile.am
+++ b/src/gnome/Makefile.am
@@ -30,7 +30,6 @@ libgncgnome_a_SOURCES = \
   druid-utils.c \
   extensions.c \
   file-history.c \
-  glade-gnc-dialogs.c \
   glade-support.c \
   gnc-amount-edit.c \
   gnc-commodity-edit.c \
@@ -89,8 +88,6 @@ noinst_HEADERS = \
   druid-qif-import.h \
   druid-utils.h \
   extensions.h \
-  glade-cb-gnc-dialogs.h \
-  glade-gnc-dialogs.h \
   glade-support.h \
   gnc-amount-edit.h \
   gnc-commodity-edit.h \
@@ -123,18 +120,11 @@ noinst_HEADERS = \
   window-report.h
 
 GLADE_FILES = \
-  glade-gnc-dialogs.c \
-  glade-cb-gnc-dialogs.h \
-  glade-gnc-dialogs.h \
   glade-support.c \
   glade-support.h
 
-#${GLADE_FILES}: gnc-dialogs.glade
-#	${GLADE} --write-source ${srcdir}/gnc-dialogs.glade
-
 EXTRA_DIST = \
   .cvsignore \
-  gnc-dialogs.glade \
   gnc-dir.h.in \
   gnucash.desktop \
   gnucash.keys.in \
diff --git a/src/gnome/dialog-account-picker.c b/src/gnome/dialog-account-picker.c
index 3ce1aa117a..919e67b02b 100644
--- a/src/gnome/dialog-account-picker.c
+++ b/src/gnome/dialog-account-picker.c
@@ -30,8 +30,6 @@
 #include "dialog-account-picker.h"
 #include "dialog-utils.h"
 #include "druid-qif-import.h"
-#include "glade-cb-gnc-dialogs.h"
-#include "glade-gnc-dialogs.h"
 #include "gnc-ui-util.h"
 #include "query-user.h"
 
@@ -151,11 +149,9 @@ new_child_string_cb(char * string, gpointer data) {
   }
 }
 
-void
+static void
 gnc_ui_qif_account_picker_new_cb(GtkButton * w, gpointer user_data) {
-  QIFAccountPickerDialog * wind = 
-    gtk_object_get_data(GTK_OBJECT(user_data),
-                        "account_picker_struct");
+  QIFAccountPickerDialog * wind = user_data;
   SCM name_setter = gh_eval_str("qif-map-entry:set-gnc-name!");
   char name[251] = "";
   char sep[2] = " ";
@@ -192,9 +188,7 @@ gnc_ui_qif_account_picker_select_cb(GtkCTree   * tree,
                                     GtkCTreeNode  * node,
                                     gint column,
                                     gpointer  user_data) {
-  QIFAccountPickerDialog * wind = 
-    gtk_object_get_data(GTK_OBJECT(user_data),
-                        "account_picker_struct");
+  QIFAccountPickerDialog * wind = user_data;
   SCM name_setter = gh_eval_str("qif-map-entry:set-gnc-name!");
 
   g_free(wind->selected_name);
@@ -210,9 +204,8 @@ gnc_ui_qif_account_picker_unselect_cb(GtkCTree   * tree,
                                       GtkCTreeNode  * node,
                                       gint column,
                                       gpointer  user_data) {
-  QIFAccountPickerDialog * wind = 
-    gtk_object_get_data(GTK_OBJECT(user_data),
-                        "account_picker_struct");
+  QIFAccountPickerDialog * wind = user_data;
+
   g_free(wind->selected_name);
   wind->selected_name = NULL;
 }
@@ -220,10 +213,8 @@ gnc_ui_qif_account_picker_unselect_cb(GtkCTree   * tree,
 
 static int
 gnc_ui_qif_account_picker_map_cb(GtkWidget * w, gpointer user_data) {
-  QIFAccountPickerDialog * wind = 
-    gtk_object_get_data(GTK_OBJECT(user_data),
-                        "account_picker_struct");
-  
+  QIFAccountPickerDialog * wind = user_data;
+
   /* update the tree display with all the existing accounts plus all
    * the ones the QIF importer thinks it will be creating.  this will
    * also select the map_entry line. */
@@ -247,11 +238,18 @@ qif_account_picker_dialog(QIFImportWindow * qif_wind, SCM map_entry) {
   SCM saved_entry  = gh_call1(save_entry, map_entry);
   int retval = -1;
   char * scmname;
+  GladeXML *xml;
+
   wind = g_new0(QIFAccountPickerDialog, 1);
 
-  wind->dialog     = create_QIF_Import_Account_Picker();
-  wind->treeview   = 
-    gtk_object_get_data(GTK_OBJECT(wind->dialog), "account_tree");
+  xml = gnc_glade_xml_new ("qif.glade", "QIF Import Account Picker");
+
+  glade_xml_signal_connect_data
+    (xml, "gnc_ui_qif_account_picker_new_cb",
+     GTK_SIGNAL_FUNC (gnc_ui_qif_account_picker_new_cb), wind);
+
+  wind->dialog     = glade_xml_get_widget (xml, "QIF Import Account Picker");
+  wind->treeview   = glade_xml_get_widget (xml, "account_tree");
   wind->qif_wind   = qif_wind;
 
   wind->map_entry  = map_entry;
@@ -262,20 +260,17 @@ qif_account_picker_dialog(QIFImportWindow * qif_wind, SCM map_entry) {
 
   scm_protect_object(wind->map_entry);
 
-  gtk_object_set_data(GTK_OBJECT(wind->dialog), "account_picker_struct",
-                      wind);
-
   gtk_signal_connect(GTK_OBJECT(wind->treeview), "tree_select_row",
                      GTK_SIGNAL_FUNC(gnc_ui_qif_account_picker_select_cb),
-                     wind->dialog);
+                     wind);
 
   gtk_signal_connect(GTK_OBJECT(wind->treeview), "tree_unselect_row",
                      GTK_SIGNAL_FUNC(gnc_ui_qif_account_picker_unselect_cb),
-                     wind->dialog);
+                     wind);
 
   gtk_signal_connect_after(GTK_OBJECT(wind->dialog), "map",
                            GTK_SIGNAL_FUNC(gnc_ui_qif_account_picker_map_cb),
-                           wind->dialog);
+                           wind);
   
   /* this is to get the checkmarks set up right.. it will get called 
    * again after the window is mapped. */
@@ -294,4 +289,3 @@ qif_account_picker_dialog(QIFImportWindow * qif_wind, SCM map_entry) {
     return saved_entry;
   }
 }
-
diff --git a/src/gnome/dialog-commodities.c b/src/gnome/dialog-commodities.c
index ef674ac346..baadea0209 100644
--- a/src/gnome/dialog-commodities.c
+++ b/src/gnome/dialog-commodities.c
@@ -28,8 +28,6 @@
 #include "FileDialog.h"
 #include "dialog-commodity.h"
 #include "dialog-utils.h"
-#include "glade-gnc-dialogs.h"
-#include "glade-support.h"
 #include "gnc-commodity.h"
 #include "gnc-component-manager.h"
 #include "gnc-engine-util.h"
diff --git a/src/gnome/dialog-price-editor.c b/src/gnome/dialog-price-editor.c
index 56ca945375..572703091b 100644
--- a/src/gnome/dialog-price-editor.c
+++ b/src/gnome/dialog-price-editor.c
@@ -29,8 +29,6 @@
 
 #include "FileDialog.h"
 #include "dialog-utils.h"
-#include "glade-gnc-dialogs.h"
-#include "glade-support.h"
 #include "global-options.h"
 #include "gnc-amount-edit.h"
 #include "gnc-commodity-edit.h"
diff --git a/src/gnome/glade-cb-gnc-dialogs.h b/src/gnome/glade-cb-gnc-dialogs.h
deleted file mode 100644
index 3108dc62de..0000000000
--- a/src/gnome/glade-cb-gnc-dialogs.h
+++ /dev/null
@@ -1,273 +0,0 @@
-#include <gnome.h>
-
-
-void
-gnc_ui_qif_account_picker_new_cb       (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-gnc_ui_print_check_dialog_ok_cb        (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-gnc_ui_print_check_dialog_cancel_cb    (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-gnc_ui_print_check_dialog_help_cb      (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-gnc_ui_find_transactions_dialog_early_date_toggle_cb
-                                        (GtkToggleButton *togglebutton,
-                                        gpointer         user_data);
-
-void
-gnc_ui_find_transactions_dialog_late_date_toggle_cb
-                                        (GtkToggleButton *togglebutton,
-                                        gpointer         user_data);
-
-void
-gnc_ui_find_transactions_dialog_search_type_cb
-                                        (GtkToggleButton *togglebutton,
-                                        gpointer         user_data);
-
-void
-gnc_ui_find_transactions_dialog_ok_cb  (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-gnc_ui_find_transactions_dialog_cancel_cb
-                                        (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-gnc_ui_find_transactions_dialog_help_cb
-                                        (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-gnc_ui_select_commodity_namespace_changed_cb
-                                        (GtkEditable     *editable,
-                                        gpointer         user_data);
-
-void
-gnc_ui_select_commodity_ok_cb          (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-gnc_ui_select_commodity_new_cb         (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-gnc_ui_select_commodity_cancel_cb      (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-gnc_ui_new_commodity_ok_cb             (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-gnc_ui_new_commodity_cancel_cb         (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-gnc_ui_new_commodity_help_cb           (GtkButton       *button,
-                                        gpointer         user_data);
-
-gboolean
-gnc_ui_commodity_druid_cancel_cb       (GnomeDruidPage  *gnomedruidpage,
-                                        gpointer         arg1,
-                                        gpointer         user_data);
-
-void
-gnc_ui_commodity_druid_finish_cb       (GnomeDruidPage  *gnomedruidpage,
-                                        gpointer         arg1,
-                                        gpointer         user_data);
-
-void
-gnc_ui_qif_import_cancel_cb            (GnomeDruid      *gnomedruid,
-                                        gpointer         user_data);
-
-gboolean
-gnc_ui_qif_import_generic_next_cb      (GnomeDruidPage  *gnomedruidpage,
-                                        gpointer         arg1,
-                                        gpointer         user_data);
-
-gboolean
-gnc_ui_qif_import_load_file_next_cb    (GnomeDruidPage  *gnomedruidpage,
-                                        gpointer         arg1,
-                                        gpointer         user_data);
-
-gboolean
-gnc_ui_qif_import_generic_back_cb      (GnomeDruidPage  *gnomedruidpage,
-                                        gpointer         arg1,
-                                        gpointer         user_data);
-
-void
-gnc_ui_qif_import_select_file_cb       (GtkButton       *button,
-                                        gpointer         user_data);
-
-gboolean
-gnc_ui_qif_import_date_format_next_cb  (GnomeDruidPage  *gnomedruidpage,
-                                        gpointer         arg1,
-                                        gpointer         user_data);
-
-gboolean
-gnc_ui_qif_import_default_acct_next_cb (GnomeDruidPage  *gnomedruidpage,
-                                        gpointer         arg1,
-                                        gpointer         user_data);
-
-gboolean
-gnc_ui_qif_import_default_acct_back_cb (GnomeDruidPage  *gnomedruidpage,
-                                        gpointer         arg1,
-                                        gpointer         user_data);
-
-void
-gnc_ui_qif_import_loaded_files_prepare_cb
-                                        (GnomeDruidPage  *gnomedruidpage,
-                                        gpointer         arg1,
-                                        gpointer         user_data);
-
-void
-gnc_ui_qif_import_select_loaded_file_cb
-                                        (GtkCList        *clist,
-                                        gint             row,
-                                        gint             column,
-                                        GdkEvent        *event,
-                                        gpointer         user_data);
-
-void
-gnc_ui_qif_import_load_another_cb      (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-gnc_ui_qif_import_unload_file_cb       (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-gnc_ui_qif_import_accounts_prepare_cb  (GnomeDruidPage  *gnomedruidpage,
-                                        gpointer         arg1,
-                                        gpointer         user_data);
-
-void
-gnc_ui_qif_import_account_line_select_cb
-                                        (GtkCList        *clist,
-                                        gint             row,
-                                        gint             column,
-                                        GdkEvent        *event,
-                                        gpointer         user_data);
-
-void
-gnc_ui_qif_import_categories_prepare_cb
-                                        (GnomeDruidPage  *gnomedruidpage,
-                                        gpointer         arg1,
-                                        gpointer         user_data);
-
-void
-gnc_ui_qif_import_category_line_select_cb
-                                        (GtkCList        *clist,
-                                        gint             row,
-                                        gint             column,
-                                        GdkEvent        *event,
-                                        gpointer         user_data);
-
-gboolean
-gnc_ui_qif_import_memo_next_cb         (GnomeDruidPage  *gnomedruidpage,
-                                        gpointer         arg1,
-                                        gpointer         user_data);
-
-void
-gnc_ui_qif_import_memo_prepare_cb      (GnomeDruidPage  *gnomedruidpage,
-                                        gpointer         arg1,
-                                        gpointer         user_data);
-
-void
-gnc_ui_qif_import_memo_line_select_cb  (GtkCList        *clist,
-                                        gint             row,
-                                        gint             column,
-                                        GdkEvent        *event,
-                                        gpointer         user_data);
-
-gboolean
-gnc_ui_qif_import_currency_next_cb     (GnomeDruidPage  *gnomedruidpage,
-                                        gpointer         arg1,
-                                        gpointer         user_data);
-
-void
-gnc_ui_qif_import_commodity_prepare_cb (GnomeDruidPage  *gnomedruidpage,
-                                        gpointer         arg1,
-                                        gpointer         user_data);
-
-void
-gnc_ui_qif_import_duplicate_new_select_cb
-                                        (GtkCList        *clist,
-                                        gint             row,
-                                        gint             column,
-                                        GdkEvent        *event,
-                                        gpointer         user_data);
-
-void
-gnc_ui_qif_import_duplicate_old_select_cb
-                                        (GtkCList        *clist,
-                                        gint             row,
-                                        gint             column,
-                                        GdkEvent        *event,
-                                        gpointer         user_data);
-
-void
-gnc_ui_qif_import_finish_cb            (GnomeDruidPage  *gnomedruidpage,
-                                        gpointer         arg1,
-                                        gpointer         user_data);
-
-void
-gnc_help_window_search_button_cb       (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-gnc_help_window_search_help_button_cb  (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-gnc_column_view_edit_add_cb            (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-gnc_column_view_edit_remove_cb         (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-gnc_edit_column_view_move_up_cb        (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-gnc_edit_column_view_move_down_cb      (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-gnc_column_view_edit_size_cb           (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-gnc_ui_new_commodity_ok_cb             (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-gnc_ui_new_commodity_cancel_cb         (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-gnc_ui_new_commodity_help_cb           (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-gnc_ui_commodity_ok_cb                 (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-gnc_ui_commodity_cancel_cb             (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-gnc_ui_commodity_help_cb               (GtkButton       *button,
-                                        gpointer         user_data);
diff --git a/src/gnome/glade-gnc-dialogs.c b/src/gnome/glade-gnc-dialogs.c
deleted file mode 100644
index 9832ed0389..0000000000
--- a/src/gnome/glade-gnc-dialogs.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * DO NOT EDIT THIS FILE - it is generated by Glade.
- */
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <string.h>
-
-#include <gnome.h>
-
-#include "glade-cb-gnc-dialogs.h"
-#include "glade-gnc-dialogs.h"
-#include "glade-support.h"
-
-GtkWidget*
-create_QIF_Import_Account_Picker (void)
-{
-  GtkWidget *QIF_Import_Account_Picker;
-  GtkWidget *vbox1;
-  GtkWidget *vbox2;
-  GtkWidget *frame1;
-  GtkWidget *scrolledwindow24;
-  GtkWidget *account_tree;
-  GtkWidget *label847711;
-  GtkWidget *label847712;
-  GtkWidget *button78;
-  GtkWidget *hbuttonbox1;
-  GtkWidget *button1;
-  GtkWidget *button2;
-
-  QIF_Import_Account_Picker = gnome_dialog_new (_("Select Account"), NULL);
-  gtk_object_set_data (GTK_OBJECT (QIF_Import_Account_Picker), "QIF_Import_Account_Picker", QIF_Import_Account_Picker);
-  gtk_window_set_default_size (GTK_WINDOW (QIF_Import_Account_Picker), 300, 400);
-  gtk_window_set_policy (GTK_WINDOW (QIF_Import_Account_Picker), TRUE, TRUE, TRUE);
-
-  vbox1 = GNOME_DIALOG (QIF_Import_Account_Picker)->vbox;
-  gtk_object_set_data (GTK_OBJECT (QIF_Import_Account_Picker), "vbox1", vbox1);
-  gtk_widget_show (vbox1);
-
-  vbox2 = gtk_vbox_new (FALSE, 0);
-  gtk_widget_ref (vbox2);
-  gtk_object_set_data_full (GTK_OBJECT (QIF_Import_Account_Picker), "vbox2", vbox2,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (vbox2);
-  gtk_box_pack_start (GTK_BOX (vbox1), vbox2, TRUE, TRUE, 0);
-
-  frame1 = gtk_frame_new (_("Select or add a GnuCash account"));
-  gtk_widget_ref (frame1);
-  gtk_object_set_data_full (GTK_OBJECT (QIF_Import_Account_Picker), "frame1", frame1,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (frame1);
-  gtk_box_pack_start (GTK_BOX (vbox2), frame1, TRUE, TRUE, 0);
-
-  scrolledwindow24 = gtk_scrolled_window_new (NULL, NULL);
-  gtk_widget_ref (scrolledwindow24);
-  gtk_object_set_data_full (GTK_OBJECT (QIF_Import_Account_Picker), "scrolledwindow24", scrolledwindow24,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (scrolledwindow24);
-  gtk_container_add (GTK_CONTAINER (frame1), scrolledwindow24);
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow24), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-
-  account_tree = gtk_ctree_new (2, 0);
-  gtk_widget_ref (account_tree);
-  gtk_object_set_data_full (GTK_OBJECT (QIF_Import_Account_Picker), "account_tree", account_tree,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (account_tree);
-  gtk_container_add (GTK_CONTAINER (scrolledwindow24), account_tree);
-  gtk_clist_set_column_width (GTK_CLIST (account_tree), 0, 214);
-  gtk_clist_set_column_width (GTK_CLIST (account_tree), 1, 48);
-  gtk_clist_column_titles_show (GTK_CLIST (account_tree));
-
-  label847711 = gtk_label_new (_("Account"));
-  gtk_widget_ref (label847711);
-  gtk_object_set_data_full (GTK_OBJECT (QIF_Import_Account_Picker), "label847711", label847711,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (label847711);
-  gtk_clist_set_column_widget (GTK_CLIST (account_tree), 0, label847711);
-
-  label847712 = gtk_label_new (_("New?"));
-  gtk_widget_ref (label847712);
-  gtk_object_set_data_full (GTK_OBJECT (QIF_Import_Account_Picker), "label847712", label847712,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (label847712);
-  gtk_clist_set_column_widget (GTK_CLIST (account_tree), 1, label847712);
-
-  button78 = gtk_button_new_with_label (_("New Account (child of selected) ..."));
-  gtk_widget_ref (button78);
-  gtk_object_set_data_full (GTK_OBJECT (QIF_Import_Account_Picker), "button78", button78,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (button78);
-  gtk_box_pack_start (GTK_BOX (vbox1), button78, FALSE, FALSE, 0);
-
-  hbuttonbox1 = GNOME_DIALOG (QIF_Import_Account_Picker)->action_area;
-  gtk_object_set_data (GTK_OBJECT (QIF_Import_Account_Picker), "hbuttonbox1", hbuttonbox1);
-  gtk_widget_show (hbuttonbox1);
-  gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox1), GTK_BUTTONBOX_SPREAD);
-  gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbuttonbox1), 8);
-
-  gnome_dialog_append_button (GNOME_DIALOG (QIF_Import_Account_Picker), GNOME_STOCK_BUTTON_OK);
-  button1 = g_list_last (GNOME_DIALOG (QIF_Import_Account_Picker)->buttons)->data;
-  gtk_widget_ref (button1);
-  gtk_object_set_data_full (GTK_OBJECT (QIF_Import_Account_Picker), "button1", button1,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (button1);
-  GTK_WIDGET_SET_FLAGS (button1, GTK_CAN_DEFAULT);
-
-  gnome_dialog_append_button (GNOME_DIALOG (QIF_Import_Account_Picker), GNOME_STOCK_BUTTON_CANCEL);
-  button2 = g_list_last (GNOME_DIALOG (QIF_Import_Account_Picker)->buttons)->data;
-  gtk_widget_ref (button2);
-  gtk_object_set_data_full (GTK_OBJECT (QIF_Import_Account_Picker), "button2", button2,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (button2);
-  GTK_WIDGET_SET_FLAGS (button2, GTK_CAN_DEFAULT);
-
-  gtk_signal_connect (GTK_OBJECT (button78), "clicked",
-                      GTK_SIGNAL_FUNC (gnc_ui_qif_account_picker_new_cb),
-                      QIF_Import_Account_Picker);
-
-  return QIF_Import_Account_Picker;
-}
-
diff --git a/src/gnome/glade-gnc-dialogs.h b/src/gnome/glade-gnc-dialogs.h
deleted file mode 100644
index a083801b6c..0000000000
--- a/src/gnome/glade-gnc-dialogs.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
- * DO NOT EDIT THIS FILE - it is generated by Glade.
- */
-
-GtkWidget* create_QIF_Import_Account_Picker (void);
diff --git a/src/gnome/glade/qif.glade b/src/gnome/glade/qif.glade
index 13ff5e7d77..f200b1a487 100644
--- a/src/gnome/glade/qif.glade
+++ b/src/gnome/glade/qif.glade
@@ -18,6 +18,158 @@
   <translatable_strings_file>qif_strings.c</translatable_strings_file>
 </project>
 
+<widget>
+  <class>GnomeDialog</class>
+  <name>QIF Import Account Picker</name>
+  <title>Select Account</title>
+  <type>GTK_WINDOW_TOPLEVEL</type>
+  <position>GTK_WIN_POS_NONE</position>
+  <modal>False</modal>
+  <default_width>300</default_width>
+  <default_height>400</default_height>
+  <allow_shrink>True</allow_shrink>
+  <allow_grow>True</allow_grow>
+  <auto_shrink>True</auto_shrink>
+  <auto_close>False</auto_close>
+  <hide_on_close>False</hide_on_close>
+
+  <widget>
+    <class>GtkVBox</class>
+    <child_name>GnomeDialog:vbox</child_name>
+    <name>vbox1</name>
+    <homogeneous>False</homogeneous>
+    <spacing>8</spacing>
+    <child>
+      <padding>1</padding>
+      <expand>True</expand>
+      <fill>True</fill>
+    </child>
+
+    <widget>
+      <class>GtkHButtonBox</class>
+      <child_name>GnomeDialog:action_area</child_name>
+      <name>hbuttonbox1</name>
+      <layout_style>GTK_BUTTONBOX_SPREAD</layout_style>
+      <spacing>8</spacing>
+      <child_min_width>85</child_min_width>
+      <child_min_height>27</child_min_height>
+      <child_ipad_x>7</child_ipad_x>
+      <child_ipad_y>0</child_ipad_y>
+      <child>
+	<padding>0</padding>
+	<expand>False</expand>
+	<fill>False</fill>
+	<pack>GTK_PACK_END</pack>
+      </child>
+
+      <widget>
+	<class>GtkButton</class>
+	<name>button1</name>
+	<can_default>True</can_default>
+	<can_focus>True</can_focus>
+	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
+      </widget>
+
+      <widget>
+	<class>GtkButton</class>
+	<name>button2</name>
+	<can_default>True</can_default>
+	<can_focus>True</can_focus>
+	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
+      </widget>
+    </widget>
+
+    <widget>
+      <class>GtkVBox</class>
+      <name>vbox2</name>
+      <homogeneous>False</homogeneous>
+      <spacing>0</spacing>
+      <child>
+	<padding>0</padding>
+	<expand>True</expand>
+	<fill>True</fill>
+      </child>
+
+      <widget>
+	<class>GtkFrame</class>
+	<name>frame1</name>
+	<label>Select or add a GnuCash account</label>
+	<label_xalign>0</label_xalign>
+	<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
+	<child>
+	  <padding>0</padding>
+	  <expand>True</expand>
+	  <fill>True</fill>
+	</child>
+
+	<widget>
+	  <class>GtkScrolledWindow</class>
+	  <name>scrolledwindow24</name>
+	  <hscrollbar_policy>GTK_POLICY_AUTOMATIC</hscrollbar_policy>
+	  <vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
+	  <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
+	  <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
+
+	  <widget>
+	    <class>GtkCTree</class>
+	    <name>account_tree</name>
+	    <can_focus>True</can_focus>
+	    <columns>2</columns>
+	    <column_widths>214,48</column_widths>
+	    <selection_mode>GTK_SELECTION_SINGLE</selection_mode>
+	    <show_titles>True</show_titles>
+	    <shadow_type>GTK_SHADOW_IN</shadow_type>
+
+	    <widget>
+	      <class>GtkLabel</class>
+	      <child_name>CTree:title</child_name>
+	      <name>label847711</name>
+	      <label>Account</label>
+	      <justify>GTK_JUSTIFY_CENTER</justify>
+	      <wrap>False</wrap>
+	      <xalign>0.5</xalign>
+	      <yalign>0.5</yalign>
+	      <xpad>0</xpad>
+	      <ypad>0</ypad>
+	    </widget>
+
+	    <widget>
+	      <class>GtkLabel</class>
+	      <child_name>CTree:title</child_name>
+	      <name>label847712</name>
+	      <label>New?</label>
+	      <justify>GTK_JUSTIFY_CENTER</justify>
+	      <wrap>False</wrap>
+	      <xalign>0.5</xalign>
+	      <yalign>0.5</yalign>
+	      <xpad>0</xpad>
+	      <ypad>0</ypad>
+	    </widget>
+	  </widget>
+	</widget>
+      </widget>
+    </widget>
+
+    <widget>
+      <class>GtkButton</class>
+      <name>button78</name>
+      <can_focus>True</can_focus>
+      <signal>
+	<name>clicked</name>
+	<handler>gnc_ui_qif_account_picker_new_cb</handler>
+	<data>QIF_Import_Account_Picker</data>
+	<last_modification_time>Sat, 10 Feb 2001 21:26:10 GMT</last_modification_time>
+      </signal>
+      <label>New Account (child of selected) ...</label>
+      <child>
+	<padding>0</padding>
+	<expand>False</expand>
+	<fill>False</fill>
+      </child>
+    </widget>
+  </widget>
+</widget>
+
 <widget>
   <class>GtkWindow</class>
   <name>QIF Import Druid</name>
diff --git a/src/gnome/glade/qif_strings.c b/src/gnome/glade/qif_strings.c
index 7a85920367..434a539426 100644
--- a/src/gnome/glade/qif_strings.c
+++ b/src/gnome/glade/qif_strings.c
@@ -4,6 +4,11 @@
  * DO NOT compile it as part of your application.
  */
 
+gchar *s = N_("Select Account");
+gchar *s = N_("Select or add a GnuCash account");
+gchar *s = N_("Account");
+gchar *s = N_("New?");
+gchar *s = N_("New Account (child of selected) ...");
 gchar *s = N_("QIF Import");
 gchar *s = N_("Import QIF files");
 gchar *s = N_("GnuCash can import financial data from QIF (Quicken \n"
diff --git a/src/gnome/gnc-dialogs.glade b/src/gnome/gnc-dialogs.glade
deleted file mode 100644
index 33d0901b25..0000000000
--- a/src/gnome/gnc-dialogs.glade
+++ /dev/null
@@ -1,178 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>gnc-dialogs</name>
-  <program_name>gnc-dialogs</program_name>
-  <directory></directory>
-  <source_directory></source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <output_main_file>False</output_main_file>
-  <output_support_files>False</output_support_files>
-  <output_build_files>False</output_build_files>
-  <backup_source_files>False</backup_source_files>
-  <main_source_file>glade-gnc-dialogs.c</main_source_file>
-  <main_header_file>glade-gnc-dialogs.h</main_header_file>
-  <handler_source_file>glade-cb-gnc-dialogs.c</handler_source_file>
-  <handler_header_file>glade-cb-gnc-dialogs.h</handler_header_file>
-  <support_source_file>glade-support.c</support_source_file>
-  <support_header_file>glade-support.h</support_header_file>
-  <translatable_strings_file>glade_strings.txt</translatable_strings_file>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>QIF Import Account Picker</name>
-  <title>Select Account</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <default_width>300</default_width>
-  <default_height>400</default_height>
-  <allow_shrink>True</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>True</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>vbox1</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>1</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>hbuttonbox1</name>
-      <layout_style>GTK_BUTTONBOX_SPREAD</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>False</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button1</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button2</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkVBox</class>
-      <name>vbox2</name>
-      <homogeneous>False</homogeneous>
-      <spacing>0</spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkFrame</class>
-	<name>frame1</name>
-	<label>Select or add a GnuCash account</label>
-	<label_xalign>0</label_xalign>
-	<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkScrolledWindow</class>
-	  <name>scrolledwindow24</name>
-	  <hscrollbar_policy>GTK_POLICY_AUTOMATIC</hscrollbar_policy>
-	  <vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
-	  <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-	  <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-
-	  <widget>
-	    <class>GtkCTree</class>
-	    <name>account_tree</name>
-	    <can_focus>True</can_focus>
-	    <columns>2</columns>
-	    <column_widths>214,48</column_widths>
-	    <selection_mode>GTK_SELECTION_SINGLE</selection_mode>
-	    <show_titles>True</show_titles>
-	    <shadow_type>GTK_SHADOW_IN</shadow_type>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <child_name>CTree:title</child_name>
-	      <name>label847711</name>
-	      <label>Account</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0.5</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	    </widget>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <child_name>CTree:title</child_name>
-	      <name>label847712</name>
-	      <label>New?</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0.5</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	    </widget>
-	  </widget>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkButton</class>
-      <name>button78</name>
-      <can_focus>True</can_focus>
-      <signal>
-	<name>clicked</name>
-	<handler>gnc_ui_qif_account_picker_new_cb</handler>
-	<data>QIF_Import_Account_Picker</data>
-	<last_modification_time>Sat, 10 Feb 2001 21:26:10 GMT</last_modification_time>
-      </signal>
-      <label>New Account (child of selected) ...</label>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>False</fill>
-      </child>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/src/gnome/print-session.c b/src/gnome/print-session.c
index 1a4f22a89b..bec877385a 100644
--- a/src/gnome/print-session.c
+++ b/src/gnome/print-session.c
@@ -27,7 +27,6 @@
 #include <gnome.h>
 #include <stdio.h>
 
-#include "glade-cb-gnc-dialogs.h"
 #include "gnc-ui.h"
 #include "messages.h"
 #include "print-session.h"
diff --git a/src/gnome/window-report.c b/src/gnome/window-report.c
index 519f44c1d1..bd581ff101 100644
--- a/src/gnome/window-report.c
+++ b/src/gnome/window-report.c
@@ -34,7 +34,6 @@
 
 #include "dialog-options.h"
 #include "dialog-utils.h"
-#include "glade-gnc-dialogs.h"
 #include "gnc-component-manager.h"
 #include "gnc-engine-util.h"
 #include "gnc-html-history.h"