diff --git a/mozilla/embedding/browser/gtk/tests/Makefile.in b/mozilla/embedding/browser/gtk/tests/Makefile.in
index ba39a472394..24de5700276 100644
--- a/mozilla/embedding/browser/gtk/tests/Makefile.in
+++ b/mozilla/embedding/browser/gtk/tests/Makefile.in
@@ -54,9 +54,7 @@ endif
 
 ifdef MOZ_ENABLE_GTK2
 LIBS		+= \
-		-lgtkembedmoz \
-		$(XLIBS) \
-		$(NULL)
+		-lgtkembedmoz
 endif
 
 include $(topsrcdir)/config/config.mk
diff --git a/mozilla/modules/plugin/base/src/Makefile.in b/mozilla/modules/plugin/base/src/Makefile.in
index e3a10e01e6a..33f87bcb5c1 100644
--- a/mozilla/modules/plugin/base/src/Makefile.in
+++ b/mozilla/modules/plugin/base/src/Makefile.in
@@ -141,7 +141,7 @@ endif		#MOZ_ENABLE_GTK
 ifdef MOZ_ENABLE_GTK2
 CXXFLAGS        += $(MOZ_GTK2_CFLAGS)
 CFLAGS          += $(MOZ_GTK2_CFLAGS)
-EXTRA_DSO_LDOPTS += -lgtkxtbin $(XLDFLAGS) $(XT_LIBS) $(MOZ_GTK2_LIBS) $(XLIBS)
+EXTRA_DSO_LDOPTS += -lgtkxtbin $(XLDFLAGS) $(XT_LIBS) $(MOZ_GTK2_LIBS)
 endif           #MOZ_ENABLE_GTK2
 
 ifdef MOZ_ENABLE_XLIB
diff --git a/mozilla/modules/plugin/samples/default/unix/Makefile.in b/mozilla/modules/plugin/samples/default/unix/Makefile.in
index 86b69474353..403122ebd40 100644
--- a/mozilla/modules/plugin/samples/default/unix/Makefile.in
+++ b/mozilla/modules/plugin/samples/default/unix/Makefile.in
@@ -58,7 +58,7 @@ CFLAGS		+= $(MOZ_GTK_CFLAGS)
 endif
 
 ifdef MOZ_ENABLE_GTK2
-EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS) $(XLDFLAGS) $(XLIBS)
+EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIB ) $(XLDFLAGS)
 CXXFLAGS	+= $(MOZ_GTK2_CFLAGS)
 CFLAGS		+= $(MOZ_GTK2_CFLAGS)
 endif
diff --git a/mozilla/widget/src/gtk2/mai/Makefile.in b/mozilla/widget/src/gtk2/mai/Makefile.in
index bc89ca15986..518e6dd8855 100644
--- a/mozilla/widget/src/gtk2/mai/Makefile.in
+++ b/mozilla/widget/src/gtk2/mai/Makefile.in
@@ -78,7 +78,7 @@ CPPSRCS		= \
                 nsMaiHyperlink.cpp \
 		$(NULL)
 
-EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS) $(XPCOM_LIBS) $(NSPR_LIBS)
+EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS)
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/widget/src/gtkxtbin/Makefile.in b/mozilla/widget/src/gtkxtbin/Makefile.in
index 85196f01c49..f6a10acff8b 100644
--- a/mozilla/widget/src/gtkxtbin/Makefile.in
+++ b/mozilla/widget/src/gtkxtbin/Makefile.in
@@ -33,7 +33,7 @@ ifdef MOZ_ENABLE_GTK2
 CSRCS		= \
 		gtk2xtbin.c \
 		$(NULL)
-EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS) $(XLDFLAGS) $(XT_LIBS) $(XLIBS)
+EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS) $(XLDFLAGS) $(XT_LIBS)
 endif
 
 ifdef MOZ_ENABLE_GTK