diff --git a/Makefile.in b/Makefile.in
index ab907245a7e..1bf4b17b8f5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -22,8 +22,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-ifdef USE_NGLAYOUT
-
 # The list of directories that need to be built to build the standalone
 # nglayout test program. The order is important.
 DIRS =				\
@@ -72,78 +70,3 @@ real_clobber: clobber
 
 real_depend: depend
 
-else
-ifndef NO_MOCHA
-DIRS_JS		= js
-endif
-
-DIRS		= config coreconf dbm xpcom base network caps
-
-ifndef MOZ_NATIVE_JPEG
-DIRS		+= jpeg
-endif
-
-ifdef MOZ_NETCAST
-DIRS		+= netcast
-endif
-
-ifdef MOZ_JAVA
-DIRS		+= sun-java ldap ifc $(DIRS_JS) nav-java ifc/tools js/jsd
-else
-DIRS		+= sun-java nav-java $(DIRS_JS)
-endif
-
-ifdef MOZ_SECURITY
-DIRS		+= security
-endif
-
-DIRS		+= privacy
-
-DIRS		+= modules lib l10n cmd
-
-ifeq ($(STAND_ALONE_JAVA),1)
-DIRS		= config lib/xp sun-java ifc js ifc/tools sun-java/java
-ifndef MOZ_NATIVE_JPEG
-DIRS		+= jpeg
-endif
-ifndef MOZ_NATIVE_ZLIB
-DIRS		+= modules/zlib
-endif
-endif
-
-include $(topsrcdir)/config/rules.mk
-
-export:: envirocheck
-
-# Running this rule assembles all the SDK source pieces into dist/sdk.
-# You'll need to run this rule on every platform to get all the
-# binaries (e.g. javah) copied there. You'll also have to do special
-# magic on a Mac.
-sdk-src::
-	$(SDKINSTALL) include/npapi.h $(SDK)/include/
-	$(SDKINSTALL) include/jri_md.h $(SDK)/include/
-	$(SDKINSTALL) include/jritypes.h $(SDK)/include/
-	$(SDKINSTALL) include/jri.h $(SDK)/include/
-	$(SDKINSTALL) lib/plugin/npupp.h $(SDK)/include/
-	$(SDKINSTALL) sdk/common/*.c* $(SDK)/common/
-	$(SDKINSTALL) sun-java/classsrc/$(ZIP_NAME).x $(SDK)/classes/$(ZIP_NAME)
-	$(SDKINSTALL) sdk/examples/simple/Source/*.c $(SDK)/examples/simple/Source/
-	$(SDKINSTALL) sdk/examples/simple/Source/*.java $(SDK)/examples/simple/Source/
-	$(SDKINSTALL) sdk/examples/simple/Source/*.class $(SDK)/examples/simple/Source/
-	$(SDKINSTALL) sdk/examples/simple/Source/_gen/*.h $(SDK)/examples/simple/Source/_gen/
-	$(SDKINSTALL) sdk/examples/simple/Source/_stubs/*.c $(SDK)/examples/simple/Source/_stubs/
-	$(SDKINSTALL) sdk/examples/simple/Unix/makefile.* $(SDK)/examples/simple/Unix/
-	$(SDKINSTALL) sdk/examples/simple/Testing/SimpleExample.html $(SDK)/examples/simple/Testing/
-	$(SDKINSTALL) sdk/examples/simple/readme.html $(SDK)/examples/simple/
-	$(SDKINSTALL) sdk/examples/UnixTemplate/Source/*.c $(SDK)/examples/UnixTemplate/Source/
-	$(SDKINSTALL) sdk/examples/UnixTemplate/Testing/Test.html $(SDK)/examples/UnixTemplate/Testing/
-	$(SDKINSTALL) sdk/examples/UnixTemplate/Unix/makefile.* $(SDK)/examples/UnixTemplate/Unix/
-	$(SDKINSTALL) sdk/examples/UnixTemplate/readme.html $(SDK)/examples/UnixTemplate/
-
-sdk-bin::
-	cd sdk; $(MAKE); cd ..
-	$(SDKINSTALL) $(DIST)/bin/javah$(BIN_SUFFIX) $(SDK)/bin/$(OS_CONFIG)/
-	$(SDKINSTALL) sdk/examples/simple/Source/$(OBJDIR)/npsimple.$(DLL_SUFFIX) $(SDK)/bin/$(OS_CONFIG)/
-	$(SDKINSTALL) sdk/examples/UnixTemplate/Source/$(OBJDIR)/nptemplate.$(DLL_SUFFIX) $(SDK)/bin/$(OS_CONFIG)/
-
-endif # USE_NGLAYOUT
diff --git a/base/src/Makefile.in b/base/src/Makefile.in
index 65e79e32d80..18fc2da81ac 100644
--- a/base/src/Makefile.in
+++ b/base/src/Makefile.in
@@ -24,15 +24,7 @@ include $(DEPTH)/config/autoconf.mk
 
 DEFINES +=-D_IMPL_NS_BASE
 
-ifeq ($(OS_TARGET),Rhapsody)
-DIRS = rhapsody
-else
-ifeq ($(USE_NGLAYOUT_GTK),1)
-DIRS = gtk
-else
-DIRS = motif
-endif
-endif
+DIRS = $(MOZ_TOOLKIT)
 
 LIBRARY_NAME = raptorbase
 
diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
index b69a6110d56..eb04f255c0b 100644
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -20,9 +20,7 @@ USE_AUTOCONF 	= 1
 MOZILLA_CLIENT	= 1
 NO_MDUPDATE	= 1
 
-USE_NGLAYOUT	= @USE_NGLAYOUT@
-USE_NGLAYOUT_GTK = @USE_NGLAYOUT_GTK@
-MOZ_FE		= @MOZ_FE@
+MOZ_TOOLKIT	= @MOZ_TOOLKIT@
 MOZ_SECURITY 	= @MOZ_SECURITY@
 MOZ_JAVA	= @MOZ_JAVA@
 MOZ_OJI		= @MOZ_OJI@
@@ -42,9 +40,7 @@ ENABLE_TESTS	= @ENABLE_TESTS@
 MOZ_USER_DIR	= @MOZ_USER_DIR@
 SMART_MAIL	= @MOZ_SMART_MAIL@
 DOM		= @MOZ_DOM@
-USE_PTHREADS	= @USE_PTHREADS@
 MOZ_MAIL_COMPOSE = @MOZ_MAIL_COMPOSE@
-FULL_STATIC_BUILD = @FULL_STATIC_BUILD@
 NO_UNIX_LDAP	= @NO_UNIX_LDAP@
 
 MOZ_NATIVE_ZLIB	= @SYSTEM_ZLIB@
@@ -72,7 +68,6 @@ ACRANLIB	= @RANLIB@
 ACWHOAMI	= @WHOAMI@
 ACUNZIP		= @UNZIP@
 ACZIP		= @ZIP@
-MOC		= @MOC@
 
 OBJDIR_TAG	= _AC
 OBJDIR_NAME	= .
@@ -93,16 +88,12 @@ MKSHLIB			= @MKSHLIB@
 DSO_LDOPTS		= @DSO_LDOPTS@
 endif
 
-FE_X_CFLAGS	= @FE_X_CFLAGS@
-FE_X_LIBS	= @FE_X_LIBS@
-FE_QT_CFLAGS	= @FE_QT_CFLAGS@
-FE_QT_LIBS	= @FE_QT_LIBS@
-FE_GNOME_CFLAGS	= @FE_GNOME_CFLAGS@
-FE_GNOME_LIBS	= @FE_GNOME_LIBS@
-FE_GTK_CFLAGS	= @FE_GTK_CFLAGS@
-FE_GTK_LIBS	= @FE_GTK_LIBS@
+TK_MOTIF_CFLAGS	= @TK_MOTIF_CFLAGS@
+TK_MOTIF_LIBS	= @TK_MOTIF_LIBS@
+TK_GTK_CFLAGS	= @TK_GTK_CFLAGS@
+TK_GTK_LIBS	= @TK_GTK_LIBS@
 
-ifdef USE_NGLAYOUT
+# XXX - these need to be cleaned up and have real checks added -cls
 NGLAYOUT_PLUGINS=1 
 CM_BLDTYPE=dbg 
 AWT_11=1 
@@ -111,5 +102,4 @@ MOZ_BITS=32
 MOZ_GOLD=1 
 OS_TARGET=@OS_TARGET@
 STANDALONE_IMAGE_LIB=1 
-endif # USE_NGYLAYOUT
 
diff --git a/config/mkdetect/Makefile.in b/config/mkdetect/Makefile.in
index e2a645f8967..72f19be01b1 100644
--- a/config/mkdetect/Makefile.in
+++ b/config/mkdetect/Makefile.in
@@ -153,7 +153,7 @@ endif
 ## Motif
 ##
 
-ifdef FE_X_LIBS
+ifdef TK_MOTIF_LIBS
 
 ##
 ## Set the motif include flags
diff --git a/configure.in b/configure.in
index 230bf648a17..12d1d71569b 100644
--- a/configure.in
+++ b/configure.in
@@ -45,9 +45,7 @@ dnl Set various checks
 dnl ========================================================
 MISSING_X=
 MISSING_MOTIF=
-MISSING_QT=
 MISSING_GTK=
-MISSING_GNOME=
 
 dnl Checks for programs.
 dnl ========================================================
@@ -67,7 +65,6 @@ AC_PATH_PROG(WHOAMI, whoami, :)
 AC_PATH_PROG(UNZIP, unzip, :)
 AC_PATH_PROG(ZIP, zip, :)
 
-AC_PATH_X
 AC_PATH_XTRA
 
 dnl CFLAGS="$CFLAGS $X_CFLAGS"
@@ -265,53 +262,23 @@ dnl AC_CHECK_LIB(svld, main)
 
 dnl Mozilla specific options
 dnl ========================================================
-AC_ARG_ENABLE(nglayout,
-[  --enable-nglayout      enable the new generation layout features], 
-    [ if test "$enableval" = "yes"; then
-	USE_NGLAYOUT=1
-	OS_TARGET=`uname -s`
-    elif test "$enableval" = "gtk"; then
-	USE_NGLAYOUT=1
-	OS_TARGET=`uname -s`
-	USE_NGLAYOUT_GTK=1
-    else 
-	USE_NGLAYOUT=
-	USE_NGLAYOUT_GTK=
-    fi],
-    USE_NGLAYOUT= )
+dnl nglayout only supports building with one toolkit
+dnl so ignore everything after the first ,
+AC_ARG_ENABLE(toolkit,
+[  --enable-toolkit=\$val	  enable \$val fe (defaults to gtk)],
+    [MOZ_TOOLKIT=`echo "$enableval" | sed -e "s/,.*//g" `], 
+    MOZ_TOOLKIT=USE_DEFAULT)
 
