--- a/gfx/Makefile.in
+++ b/gfx/Makefile.in
@@ -43,21 +43,17 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= gfx
 
 ifdef MOZ_TREE_CAIRO
 DIRS		= cairo
 endif
 
-ifdef MOZ_ENABLE_CAIRO_GFX
-DIRS            += thebes
-endif
-
-DIRS		+= public idl src
+DIRS		+= thebes public idl src
 
 ifdef ENABLE_TESTS
 ifndef MOZ_ENABLE_LIBXUL
 TOOL_DIRS	+= tests
 endif
 endif
 
 include $(topsrcdir)/config/rules.mk

--- a/gfx/src/Makefile.in
+++ b/gfx/src/Makefile.in
@@ -57,34 +57,24 @@ REQUIRES	= xpcom \
 		  widget \
 		  locale \
 		  view \
 		  pref \
 		  unicharutil \
 		  thebes \
 		  $(NULL)
 
-DIRS        = shared
+DIRS        = shared thebes
 
 ifdef MOZ_ENABLE_POSTSCRIPT
 DIRS        += psshared
 endif
 
-ifdef MOZ_ENABLE_CAIRO_GFX
-DIRS        += thebes
-else
- ifdef MOZ_ENABLE_PHOTON
- DIRS        += photon
- endif
- ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
- DIRS	     += mac
- endif
- ifneq (,$(filter windows beos mac,$(MOZ_WIDGET_TOOLKIT)))
- DIRS        += $(MOZ_WIDGET_TOOLKIT)
- endif
+ifdef MOZ_ENABLE_PHOTON
+DIRS        += photon
 endif
 
 CPPSRCS = \
         nsColor.cpp \
         nsColorNames.cpp \
         nsDeviceContext.cpp \
         nsFont.cpp \
         nsFontList.cpp \
@@ -93,33 +83,23 @@ CPPSRCS = \
         nsTransform2D.cpp \
         nsScriptableRegion.cpp \
         $(NULL)
 
 ifeq (,$(filter windows,$(MOZ_WIDGET_TOOLKIT)))
 REQUIRES += uconv
 endif
 
-ifneq (,$(filter beos windows os2,$(MOZ_WIDGET_TOOLKIT)))
-CPPSRCS += imgScaler.cpp
-endif
-
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
-CPPSRCS += \
-        mac/nsRegionPool.cpp \
-        $(NULL)
-endif
-
 EXTRA_DSO_LDOPTS = \
         $(DEPTH)/modules/libutil/src/$(LIB_PREFIX)mozutil_s.$(LIB_SUFFIX) \
         $(MOZ_UNICHARUTIL_LIBS) \
         $(MOZ_COMPONENT_LIBS) \
         $(NULL)
 
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ifeq(cocoa,$(MOZ_WIDGET_TOOLKIT))
 EXTRA_DSO_LDOPTS += \
         $(TK_LIBS) \
         $(NULL)
 endif
 
 # This library is used by other shared libs in a static build
 FORCE_USE_PIC = 1