--- a/toolkit/toolkit-makefiles.sh
+++ b/toolkit/toolkit-makefiles.sh
@@ -489,17 +489,16 @@ MAKEFILES_widget="
   widget/src/beos/Makefile
   widget/src/build/Makefile
   widget/src/gtkxtbin/Makefile
   widget/src/photon/Makefile
   widget/src/cocoa/Makefile
   widget/src/os2/Makefile
   widget/src/windows/Makefile
   widget/src/xpwidgets/Makefile
-  widget/src/support/Makefile
 "
 
 MAKEFILES_xpcom="
   xpcom/string/Makefile
   xpcom/string/public/Makefile
   xpcom/string/src/Makefile
   xpcom/Makefile
   xpcom/base/Makefile

--- a/widget/public/Makefile.in
+++ b/widget/public/Makefile.in
@@ -42,18 +42,16 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= widget
 XPIDL_MODULE	= widget
 GRE_MODULE	= 1
 
 EXPORTS		= \
-		widgetCore.h \
-		nsStringUtil.h \
 		nsIWidget.h \
 		nsGUIEvent.h \
 		nsEvent.h \
 		nsIEventListener.h \
 		nsWidgetsCID.h \
 		nsILookAndFeel.h \
 		nsIPluginWidget.h \
 		nsINativeKeyBindings.h \

deleted file mode 100644
--- a/widget/public/nsStringUtil.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- Mode: c++; tab-width: 2; indent-tabs-mode: nil; -*- */
-/* ***** 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 mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-
-// Convience macros for converting nsString's to chars +
-// creating temporary char[] bufs.
-
-#ifndef NS_STR_UTIL_H
-#define NS_STR_UTIL_H
-
-// temporary char[] macro
-
-// Convience MACROS which use a static char array if possible to reduce
-// memory fragmentation, otherwise they allocate a char[] which must be
-// freed.  REMEMBER to always use the NS_FREE_CHAR_BUF after using the
-// NS_ALLOC_CHAR_BUF. You can not nest NS_ALLOC_CHAR_BUF's. 
-
-#define NS_ALLOC_CHAR_BUF(aBuf, aSize, aActualSize) \
-  int _ns_tmpActualSize = aActualSize;              \
-  char _ns_smallBuffer[aSize];                      \
-  char * const aBuf = _ns_tmpActualSize <= aSize ? _ns_smallBuffer : new char[_ns_tmpActualSize]; 
-
-#define NS_FREE_CHAR_BUF(aBuf)   \
-  if (aBuf != _ns_smallBuffer) \
-   delete[] aBuf;
-
-#endif // !defined(NS_STR_UTIL_H)

deleted file mode 100644
--- a/widget/public/widgetCore.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** 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 mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Marco Pesenti Gritti <marco@gnome.org>
- * Portions created by the Initial Developer are Copyright (C) 2004
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of 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 ***** */
-
-#ifndef widgetCore_h__
-#define widgetCore_h__
-
-#include "nscore.h"
-
-#ifdef _IMPL_NS_WIDGET
-#define NS_WIDGET NS_EXPORT
-#else
-#define NS_WIDGET NS_IMPORT
-#endif
-
-#endif

--- a/widget/src/Makefile.in
+++ b/widget/src/Makefile.in
@@ -39,19 +39,19 @@ DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE  = widget
 
-DIRS		= xpwidgets support
+DIRS		= xpwidgets
 
