diff --git a/mozilla/mailnews/base/tests/identity/Makefile.in b/mozilla/mailnews/base/tests/identity/Makefile.in
index 3e8b3c15d54..dca35d68935 100644
--- a/mozilla/mailnews/base/tests/identity/Makefile.in
+++ b/mozilla/mailnews/base/tests/identity/Makefile.in
@@ -24,6 +24,13 @@ include $(DEPTH)/config/autoconf.mk
 
 PROGRAM = identity
 
+# Hardcoding dlopen()'s?  This needs to get fixed.
+#
+TOOLKIT_CFLAGS := \
+	-DWIDGET_DLL=\"libwidget$(MOZ_TOOLKIT).$(DLL_SUFFIX)\" \
+	-DGFXWIN_DLL=\"libgfx$(MOZ_TOOLKIT).$(DLL_SUFFIX)\" \
+	$(TK_CFLAGS)
+
 CPPSRCS = \
 		identity.cpp \
 		$(NULL)
@@ -41,5 +48,7 @@ LIBS =	\
 
 include $(topsrcdir)/config/config.mk
 
+CXXFLAGS+=	$(TOOLKIT_CFLAGS)
+
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/mailnews/compose/tests/smtp/Makefile.in b/mozilla/mailnews/compose/tests/smtp/Makefile.in
index 35fef1ec822..19129593020 100644
--- a/mozilla/mailnews/compose/tests/smtp/Makefile.in
+++ b/mozilla/mailnews/compose/tests/smtp/Makefile.in
@@ -58,8 +58,8 @@ LIBS = \
 	-ljsdom	\
 	-ljsurl	\
 	-limg	\
-	-lpng	\
-	-ljpeg	\
+	$(PNG_LIBS)     \
+	$(JPEG_LIBS)    \
 	-lxp	\
 	-lgfx$(MOZ_TOOLKIT)    \
 	-lraptorgfx \
diff --git a/mozilla/mailnews/news/tests/nntp/Makefile.in b/mozilla/mailnews/news/tests/nntp/Makefile.in
index 228752ae481..bdf81d5ea10 100644
--- a/mozilla/mailnews/news/tests/nntp/Makefile.in
+++ b/mozilla/mailnews/news/tests/nntp/Makefile.in
@@ -59,8 +59,8 @@ LIBS = \
 	-ljsdom	\
 	-ljsurl	\
 	-limg	\
-	-lpng	\
-	-ljpeg	\
+	$(PNG_LIBS)     \
+	$(JPEG_LIBS)    \
 	-lgfx$(MOZ_TOOLKIT) 	\
 	-lraptorgfx 	\
 	-lgfxps		\