-AC_ARG_ENABLE(fe,
-[  --enable-fe=\$val	  enable \$val fe (defaults to x)],
-    [fe_list=`echo "$enableval" | sed -e 's/,/ /g' -e 's|$| |'`], 
-    fe_list=USE_DEFAULT)
-
-if [ test "$fe_list" = "USE_DEFAULT" ]; then
+if [ test "$MOZ_TOOLKIT" = "USE_DEFAULT" ]; then
     res=`echo $target_os| grep -c "^Rhapsody"`
     if [ test $res != 0 ]; then
-	fe_list="yb "
+	MOZ_TOOLKIT="rhapsody"
     else
-	fe_list="x  "
+	MOZ_TOOLKIT="gtk"
     fi
 fi
 
-for fe in $fe_list; do
-    # Test whether such a subdir really exists.
-    if [ test -d $srcdir/cmd/${fe}fe ]; then
-	MOZ_FE="$MOZ_FE $fe"
-    else
-    	AC_MSG_ERROR(FE directory $srcdir/cmd/${fe}fe does not exist.)
-    fi
-done
-
-echo "Using FE:${MOZ_FE}."
-unset fe_list
-
-FULL_STATIC_BUILD=1
-AC_ARG_ENABLE(min-shared,
-[  --enable-min-shared     enable use of minimal internal dynamic libs ],
-        [if test "$enableval" = "yes"; then
-	    FULL_STATIC_BUILD=
-        fi] )
+OS_TARGET=`uname -s`
 
 AC_ARG_ENABLE(shared,
 [  --disable-shared        disable building of internal shared libs],
@@ -435,10 +402,8 @@ AC_ARG_ENABLE(ldap,
 	    NO_UNIX_LDAP=
 	fi] )
 
