diff --git a/mozilla/embedding/browser/gtk/src/Makefile.in b/mozilla/embedding/browser/gtk/src/Makefile.in
index cc80a6b704c..4363941e4d0 100644
--- a/mozilla/embedding/browser/gtk/src/Makefile.in
+++ b/mozilla/embedding/browser/gtk/src/Makefile.in
@@ -71,11 +71,7 @@ EXTRA_DSO_LDOPTS = \
 		-lgtksuperwin \
 		$(NULL)
 
-ifndef MOZ_MONOLITHIC_TOOLKIT
 EXTRA_DSO_LDOPTS += $(MOZ_GTK_LDFLAGS)
-else
-EXTRA_DSO_LDOPTS += $(TK_LIBS)
-endif
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/embedding/browser/photon/src/Makefile.in b/mozilla/embedding/browser/photon/src/Makefile.in
index 91d684c5210..f4c97faebbf 100644
--- a/mozilla/embedding/browser/photon/src/Makefile.in
+++ b/mozilla/embedding/browser/photon/src/Makefile.in
@@ -79,11 +79,7 @@ EXTRA_DSO_LDOPTS = \
 		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
 
-ifndef MOZ_MONOLITHIC_TOOLKIT
 EXTRA_DSO_LDOPTS += $(MOZ_PH_LDFLAGS)
-else
-EXTRA_DSO_LDOPTS += $(TK_LIBS)
-endif
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/gfx/src/Makefile.in b/mozilla/gfx/src/Makefile.in
index 28262439668..f6fcb5b57cf 100644
--- a/mozilla/gfx/src/Makefile.in
+++ b/mozilla/gfx/src/Makefile.in
@@ -48,15 +48,15 @@ else
 DIRS		= ps
 endif
 
+ifneq (,$(filter beos os2 mac,$(MOZ_GFX_TOOLKIT)))
+DIRS		+= $(MOZ_GFX_TOOLKIT)
+endif
+
 # Build xlibrgb only for X toolkits and/or Xprint
 ifneq (,$(filter xlib,$(MOZ_WIDGET_TOOLKIT))$(MOZ_ENABLE_XLIB)$(MOZ_ENABLE_XPRINT))
 DIRS		+= xlibrgb
 endif
 
-ifdef MOZ_MONOLITHIC_TOOLKIT
-DIRS		+= $(MOZ_GFX_TOOLKIT)
-else
-
 ifdef MOZ_ENABLE_GTK
 DIRS		+= gtk
 endif
@@ -73,7 +73,6 @@ endif
 ifdef MOZ_ENABLE_PHOTON
 DIRS		+= photon
 endif
-endif
 
 ifdef MOZ_ENABLE_XPRINT
 DIRS		+= xprint 
diff --git a/mozilla/gfx/src/gtk/Makefile.in b/mozilla/gfx/src/gtk/Makefile.in
index 68cf59fd232..17205c84b80 100644
--- a/mozilla/gfx/src/gtk/Makefile.in
+++ b/mozilla/gfx/src/gtk/Makefile.in
@@ -65,15 +65,9 @@ CPPSRCS		= \
 
 include $(topsrcdir)/config/rules.mk
 
-ifndef MOZ_MONOLITHIC_TOOLKIT
 EXTRA_DSO_LDOPTS += $(MOZ_GTK_LDFLAGS)
 CXXFLAGS	+= $(MOZ_GTK_CFLAGS) 
 CFLAGS		+= $(MOZ_GTK_CFLAGS)
-else
-EXTRA_DSO_LDOPTS += $(TK_LIBS)
-CXXFLAGS	+= $(TK_CFLAGS)
-CFLAGS		+= $(TK_CFLAGS)
-endif
 
 ifdef MOZ_ENABLE_XINERAMA
 GFX_XINERAMA_LIBS += $(MOZ_XINERAMA_LIBS)
diff --git a/mozilla/gfx/src/qt/Makefile.in b/mozilla/gfx/src/qt/Makefile.in
index 8111b8f1468..2778e6c2443 100644
--- a/mozilla/gfx/src/qt/Makefile.in
+++ b/mozilla/gfx/src/qt/Makefile.in
@@ -66,15 +66,9 @@ CPPSRCS		= \
 
 include $(topsrcdir)/config/rules.mk
 
