--- a/layout/Makefile.in
+++ b/layout/Makefile.in
@@ -80,11 +80,15 @@ DIRS           += build
 ifdef ENABLE_TESTS
 PARALLEL_DIRS += \
   xul/test \
   xul/base/test \
   $(NULL)
 
 TOOL_DIRS      += tools/reftest reftests/fonts reftests/fonts/mplus
 DIRS           += tools/pageloader
+
+ifdef MOZ_DEBUG
+DIRS            += tools/layout-debug
+endif
 endif
 
 include $(topsrcdir)/config/rules.mk

rename from extensions/layout-debug/Makefile.in
rename to layout/tools/layout-debug/Makefile.in
--- a/extensions/layout-debug/Makefile.in
+++ b/layout/tools/layout-debug/Makefile.in
@@ -31,17 +31,17 @@
 # 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		= ../..
+DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= layout_debug
 DIRS		= src ui

rename from extensions/layout-debug/application.ini
rename to layout/tools/layout-debug/application.ini

rename from extensions/layout-debug/chrome.manifest
rename to layout/tools/layout-debug/chrome.manifest

rename from extensions/layout-debug/layoutdebug-prefs.js
rename to layout/tools/layout-debug/layoutdebug-prefs.js

rename from extensions/layout-debug/makefiles.sh
rename to layout/tools/layout-debug/makefiles.sh
--- a/extensions/layout-debug/makefiles.sh
+++ b/layout/tools/layout-debug/makefiles.sh
@@ -32,12 +32,12 @@
 # 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 *****
 
 add_makefiles "
-  extensions/layout-debug/Makefile
-  extensions/layout-debug/src/Makefile
-  extensions/layout-debug/ui/Makefile
+  layout/tools/layout-debug/Makefile
+  layout/tools/layout-debug/src/Makefile
+  layout/tools/layout-debug/ui/Makefile
 "

rename from extensions/layout-debug/src/Makefile.in
rename to layout/tools/layout-debug/src/Makefile.in
--- a/extensions/layout-debug/src/Makefile.in
+++ b/layout/tools/layout-debug/src/Makefile.in
@@ -30,17 +30,17 @@
 # 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		= ../../..
+DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= layout_debug
 LIBRARY_NAME	= gkdebug

rename from extensions/layout-debug/src/nsDebugFactory.cpp
rename to layout/tools/layout-debug/src/nsDebugFactory.cpp

rename from extensions/layout-debug/src/nsILayoutDebuggingTools.idl
rename to layout/tools/layout-debug/src/nsILayoutDebuggingTools.idl

rename from extensions/layout-debug/src/nsILayoutRegressionTester.idl
rename to layout/tools/layout-debug/src/nsILayoutRegressionTester.idl

rename from extensions/layout-debug/src/nsLayoutDebugCIID.h
rename to layout/tools/layout-debug/src/nsLayoutDebugCIID.h

rename from extensions/layout-debug/src/nsLayoutDebugCLH.cpp
rename to layout/tools/layout-debug/src/nsLayoutDebugCLH.cpp

rename from extensions/layout-debug/src/nsLayoutDebugCLH.h
rename to layout/tools/layout-debug/src/nsLayoutDebugCLH.h

rename from extensions/layout-debug/src/nsLayoutDebuggingTools.cpp
rename to layout/tools/layout-debug/src/nsLayoutDebuggingTools.cpp

rename from extensions/layout-debug/src/nsLayoutDebuggingTools.h
rename to layout/tools/layout-debug/src/nsLayoutDebuggingTools.h

rename from extensions/layout-debug/src/nsRegressionTester.cpp
rename to layout/tools/layout-debug/src/nsRegressionTester.cpp

rename from extensions/layout-debug/src/nsRegressionTester.h
rename to layout/tools/layout-debug/src/nsRegressionTester.h

rename from extensions/layout-debug/ui/Makefile.in
rename to layout/tools/layout-debug/ui/Makefile.in
--- a/extensions/layout-debug/ui/Makefile.in
+++ b/layout/tools/layout-debug/ui/Makefile.in
@@ -30,16 +30,16 @@
 # 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		= ../../..
+DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/rules.mk

rename from extensions/layout-debug/ui/content/layoutdebug-overlay.xul
rename to layout/tools/layout-debug/ui/content/layoutdebug-overlay.xul

rename from extensions/layout-debug/ui/content/layoutdebug.js
rename to layout/tools/layout-debug/ui/content/layoutdebug.js

rename from extensions/layout-debug/ui/content/layoutdebug.xul
rename to layout/tools/layout-debug/ui/content/layoutdebug.xul

rename from extensions/layout-debug/ui/jar.mn
rename to layout/tools/layout-debug/ui/jar.mn

rename from extensions/layout-debug/ui/locale/en-US/layoutdebug-overlay.dtd
rename to layout/tools/layout-debug/ui/locale/en-US/layoutdebug-overlay.dtd

rename from extensions/layout-debug/ui/locale/en-US/layoutdebug.dtd
rename to layout/tools/layout-debug/ui/locale/en-US/layoutdebug.dtd

--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
@@ -268,12 +268,8 @@ export:: $(RDF_UTIL_SRC_CPPSRCS) $(INTL_
 ifdef MOZ_ENABLE_LIBXUL
 include $(srcdir)/libxul-rules.mk
 endif
 
 ifdef MOZ_JAVAXPCOM
 dlldeps-javaxpcom.cpp: $(topsrcdir)/extensions/java/xpcom/src/dlldeps-javaxpcom.cpp
 	$(INSTALL) $^ .
 endif
-
-ifneq (,$(filter layout-debug,$(MOZ_EXTENSIONS)))
-DEFINES += -DMOZ_ENABLE_EXTENSION_LAYOUT_DEBUG
-endif

--- a/toolkit/library/libxul-config.mk
+++ b/toolkit/library/libxul-config.mk
@@ -327,19 +327,21 @@ DEFINES += -DMOZ_SPELLCHECK
 COMPONENT_LIBS += spellchecker
 endif
 
 ifdef MOZ_ZIPWRITER
 DEFINES += -DMOZ_ZIPWRITER
 COMPONENT_LIBS += zipwriter
 endif
 
-ifneq (,$(filter layout-debug,$(MOZ_EXTENSIONS)))
+ifdef MOZ_DEBUG
+ifdef ENABLE_TESTS
 COMPONENT_LIBS += gkdebug
 endif
+endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
 OS_LIBS += -framework OpenGL -lcups
 endif
 
 EXTRA_DSO_LDOPTS += \
 	$(LIBS_DIR) \
 	$(JPEG_LIBS) \

--- a/toolkit/library/nsStaticXULComponents.cpp
+++ b/toolkit/library/nsStaticXULComponents.cpp
@@ -124,17 +124,17 @@
     MODULE(nsAutoConfigModule)
 #else
 #define SYSTEMPREF_MODULES MODULE(nsAutoConfigModule)
 #endif
 #else
 #define SYSTEMPREF_MODULES
 #endif
 
-#ifdef MOZ_ENABLE_EXTENSION_LAYOUT_DEBUG
+#if defined(MOZ_DEBUG) && defined(ENABLE_TESTS)
 #define LAYOUT_DEBUG_MODULE MODULE(nsLayoutDebugModule)
 #else
 #define LAYOUT_DEBUG_MODULE
 #endif
 
 #ifdef MOZ_PLUGINS
 #define PLUGINS_MODULES \
     MODULE(nsPluginModule)