diff --git a/ChangeLog b/ChangeLog
index 75b6997164..4a55fa3a7d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-09-16  Manish Singh  <yosh@gimp.org>
+
+	* app/Makefile.am: use -u to prevent garbage collection of symbols
+	prematurely. I wonder if this works everywhere...
+
+	* app/pdb/Makefile.am
+	* app/vectors/Makefile.am: remove gross hacks
+
 2003-09-16  Simon Budig  <simon@gimp.org>
 
 	* app/vectors/gimpvectors.[ch]: Implemented an (unused/untested)
diff --git a/app/Makefile.am b/app/Makefile.am
index 8fe91058b3..eec899cb2a 100644
--- a/app/Makefile.am
+++ b/app/Makefile.am
@@ -50,9 +50,16 @@ REGEXREPL = $(top_builddir)/regexrepl/libregex.a
 endif
 
 if OS_WIN32
-gimp_1_3_LDFLAGS = -mwindows
+mwindows = -mwindows
 endif
 
+gimp_1_3_LDFLAGS = \
+	$(mwindows)					\
+	-u gimp_container_get_filtered_name_array	\
+	-u gimp_xml_parser_new				\
+	-u gimp_xml_parser_parse_file			\
+	-u gimp_xml_parser_free
+
 AM_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"Gimp\"		\
 	-DGIMP_APP_GLUE_COMPILATION	\
diff --git a/app/pdb/Makefile.am b/app/pdb/Makefile.am
index ba8f3ad07d..5f3c4eafc8 100644
--- a/app/pdb/Makefile.am
+++ b/app/pdb/Makefile.am
@@ -48,9 +48,6 @@ libapppdb_a_SOURCES = \
 	undo_cmds.c		\
 	unit_cmds.c
 
-## This is a truly ugly hack
-libapppdb_a_LIBADD = ../core/gimpcontainer-filter.o
-
 AM_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"Gimp-PDB\"	\
 	@GIMP_THREAD_FLAGS@ 		\
diff --git a/app/vectors/Makefile.am b/app/vectors/Makefile.am
index 5b13e57d3c..49d942efc8 100644
--- a/app/vectors/Makefile.am
+++ b/app/vectors/Makefile.am
@@ -34,7 +34,3 @@ libappvectors_a_SOURCES = \
 	gimpvectors-import.h	\
 	gimpvectors-preview.c	\
 	gimpvectors-preview.h
-
-## This is a truly ugly hack
-libappvectors_a_LIBADD = ../config/gimpxmlparser.o
-