diff --git a/ChangeLog b/ChangeLog
index f04e3c7de7..1ce95b0f07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,21 @@
 2003-05-30  Tor Lillqvist  <tml@iki.fi>
 
+	* configure.in: As gimp uses fontconfig directly, check for it.
+
+	* app/Makefile.am: And link with it.
+
+	* app/gimp.sym: Remove dead symbols.
+
+	* libgimp/gimp.def
+	* libgimpwidgets/gimpwidgets.def: Move gimp_standard_help_func.
+
 	* plug-ins/common/wmf.c (load_image): Remove the message asking
 	the user to send files with unhandled opcodes to me. I'm really
 	not interested in getting them currently... (BTW, the wmf plug-in
 	really should be rewritten to use libwmf.)
 
+	* plug-ins/xjt/xjt.c: Use _mkdir() on Win32.
+
 2003-05-30  Maurits Rijk <lpeek.mrijk@consunet.nl>
 
 	* plug-ins/common/film.c (film_dialog): fix for #113882 (Clean-up Film 
diff --git a/app/Makefile.am b/app/Makefile.am
index 7f4db5e05f..744941c9fd 100644
--- a/app/Makefile.am
+++ b/app/Makefile.am
@@ -102,6 +102,7 @@ gimp_1_3_LDADD = \
 	$(LIBART_LIBS)							\
 	$(GIMP_THREAD_LIBS)						\
 	$(GIMP_MP_LIBS)							\
+	$(FONTCONFIG_LIBS)						\
 	$(INTLLIBS)							\
 	$(REGEXREPL)
 
diff --git a/app/gimp.sym b/app/gimp.sym
index 75618e716e..742406dfbe 100644
--- a/app/gimp.sym
+++ b/app/gimp.sym
@@ -1,6 +1,4 @@
 gimp_object_get_type
-gimp_palette_get_background
-gimp_palette_get_foreground
 gimp_standard_help_func
 gimp_tool_control_get_cursor
 gimp_tool_control_get_cursor_modifier
@@ -14,8 +12,6 @@ gimp_tool_control_is_paused
 gimp_tool_control_is_toggled
 gimp_tool_control_pause
 gimp_tool_control_resume
-gimp_tool_real_button_press
-gimp_tool_real_button_release
 gimp_tool_set_cursor
 gimp_unit_get_abbreviation
 gimp_unit_get_digits
diff --git a/configure.in b/configure.in
index f7a9f4306a..dbff0970c1 100644
--- a/configure.in
+++ b/configure.in
@@ -285,6 +285,7 @@ PKG_CHECK_MODULES(LIBART, libart-2.0)
 AC_SUBST(LIBART_CFLAGS)
 AC_SUBST(LIBART_LIBS)
 
+PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= 1.0.1, have_fontconfig=true, :)
 
 ##########################################
 # Check for some special functions we need
diff --git a/libgimp/gimp.def b/libgimp/gimp.def
index 8cd2a45408..bf11253f9e 100644
--- a/libgimp/gimp.def
+++ b/libgimp/gimp.def
@@ -321,7 +321,6 @@ EXPORTS
 	gimp_show_tool_tips
 	gimp_smudge
 	gimp_smudge_default
-	gimp_standard_help_func
 	gimp_temp_name
 	gimp_text
 	gimp_text_fontname
diff --git a/libgimpwidgets/gimpwidgets.def b/libgimpwidgets/gimpwidgets.def
index fae3aca565..dbf03e36e8 100644
--- a/libgimpwidgets/gimpwidgets.def
+++ b/libgimpwidgets/gimpwidgets.def
@@ -118,7 +118,7 @@ EXPORTS
 	gimp_size_entry_set_value
 	gimp_size_entry_set_value_boundaries
 	gimp_spin_button_new
-;	gimp_standard_help_func
+	gimp_standard_help_func
 	gimp_stock_init
 	gimp_table_attach_aligned
 	gimp_toggle_button_sensitive_update
diff --git a/plug-ins/xjt/xjt.c b/plug-ins/xjt/xjt.c
index c1e511450a..f3c235cec6 100644
--- a/plug-ins/xjt/xjt.c
+++ b/plug-ins/xjt/xjt.c
@@ -67,6 +67,10 @@
 
 #include "libgimp/stdplugins-intl.h"
 
+#ifdef G_OS_WIN32
+#define mkdir(path,mode) _mkdir(path)
+#endif
+
 /* XJT includes */
 #include "xjpeg.h"
 #include "xpdb_calls.h"