-AC_SUBST(USE_NGLAYOUT)
-AC_SUBST(USE_NGLAYOUT_GTK)
 AC_SUBST(OS_TARGET)
-AC_SUBST(MOZ_FE)
+AC_SUBST(MOZ_TOOLKIT)
 AC_SUBST(MOZ_SECURITY)
 AC_SUBST(MOZ_NETCAST)
 AC_SUBST(MOZ_JAVA)
@@ -455,7 +420,6 @@ AC_SUBST(ENABLE_TESTS)
 AC_SUBST(MOZ_USER_DIR)
 AC_SUBST(MOZ_SMART_MAIL)
 AC_SUBST(MOZ_DOM)
-AC_SUBST(USE_PTHREADS)
 AC_SUBST(MOZ_MAIL_COMPOSE)
 AC_SUBST(FULL_STATIC_BUILD)
 AC_SUBST(NO_UNIX_LDAP)
@@ -478,22 +442,24 @@ AC_CHECK_LIB(Xmu, XmuLookupString, [XLIBS="-lXmu $XLIBS"],
 	[MISSING_X="$MISSING_X -lXmu"], $XLIBS)
 LDFLAGS="$_SAVE_LDFLAGS"
 
-res=`echo :$MOZ_FE | grep -c " x"`
+dnl Check for toolkit libs
+dnl ========================================================
+res=`echo :$MOZ_TOOLKIT | grep -c "motif"`
 if [ test $res != 0 ]; then
     if [ test "$MOTIF_REQUIRES_XPM" = "True" || test "$MOTIF_VERSION" = "2.1" ]; then
         _SAVE_LDFLAGS="$LDFLAGS"
     	LDFLAGS="$XLDFLAGS $LDFLAGS"
 	if [ test "$MOTIF_REQUIRES_XPM" = "True" ]; then
 	    AC_CHECK_LIB(Xpm, XpmWriteFileFromImage, 
-		FE_X_LIBS="-lXpm $FE_X_LIBS", 
+		TK_MOTIF_LIBS="-lXpm $TK_MOTIF_LIBS", 
 		[MISSING_MOTIF="-lXpm $MISSING_MOTIF"], $XLIBS)
 	fi
 	if [ test "$MOTIF_VERSION" = "2.1" ]; then
 	    AC_CHECK_LIB(Xp, XpGetPrinterList, 
-		FE_X_LIBS="-lXp $FE_X_LIBS",
+		TK_MOTIF_LIBS="-lXp $TK_MOTIF_LIBS",
 		[MISSING_MOTIF="-lXp $MISSING_MOTIF"], $XLIBS)
 	fi
-	FE_X_LIBS="$XLDFLAGS $FE_X_LIBS"
+	TK_MOTIF_LIBS="$XLDFLAGS $TK_MOTIF_LIBS"
 	LDFLAGS="$_SAVE_LDFLAGS"
     fi
 
@@ -526,46 +492,32 @@ if [ test $res != 0 ]; then
 	_SAVE_LDFLAGS="$LDFLAGS"
     	LDFLAGS="$MOTIF_DYNAMIC_PATHS $XLDFLAGS $LDFLAGS"
     	AC_CHECK_LIB(Xm, XmStringCreate, 
-	    FE_X_LIBS="$MOTIF_DYNAMIC_PATHS $MOTIF_DYNAMIC_FLAGS $FE_X_LIBS",
+	    TK_MOTIF_LIBS="$MOTIF_DYNAMIC_PATHS $MOTIF_DYNAMIC_FLAGS $TK_MOTIF_LIBS",
 	    [MISSING_MOTIF="$MOTIF_DYNAMIC_FLAGS $MISSING_MOTIF"], 
-	    $MOTIF_DYNAMIC_PATHS $FE_X_LIBS $XLIBS)
+	    $MOTIF_DYNAMIC_PATHS $TK_MOTIF_LIBS $XLIBS)
 	LDFLAGS="$_SAVE_LDFLAGS"
     else
     	AC_CHECK_LIB(Xm, XmStringCreate, 
-	    FE_X_LIBS="$MOTIF_STATIC_FLAGS $FE_X_LIBS",
+	    TK_MOTIF_LIBS="$MOTIF_STATIC_FLAGS $TK_MOTIF_LIBS",
 	    [MISSING_MOTIF="$MOTIF_STATIC_FLAGS $MISSING_MOTIF"], 
-	    $FE_X_LIBS $XLIBS)
+	    $TK_MOTIF_LIBS $XLIBS)
     fi
 
-    FE_X_CFLAGS="$MOTIF_INCLUDES"
+    TK_MOTIF_CFLAGS="$MOTIF_INCLUDES"
 fi
 
-res=`echo :$MOZ_FE | grep -c " qt"`
-if [ test $res != 0 ]; then
-    _SAVE_LDFLAGS=$LDFLAGS
-    LDFLAGS="$LDFLAGS -L$QTDIR/lib"
-    AC_CHECK_LIB(qt, set_new_handler, 
-	[FE_QT_LIBS='-L$(QTDIR)/lib -lqt' FE_QT_CFLAGS='-I$(QTDIR)/include'],
-	[MISSING_QT=1])
-    LDFLAGS=$_SAVE_LDFLAGS 
-    AC_PATH_PROG(MOC, moc, :)
-fi
-
-res=`echo :$MOZ_FE | grep -c " gtk"`
+res=`echo :$MOZ_TOOLKIT | grep -c "gtk"`
 if [ test $res != 0 ]; then
     AC_CHECK_LIB(gtk, gtk_widget_set, 
-	[FE_GTK_LIBS="`gtk-config --libs`" FE_GTK_CFLAGS="`gtk-config --cflags`" ],
+	[TK_GTK_LIBS="`gtk-config --libs`" TK_GTK_CFLAGS="`gtk-config --cflags`" ],
 	[MISSING_GTK=1],
 	`gtk-config --libs`)
 fi
 
