diff --git a/mozilla/gfx/Makefile.in b/mozilla/gfx/Makefile.in
index 7ede01f1d92..d0eed84759f 100644
--- a/mozilla/gfx/Makefile.in
+++ b/mozilla/gfx/Makefile.in
@@ -48,11 +48,7 @@ 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
diff --git a/mozilla/gfx/src/Makefile.in b/mozilla/gfx/src/Makefile.in
index 1c33cda469d..98b0f8cafa9 100644
--- a/mozilla/gfx/src/Makefile.in
+++ b/mozilla/gfx/src/Makefile.in
@@ -62,24 +62,14 @@ REQUIRES	= xpcom \
 		  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 = \
@@ -98,23 +88,13 @@ 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)