-ifndef MOZ_MONOLITHIC_TOOLKIT
 EXTRA_DSO_LDOPTS += $(MOZ_QT_LDFLAGS)
 CXXFLAGS	+= $(MOZ_QT_CFLAGS)
 CFLAGS		+= $(MOZ_QT_CFLAGS)
-else
-EXTRA_DSO_LDOPTS += $(TK_LIBS)
-CXXFLAGS	+= $(TK_CFLAGS)
-CFLAGS		+= $(TK_CFLAGS)
-endif
 
 EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) \
                 -lgkgfx \
diff --git a/mozilla/gfx/src/xlib/Makefile.in b/mozilla/gfx/src/xlib/Makefile.in
index efd59a9f988..0df799f9777 100644
--- a/mozilla/gfx/src/xlib/Makefile.in
+++ b/mozilla/gfx/src/xlib/Makefile.in
@@ -78,13 +78,8 @@ endif
 
 include $(topsrcdir)/config/rules.mk
 
-ifndef MOZ_MONOLITHIC_TOOLKIT
 EXTRA_DSO_LDOPTS += -L$(DIST)/bin -lxlibrgb $(MOZ_XLIB_LDFLAGS)
 CXXFLAGS	+= $(MOZ_XLIB_CFLAGS)
-else
-EXTRA_DSO_LDOPTS += $(TK_LIBS)
-CXXFLAGS	+= $(TK_CFLAGS)
-endif
 
 ifdef HAVE_XIE
 DEFINES         += -DHAVE_XIE
diff --git a/mozilla/modules/plugin/base/src/Makefile.in b/mozilla/modules/plugin/base/src/Makefile.in
index e2089dee1a5..d0ab85a8c8e 100644
--- a/mozilla/modules/plugin/base/src/Makefile.in
+++ b/mozilla/modules/plugin/base/src/Makefile.in
@@ -94,36 +94,19 @@ EXTRA_DSO_LDOPTS = \
 		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
 
-
-ifndef MOZ_MONOLITHIC_TOOLKIT
-EXTRA_DSO_LDOPTS += $(MOZ_GTK_LDFLAGS)
-else
-EXTRA_DSO_LDOPTS += $(TK_LIBS)
-endif 
-
 include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -D_IMPL_NS_PLUGIN
 
 ifdef MOZ_ENABLE_GTK
-ifndef MOZ_MONOLITHIC_TOOLKIT
 CXXFLAGS        += $(MOZ_GTK_CFLAGS)
 CFLAGS          += $(MOZ_GTK_CFLAGS)
-EXTRA_DSO_LDOPTS += -lgtkxtbin -lgtksuperwin -L/usr/X11R6/lib -lXt
-else
-CXXFLAGS        += $(TK_CFLAGS)
-CFLAGS          += $(TK_CFLAGS)
-EXTRA_DSO_LDOPTS += -lgtkxtbin -lgtksuperwin -L/usr/X11R6/lib -lXt 
-endif		#MOZ_MONOLITHIC_TOOLKIT
+EXTRA_DSO_LDOPTS += -lgtkxtbin -lgtksuperwin -L/usr/X11R6/lib -lXt $(MOZ_GTK_LDFLAGS)
 endif		#MOZ_ENABLE_GTK
 
 ifdef MOZ_ENABLE_QT
 EXTRA_DSO_LDOPTS += $(MOZ_QT_LDFLAGS)
-ifndef MOZ_MONOLITHIC_TOOLKIT
 CXXFLAGS        += $(MOZ_QT_CFLAGS)
 CFLAGS          += $(MOZ_QT_CFLAGS)
-else
-CXXFLAGS        += $(TK_CFLAGS)
-CFLAGS          += $(TK_CFLAGS)
-endif		#MOZ_MONOLITHIC_TOOLKIT
 endif		#MOZ_ENABLE_QT
