Index: src/Makefile.dep
===================================================================
--- src/Makefile.dep	(revision 6761)
+++ src/Makefile.dep	(revision 6762)
@@ -947,6 +947,8 @@
  ../src_plugins/lib_gtk_common/dlg_attribute.h \
  ../src_plugins/lib_gtk_common/dlg_confirm.h \
  ../src_plugins/lib_gtk_common/dlg_export.h \
+ ../src_plugins/lib_gtk_common/dlg_file_chooser.h \
+ ../src_plugins/lib_gtk_common/util_str.h \
  ../src_plugins/lib_gtk_common/dlg_input.h \
  ../src_plugins/lib_gtk_common/dlg_message.h \
  ../src_plugins/lib_gtk_common/dlg_print.h \
@@ -1593,8 +1595,8 @@
  obj_rat.h layer_grp.h library.h rats_patch.h board.h font.h box.h \
  math_helper.h move.h misc_util.h data.h crosshair.h vtonpoint.h hid.h \
  error.h drc.h buffer.h error.h pcb-printf.h \
- ../src_3rd/genvector/gds_char.h compat_misc.h compat_nls.h \
- action_helper.h hid_actions.h plugins.h dolists.h
+ ../src_3rd/genvector/gds_char.h compat_misc.h action_helper.h \
+ hid_actions.h plugins.h dolists.h
 ../src_plugins/import_netlist/import_netlist.o: \
  ../src_plugins/import_netlist/import_netlist.c ../config.h board.h \
  const.h macro.h global_typedefs.h pcb_bool.h unit.h vtroutestyle.h \
Index: src_plugins/hid_gtk/gtkhid-main.c
===================================================================
--- src_plugins/hid_gtk/gtkhid-main.c	(revision 6761)
+++ src_plugins/hid_gtk/gtkhid-main.c	(revision 6762)
@@ -42,6 +42,7 @@
 #include "../src_plugins/lib_gtk_common/dlg_attribute.h"
 #include "../src_plugins/lib_gtk_common/dlg_confirm.h"
 #include "../src_plugins/lib_gtk_common/dlg_export.h"
+#include "../src_plugins/lib_gtk_common/dlg_file_chooser.h"
 #include "../src_plugins/lib_gtk_common/dlg_input.h"
 #include "../src_plugins/lib_gtk_common/dlg_message.h"
 #include "../src_plugins/lib_gtk_common/dlg_print.h"
@@ -275,6 +276,12 @@
 	return pcb_gtk_dlg_progress(ghid_port.top_window, so_far, total, message);
 }
 
+static char *ghid_fileselect(const char *title, const char *descr, const char *default_file, const char *default_ext, const char *history_tag, int flags)
+{
+	return pcb_gtk_fileselect(ghid_port.top_window, title, descr, default_file, default_ext, history_tag, flags);
+}
+
+
 static int ghid_propedit_start(void *pe, int num_props,
 															 const char *(*query) (void *pe, const char *cmd, const char *key, const char *val, int idx))
 {
Index: src_plugins/hid_gtk/gui.h
===================================================================
--- src_plugins/hid_gtk/gui.h	(revision 6761)
+++ src_plugins/hid_gtk/gui.h	(revision 6762)
@@ -204,18 +204,6 @@
 */
 #define		GUI_DIALOG_RESPONSE_ALL	1
 
-gchar *ghid_dialog_file_select_open(const gchar * title, gchar ** path, const gchar * shortcuts);
-gchar *ghid_dialog_file_select_save(const gchar * title, gchar ** path, const gchar * file, const gchar * shortcuts, const char **formats, const char **extensions, int *format);
-/*gboolean ghid_dialog_confirm(const gchar * message, const gchar * cancelmsg, const gchar * okmsg);
-int ghid_dialog_close_confirm(void);
-#define GUI_DIALOG_CLOSE_CONFIRM_CANCEL 0
-#define GUI_DIALOG_CLOSE_CONFIRM_NOSAVE 1
-#define GUI_DIALOG_CLOSE_CONFIRM_SAVE   2
-gint ghid_dialog_confirm_all(gchar * message);
-gchar *ghid_dialog_input(const char *prompt, const char *initial);*/
-
-char *ghid_fileselect(const char *, const char *, const char *, const char *, const char *, int);
-
 /* gui-drc-window.c */
 void ghid_drc_window_show(gboolean raise);
 void ghid_drc_window_reset_message(void);
Index: src_plugins/lib_gtk_common/dlg_file_chooser.c
===================================================================
--- src_plugins/lib_gtk_common/dlg_file_chooser.c	(revision 6761)
+++ src_plugins/lib_gtk_common/dlg_file_chooser.c	(revision 6762)
@@ -309,7 +309,7 @@
 
 /* ---------------------------------------------- */
 /* Caller must g_free() the returned filename. */
-gchar *ghid_fileselect(GtkWidget *top_window, const char *title, const char *descr, const char *default_file, const char *default_ext, const char *history_tag, int flags)
+gchar *pcb_gtk_fileselect(GtkWidget *top_window, const char *title, const char *descr, const char *default_file, const char *default_ext, const char *history_tag, int flags)
 {
 	GtkWidget *dialog;
 	gchar *result = NULL;
Index: src_plugins/lib_gtk_common/dlg_file_chooser.h
===================================================================
--- src_plugins/lib_gtk_common/dlg_file_chooser.h	(revision 6761)
+++ src_plugins/lib_gtk_common/dlg_file_chooser.h	(revision 6762)
@@ -9,4 +9,4 @@
 
 gchar *ghid_dialog_file_select_save(GtkWidget *top_window, const gchar *title, gchar **path, const gchar *file, const gchar *shortcuts, const char **formats, const char **extensions, int *format);
 
-gchar *ghid_fileselect(GtkWidget *top_window, const char *title, const char *descr, const char *default_file, const char *default_ext, const char *history_tag, int flags);
+gchar *pcb_gtk_fileselect(GtkWidget *top_window, const char *title, const char *descr, const char *default_file, const char *default_ext, const char *history_tag, int flags);