--- a/widget/src/beos/Makefile.in
+++ b/widget/src/beos/Makefile.in
@@ -63,22 +63,20 @@ REQUIRES	= xpcom \
 		  gfx \
 		  dom \
 		  intl \
 		  uconv \
 		  necko \
 		  pref \
 		  view \
 		  locale \
+		  cairo \
+		  thebes \
 		  $(NULL)
 
-ifdef MOZ_ENABLE_CAIRO_GFX
-REQUIRES += cairo thebes
-endif
-
 CPPSRCS		= \
 		nsAppShell.cpp \
 		nsBidiKeyboard.cpp \
 		nsClipboard.cpp \
 		nsDragService.cpp \
 		nsFilePicker.cpp \
 		nsLookAndFeel.cpp \
 		nsSound.cpp \
@@ -97,22 +95,19 @@ SHARED_LIBRARY_LIBS = $(DIST)/lib/libxpw
 
 EXTRA_DSO_LDOPTS = \
 		-ltracker \
 		-lgame \
 		$(TOOLKIT_DSO_LDOPTS) \
 		$(MOZ_COMPONENT_LIBS) \
 		-lgkgfx \
 		$(TK_LIBS) \
+		-lthebes \
 		$(NULL)
 
-ifdef MOZ_ENABLE_CAIRO_GFX
-EXTRA_DSO_LDOPTS += -lthebes
-endif
-
 include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -D_IMPL_NS_WIDGET -I$(srcdir)/../xpwidgets -I$(srcdir)
 
 CXXFLAGS	+= $(TK_CFLAGS)
 
 INCLUDES += \
 		-I$(srcdir)/../xpwidgets \

--- a/widget/src/build/Makefile.in
+++ b/widget/src/build/Makefile.in
@@ -55,22 +55,20 @@ PACKAGE_FILE = widget_win.pkg
 REQUIRES	= xpcom \
 		  string \
 		  necko \
 		  uconv \
 		  gfx \
 		  dom \
 		  timer \
 		  accessibility \
+		  thebes \
+		  cairo \
 		  $(NULL)
 
-ifeq ($(MOZ_ENABLE_CAIRO_GFX),1)
-REQUIRES += thebes cairo
-endif
-
 CPPSRCS		= nsWinWidgetFactory.cpp
 
 EXTRA_DSO_LIBS	= gkgfx
 
 ifdef MOZ_ENABLE_CAIRO_GFX
 EXTRA_DSO_LIBS	+= thebes
 endif
 

--- a/widget/src/windows/Makefile.in
+++ b/widget/src/windows/Makefile.in
@@ -65,22 +65,20 @@ REQUIRES	= xpcom \
 			docshell \
 			layout \
 			xuldoc \
 			view \
 			imglib2 \
 			uriloader \
 			webbrowserpersist \
 			unicharutil \
+			thebes \
+			cairo \
 			$(NULL)
 
-ifdef MOZ_ENABLE_CAIRO_GFX
-REQUIRES += thebes cairo
-endif
-
 CPPSRCS		= \
 	L_Ienumfe.cpp  \
 	nsWindow.cpp         \
 	nsAppShell.cpp       \
 	nsLookAndFeel.cpp    \
 	nsToolkit.cpp        \
 	nsKeyboardLayout.cpp \
 	nsDataObj.cpp  \

--- a/widget/src/xpwidgets/Makefile.in
+++ b/widget/src/xpwidgets/Makefile.in
@@ -57,22 +57,20 @@ REQUIRES	= xpcom \
 		  locale \
 		  necko \
 		  htmlparser \
 		  uconv \
 		  unicharutil \
 		  view \
 		  windowwatcher \
 		  lcms \
+		  thebes \
+		  cairo \
 		  $(NULL)
 
-ifeq ($(MOZ_ENABLE_CAIRO_GFX),1)
-REQUIRES += thebes cairo
-endif
-
 DEFINES		+= -D_IMPL_NS_WIDGET -DUSE_TLS_FOR_TOOLKIT
 
 CPPSRCS		= \
 		nsBaseAppShell.cpp \
 		nsBaseWidget.cpp \
 		nsTransferable.cpp \
 		nsHTMLFormatConverter.cpp \
 		nsBaseDragService.cpp \
@@ -81,26 +79,26 @@ CPPSRCS		= \
 		nsClipboardHelper.cpp \
 		nsPrintOptionsImpl.cpp \
 		nsPrintSettingsImpl.cpp \
 		nsPrintSession.cpp \
 		nsWidgetAtoms.cpp \
 		nsIdleService.cpp \
 		$(NULL)
 
-ifneq (,$(filter beos os2 mac cocoa windows,$(MOZ_WIDGET_TOOLKIT)))
+ifneq (,$(filter beos os2 cocoa windows,$(MOZ_WIDGET_TOOLKIT)))
 CPPSRCS += nsBaseClipboard.cpp
 endif
 
-ifneq (,$(filter beos gtk2 os2 mac cocoa photon windows,$(MOZ_WIDGET_TOOLKIT)))
+ifneq (,$(filter beos gtk2 os2 cocoa photon windows,$(MOZ_WIDGET_TOOLKIT)))
 CPPSRCS += nsBaseFilePicker.cpp
 REQUIRES += docshell view intl
 endif
 
-ifneq (,$(filter gtk2 windows mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ifneq (,$(filter gtk2 windows cocoa,$(MOZ_WIDGET_TOOLKIT)))
 CPPSRCS += nsNativeTheme.cpp
 endif
 
 LOCAL_INCLUDES	= \
 		-I$(srcdir)/../$(MOZ_WIDGET_TOOLKIT) \
 		-I$(srcdir) \
 		$(NULL)