+
diff --git a/mozilla/modules/plugin/samples/default/unix/Makefile.in b/mozilla/modules/plugin/samples/default/unix/Makefile.in
index 0f2c24a577e..412ef0e8965 100644
--- a/mozilla/modules/plugin/samples/default/unix/Makefile.in
+++ b/mozilla/modules/plugin/samples/default/unix/Makefile.in
@@ -51,14 +51,10 @@ include $(topsrcdir)/config/rules.mk
 EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) -lXt \
 		$(NULL)
 
-ifndef MOZ_MONOLITHIC_TOOLKIT
+ifdef MOZ_ENABLE_GTK
 EXTRA_DSO_LDOPTS += $(MOZ_GTK_LDFLAGS)
 CXXFLAGS	+= $(MOZ_GTK_CFLAGS)
 CFLAGS		+= $(MOZ_GTK_CFLAGS)
-else
-EXTRA_DSO_LDOPTS += $(TK_LIBS)
-CXXFLAGS	+= $(TK_CFLAGS)
-CFLAGS		+= $(TK_CFLAGS)
 endif
 
 install-plugin: $(SHARED_LIBRARY)
diff --git a/mozilla/webshell/tests/viewer/unix/Makefile.in b/mozilla/webshell/tests/viewer/unix/Makefile.in
index ec0fae35676..718460a402d 100644
--- a/mozilla/webshell/tests/viewer/unix/Makefile.in
+++ b/mozilla/webshell/tests/viewer/unix/Makefile.in
@@ -26,9 +26,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-ifdef MOZ_MONOLITHIC_TOOLKIT
-DIRS		= $(MOZ_WIDGET_TOOLKIT)
-else
 DIRS		=
 
 ifdef MOZ_ENABLE_GTK
@@ -41,7 +38,5 @@ ifdef MOZ_ENABLE_XLIB
 DIRS		+= xlib
 endif
 
-endif
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/webshell/tests/viewer/unix/gtk/Makefile.in b/mozilla/webshell/tests/viewer/unix/gtk/Makefile.in
index 896c305c52d..0ff2518b7c1 100644
--- a/mozilla/webshell/tests/viewer/unix/gtk/Makefile.in
+++ b/mozilla/webshell/tests/viewer/unix/gtk/Makefile.in
@@ -67,9 +67,5 @@ DEFINES		+= -D_TIME_H=1
 endif
 endif
 
-ifndef MOZ_MONOLITHIC_TOOLKIT
 CXXFLAGS	+= $(MOZ_GTK_CFLAGS)
-else
-CXXFLAGS	+= $(TK_CFLAGS)
-endif
 
diff --git a/mozilla/webshell/tests/viewer/unix/qt/Makefile.in b/mozilla/webshell/tests/viewer/unix/qt/Makefile.in
index 47447632dda..9de888d2266 100644
--- a/mozilla/webshell/tests/viewer/unix/qt/Makefile.in
+++ b/mozilla/webshell/tests/viewer/unix/qt/Makefile.in
@@ -62,9 +62,5 @@ ifeq ($(OS_ARCH), Linux)
 DEFINES		+= -D_XOPEN_SOURCE=500
 endif
 
-ifndef MOZ_MONOLITHIC_TOOLKIT
 CXXFLAGS	+= $(MOZ_QT_CFLAGS)
-else
-CXXFLAGS	+= $(TK_CFLAGS)
-endif
 
diff --git a/mozilla/webshell/tests/viewer/unix/xlib/Makefile.in b/mozilla/webshell/tests/viewer/unix/xlib/Makefile.in
index 45f3273e285..5e7555f2d09 100644
--- a/mozilla/webshell/tests/viewer/unix/xlib/Makefile.in
+++ b/mozilla/webshell/tests/viewer/unix/xlib/Makefile.in
@@ -61,9 +61,5 @@ ifeq ($(OS_ARCH), Linux)
 DEFINES		+= -D_XOPEN_SOURCE=500
 endif
 
-ifndef MOZ_MONOLITHIC_TOOLKIT
 CXXFLAGS	+= $(MOZ_XLIB_CFLAGS)
-else
-CXXFLAGS	+= $(TK_CFLAGS)
-endif
 
