diff --git a/gfx/Makefile.in b/gfx/Makefile.in
index 288c9f78ce4..e09ef9631cd 100644
--- a/gfx/Makefile.in
+++ b/gfx/Makefile.in
@@ -59,7 +59,7 @@ endif
 DIRS		+= angle
 
 
-DIRS		+= src qcms layers harfbuzz/src ots/src thebes src/thebes
+DIRS		+= src qcms layers harfbuzz/src ots/src thebes
 
 ifdef BUILD_STATIC_LIBS
 DIRS		+= ycbcr
diff --git a/gfx/src/Makefile.in b/gfx/src/Makefile.in
index b05b1cd57f2..1be54bef9e1 100644
--- a/gfx/src/Makefile.in
+++ b/gfx/src/Makefile.in
@@ -43,10 +43,14 @@ VPATH       = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE         = gfx
+MODULE_NAME    = nsGfxModule
 LIBRARY_NAME   = gkgfx
 EXPORT_LIBRARY = 1
 GRE_MODULE     = 1
 LIBXUL_LIBRARY = 1
+IS_COMPONENT   = 1
+# This library is used by other shared libs in a static build
+FORCE_USE_PIC  = 1
 
 XPIDLSRCS = \
 	nsIFontEnumerator.idl \
@@ -76,6 +80,7 @@ EXPORTS	= \
 	nsITheme.h \
 	nsThemeConstants.h \
 	gfxCrashReporterUtils.h \
+	nsIThebesFontMetrics.h \
 	$(NULL)
 
 ifdef MOZ_X11
@@ -91,38 +96,58 @@ CPPSRCS = \
         nsTransform2D.cpp \
         nsScriptableRegion.cpp \
         gfxCrashReporterUtils.cpp \
+        nsThebesDeviceContext.cpp \
+        nsThebesRegion.cpp \
+        nsThebesGfxFactory.cpp \
+        nsThebesRenderingContext.cpp \
+        nsThebesFontMetrics.cpp \
+        nsThebesFontEnumerator.cpp \
        $(NULL)
 
-EXTRA_DSO_LDOPTS = \
-        $(MOZ_UNICHARUTIL_LIBS) \
-        $(MOZ_COMPONENT_LIBS) \
-        $(MOZ_JS_LIBS) \
-        $(NULL)
-
 ifdef MOZ_X11
-CPPSRCS += \
-        X11Util.cpp \
-        $(NULL)
-EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS)
+CPPSRCS += X11Util.cpp
 endif
 
-ifneq (,$(filter cocoa,$(MOZ_WIDGET_TOOLKIT)))
-EXTRA_DSO_LDOPTS += \
-        $(TK_LIBS) \
-        $(NULL)
+ifeq ($(MOZ_WIDGET_TOOLKIT),android)
+CPPSRCS += nsSystemFontsAndroid.cpp
 endif
 
-# This library is used by other shared libs in a static build
-FORCE_USE_PIC = 1
+ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
+CMMSRCS = nsSystemFontsMac.mm
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
+CPPSRCS += nsSystemFontsGTK2.cpp
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
+CPPSRCS += nsSystemFontsOS2.cpp
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
+CPPSRCS += nsSystemFontsQt.cpp
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
+CPPSRCS += nsSystemFontsWin.cpp
+OS_LIBS += $(call EXPAND_LIBNAME,usp10)
+endif
 
 include $(topsrcdir)/config/rules.mk
 
+CXXFLAGS += $(TK_CFLAGS) $(MOZ_CAIRO_CFLAGS)
+
 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
-CXXFLAGS += $(MOZ_GTK2_CFLAGS)
+DEFINES += -DMOZ_ENABLE_GTK2
+CXXFLAGS += $(MOZ_GTK2_CFLAGS) $(MOZ_PANGO_CFLAGS)
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
+CXXFLAGS += $(CAIRO_FT_CFLAGS)
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
 CXXFLAGS += $(MOZ_QT_CFLAGS)
 endif
 