-res=`echo :$MOZ_FE | grep -c " gnome"`
-if [ test $res != 0 ]; then
-    AC_CHECK_LIB(gnome, gnome_init,
-	[FE_GNOME_LIBS="`gnome-config --libs gnomeui`" FE_GNOME_CFLAGS="`gnome-config --cflags gnomeui`"],
-	[MISSING_GNOME=1],
-	`gnome-config --libs gnomeui`)
-fi
+AC_SUBST(TK_GTK_CFLAGS)
+AC_SUBST(TK_GTK_LIBS)
+AC_SUBST(TK_MOTIF_CFLAGS)
+AC_SUBST(TK_MOTIF_LIBS)
 
 XCFLAGS="$X_CFLAGS"
 
@@ -573,17 +525,6 @@ AC_SUBST(XCFLAGS)
 AC_SUBST(XLDFLAGS)
 AC_SUBST(XLIBS)
 
-AC_SUBST(FE_X_CFLAGS)
-AC_SUBST(FE_X_LIBS)
-AC_SUBST(FE_QT_CFLAGS)
-AC_SUBST(FE_QT_LIBS)
-AC_SUBST(FE_GTK_CFLAGS)
-AC_SUBST(FE_GTK_LIBS)
-AC_SUBST(FE_GNOME_CFLAGS)
-AC_SUBST(FE_GNOME_LIBS)
-
-#if test -z "$USE_NGLAYOUT"; then
-
 dnl system JPEG support
 dnl ========================================================
 AC_ARG_WITH(jpeg,
@@ -698,8 +639,6 @@ if [ test -n "${PNG_DIR}" && test -d "${PNG_DIR}" && test "$SYSTEM_PNG" = 1 ]; t
     PNG_LIBS="-L${PNG_DIR}/lib ${PNG_LIBS}"
 fi
 
-#fi # !USE_NGLAYOUT
-
 dnl system NSPR support
 dnl we always use the system NSPR from now on...this option
 dnl tells where to find nspr rather than whether to use it
@@ -721,16 +660,6 @@ _SAVE_LIBS=$LIBS
 CFLAGS="$CFLAGS -I${NSPR_DIR}/include"
 LDFLAGS="$LDFLAGS -L${NSPR_DIR}/lib $NSPR_LIBS"
 
-dnl AC_MSG_CHECKING("for nspr.h")
-dnl AC_TRY_COMPILE([#include "nspr.h"], [], 
-dnl [result="yes"],
-dnl [MISSING_NSPR="$MISSING_NSPR nspr.h" result="no"])
-dnl AC_MSG_RESULT("$result")
-
-dnl AC_CHECK_LIB(nspr21, PR_GetUniqueIdentity, 
-dnl	[_FOUND_NSPR_LIB=1 NSPR_LIBS="-lnspr21 $NSPR_LIBS",
-dnl [MISSING_NSPR="$MISSING_NSPR -lnspr21"], $NSPR_LIBS)
-
 AC_MSG_CHECKING("for PR_GetCurrentThread in -lnspr21")
 LIBS="-lnspr21 $NSPR_LIBS $LIBS"
 AC_TRY_RUN(
@@ -753,7 +682,7 @@ LIBS=$_SAVE_LIBS
 case "$target" in
 *-*-linux*) 
 	AC_CHECK_LIB(pthread, pthread_create, 
-		NSPR_LIBS="-lpthread $NSPR_LIBS" USE_PTHREADS=1) ;;
+		NSPR_LIBS="-lpthread $NSPR_LIBS") ;;
 alpha-*-osf*)
 	CFLAGS="$CFLAGS -pthread" 
 	_SAVE_CFLAGS="$_SAVE_CFLAGS -pthread" ;;
@@ -817,276 +746,25 @@ if [ test "$MISSING_X" != "" ]; then
    AC_MSG_ERROR([ Could not find the following libraries: $MISSING_X ]);
 fi
 
-res=`echo :$MOZ_FE | grep -c " x"`
-if [ test $res != 0 ]; then
-    if [ test "$MISSING_MOTIF" != "" ]; then 
-	AC_MSG_ERROR([ Could not the following libraries needed for xfe: $MISSING_MOTIF ]);
-    else
-	FE_X_MAKEFILES="
-cmd/xfe/Makefile
-cmd/xfe/DtWidgets/Makefile
-cmd/xfe/Microline3.0/Makefile
-cmd/xfe/Microline3.0/XmL/Makefile
-cmd/xfe/Microline3.0/examples/Makefile
-cmd/xfe/XfeWidgets/Makefile
-cmd/xfe/XfeWidgets/Xfe/Makefile
-cmd/xfe/XfeWidgets/XfeBm/Makefile
-cmd/xfe/XfeWidgets/XfeCaption/Makefile
-cmd/xfe/XfeWidgets/XfeComboBox/Makefile
-cmd/xfe/XfeWidgets/XfeToolBar/Makefile
-cmd/xfe/XfeWidgets/XfeToolTip/Makefile
-cmd/xfe/XfeWidgets/XfeTest/Makefile
-cmd/xfe/XfeWidgets/tests/Makefile
-cmd/xfe/XfeWidgets/tests/Xfe/Makefile
-cmd/xfe/XfeWidgets/tests/XfeBm/Makefile
-cmd/xfe/XfeWidgets/tests/XfeCaption/Makefile
-cmd/xfe/XfeWidgets/tests/XfeComboBox/Makefile
-cmd/xfe/XfeWidgets/tests/XfeToolBar/Makefile
-cmd/xfe/XfeWidgets/tests/XfeToolTip/Makefile
-cmd/xfe/XfeWidgets/tests/XmL/Makefile
-cmd/xfe/icons/Makefile
-cmd/xfe/plugins/Makefile
-cmd/xfe/plugins/ImAlive/Makefile
-cmd/xfe/plugins/javatest/Makefile
-cmd/xfe/plugins/nullplugin/Makefile
-cmd/xfe/plugins/textplugin/Makefile
-cmd/xfe/src/Makefile"
-    fi
+if [ test "$MISSING_GTK" != "" ]; then
+   AC_MSG_ERROR([ Could not find the following libraries: $MISSING_GTK ]);
 fi
 
-res=`echo :$MOZ_FE | grep -c " qt"`
-if [ test $res != 0 ]; then
-    if [ test "$MISSING_QT" != "" ]; then 
-	AC_MSG_ERROR([ Could not find standard qt libraries.]);
-    else
-	FE_QT_MAKEFILES="
-cmd/qtfe/Makefile
-cmd/qtfe/icons/Makefile"
-    fi
-fi
-
-res=`echo :$MOZ_FE | grep -c " gtk"`
-if [ test $res != 0 ]; then
-    if [ test "$MISSING_GTK" != "" ]; then
-	AC_MSG_ERROR([ Could not find standard gtk libraries.]);
-    else
-	FE_GTK_MAKEFILES=""
-    fi
-fi
-
-res=`echo :$MOZ_FE | grep -c " gnome"`
-if [ test $res != 0 ]; then
-    if [ test "$MISSING_GNOME" != "" ]; then
-	AC_MSG_ERROR([ Could not find standard gnome libraries.]);
-    else
-	FE_GNOME_MAKEFILES="
-cmd/gnomefe/Makefile
-cmd/gnomefe/gnome-src/Makefile
-cmd/gnomefe/gnome-widgets/Makefile"
-    fi
+if [ test "$MISSING_MOTIF" != "" ]; then
+   AC_MSG_ERROR([ Could not find the following libraries: $MISSING_MOTIF ]);
 fi
 
 if [ test "$MISSING_NSPR" != "" ]; then
     AC_MSG_ERROR([Could not find standard nspr headers or libraries.]);
 fi
 
-CLASSIC_MAKEFILES="
-Makefile
-base/Makefile
-base/public/Makefile
-base/src/Makefile
-base/src/motif/Makefile
-base/src/gtk/Makefile
-base/tests/Makefile
-caps/Makefile
-caps/public/Makefile
-caps/include/Makefile
-caps/src/Makefile
-cmd/Makefile
-cmd/stubfe/Makefile
-$FE_GNOME_MAKEFILES
-$FE_GTK_MAKEFILES
-$FE_QT_MAKEFILES
-$FE_X_MAKEFILES
-config/Makefile
-config/autoconf.mk
-config/mkdepend/Makefile
-config/mkdetect/Makefile
-config/ports/Makefile
-dbm/Makefile
-dbm/include/Makefile
-dbm/src/Makefile
-dbm/tests/Makefile
-include/Makefile
-jpeg/Makefile
-js/Makefile
-js/jsd/Makefile
-js/jsd/classes/Makefile
-js/src/Makefile
-js/src/liveconnect/Makefile
-js/src/liveconnect/classes/Makefile
-js/src/xpcom/Makefile
-l10n/Makefile
-l10n/us/Makefile
-l10n/us/xp/Makefile
-lib/Makefile
-lib/htmldlgs/Makefile
-lib/layout/Makefile
-lib/libdom/Makefile
-lib/libi18n/Makefile
-lib/libi18n/unicode/Makefile
-lib/libi18n/unicode/tbltool/Makefile
-lib/libi18n/unicode/ufrmtbl/Makefile
-lib/libi18n/unicode/utotbl/Makefile
-lib/liblayer/Makefile
-lib/liblayer/include/Makefile
-lib/liblayer/src/Makefile
-lib/libmime/Makefile
-lib/libmisc/Makefile
-lib/libmocha/Makefile
-lib/libparse/Makefile
-lib/libpics/Makefile
-lib/libpwcac/Makefile
-lib/libstyle/Makefile
-lib/mailto/Makefile
-lib/mariner/Makefile
-lib/mariner/public/Makefile
-lib/mariner/src/Makefile
-lib/xlate/Makefile
-lib/xp/Makefile
-modules/Makefile
-modules/calendar/Makefile
-modules/calendar/src/Makefile
-modules/calendar/src/libcal/Makefile
-modules/edtplug/Makefile
-modules/edtplug/classes/Makefile
-modules/edtplug/classes/netscape/Makefile
-modules/edtplug/classes/netscape/plugin/Makefile
-modules/edtplug/classes/netscape/plugin/composer/Makefile
-modules/edtplug/classes/netscape/plugin/composer/io/Makefile
-modules/edtplug/classes/netscape/test/Makefile
-modules/edtplug/classes/netscape/test/plugin/Makefile
-modules/edtplug/classes/netscape/test/plugin/composer/Makefile
-modules/edtplug/include/Makefile
-modules/edtplug/src/Makefile
-modules/libfont/Makefile
-modules/libfont/classes/Makefile
-modules/libfont/classes/netscape/Makefile
-modules/libfont/classes/netscape/fonts/Makefile
-modules/libfont/producers/Makefile
-modules/libfont/public/Makefile
-modules/libfont/src/Makefile
-modules/libhook/Makefile
-modules/libhook/public/Makefile
-modules/libhook/src/Makefile
-modules/libimg/Makefile
-modules/libimg/classes/Makefile
-modules/libimg/classes/netscape/Makefile
-modules/libimg/classes/netscape/libimg/Makefile
-modules/libimg/png/Makefile
-modules/libimg/public/Makefile
-modules/libimg/src/Makefile
-modules/libpref/Makefile
-modules/libpref/admin/Makefile
-modules/libpref/l10n/Makefile
-modules/libpref/public/Makefile
-modules/libpref/src/Makefile
-modules/libreg/Makefile
-modules/libreg/include/Makefile
-modules/libreg/src/Makefile
-modules/libutil/Makefile
-modules/libutil/public/Makefile
-modules/libutil/src/Makefile
-modules/oji/Makefile
-modules/oji/public/Makefile
-modules/oji/src/Makefile
-modules/plugin/Makefile
-modules/plugin/nglsrc/Makefile
-modules/plugin/public/Makefile
-modules/plugin/src/Makefile
-modules/plugin/test/Makefile
-modules/progress/Makefile
-modules/progress/public/Makefile
-modules/progress/src/Makefile
-modules/rdf/Makefile
-modules/rdf/include/Makefile
-modules/rdf/src/Makefile
-modules/schedulr/Makefile
-modules/schedulr/public/Makefile
-modules/schedulr/src/Makefile
-modules/security/Makefile
-modules/security/freenav/Makefile
-modules/softupdt/Makefile
-modules/softupdt/classes/Makefile
-modules/softupdt/classes/netscape/Makefile
-modules/softupdt/classes/netscape/softupdate/Makefile
-modules/softupdt/include/Makefile
-modules/softupdt/src/Makefile
-modules/softupdt/src/nsdiff/Makefile
-modules/softupdt/src/nspatch/Makefile
-modules/xml/Makefile
-modules/xml/js/Makefile
-modules/xml/js/test/Makefile
-modules/zlib/Makefile
-modules/zlib/src/Makefile
-nav-java/Makefile
-nav-java/stubs/Makefile
-nav-java/stubs/include/Makefile
-nav-java/stubs/jri/Makefile
-nav-java/stubs/src/Makefile
-network/Makefile
-network/cache/Makefile
-network/cache/nu/Makefile
-network/cache/nu/include/Makefile
-network/cache/nu/public/Makefile
-network/cache/nu/src/Makefile
-network/client/Makefile
-network/cnvts/Makefile
-network/cstream/Makefile
-network/main/Makefile
-network/mimetype/Makefile
-network/module/Makefile
-network/module/tests/Makefile
-network/protocol/Makefile
-network/protocol/about/Makefile
-network/protocol/callback/Makefile
-network/protocol/certld/Makefile
-network/protocol/dataurl/Makefile
-network/protocol/file/Makefile
-network/protocol/ftp/Makefile
-network/protocol/gopher/Makefile
-network/protocol/http/Makefile
-network/protocol/imap4/Makefile
-network/protocol/js/Makefile
-network/protocol/ldap/Makefile
-network/protocol/mailbox/Makefile
-network/protocol/marimba/Makefile
-network/protocol/nntp/Makefile
-network/protocol/pop3/Makefile
-network/protocol/remote/Makefile
-network/protocol/smtp/Makefile
-network/util/Makefile
-privacy/Makefile
-privacy/public/Makefile
-privacy/src/Makefile
-sun-java/Makefile
-sun-java/stubs/Makefile
-sun-java/stubs/include/Makefile
-sun-java/stubs/jri/Makefile
-sun-java/stubs/src/Makefile
-xpcom/Makefile
-xpcom/public/Makefile
-xpcom/src/Makefile
-xpcom/tests/Makefile
-xpcom/tests/dynamic/Makefile "
-
 NG_MAKEFILES="
 Makefile
 base/Makefile
 base/public/Makefile
 base/src/Makefile
+base/src/motif/Makefile
 base/src/rhapsody/Makefile
-base/src/unix/Makefile
 base/src/gtk/Makefile
 base/tests/Makefile
 config/Makefile
@@ -1265,10 +943,5 @@ xpcom/src/Makefile
 xpcom/tests/Makefile
 xpcom/tests/dynamic/Makefile"
 
-if test "$USE_NGLAYOUT" = 1; then
-    THE_MAKEFILES="$NG_MAKEFILES"
-else
-    THE_MAKEFILES="$CLASSIC_MAKEFILES"
-fi
-AC_OUTPUT($THE_MAKEFILES)
+AC_OUTPUT($NG_MAKEFILES)
 
diff --git a/dom/src/build/Makefile.in b/dom/src/build/Makefile.in
index c5d7592151d..835baccdeb3 100644
--- a/dom/src/build/Makefile.in
+++ b/dom/src/build/Makefile.in
@@ -43,13 +43,8 @@ LD_ALL = -all
 LD_NONE = -none
 endif
 
-ifeq ($(USE_NGLAYOUT_GTK),1)
-GFX_DSO_FLAGS = -lgfxgtk
-BASE_DSO_FLAGS = -lgmbasegtk
-else
-GFX_DSO_FLAGS = -lgfxmotif
-BASE_DSO_FLAGS = -lgmbasemotif
-endif
+GFX_DSO_FLAGS = $(addprefix -lgfx, $(MOZ_TOOLKIT))
+BASE_DSO_FLAGS= $(addprefix -lgmbase, $(MOZ_TOOLKIT))
 
 EXTRA_DSO_LDOPTS = \
 	-L$(DIST)/lib \
diff --git a/gfx/src/Makefile.in b/gfx/src/Makefile.in
index d03220079bf..5beeb9e572d 100644
--- a/gfx/src/Makefile.in
+++ b/gfx/src/Makefile.in
@@ -24,15 +24,7 @@ include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/config.mk
 
-ifeq ($(OS_TARGET),Rhapsody)
-DIRS = rhapsody
-else
-ifeq ($(USE_NGLAYOUT_GTK),1)
-DIRS = gtk
-else
-DIRS = motif
-endif
-endif
+DIRS = $(MOZ_TOOLKIT)
 
 LIBRARY_NAME = raptorgfx
 
diff --git a/gfx/src/motif/Makefile.in b/gfx/src/motif/Makefile.in
index 9c989df30bf..50d8b7984ec 100644
--- a/gfx/src/motif/Makefile.in
+++ b/gfx/src/motif/Makefile.in
@@ -38,8 +38,7 @@ EXTRA_DSO_LDOPTS+=\
 	-lraptorgfx \
 	-lraptorbase \
 	-lreg \
-	$(LIBNSPR)\
-	$(DIST)/lib/libplc21.a
+	$(NSPR_LIBS)
 
 EXTRA_DSO_LDOPTS+= $(XLDFLAGS) $(XLIBS)
 
diff --git a/layout/build/Makefile.in b/layout/build/Makefile.in
index 60046f0766f..f0c3475a1bf 100644
--- a/layout/build/Makefile.in
+++ b/layout/build/Makefile.in
@@ -44,11 +44,7 @@ LD_ALL = -all
 LD_NONE = -none
 endif
 
-ifeq ($(USE_NGLAYOUT_GTK),1)
-BASE_DSO_FLAGS = -lgmbasegtk
-else
-BASE_DSO_FLAGS = -lgmbasemotif
-endif
+BASE_DSO_FLAGS = $(addprefix -lgmbase, $(MOZ_TOOLKIT))
 
 EXTRA_DSO_LDOPTS = \
 	-L$(DIST)/lib	\
diff --git a/webshell/tests/viewer/Makefile.in b/webshell/tests/viewer/Makefile.in
index 179659650dd..9e35f6f865b 100644
--- a/webshell/tests/viewer/Makefile.in
+++ b/webshell/tests/viewer/Makefile.in
@@ -24,36 +24,33 @@ include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/config.mk
 
-ifeq ($(USE_NGLAYOUT_GTK),1)
 
-	TOOLKIT_GFX_LIB     = -lgfxgtk
-	TOOLKIT_WIDGET_LIB  = -lwidgetgtk
-	TOOLKIT_BASE_LIB    = -lgmbasegtk
+TOOLKIT_GFX_LIB		= $(addprefix -lgfx, $(MOZ_TOOLKIT))
+TOOLKIT_WIDGET_LIB	= $(addprefix -lwidget, $(MOZ_TOOLKIT))
+TOOLKIT_BASE_LIB	= $(addprefix -lgmbase, $(MOZ_TOOLKIT))
 
-	TOOLKIT_CFLAGS = \
-		-DWIDGET_DLL=\"libwidgetgtk.so\" \
-		-DGFXWIN_DLL=\"libgfxgtk.so\"
+ifneq (,$(filter gtk,$(MOZ_TOOLKIT)))
+TOOLKIT_CFLAGS = \
+	-DWIDGET_DLL=\"libwidgetgtk.so\" \
+	-DGFXWIN_DLL=\"libgfxgtk.so\"
 
-	TOOLKIT_CPPSRCS = \
-		nsGTKMain.cpp \
-		nsGTKMenu.cpp
-
-	TOOLKIT_INCLUDES = $(shell gtk-config --cflags)
+TOOLKIT_CPPSRCS = \
+	nsGTKMain.cpp \
+	nsGTKMenu.cpp
 
+TOOLKIT_CFLAGS = $(TK_GTK_CFLAGS)
 else
+ifneq (,$(filter motif,$(MOZ_TOOLKIT)))
+TOOLKIT_CFLAGS = \
+	-DWIDGET_DLL=\"libwidgetmotif.so\" \
+	-DGFXWIN_DLL=\"libgfxmotif.so\"
 
-	TOOLKIT_GFX_LIB        = -lgfxmotif
-	TOOLKIT_WIDGET_LIB     = -lwidgetmotif
-	TOOLKIT_BASE_LIB = -lgmbasemotif
-
-	TOOLKIT_CFLAGS = \
-		-DWIDGET_DLL=\"libwidgetmotif.so\" \
-		-DGFXWIN_DLL=\"libgfxmotif.so\"
-
-	TOOLKIT_CPPSRCS = \
-			nsMotifMenu.cpp \
-			nsUnixMain.cpp
+TOOLKIT_CPPSRCS = \
+	nsMotifMenu.cpp \
+	nsUnixMain.cpp
 
+TOOLKIT_CFLAGS = $(TK_MOTIF_CFLAGS)
+endif
 endif
 
 CPPSRCS = \
@@ -79,8 +76,6 @@ INCLUDES += \
 			-I$(PUBLIC)/network \
 			-I$(PUBLIC)/xp
 
-INCLUDES += $(FE_X_CFLAGS) $(TOOLKIT_INCLUDES)
-
 OBJS    = $(CPPSRCS:.cpp=.o)
 
 ifdef MOZ_OJI
@@ -167,12 +162,12 @@ include $(topsrcdir)/config/rules.mk
 $(PROGS): $(OBJS) #$(EX_LIBS)
 	@$(MAKE_OBJDIR)
 ifeq ($(OS_ARCH),Linux)
-	$(CCC) -rdynamic -o $@ $(OBJS) $(LDFLAGS) $(EX_LIBS) $(NSPR_LIBS) $(FE_X_LIBS) $(XLDFLAGS) $(XLIBS) $(OS_LIBS)
+	$(CCC) -rdynamic -o $@ $(OBJS) $(LDFLAGS) $(EX_LIBS) $(NSPR_LIBS) $(TK_MOTIF_LIBS) $(XLDFLAGS) $(XLIBS) $(OS_LIBS)
 else
 ifeq ($(OS_ARCH),IRIX)
-	$(CCC) -o $@ -woff 84,85 $(LDFLAGS) $(OBJS) $(EX_LIBS) $(NSPR_LIBS) $(FE_X_LIBS) $(XLDFLAGS) $(XLIBS) $(OS_LIBS)
+	$(CCC) -o $@ -woff 84,85 $(LDFLAGS) $(OBJS) $(EX_LIBS) $(NSPR_LIBS) $(TK_MOTIF_LIBS) $(XLDFLAGS) $(XLIBS) $(OS_LIBS)
 else
-	$(CCC) -o $@ $(LDFLAGS) $(OBJS) $(EX_LIBS) $(NSPR_LIBS) $(FE_X_LIBS) $(XLDFLAGS) $(XLIBS) $(OS_LIBS)
+	$(CCC) -o $@ $(LDFLAGS) $(OBJS) $(EX_LIBS) $(NSPR_LIBS) $(TK_MOTIF_LIBS) $(XLDFLAGS) $(XLIBS) $(OS_LIBS)
 endif
 endif
 
diff --git a/widget/src/Makefile.in b/widget/src/Makefile.in
index efec7bc59c1..43f6ecc9006 100644
--- a/widget/src/Makefile.in
+++ b/widget/src/Makefile.in
@@ -22,16 +22,7 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-ifeq ($(OS_TARGET),Rhapsody)
-DIRS = rhapsody
-else
-ifeq ($(USE_NGLAYOUT_GTK),1)
-DIRS = gtk
-else
-DIRS = motif
-endif
-DIRS += xpwidgets build
-endif
+DIRS = $(MOZ_TOOLKIT) xpwidgets build
 
 include $(topsrcdir)/config/config.mk
 
diff --git a/widget/src/build/Makefile.in b/widget/src/build/Makefile.in
index 5ce6d1e6f10..bc59e2568cc 100644
--- a/widget/src/build/Makefile.in
+++ b/widget/src/build/Makefile.in
@@ -24,10 +24,16 @@ include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/config.mk
 
-ifeq ($(USE_NGLAYOUT_GTK),1)
-LIBRARY_NAME = widgetgtk
+LIBRARY_NAME = $(addsuffix $(MOZ_TOOLKIT), widget)
+
+ifneq (,$(filter gtk, $(MOZ_TOOLKIT)))
+TOOLKIT_CFLAGS += $(TK_GTK_CFLAGS)
+TOOLKIT_LIBS += $(TK_GTK_LIBS)
 else
-LIBRARY_NAME = widgetmotif
+ifneq (,$(filter motif, $(MOZ_TOOLKIT)))
+TOOLKIT_CFLAGS += $(TK_MOTIF_CFLAGS)
+TOOLKIT_LIBS += $(TK_MOTIF_LIBS)
+endif
 endif
 
 MODULE=raptor
@@ -36,7 +42,7 @@ REQUIRES=util img xpcom raptor netlib
 
 INCLUDES+= -I$(srcdir)/../xpwidgets -I$(srcdir)/../motif -I$(srcdir)/.
 
-INCLUDES += $(FE_X_CFLAGS)
+CFLAGS += $(TOOLKIT_CFLAGS)
 
 # nsMotifWidgetFactory actually has no Motif/Xt/Xlib code in it -- surprise!
 CPPSRCS=dlldeps.cpp nsWidgetSupport.cpp nsMotifWidgetFactory.cpp
@@ -47,11 +53,8 @@ LD_ALL = -all
 LD_NONE = -none
 endif
 
-ifeq ($(USE_NGLAYOUT_GTK),1)
-TOOLKIT_DSO_LDOPTS = $(DIST)/lib/libraptorwidgetgtk_s.a
-else
-TOOLKIT_DSO_LDOPTS = $(DIST)/lib/libraptorwidgetmotif_s.a
-endif
+TOOLKIT_DSO_LDOPTS = $(addprefix $(DIST)/lib/libraptorwidget, \
+			$(addsuffix _s.a, $(MOZ_TOOLKIT)))
 
 EXTRA_DSO_LDOPTS+=\
 	$(TOOLKIT_DSO_LDOPTS) \
@@ -62,6 +65,6 @@ EXTRA_DSO_LDOPTS+=\
 	-lreg \
 	$(NSPR_LIBS)
 
-EXTRA_DSO_LDOPTS += $(FE_X_LIBS) $(XLDFLAGS) $(XLIBS)
+EXTRA_DSO_LDOPTS += $(TOOLKIT_LIBS) $(XLDFLAGS) $(XLIBS)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/widget/src/gtk/Makefile.in b/widget/src/gtk/Makefile.in
index c4fcf8ecc47..fa594a6e08e 100644
--- a/widget/src/gtk/Makefile.in
+++ b/widget/src/gtk/Makefile.in
@@ -35,7 +35,7 @@ DEFINES += -D_IMPL_NS_WIDGET
 
 INCLUDES+= -I$(srcdir)/../xpwidgets -I$(srcdir)/../gtk -I$(srcdir)/.
 
-INCLUDES += $(FE_X_CFLAGS) $(shell gtk-config --cflags)
+INCLUDES += $(TK_GTK_CFLAGS)
 
 CPPSRCS= \
 	nsAppShell.cpp \
diff --git a/widget/src/motif/Makefile.in b/widget/src/motif/Makefile.in
index 6c50e6aba88..537274addfa 100644
--- a/widget/src/motif/Makefile.in
+++ b/widget/src/motif/Makefile.in
@@ -35,7 +35,7 @@ DEFINES += -D_IMPL_NS_WIDGET
 
 INCLUDES+= -I$(srcdir)/../xpwidgets -I$(srcdir)/../motif -I$(srcdir)/.
 
-INCLUDES += $(FE_X_CFLAGS)
+INCLUDES += $(TK_MOTIF_CFLAGS)
 
 CPPSRCS= \
         nsMenuBar.cpp \
diff --git a/widget/src/xpwidgets/Makefile.in b/widget/src/xpwidgets/Makefile.in
index fac86002cf8..78ab47025f3 100644
--- a/widget/src/xpwidgets/Makefile.in
+++ b/widget/src/xpwidgets/Makefile.in
@@ -35,8 +35,6 @@ else
 INCLUDES += -I$(srcdir)/../public -I$(PUBLIC)/xpcom -I$(PUBLIC)/raptor -I$(srcdir)/../motif -I$(srcdir)/.
 endif
 
-INCLUDES +=  $(FE_X_CFLAGS)
-
 CPPSRCS=nsBaseWidget.cpp                \
 	nsMenuButton.cpp                \
 	nsToolbarItemHolder.cpp         \