diff --git a/mozilla/widget/src/Makefile.in b/mozilla/widget/src/Makefile.in
index 9f183ca6080..cd0ce96a001 100644
--- a/mozilla/widget/src/Makefile.in
+++ b/mozilla/widget/src/Makefile.in
@@ -28,6 +28,10 @@ include $(DEPTH)/config/autoconf.mk
 
 DIRS		= xpwidgets support
 
+ifneq (,$(filter beos os2 mac,$(MOZ_WIDGET_TOOLKIT)))
+DIRS		+= $(MOZ_WIDGET_TOOLKIT)
+endif
+
 #
 # Dont build the DSO under the 'build' directory as windows does.
 #
@@ -35,8 +39,6 @@ DIRS		= xpwidgets support
 # multiple implementations of widget can be built on the same
 # source tree.
 #
-ifndef MOZ_MONOLITHIC_TOOLKIT
-
 ifdef MOZ_ENABLE_GTK
 DIRS		+= gtksuperwin
 DIRS            += gtkxtbin
@@ -64,13 +66,5 @@ ifdef MOZ_ENABLE_XREMOTE
 DIRS		+= xremoteclient
 endif
 
-else
-ifdef MOZ_ENABLE_GTK
-DIRS            += gtkxtbin
-DIRS		+= gtksuperwin
-endif
-DIRS		+= $(MOZ_WIDGET_TOOLKIT)
-endif
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/widget/src/gtk/Makefile.in b/mozilla/widget/src/gtk/Makefile.in
index 2495a08af76..1ceb1414be1 100644
--- a/mozilla/widget/src/gtk/Makefile.in
+++ b/mozilla/widget/src/gtk/Makefile.in
@@ -76,21 +76,12 @@ EXTRA_DSO_LDOPTS = \
 		$(MOZ_JS_LIBS) \
 		$(NULL)
 
-ifndef MOZ_MONOLITHIC_TOOLKIT
 EXTRA_DSO_LDOPTS +=  -L$(DIST)/lib -lgtksuperwin $(MOZ_GTK_LDFLAGS)
-else
-EXTRA_DSO_LDOPTS += -L$(DIST)/lib -lgtksuperwin $(TK_LIBS)
-endif
 
 include $(topsrcdir)/config/rules.mk
 
-ifndef MOZ_MONOLITHIC_TOOLKIT
 CXXFLAGS	+= $(MOZ_GTK_CFLAGS)
 CFLAGS		+= $(MOZ_GTK_CFLAGS)
-else
-CXXFLAGS	+= $(TK_CFLAGS)
-CFLAGS		+= $(TK_CFLAGS)
-endif
 
 DEFINES		+= -D_IMPL_NS_WIDGET -DUSE_XIM
 
diff --git a/mozilla/widget/src/gtksuperwin/Makefile.in b/mozilla/widget/src/gtksuperwin/Makefile.in
index 5e9c0ebb20f..07fa277ed2c 100644
--- a/mozilla/widget/src/gtksuperwin/Makefile.in
+++ b/mozilla/widget/src/gtksuperwin/Makefile.in
@@ -33,11 +33,7 @@ CSRCS           = \
                 gtkmozbox.c
 
 
-ifndef MOZ_MONOLITHIC_TOOLKIT
 EXTRA_DSO_LDOPTS += $(MOZ_GTK_LDFLAGS)
-else
-EXTRA_DSO_LDOPTS += $(TK_LIBS)
-endif
 
 EXPORTS         = gdksuperwin.h \
 		  gtkmozarea.h \
@@ -45,11 +41,7 @@ EXPORTS         = gdksuperwin.h \
 
 include $(topsrcdir)/config/rules.mk
 
-ifndef MOZ_MONOLITHIC_TOOLKIT
 CFLAGS		+= $(MOZ_GTK_CFLAGS)
-else
-CFLAGS		+= $(TK_CFLAGS)
-endif
 
 DEFINES		+= -D_IMPL_NS_WIDGET -DUSE_XIM
 