-DEFINES     += -D_IMPL_NS_GFX
+DEFINES += -D_IMPL_NS_GFX
diff --git a/gfx/src/thebes/mozilla-decoder.cpp b/gfx/src/mozilla-decoder.cpp
similarity index 100%
rename from gfx/src/thebes/mozilla-decoder.cpp
rename to gfx/src/mozilla-decoder.cpp
diff --git a/gfx/src/thebes/mozilla-decoder.h b/gfx/src/mozilla-decoder.h
similarity index 100%
rename from gfx/src/thebes/mozilla-decoder.h
rename to gfx/src/mozilla-decoder.h
diff --git a/gfx/src/thebes/nsIThebesFontMetrics.h b/gfx/src/nsIThebesFontMetrics.h
similarity index 100%
rename from gfx/src/thebes/nsIThebesFontMetrics.h
rename to gfx/src/nsIThebesFontMetrics.h
diff --git a/gfx/src/thebes/nsSystemFontsAndroid.cpp b/gfx/src/nsSystemFontsAndroid.cpp
similarity index 100%
rename from gfx/src/thebes/nsSystemFontsAndroid.cpp
rename to gfx/src/nsSystemFontsAndroid.cpp
diff --git a/gfx/src/thebes/nsSystemFontsAndroid.h b/gfx/src/nsSystemFontsAndroid.h
similarity index 100%
rename from gfx/src/thebes/nsSystemFontsAndroid.h
rename to gfx/src/nsSystemFontsAndroid.h
diff --git a/gfx/src/thebes/nsSystemFontsGTK2.cpp b/gfx/src/nsSystemFontsGTK2.cpp
similarity index 100%
rename from gfx/src/thebes/nsSystemFontsGTK2.cpp
rename to gfx/src/nsSystemFontsGTK2.cpp
diff --git a/gfx/src/thebes/nsSystemFontsGTK2.h b/gfx/src/nsSystemFontsGTK2.h
similarity index 100%
rename from gfx/src/thebes/nsSystemFontsGTK2.h
rename to gfx/src/nsSystemFontsGTK2.h
diff --git a/gfx/src/thebes/nsSystemFontsMac.h b/gfx/src/nsSystemFontsMac.h
similarity index 100%
rename from gfx/src/thebes/nsSystemFontsMac.h
rename to gfx/src/nsSystemFontsMac.h
diff --git a/gfx/src/thebes/nsSystemFontsMac.mm b/gfx/src/nsSystemFontsMac.mm
similarity index 100%
rename from gfx/src/thebes/nsSystemFontsMac.mm
rename to gfx/src/nsSystemFontsMac.mm
diff --git a/gfx/src/thebes/nsSystemFontsOS2.cpp b/gfx/src/nsSystemFontsOS2.cpp
similarity index 100%
rename from gfx/src/thebes/nsSystemFontsOS2.cpp
rename to gfx/src/nsSystemFontsOS2.cpp
diff --git a/gfx/src/thebes/nsSystemFontsOS2.h b/gfx/src/nsSystemFontsOS2.h
similarity index 100%
rename from gfx/src/thebes/nsSystemFontsOS2.h
rename to gfx/src/nsSystemFontsOS2.h
diff --git a/gfx/src/thebes/nsSystemFontsQt.cpp b/gfx/src/nsSystemFontsQt.cpp
similarity index 100%
rename from gfx/src/thebes/nsSystemFontsQt.cpp
rename to gfx/src/nsSystemFontsQt.cpp
diff --git a/gfx/src/thebes/nsSystemFontsQt.h b/gfx/src/nsSystemFontsQt.h
similarity index 100%
rename from gfx/src/thebes/nsSystemFontsQt.h
rename to gfx/src/nsSystemFontsQt.h
diff --git a/gfx/src/thebes/nsSystemFontsWin.cpp b/gfx/src/nsSystemFontsWin.cpp
similarity index 100%
rename from gfx/src/thebes/nsSystemFontsWin.cpp
rename to gfx/src/nsSystemFontsWin.cpp
diff --git a/gfx/src/thebes/nsSystemFontsWin.h b/gfx/src/nsSystemFontsWin.h
similarity index 100%
rename from gfx/src/thebes/nsSystemFontsWin.h
rename to gfx/src/nsSystemFontsWin.h
diff --git a/gfx/src/thebes/nsThebesDeviceContext.cpp b/gfx/src/nsThebesDeviceContext.cpp
similarity index 100%
rename from gfx/src/thebes/nsThebesDeviceContext.cpp
rename to gfx/src/nsThebesDeviceContext.cpp
diff --git a/gfx/src/thebes/nsThebesDeviceContext.h b/gfx/src/nsThebesDeviceContext.h
similarity index 100%
rename from gfx/src/thebes/nsThebesDeviceContext.h
rename to gfx/src/nsThebesDeviceContext.h
diff --git a/gfx/src/thebes/nsThebesFontEnumerator.cpp b/gfx/src/nsThebesFontEnumerator.cpp
similarity index 100%
rename from gfx/src/thebes/nsThebesFontEnumerator.cpp
rename to gfx/src/nsThebesFontEnumerator.cpp
diff --git a/gfx/src/thebes/nsThebesFontEnumerator.h b/gfx/src/nsThebesFontEnumerator.h
similarity index 100%
rename from gfx/src/thebes/nsThebesFontEnumerator.h
rename to gfx/src/nsThebesFontEnumerator.h
diff --git a/gfx/src/thebes/nsThebesFontMetrics.cpp b/gfx/src/nsThebesFontMetrics.cpp
similarity index 100%
rename from gfx/src/thebes/nsThebesFontMetrics.cpp
rename to gfx/src/nsThebesFontMetrics.cpp
diff --git a/gfx/src/thebes/nsThebesFontMetrics.h b/gfx/src/nsThebesFontMetrics.h
similarity index 100%
rename from gfx/src/thebes/nsThebesFontMetrics.h
rename to gfx/src/nsThebesFontMetrics.h
diff --git a/gfx/src/thebes/nsThebesGfxFactory.cpp b/gfx/src/nsThebesGfxFactory.cpp
similarity index 100%
rename from gfx/src/thebes/nsThebesGfxFactory.cpp
rename to gfx/src/nsThebesGfxFactory.cpp
diff --git a/gfx/src/thebes/nsThebesRegion.cpp b/gfx/src/nsThebesRegion.cpp
similarity index 100%
rename from gfx/src/thebes/nsThebesRegion.cpp
rename to gfx/src/nsThebesRegion.cpp
diff --git a/gfx/src/thebes/nsThebesRegion.h b/gfx/src/nsThebesRegion.h
similarity index 100%
rename from gfx/src/thebes/nsThebesRegion.h
rename to gfx/src/nsThebesRegion.h
diff --git a/gfx/src/thebes/nsThebesRenderingContext.cpp b/gfx/src/nsThebesRenderingContext.cpp
similarity index 100%
rename from gfx/src/thebes/nsThebesRenderingContext.cpp
rename to gfx/src/nsThebesRenderingContext.cpp
diff --git a/gfx/src/thebes/nsThebesRenderingContext.h b/gfx/src/nsThebesRenderingContext.h
similarity index 100%
rename from gfx/src/thebes/nsThebesRenderingContext.h
rename to gfx/src/nsThebesRenderingContext.h
diff --git a/gfx/src/thebes/Makefile.in b/gfx/src/thebes/Makefile.in
deleted file mode 100644
index b2b02043aaf..00000000000
--- a/gfx/src/thebes/Makefile.in
+++ /dev/null
@@ -1,132 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is thebes gfx
-#
-# The Initial Developer of the Original Code is
-# mozilla.org.
-# Portions created by the Initial Developer are Copyright (C) 2005
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Vladimir Vukicevic <vladimir@pobox.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE = gfx
-LIBRARY_NAME = gkgfxthebes
-SHORT_LIBNAME = gkgfxthb
-EXPORT_LIBRARY = 1
-IS_COMPONENT = 1
-MODULE_NAME = nsGfxModule
-GRE_MODULE = 1
-LIBXUL_LIBRARY = 1
-
-
-CPPSRCS		= \
-		nsThebesDeviceContext.cpp \
-		nsThebesRegion.cpp \
-		nsThebesGfxFactory.cpp \
-		nsThebesRenderingContext.cpp \
-		nsThebesFontMetrics.cpp \
-		nsThebesFontEnumerator.cpp \
-		$(NULL)
-
-
-EXTRA_DSO_LIBS	= gkgfx thebes
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
-CPPSRCS += nsSystemFontsQt.cpp
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
-CPPSRCS		+= nsSystemFontsGTK2.cpp
-
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
-CPPSRCS		+= nsSystemFontsWin.cpp \
-		   $(NULL)
-
-ifndef WINCE
-_OS_LIBS	= usp10
-endif
-OS_LIBS		+= $(call EXPAND_LIBNAME,$(_OS_LIBS))
-
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
-CPPSRCS		+= nsSystemFontsOS2.cpp \
-		   $(NULL)
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
-CMMSRCS		= nsSystemFontsMac.mm
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),android)
-CPPSRCS		+= nsSystemFontsAndroid.cpp
-endif
-
-EXPORTS         += nsIThebesFontMetrics.h
-
-LOCAL_INCLUDES	= \
-		-I$(srcdir)/. \
-		-I$(srcdir)/.. \
-		-I$(srcdir)/../shared \
-		$(NULL)
-
-EXTRA_DSO_LDOPTS += \
-		$(LIBS_DIR) \
-		$(EXTRA_DSO_LIBS) \
-		$(MOZ_COMPONENT_LIBS) \
-		$(MOZ_UNICHARUTIL_LIBS) \
-		$(MOZ_JS_LIBS) \
-		$(TK_LIBS) \
-		$(NULL)
-
-ifdef MOZ_X11
-EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS)
-endif
-
-include $(topsrcdir)/config/rules.mk
-
-CXXFLAGS  += $(TK_CFLAGS) $(MOZ_CAIRO_CFLAGS)
-
-ifdef MOZ_ENABLE_GTK2
-DEFINES += -DMOZ_ENABLE_GTK2
-CXXFLAGS += $(MOZ_PANGO_CFLAGS)
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
-CXXFLAGS += $(CAIRO_FT_CFLAGS)
-endif
diff --git a/toolkit/library/libxul-config.mk b/toolkit/library/libxul-config.mk
index 931185ff2e2..0b0e47177ac 100644
--- a/toolkit/library/libxul-config.mk
+++ b/toolkit/library/libxul-config.mk
@@ -116,7 +116,6 @@ endif
 STATIC_LIBS += \
 	xpcom_core \
 	ucvutil_s \
-	gkgfx \
 	$(NULL)
 
 ifdef MOZ_IPC
@@ -140,6 +139,7 @@ COMPONENT_LIBS += \
 	pref \
 	htmlpars \
 	imglib2 \
+	gkgfx \
 	gklayout \
 	docshell \
 	embedcomponents \
@@ -300,8 +300,6 @@ STATIC_LIBS += thebes ycbcr
 
 STATIC_LIBS += angle
 
-COMPONENT_LIBS += gkgfxthebes
-
 ifeq (windows,$(MOZ_WIDGET_TOOLKIT))
 COMPONENT_LIBS += gkwidget
 endif
diff --git a/toolkit/toolkit-makefiles.sh b/toolkit/toolkit-makefiles.sh
index 659e67ee9ee..ab8cdd28abc 100644
--- a/toolkit/toolkit-makefiles.sh
+++ b/toolkit/toolkit-makefiles.sh
@@ -124,7 +124,6 @@ MAKEFILES_gfx="
   gfx/ycbcr/Makefile
   gfx/layers/Makefile
   gfx/src/Makefile
-  gfx/src/thebes/Makefile
   gfx/tests/Makefile
   gfx/thebes/Makefile
   gfx/qcms/Makefile