-ifneq (,$(filter beos os2 mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ifneq (,$(filter beos os2 cocoa qt,$(MOZ_WIDGET_TOOLKIT)))
 DIRS		+= $(MOZ_WIDGET_TOOLKIT)
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 DIRS		+= windows build
 endif
 
 #
@@ -63,18 +63,14 @@ endif
 #
 ifdef MOZ_ENABLE_GTK2
 DIRS		+= gtk2
 ifdef MOZ_X11
 DIRS		+= gtkxtbin
 endif
 endif
 
-ifeq (qt,$(MOZ_WIDGET_TOOLKIT))
-DIRS		+= qt
-endif
-
 ifdef MOZ_ENABLE_PHOTON
 DIRS		+= photon
 endif
 
 include $(topsrcdir)/config/rules.mk
 

deleted file mode 100644
--- a/widget/src/build/nsWidgetSupport.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** 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 mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-
-
-#include "widgetCore.h"
-#include "nsWidgetSupport.h"
-#include "nsRect.h"
-#include "nsIAppShell.h"
-#include "nsIEventListener.h"
-#include "nsILookAndFeel.h"
-#include "nsIToolkit.h"
-#include "nsIWidget.h"
-
-
-static NS_DEFINE_IID(kIWidgetIID, NS_IWIDGET_IID);
-
-
-extern NS_WIDGET nsresult 
-NS_ShowWidget(nsISupports* aWidget, PRBool aShow)
-{
-
-  nsIWidget* 	widget = nsnull;
-	if (NS_OK == aWidget->QueryInterface(kIWidgetIID,(void**)&widget)) {
-	  widget->Show(aShow);
-	  NS_IF_RELEASE(widget);
-	}
-
-  return NS_OK;
-}
-
-extern NS_WIDGET nsresult 
-NS_MoveWidget(nsISupports* aWidget, PRUint32 aX, PRUint32 aY)
-{
-
-  nsIWidget* 	widget = nsnull;
-	if (NS_OK == aWidget->QueryInterface(kIWidgetIID,(void**)&widget)) {
-	  widget->Move(aX,aY);
-	  NS_IF_RELEASE(widget);
-	}
-  return NS_OK;
-}
-
-extern NS_WIDGET nsresult 
-NS_EnableWidget(nsISupports* aWidget, PRBool aEnable)
-{
-	nsIWidget* 	widget;
-	if (NS_OK == aWidget->QueryInterface(kIWidgetIID,(void**)&widget))
-	{
-		widget->Enable(aEnable);
-		NS_RELEASE(widget);
-	}
-  return NS_OK;
-}
-
-
-extern NS_WIDGET nsresult 
-NS_SetFocusToWidget(nsISupports* aWidget)
-{
-
-  nsIWidget* 	widget = nsnull;
-	if (NS_OK == aWidget->QueryInterface(kIWidgetIID,(void**)&widget)) {
-	  widget->SetFocus();
-	  NS_IF_RELEASE(widget);
-	}
-  return NS_OK;
-}
-
-
-extern NS_WIDGET nsresult 
-NS_GetWidgetNativeData(nsISupports* aWidget, void** aNativeData)
-{
-	void* 			result = nsnull;
-	nsIWidget* 	widget;
-	if (NS_OK == aWidget->QueryInterface(kIWidgetIID,(void**)&widget))
-	{
-		result = widget->GetNativeData(NS_NATIVE_WIDGET);
-		NS_RELEASE(widget);
-	}
-	*aNativeData = result;
-  return NS_OK;
-
-}

deleted file mode 100644
--- a/widget/src/support/Makefile.in
+++ /dev/null
@@ -1,62 +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 mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# 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		= widget
-LIBRARY_NAME	= widgetsupport_s
-LIBXUL_LIBRARY  = 1
-REQUIRES	= xpcom \
-		  gfx \
-		  $(NULL)
-
-CPPSRCS		= nsWidgetSupport.cpp
-
-EXPORTS		= nsWidgetSupport.h
-
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
-include $(topsrcdir)/config/rules.mk
-
-CXXFLAGS	+= $(TK_CFLAGS)
-

deleted file mode 100644
--- a/widget/src/support/nsWidgetSupport.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** 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 mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-
-#include "nsWidgetSupport.h"
-#include "nsRect.h"
-#include "nsIWidget.h"
-
-nsresult
-NS_ShowWidget(nsISupports* aWidget, PRBool aShow)
-{
-  nsCOMPtr<nsIWidget> widget = do_QueryInterface(aWidget);
-  if (widget) {
-    widget->Show(aShow);
-  }
-
-  return NS_OK;
-}
-
-nsresult
-NS_MoveWidget(nsISupports* aWidget, PRUint32 aX, PRUint32 aY)
-{
-  nsCOMPtr<nsIWidget> widget = do_QueryInterface(aWidget);
-  if (widget) {
-    widget->Move(aX, aY);
-  }
-
-  return NS_OK;
-}
-
-nsresult
-NS_EnableWidget(nsISupports* aWidget, PRBool aEnable)
-{
-  nsCOMPtr<nsIWidget> widget = do_QueryInterface(aWidget);
-  if (widget) {
-    widget->Enable(aEnable);
-  }
-
-  return NS_OK;
-}
-
-nsresult
-NS_SetFocusToWidget(nsISupports* aWidget)
-{
-  nsCOMPtr<nsIWidget> widget = do_QueryInterface(aWidget);
-  if (widget) {
-    widget->SetFocus();
-  }
-
-  return NS_OK;
-}
-
-nsresult
-NS_GetWidgetNativeData(nsISupports* aWidget, void** aNativeData)
-{
-  void *result = nsnull;
-  nsCOMPtr<nsIWidget> widget = do_QueryInterface(aWidget);
-  if (widget) {
-    result = widget->GetNativeData(NS_NATIVE_WIDGET);
-  }
-
-  *aNativeData = result;
-
-  return NS_OK;
-}

deleted file mode 100644
--- a/widget/src/support/nsWidgetSupport.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** 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 mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-
-#ifndef nsWidgetSupport_h__
-#define nsWidgetSupport_h__
-
-#include "nscore.h"
-#include "nsISupports.h"
-#include "nsIWidget.h"
-
-
-struct nsRect;
-class nsIAppShell;
-class nsIEventListener;
-class nsILookAndFeel;
-class nsIToolkit;
-class nsIWidget;
-class nsITooltipWidget;
-
-extern nsresult 
-NS_ShowWidget(nsISupports* aWidget, PRBool aShow);
-
-extern nsresult 
-NS_MoveWidget(nsISupports* aWidget, PRUint32 aX, PRUint32 aY);
-
-extern nsresult 
-NS_EnableWidget(nsISupports* aWidget, PRBool aEnable);
-
-extern nsresult 
-NS_SetFocusToWidget(nsISupports* aWidget);
-
-extern nsresult 
-NS_GetWidgetNativeData(nsISupports* aWidget, void** aNativeData);
-
-
-
-
-
-#endif