diff --git a/mozilla/widget/src/gtkxtbin/Makefile.in b/mozilla/widget/src/gtkxtbin/Makefile.in
index 46d3578dd1a..35313fc4c43 100644
--- a/mozilla/widget/src/gtkxtbin/Makefile.in
+++ b/mozilla/widget/src/gtkxtbin/Makefile.in
@@ -33,21 +33,13 @@ EXPORT_LIBRARY = 1
 CSRCS           = \
                 gtkxtbin.c \
 
-ifndef MOZ_MONOLITHIC_TOOLKIT
 EXTRA_DSO_LDOPTS += $(MOZ_GTK_LDFLAGS) -lXt
-else
-EXTRA_DSO_LDOPTS += $(TK_LIBS) -lXt
-endif
 
 EXPORTS         = gtkxtbin.h 
 
 include $(topsrcdir)/config/rules.mk
 
-ifndef MOZ_MONOLITHIC_TOOLKIT
 CFLAGS		+= $(MOZ_GTK_CFLAGS)
-else
-CFLAGS		+= $(TK_CFLAGS)
-endif
 
 DEFINES		+= -D_IMPL_NS_WIDGET -DUSE_XIM
 
diff --git a/mozilla/widget/src/qt/Makefile.in b/mozilla/widget/src/qt/Makefile.in
index 86ac225eeb6..4e93dcfe82a 100644
--- a/mozilla/widget/src/qt/Makefile.in
+++ b/mozilla/widget/src/qt/Makefile.in
@@ -77,21 +77,12 @@ EXTRA_DSO_LDOPTS = \
 		$(MOZ_JS_LIBS) \
                 $(NULL)
 
-ifndef MOZ_MONOLITHIC_TOOLKIT
 EXTRA_DSO_LDOPTS += -L$(DIST)/lib $(MOZ_QT_LDFLAGS) $(MOZ_XLIB_LDFLAGS)
-else
-EXTRA_DSO_LDOPTS += -L$(DIST)/lib $(TK_LIBS)
-endif
 
 include $(topsrcdir)/config/rules.mk
 
-ifndef MOZ_MONOLITHIC_TOOLKIT
 CXXFLAGS	+= $(MOZ_QT_CFLAGS)
 CFLAGS		+= $(MOZ_QT_CFLAGS)
-else
-CXXFLAGS	+= $(TK_CFLAGS)
-CFLAGS		+= $(TK_CFLAGS)
-endif
 
 DEFINES		+= -D_IMPL_NS_WIDGET
 
diff --git a/mozilla/widget/src/xlib/Makefile.in b/mozilla/widget/src/xlib/Makefile.in
index 9ba52c38cd0..66a58df6b32 100644
--- a/mozilla/widget/src/xlib/Makefile.in
+++ b/mozilla/widget/src/xlib/Makefile.in
@@ -83,17 +83,9 @@ include $(topsrcdir)/config/rules.mk
 
 EXTRA_DSO_LDOPTS += -L$(DIST)/bin -L$(DIST)/lib -lgkgfx $(MOZ_COMPONENT_LIBS)
 
-ifndef MOZ_MONOLITHIC_TOOLKIT
 EXTRA_DSO_LDOPTS += -L$(DIST)/bin -lXt -lxlibrgb -lxlibxtbin $(MOZ_XLIB_LDFLAGS)
-else
-EXTRA_DSO_LDOPTS += $(TK_LIBS)
-endif
 
-ifndef MOZ_MONOLITHIC_TOOLKIT
 CXXFLAGS	+= $(MOZ_XLIB_CFLAGS)
-else
-CXXFLAGS	+= $(TK_CFLAGS)
-endif
 
 DEFINES		+= -D_IMPL_NS_WIDGET
 
diff --git a/mozilla/widget/src/xlibxtbin/Makefile.in b/mozilla/widget/src/xlibxtbin/Makefile.in
index 047296a9890..f9943730f97 100644
--- a/mozilla/widget/src/xlibxtbin/Makefile.in
+++ b/mozilla/widget/src/xlibxtbin/Makefile.in
@@ -36,21 +36,13 @@ CPPSRCS         = \
 
 EXTRA_DSO_LDOPTS += -L$(DIST)/bin -L$(DIST)/lib -lxlibrgb
 
-ifndef MOZ_MONOLITHIC_TOOLKIT
 EXTRA_DSO_LDOPTS += $(MOZ_XLIB_LDFLAGS) -L/usr/X11R6/lib -lXt
-else
-EXTRA_DSO_LDOPTS += $(TK_LIBS) -L/usr/X11R6/lib -lXt
-endif
 
 EXPORTS         = xlibxtbin.h 
 
 include $(topsrcdir)/config/rules.mk
 
-ifndef MOZ_MONOLITHIC_TOOLKIT
 CFLAGS		+= $(MOZ_XLIB_CFLAGS)
-else
-CFLAGS		+= $(TK_CFLAGS)
-endif
 
 DEFINES		+= -D_IMPL_NS_WIDGET -DUSE_XIM
 
diff --git a/mozilla/widget/timer/src/unix/Makefile.in b/mozilla/widget/timer/src/unix/Makefile.in
index 8eabf07c50f..b49c9e95851 100644
--- a/mozilla/widget/timer/src/unix/Makefile.in
+++ b/mozilla/widget/timer/src/unix/Makefile.in
@@ -29,10 +29,6 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= timer
 EXPORTS		= nsUnixTimerCIID.h
 
-ifdef MOZ_MONOLITHIC_TOOLKIT
-DIRS		= $(MOZ_WIDGET_TOOLKIT)
-else
-
 ifdef MOZ_ENABLE_GTK
 DIRS		+= gtk
 endif
@@ -49,7 +45,5 @@ ifdef MOZ_ENABLE_PHOTON
 DIRS		+= photon
 endif
 
-endif
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/widget/timer/src/unix/gtk/Makefile.in b/mozilla/widget/timer/src/unix/gtk/Makefile.in
index a0177a64ff7..9cdacd0ffe1 100644
--- a/mozilla/widget/timer/src/unix/gtk/Makefile.in
+++ b/mozilla/widget/timer/src/unix/gtk/Makefile.in
@@ -34,24 +34,14 @@ REQUIRES	= xpcom \
 
 CPPSRCS		= nsTimerGtk.cpp
 
-ifndef MOZ_MONOLITHIC_TOOLKIT
 EXPORT_LIBRARY = 1
 TIMER_SUFFIX	= gtk
 IS_COMPONENT	= 1
 MODULE_NAME	= nsGtkTimerModule
 CPPSRCS		+= nsTimerGtkFactory.cpp
 EXTRA_DSO_LDOPTS = $(MOZ_GTK_LDFLAGS) $(MOZ_COMPONENT_LIBS)
-else
-TIMER_SUFFIX	= s
-FORCE_STATIC_LIB = 1
-endif
 
 include $(topsrcdir)/config/rules.mk
 
-ifndef MOZ_MONOLITHIC_TOOLKIT
 INCLUDES	+= $(MOZ_GTK_CFLAGS) -I$(srcdir)/..
-else
-CXXFLAGS	+= $(TK_CFLAGS)
-INCLUDES	+= $(TK_CFLAGS) -I$(srcdir)/..
-endif
 
diff --git a/mozilla/widget/timer/src/unix/photon/Makefile.in b/mozilla/widget/timer/src/unix/photon/Makefile.in
index 8069c058e5a..da4512ef363 100644
--- a/mozilla/widget/timer/src/unix/photon/Makefile.in
+++ b/mozilla/widget/timer/src/unix/photon/Makefile.in
@@ -34,24 +34,14 @@ REQUIRES	= xpcom \
 
 CPPSRCS		= nsTimerPh.cpp
 
-ifndef MOZ_MONOLITHIC_TOOLKIT
 TIMER_SUFFIX	= photon
 IS_COMPONENT	= 1
 EXPORT_LIBRARY = 1
 MODULE_NAME	= nsPhTimerModule
 CPPSRCS		+= nsTimerPhFactory.cpp
 EXTRA_DSO_LDOPTS = $(MOZ_COMPONENT_LIBS)
-else
-TIMER_SUFFIX	= s
-FORCE_STATIC_LIB = 1
-endif
 
 include $(topsrcdir)/config/rules.mk
 
-ifndef MOZ_MONOLITHIC_TOOLKIT
 INCLUDES	+= $(MOZ_PH_CFLAGS) -I$(srcdir)/..
-else
-CXXFLAGS	+= $(TK_CFLAGS)
-INCLUDES	+= $(TK_CFLAGS) -I$(srcdir)/..
-endif
 
diff --git a/mozilla/widget/timer/src/unix/qt/Makefile.in b/mozilla/widget/timer/src/unix/qt/Makefile.in
index 1f424ceed5f..e79ef6bc42c 100644
--- a/mozilla/widget/timer/src/unix/qt/Makefile.in
+++ b/mozilla/widget/timer/src/unix/qt/Makefile.in
@@ -41,23 +41,14 @@ MOCSRCS         = \
 		moc_nsTimerEventHandler.cpp \
 		$(NULL)
 
-ifndef MOZ_MONOLITHIC_TOOLKIT
 EXPORT_LIBRARY = 1
 TIMER_SUFFIX	= qt
 IS_COMPONENT	= 1
 MODULE_NAME	= nsQtTimerModule
 CPPSRCS		+= nsTimerQtFactory.cpp
 EXTRA_DSO_LDOPTS = $(MOZ_QT_LDFLAGS) $(MOZ_COMPONENT_LIBS)
-else
-TIMER_SUFFIX	= s
-FORCE_STATIC_LIB = 1
-endif
 
 include $(topsrcdir)/config/rules.mk
 
-ifndef MOZ_MONOLITHIC_TOOLKIT
 INCLUDES        += $(MOZ_QT_CFLAGS) -I$(srcdir)/..
-else
-CXXFLAGS        += $(TK_CFLAGS)
-INCLUDES        += $(TK_CFLAGS) -I$(srcdir)/..
-endif
+
diff --git a/mozilla/widget/timer/src/unix/xlib/Makefile.in b/mozilla/widget/timer/src/unix/xlib/Makefile.in
index 8238bcf1309..e22f26e0178 100644
--- a/mozilla/widget/timer/src/unix/xlib/Makefile.in
+++ b/mozilla/widget/timer/src/unix/xlib/Makefile.in
@@ -35,24 +35,14 @@ REQUIRES	= xpcom \
 
 CPPSRCS		= nsTimerXlib.cpp
 
-ifndef MOZ_MONOLITHIC_TOOLKIT
 EXPORT_LIBRARY = 1
 TIMER_SUFFIX	= xlib
 IS_COMPONENT	= 1
 MODULE_NAME	= nsXlibTimerModule
 CPPSRCS		+= nsTimerXlibFactory.cpp
 EXTRA_DSO_LDOPTS = $(MOZ_XLIB_LDFLAGS) $(MOZ_COMPONENT_LIBS)
-else
-TIMER_SUFFIX	= s
-FORCE_STATIC_LIB = 1
-endif
 
 include $(topsrcdir)/config/rules.mk
 
-ifndef MOZ_MONOLITHIC_TOOLKIT
 INCLUDES	+= $(MOZ_XLIB_CFLAGS) -I$(srcdir)/..
-else
-CXXFLAGS	+= $(TK_CFLAGS)
-INCLUDES	+= $(TK_CFLAGS) -I$(srcdir)/..
-endif
 
diff --git a/mozilla/xpfe/bootstrap/Makefile.in b/mozilla/xpfe/bootstrap/Makefile.in
index b4b2ffaf157..1e16025fed2 100644
--- a/mozilla/xpfe/bootstrap/Makefile.in
+++ b/mozilla/xpfe/bootstrap/Makefile.in
@@ -149,10 +149,6 @@ ifdef MOZ_ENABLE_PHOTON
 XP_LIBS		+= $(TK_LIBS)
 endif
 
-ifdef MOZ_MONOLITHIC_TOOLKIT
-XP_LIBS		+= $(TK_LIBS)
-endif
-
 ifdef NS_TRACE_MALLOC
 DEFINES		+= -DNS_TRACE_MALLOC
 endif