--- a/dom/ipc/Makefile.in
+++ b/dom/ipc/Makefile.in
@@ -79,27 +79,27 @@ CPPSRCS = \
   TabMessageUtils.cpp \
   $(NULL)
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES += \
-		-I$(srcdir)/../../content/base/src \
-		-I$(srcdir)/../../content/events/src \
-		-I$(srcdir)/../../toolkit/components/places/src \
-		-I$(topsrcdir)/chrome/src \
-		-I$(topsrcdir)/uriloader/exthandler \
-		-I$(srcdir)/../../netwerk/base/src \
-		-I$(srcdir)/../src/base \
-		-I$(srcdir)/../src/storage \
-		-I$(srcdir)/../../xpcom/base \
-		-I$(topsrcdir)/extensions/cookie \
-		$(NULL)
+	-I$(srcdir)/../../content/base/src \
+	-I$(srcdir)/../../content/events/src \
+	-I$(srcdir)/../../toolkit/components/places \
+	-I$(topsrcdir)/chrome/src \
+	-I$(topsrcdir)/uriloader/exthandler \
+	-I$(srcdir)/../../netwerk/base/src \
+	-I$(srcdir)/../src/base \
+	-I$(srcdir)/../src/storage \
+	-I$(srcdir)/../../xpcom/base \
+	-I$(topsrcdir)/extensions/cookie \
+	$(NULL)
 
 DEFINES += -DBIN_SUFFIX='"$(BIN_SUFFIX)"'
 
 ifdef MOZ_PERMISSIONS
 DEFINES += -DMOZ_PERMISSIONS
 endif
 
 CXXFLAGS += $(TK_CFLAGS)

--- a/toolkit/Makefile.in
+++ b/toolkit/Makefile.in
@@ -14,18 +14,20 @@
 # The Original Code is mozilla.org build system.
 #
 # The Initial Developer of the Original Code is
 # Netscape Communications Corporation.
 # Portions created by the Initial Developer are Copyright (C) 2002
 # the Initial Developer. All Rights Reserved.
 #
 # Contributor(s):
+#  Ben Goodger <ben@bengoodger.com>
 #  Brian Ryner <bryner@brianryner.com>
 #  Pierre Chanial <chanial@noos.fr>
+#  Shawn Wilsher <me@shawnwilsher.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
@@ -42,23 +44,36 @@ srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 PARALLEL_DIRS = \
   components \
   content \
   locales \
-  mozapps \
+  mozapps/downloads \
+  mozapps/extensions \
+  mozapps/handling \
+  mozapps/plugins \
+  mozapps/shared \
+  mozapps/update \
+  mozapps/xpinstall \
   obsolete \
   profile \
   spatial-navigation \
   themes \
   $(NULL)
 
+ifeq ($(OS_ARCH),WINCE)
+ifdef WINCE_WINDOWS_MOBILE
+DIRS += mozapps/readstrings
+DIRS += mozapps/installer/wince
+endif
+endif
+
 ifneq (,$(filter gtk2 qt,$(MOZ_WIDGET_TOOLKIT)))
 PARALLEL_DIRS += system/unixproxy
 endif
 
 ifneq (,$(filter cocoa,$(MOZ_WIDGET_TOOLKIT)))
 PARALLEL_DIRS += system/osxproxy
 endif
 

--- a/toolkit/components/alerts/Makefile.in
+++ b/toolkit/components/alerts/Makefile.in
@@ -31,35 +31,51 @@
 # 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@
+srcdir = @srcdir@
+VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS    = public 
+MODULE = alerts
+XPIDLSRCS = nsIAlertsService.idl
 
 ifneq (,$(filter $(MOZ_WIDGET_TOOLKIT),windows gtk2 qt android))
-DIRS += src
+LIBRARY_NAME = alerts_s
+FORCE_STATIC_LIB = 1
+LIBXUL_LIBRARY = 1
+CPPSRCS = \
+  nsAlertsService.cpp \
+  $(NULL)
+LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/components/build/
 endif
 
 ifneq (,$(filter cocoa, $(MOZ_WIDGET_TOOLKIT)))
-# src/mac/growl needs to be first for linking to work!
+XPIDLSRCS += nsINotificationsList.idl
+# mac/growl needs to be first for linking to work!
 DIRS += \
-  src/mac/growl \
-  src/mac \
+  mac/growl \
+  mac \
   $(NULL)
 endif
 
 ifdef ENABLE_TESTS
-DIRS  += test
+DIRS += test
+endif
+
+ifneq (,$(filter $(MOZ_WIDGET_TOOLKIT),windows gtk2 qt android))
+include $(topsrcdir)/config/config.mk
+include $(topsrcdir)/ipc/chromium/chromium-config.mk
 endif
 
 include $(topsrcdir)/config/rules.mk
 
+ifneq (,$(filter $(MOZ_WIDGET_TOOLKIT),windows gtk2 qt android))
+EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
+endif

rename from toolkit/components/alerts/src/mac/Makefile.in
rename to toolkit/components/alerts/mac/Makefile.in
--- a/toolkit/components/alerts/src/mac/Makefile.in
+++ b/toolkit/components/alerts/mac/Makefile.in
@@ -29,29 +29,28 @@
 # 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 = alerts
 LIBRARY_NAME = alerts_s
 IS_COMPONENT = 1
 FORCE_SHARED_LIB = 1
 
-
 CMMSRCS = \
   nsAlertsService.mm \
   mozGrowlDelegate.mm \
   nsAlertsImageLoadListener.mm \
   nsNotificationsList.mm \
   $(NULL)
 
 CPPSRCS = \

rename from toolkit/components/alerts/src/mac/growl/CFGrowlAdditions.c
rename to toolkit/components/alerts/mac/growl/CFGrowlAdditions.c

rename from toolkit/components/alerts/src/mac/growl/CFGrowlAdditions.h
rename to toolkit/components/alerts/mac/growl/CFGrowlAdditions.h

rename from toolkit/components/alerts/src/mac/growl/CFGrowlDefines.h
rename to toolkit/components/alerts/mac/growl/CFGrowlDefines.h

rename from toolkit/components/alerts/src/mac/growl/CFMutableDictionaryAdditions.c
rename to toolkit/components/alerts/mac/growl/CFMutableDictionaryAdditions.c

rename from toolkit/components/alerts/src/mac/growl/CFMutableDictionaryAdditions.h
rename to toolkit/components/alerts/mac/growl/CFMutableDictionaryAdditions.h

rename from toolkit/components/alerts/src/mac/growl/CFURLAdditions.c
rename to toolkit/components/alerts/mac/growl/CFURLAdditions.c

rename from toolkit/components/alerts/src/mac/growl/CFURLAdditions.h
rename to toolkit/components/alerts/mac/growl/CFURLAdditions.h

rename from toolkit/components/alerts/src/mac/growl/GrowlAbstractSingletonObject.h
rename to toolkit/components/alerts/mac/growl/GrowlAbstractSingletonObject.h

rename from toolkit/components/alerts/src/mac/growl/GrowlApplicationBridge.h
rename to toolkit/components/alerts/mac/growl/GrowlApplicationBridge.h

rename from toolkit/components/alerts/src/mac/growl/GrowlApplicationBridge.m
rename to toolkit/components/alerts/mac/growl/GrowlApplicationBridge.m

rename from toolkit/components/alerts/src/mac/growl/GrowlDefines.h
rename to toolkit/components/alerts/mac/growl/GrowlDefines.h

rename from toolkit/components/alerts/src/mac/growl/GrowlDefinesInternal.h
rename to toolkit/components/alerts/mac/growl/GrowlDefinesInternal.h

rename from toolkit/components/alerts/src/mac/growl/GrowlPathUtilities.h
rename to toolkit/components/alerts/mac/growl/GrowlPathUtilities.h

rename from toolkit/components/alerts/src/mac/growl/GrowlPathUtilities.m
rename to toolkit/components/alerts/mac/growl/GrowlPathUtilities.m

rename from toolkit/components/alerts/src/mac/growl/GrowlPathway.h
rename to toolkit/components/alerts/mac/growl/GrowlPathway.h

rename from toolkit/components/alerts/src/mac/growl/GrowlPreferencesController.h
rename to toolkit/components/alerts/mac/growl/GrowlPreferencesController.h

rename from toolkit/components/alerts/src/mac/growl/GrowlTicketController.h
rename to toolkit/components/alerts/mac/growl/GrowlTicketController.h

rename from toolkit/components/alerts/src/mac/growl/Makefile.in
rename to toolkit/components/alerts/mac/growl/Makefile.in
--- a/toolkit/components/alerts/src/mac/growl/Makefile.in
+++ b/toolkit/components/alerts/mac/growl/Makefile.in
@@ -29,17 +29,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 = alerts
 LIBRARY_NAME = growl_s

rename from toolkit/components/alerts/src/mac/growl/license.txt
rename to toolkit/components/alerts/mac/growl/license.txt

rename from toolkit/components/alerts/src/mac/mozGrowlDelegate.h
rename to toolkit/components/alerts/mac/mozGrowlDelegate.h

rename from toolkit/components/alerts/src/mac/mozGrowlDelegate.mm
rename to toolkit/components/alerts/mac/mozGrowlDelegate.mm

rename from toolkit/components/alerts/src/mac/nsAlertsImageLoadListener.h
rename to toolkit/components/alerts/mac/nsAlertsImageLoadListener.h

rename from toolkit/components/alerts/src/mac/nsAlertsImageLoadListener.mm
rename to toolkit/components/alerts/mac/nsAlertsImageLoadListener.mm

rename from toolkit/components/alerts/src/mac/nsAlertsService.h
rename to toolkit/components/alerts/mac/nsAlertsService.h

rename from toolkit/components/alerts/src/mac/nsAlertsService.mm
rename to toolkit/components/alerts/mac/nsAlertsService.mm

rename from toolkit/components/alerts/src/mac/nsAlertsServiceModule.cpp
rename to toolkit/components/alerts/mac/nsAlertsServiceModule.cpp

rename from toolkit/components/alerts/src/mac/nsNotificationsList.h
rename to toolkit/components/alerts/mac/nsNotificationsList.h

rename from toolkit/components/alerts/src/mac/nsNotificationsList.mm
rename to toolkit/components/alerts/mac/nsNotificationsList.mm

rename from toolkit/components/alerts/src/nsAlertsService.cpp
rename to toolkit/components/alerts/nsAlertsService.cpp

rename from toolkit/components/alerts/src/nsAlertsService.h
rename to toolkit/components/alerts/nsAlertsService.h

rename from toolkit/components/alerts/public/nsIAlertsService.idl
rename to toolkit/components/alerts/nsIAlertsService.idl

rename from toolkit/components/alerts/public/nsINotificationsList.idl
rename to toolkit/components/alerts/nsINotificationsList.idl

deleted file mode 100644
--- a/toolkit/components/alerts/public/Makefile.in
+++ /dev/null
@@ -1,55 +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    = alerts
-XPIDL_MODULE=alerts
-
-XPIDLSRCS = nsIAlertsService.idl
-
-ifneq (,$(filter cocoa, $(MOZ_WIDGET_TOOLKIT)))
-XPIDLSRCS += nsINotificationsList.idl
-endif
-
-include $(topsrcdir)/config/rules.mk
-

deleted file mode 100644
--- a/toolkit/components/alerts/src/Makefile.in
+++ /dev/null
@@ -1,62 +0,0 @@
-#! gmake
-# 
-# ***** 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) 2000
-# 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    = alerts
-LIBRARY_NAME  = alerts_s
-FORCE_STATIC_LIB = 1
-LIBXUL_LIBRARY = 1
-
-
-CPPSRCS   = \
-    nsAlertsService.cpp \
-    $(NULL)
-
-LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/components/build/
-
-include $(topsrcdir)/config/config.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk
-include $(topsrcdir)/config/rules.mk
-
-EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)

--- a/toolkit/components/autocomplete/Makefile.in
+++ b/toolkit/components/autocomplete/Makefile.in
@@ -1,14 +1,76 @@
-DEPTH   = ../../..
+# ***** 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):
+#   Joe Hewitt <hewitt@netscape.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@
+srcdir = @srcdir@
+VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = public src
+MODULE = autocomplete
+MODULE_NAME = tkAutoCompleteModule
+LIBRARY_NAME = tkautocomplete
+SHORT_LIBNAME = tkautoc
+IS_COMPONENT = 1
+EXPORT_LIBRARY = 1
+LIBXUL_LIBRARY = 1
+
+XPIDLSRCS = \
+  nsIAutoCompleteController.idl \
+  nsIAutoCompleteInput.idl \
+  nsIAutoCompletePopup.idl \
+  nsIAutoCompleteResult.idl \
+  nsIAutoCompleteSearch.idl \
+  nsIAutoCompleteSimpleResult.idl \
+  $(NULL)
+
+CPPSRCS = \
+  nsAutoCompleteController.cpp \
+  nsAutoCompleteSimpleResult.cpp \
+  $(NULL)
+
+EXTRA_DSO_LDOPTS += \
+  $(MOZ_UNICHARUTIL_LIBS) \
+  $(MOZ_COMPONENT_LIBS) \
+  $(NULL)
 
 ifdef ENABLE_TESTS
 DIRS += tests
 endif
 
 include $(topsrcdir)/config/rules.mk

rename from toolkit/components/autocomplete/src/nsAutoCompleteController.cpp
rename to toolkit/components/autocomplete/nsAutoCompleteController.cpp

rename from toolkit/components/autocomplete/src/nsAutoCompleteController.h
rename to toolkit/components/autocomplete/nsAutoCompleteController.h

rename from toolkit/components/autocomplete/src/nsAutoCompleteSimpleResult.cpp
rename to toolkit/components/autocomplete/nsAutoCompleteSimpleResult.cpp

rename from toolkit/components/autocomplete/src/nsAutoCompleteSimpleResult.h
rename to toolkit/components/autocomplete/nsAutoCompleteSimpleResult.h

rename from toolkit/components/autocomplete/public/nsIAutoCompleteController.idl
rename to toolkit/components/autocomplete/nsIAutoCompleteController.idl

rename from toolkit/components/autocomplete/public/nsIAutoCompleteInput.idl
rename to toolkit/components/autocomplete/nsIAutoCompleteInput.idl

rename from toolkit/components/autocomplete/public/nsIAutoCompletePopup.idl
rename to toolkit/components/autocomplete/nsIAutoCompletePopup.idl

rename from toolkit/components/autocomplete/public/nsIAutoCompleteResult.idl
rename to toolkit/components/autocomplete/nsIAutoCompleteResult.idl

rename from toolkit/components/autocomplete/public/nsIAutoCompleteSearch.idl
rename to toolkit/components/autocomplete/nsIAutoCompleteSearch.idl

rename from toolkit/components/autocomplete/public/nsIAutoCompleteSimpleResult.idl
rename to toolkit/components/autocomplete/nsIAutoCompleteSimpleResult.idl

deleted file mode 100644
--- a/toolkit/components/autocomplete/public/Makefile.in
+++ /dev/null
@@ -1,57 +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):
-#   Joe Hewitt <hewitt@netscape.com> (Original Author)
-#
-# 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 = autocomplete
-XPIDL_MODULE = autocomplete
-
-XPIDLSRCS	= nsIAutoCompleteController.idl \
-            nsIAutoCompleteInput.idl \
-            nsIAutoCompletePopup.idl \
-            nsIAutoCompleteSearch.idl \
-            nsIAutoCompleteResult.idl \
-            nsIAutoCompleteSimpleResult.idl \
-            $(NULL)
-
-include $(topsrcdir)/config/rules.mk

deleted file mode 100644
--- a/toolkit/components/autocomplete/src/Makefile.in
+++ /dev/null
@@ -1,64 +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):
-#   Joe Hewitt <hewitt@netscape.com> (Original Author)
-#
-# 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 = autocomplete
-MODULE_NAME = tkAutoCompleteModule
-LIBRARY_NAME = tkautocomplete
-SHORT_LIBNAME = tkautoc
-IS_COMPONENT = 1
-EXPORT_LIBRARY = 1
-LIBXUL_LIBRARY = 1
-
-
-CPPSRCS = nsAutoCompleteController.cpp \
-          nsAutoCompleteSimpleResult.cpp \
-          $(NULL)
-
-EXTRA_DSO_LDOPTS += \
-	$(MOZ_UNICHARUTIL_LIBS) \
-	$(MOZ_COMPONENT_LIBS) \
-	$(NULL)
-
-include $(topsrcdir)/config/rules.mk

--- a/toolkit/components/build/Makefile.in
+++ b/toolkit/components/build/Makefile.in
@@ -50,102 +50,100 @@ IS_COMPONENT = 1
 MODULE_NAME = nsToolkitCompsModule
 LIBXUL_LIBRARY = 1
 
 ifneq (,$(filter $(MOZ_WIDGET_TOOLKIT),windows gtk2 qt android))
 ALERTS_SERVICE=1
 DEFINES += -DALERTS_SERVICE
 endif
 
-
-
 EXPORTS = nsToolkitCompsCID.h
 
 CPPSRCS = nsToolkitCompsModule.cpp
 
 include $(topsrcdir)/config/config.mk
 
 LOCAL_INCLUDES = \
-	-I$(srcdir)/../downloads/src \
-	-I$(srcdir)/../feeds/src \
-	-I$(srcdir)/../find/src \
-	-I$(srcdir)/../intl \
-	-I$(srcdir)/../startup/src \
-	-I$(srcdir)/../statusfilter \
-	-I$(srcdir)/../typeaheadfind/src \
-	-I$(srcdir)/../url-classifier/src \
-	$(NULL)
+  -I$(srcdir)/../downloads \
+  -I$(srcdir)/../feeds \
+  -I$(srcdir)/../find \
+  -I$(srcdir)/../intl \
+  -I$(srcdir)/../startup \
+  -I$(srcdir)/../statusfilter \
+  -I$(srcdir)/../typeaheadfind \
+  -I$(srcdir)/../url-classifier \
+  $(NULL)
 
 ifdef ALERTS_SERVICE
 LOCAL_INCLUDES += \
-	-I$(srcdir)/../alerts/src \
-	$(NULL)
+  -I$(srcdir)/../alerts \
+  $(NULL)
 endif
 
 ifeq (Android,$(OS_TARGET))
 LOCAL_INCLUDES += \
-	-I$(srcdir)/../webapps \
-	$(NULL)
+  -I$(srcdir)/../webapps \
+  $(NULL)
 endif
 
 SHARED_LIBRARY_LIBS = \
-	../find/src/$(LIB_PREFIX)mozfind_s.$(LIB_SUFFIX) \
-	../typeaheadfind/src/$(LIB_PREFIX)fastfind_s.$(LIB_SUFFIX) \
-	../startup/src/$(LIB_PREFIX)appstartup_s.$(LIB_SUFFIX) \
-	../statusfilter/$(LIB_PREFIX)mozbrwsr_s.$(LIB_SUFFIX) \
-	$(NULL)
+  ../find/$(LIB_PREFIX)mozfind_s.$(LIB_SUFFIX) \
+  ../typeaheadfind/$(LIB_PREFIX)fastfind_s.$(LIB_SUFFIX) \
+  ../startup/$(LIB_PREFIX)appstartup_s.$(LIB_SUFFIX) \
+  ../statusfilter/$(LIB_PREFIX)mozbrwsr_s.$(LIB_SUFFIX) \
+  $(NULL)
 
 ifndef MOZ_DISABLE_PARENTAL_CONTROLS
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
-SHARED_LIBRARY_LIBS += ../parentalcontrols/src/$(LIB_PREFIX)parentalcontrols_s.$(LIB_SUFFIX)
+SHARED_LIBRARY_LIBS += ../parentalcontrols/$(LIB_PREFIX)parentalcontrols_s.$(LIB_SUFFIX)
 LOCAL_INCLUDES += \
-	-I$(srcdir)/../parentalcontrols/src \
-	$(NULL)
+  -I$(srcdir)/../parentalcontrols \
+  $(NULL)
 endif
 endif
 
 ifdef MOZ_RDF
 SHARED_LIBRARY_LIBS += \
-  ../downloads/src/$(LIB_PREFIX)download_s.$(LIB_SUFFIX) \
+  ../downloads/$(LIB_PREFIX)download_s.$(LIB_SUFFIX) \
   ../intl/$(LIB_PREFIX)intl_s.$(LIB_SUFFIX) \
   $(NULL)
 endif
 
 ifdef ALERTS_SERVICE
-SHARED_LIBRARY_LIBS += ../alerts/src/$(LIB_PREFIX)alerts_s.$(LIB_SUFFIX)
+SHARED_LIBRARY_LIBS += ../alerts/$(LIB_PREFIX)alerts_s.$(LIB_SUFFIX)
 endif
 ifdef ALERTS_SERVICE_MAC
-SHARED_LIBRARY_LIBS += ../alerts/src/mac/$(LIB_PREFIX)alerts_s.$(LIB_SUFFIX)
-SHARED_LIBRARY_LIBS += ../alerts/src/mac/growl/$(LIB_PREFIX)growl_s.$(LIB_SUFFIX)
+SHARED_LIBRARY_LIBS += ../alerts/mac/$(LIB_PREFIX)alerts_s.$(LIB_SUFFIX)
+SHARED_LIBRARY_LIBS += ../alerts/mac/growl/$(LIB_PREFIX)growl_s.$(LIB_SUFFIX)
 endif
 
 ifdef MOZ_URL_CLASSIFIER
-SHARED_LIBRARY_LIBS += ../url-classifier/src/$(LIB_PREFIX)urlclassifier_s.$(LIB_SUFFIX)
+SHARED_LIBRARY_LIBS += ../url-classifier/$(LIB_PREFIX)urlclassifier_s.$(LIB_SUFFIX)
 EXTRA_DSO_LDOPTS += $(ZLIB_LIBS)
 endif
 
 ifdef MOZ_FEEDS
-SHARED_LIBRARY_LIBS += ../feeds/src/$(LIB_PREFIX)feed_s.$(LIB_SUFFIX)
+SHARED_LIBRARY_LIBS += ../feeds/$(LIB_PREFIX)feed_s.$(LIB_SUFFIX)
 endif
 
 ifeq (Android,$(OS_TARGET))
 SHARED_LIBRARY_LIBS += ../webapps/$(LIB_PREFIX)webapps_s.$(LIB_SUFFIX)
 endif
 
 EXTRA_DSO_LIBS = gkgfx
 
 EXTRA_DSO_LDOPTS += \
-	$(LIBS_DIR) \
-	$(EXTRA_DSO_LIBS) \
-	$(MOZ_UNICHARUTIL_LIBS) \
-	$(MOZ_COMPONENT_LIBS) \
-	$(MOZ_JS_LIBS) \
-	$(NULL)
+  $(LIBS_DIR) \
+  $(EXTRA_DSO_LIBS) \
+  $(MOZ_UNICHARUTIL_LIBS) \
+  $(MOZ_COMPONENT_LIBS) \
+  $(MOZ_JS_LIBS) \
+  $(NULL)
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 EXTRA_DSO_LDOPTS += $(TK_LIBS)
 endif
 
 ifeq ($(OS_ARCH),WINNT)
-OS_LIBS	+= $(call EXPAND_LIBNAME,shell32 ole32)
+OS_LIBS += $(call EXPAND_LIBNAME,shell32 ole32)
 endif
 
 include $(topsrcdir)/config/rules.mk

--- a/toolkit/components/commandlines/Makefile.in
+++ b/toolkit/components/commandlines/Makefile.in
@@ -37,18 +37,42 @@
 
 DEPTH     = ../../..
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = \
-	public \
-	src \
-	$(NULL)
+MODULE = toolkitcomps
+XPIDL_MODULE = commandlines
+LIBRARY_NAME = commandlines
+SHORT_LIBNAME = cmdlines
+EXPORT_LIBRARY = 1
+IS_COMPONENT = 1
+MODULE_NAME = CommandLineModule
+LIBXUL_LIBRARY = 1
+
+XPIDLSRCS = \
+  nsICommandLine.idl \
+  nsICommandLineHandler.idl \
+  nsICommandLineRunner.idl \
+  nsICommandLineValidator.idl \
+  $(NULL)
+
+CPPSRCS = \
+  nsCommandLine.cpp \
+  $(NULL)
+
+EXTRA_DSO_LDOPTS += \
+  $(MOZ_UNICHARUTIL_LIBS) \
+  $(MOZ_COMPONENT_LIBS) \
+  $(NULL)
+
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
+EXTRA_DSO_LDOPTS += $(TK_LIBS)
+endif
 
 ifdef ENABLE_TESTS
 DIRS += test
 endif
 
 include $(topsrcdir)/config/rules.mk

rename from toolkit/components/commandlines/src/nsCommandLine.cpp
rename to toolkit/components/commandlines/nsCommandLine.cpp

rename from toolkit/components/commandlines/public/nsICommandLine.idl
rename to toolkit/components/commandlines/nsICommandLine.idl

rename from toolkit/components/commandlines/public/nsICommandLineHandler.idl
rename to toolkit/components/commandlines/nsICommandLineHandler.idl

rename from toolkit/components/commandlines/public/nsICommandLineRunner.idl
rename to toolkit/components/commandlines/nsICommandLineRunner.idl

rename from toolkit/components/commandlines/public/nsICommandLineValidator.idl
rename to toolkit/components/commandlines/nsICommandLineValidator.idl

deleted file mode 100644
--- a/toolkit/components/commandlines/public/Makefile.in
+++ /dev/null
@@ -1,55 +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 the Mozilla toolkit.
-#
-# The Initial Developer of the Original Code is
-# Benjamin Smedberg <benjamin@smedbergs.us>.
-#
-# 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 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       = toolkitcomps
-XPIDL_MODULE = commandlines
-
-XPIDLSRCS = \
-	nsICommandLine.idl \
-	nsICommandLineRunner.idl \
-	nsICommandLineHandler.idl \
-	nsICommandLineValidator.idl \
-	$(NULL)
-
-include $(topsrcdir)/config/rules.mk

deleted file mode 100644
--- a/toolkit/components/commandlines/src/Makefile.in
+++ /dev/null
@@ -1,70 +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 the Mozilla toolkit.
-#
-# The Initial Developer of the Original Code is
-# Benjamin Smedberg <benjamin@smedbergs.us>.
-#
-# 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 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
-
-# Because this is used by seamonkey and the toolkit, we build this as its
-# own component, instead of building it into toolkit/components/build
-
-MODULE         = toolkitcomps
-LIBRARY_NAME   = commandlines
-SHORT_LIBNAME  = cmdlines
-EXPORT_LIBRARY = 1
-IS_COMPONENT   = 1
-MODULE_NAME    = CommandLineModule
-LIBXUL_LIBRARY = 1
-
-
-CPPSRCS = \
-	nsCommandLine.cpp \
-	$(NULL)
-
-EXTRA_DSO_LDOPTS += \
-	$(MOZ_UNICHARUTIL_LIBS) \
-	$(MOZ_COMPONENT_LIBS) \
-	$(NULL)
-
-ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-EXTRA_DSO_LDOPTS += $(TK_LIBS)
-endif
-
-include $(topsrcdir)/config/rules.mk

--- a/toolkit/components/contentprefs/Makefile.in
+++ b/toolkit/components/contentprefs/Makefile.in
@@ -29,22 +29,24 @@
 # 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@
+DEPTH = ../../..
+topsrcdir = @top_srcdir@
+srcdir = @srcdir@
+VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = src
+MODULE = contentprefs
+
+EXTRA_COMPONENTS = nsContentPrefService.js nsContentPrefService.manifest
 
 ifdef ENABLE_TESTS
-	DIRS += tests
+DIRS += tests
 endif
 
 include $(topsrcdir)/config/rules.mk

rename from toolkit/components/contentprefs/src/nsContentPrefService.js
rename to toolkit/components/contentprefs/nsContentPrefService.js

rename from toolkit/components/contentprefs/src/nsContentPrefService.manifest
rename to toolkit/components/contentprefs/nsContentPrefService.manifest

deleted file mode 100644
--- a/toolkit/components/contentprefs/src/Makefile.in
+++ /dev/null
@@ -1,48 +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 Content Prefs (cpref).
-#
-# The Initial Developer of the Original Code is Mozilla.
-# Portions created by the Initial Developer are Copyright (C) 2006
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Myk Melez <myk@mozilla.org>
-#
-# 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 = contentprefs
-
-EXTRA_COMPONENTS = nsContentPrefService.js nsContentPrefService.manifest
-
-include $(topsrcdir)/config/rules.mk

--- a/toolkit/components/downloads/Makefile.in
+++ b/toolkit/components/downloads/Makefile.in
@@ -15,38 +15,72 @@
 # 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):
+#   Stuart Parmenter <pavlov@pavlov.net>
 #
 # 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   = ../../..
+DEPTH = ../../..
 topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH   = @srcdir@
+srcdir = @srcdir@
+VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = public src
+MODULE = downloads
+LIBRARY_NAME = download_s
+FORCE_STATIC_LIB = 1
+LIBXUL_LIBRARY = 1
+
+XPIDLSRCS = \
+  nsIDownload.idl \
+  nsIDownloadManager.idl \
+  nsIDownloadManagerUI.idl \
+  nsIDownloadProgressListener.idl \
+  $(NULL)
+
+CPPSRCS = \
+  nsDownloadManager.cpp \
+  $(NULL)
+
+ifndef GNU_CXX
+ifeq ($(OS_ARCH),WINNT)
+CPPSRCS += nsDownloadScanner.cpp
+endif
+endif
+
+# definition of MOZ_SUITE is only added via config.mk
+include $(topsrcdir)/config/config.mk
+
+ifndef MOZ_SUITE
+# XXX - Until Suite builds off XULRunner we can't guarantee our implementation
+# of nsIDownloadManagerUI overrides toolkit's.
+EXTRA_COMPONENTS = \
+  nsDownloadManagerUI.js \
+  nsDownloadManagerUI.manifest \
+  $(NULL)
+endif
 
 ifdef ENABLE_TESTS
 DIRS += test
 endif
 
 include $(topsrcdir)/config/rules.mk
 
+EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)

rename from toolkit/components/downloads/src/nsDownloadManager.cpp
rename to toolkit/components/downloads/nsDownloadManager.cpp

rename from toolkit/components/downloads/src/nsDownloadManager.h
rename to toolkit/components/downloads/nsDownloadManager.h

rename from toolkit/components/downloads/src/nsDownloadManagerUI.js
rename to toolkit/components/downloads/nsDownloadManagerUI.js

rename from toolkit/components/downloads/src/nsDownloadManagerUI.manifest
rename to toolkit/components/downloads/nsDownloadManagerUI.manifest

rename from toolkit/components/downloads/src/nsDownloadProxy.h
rename to toolkit/components/downloads/nsDownloadProxy.h

rename from toolkit/components/downloads/src/nsDownloadScanner.cpp
rename to toolkit/components/downloads/nsDownloadScanner.cpp

rename from toolkit/components/downloads/src/nsDownloadScanner.h
rename to toolkit/components/downloads/nsDownloadScanner.h

rename from toolkit/components/downloads/public/nsIDownload.idl
rename to toolkit/components/downloads/nsIDownload.idl

rename from toolkit/components/downloads/public/nsIDownloadManager.idl
rename to toolkit/components/downloads/nsIDownloadManager.idl

rename from toolkit/components/downloads/public/nsIDownloadManagerUI.idl
rename to toolkit/components/downloads/nsIDownloadManagerUI.idl

rename from toolkit/components/downloads/public/nsIDownloadProgressListener.idl
rename to toolkit/components/downloads/nsIDownloadProgressListener.idl

deleted file mode 100644
--- a/toolkit/components/downloads/public/Makefile.in
+++ /dev/null
@@ -1,54 +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    = downloads
-
-XPIDLSRCS = nsIDownloadManager.idl \
-            nsIDownloadProgressListener.idl \
-            nsIDownload.idl \
-            nsIDownloadManagerUI.idl \
-            $(NULL)
-
-include $(topsrcdir)/config/rules.mk
-

deleted file mode 100644
--- a/toolkit/components/downloads/src/Makefile.in
+++ /dev/null
@@ -1,78 +0,0 @@
-#! gmake
-# 
-# ***** 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) 2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Stuart Parmenter <pavlov@netscape.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    = downloads
-LIBRARY_NAME  = download_s
-FORCE_STATIC_LIB = 1
-LIBXUL_LIBRARY = 1
-
-
-CPPSRCS   = \
-    nsDownloadManager.cpp \
-    $(NULL)
-
-ifndef GNU_CXX
-ifeq ($(OS_ARCH),WINNT)
-CPPSRCS += nsDownloadScanner.cpp
-endif
-endif
-
-# definition of MOZ_SUITE is only added via config.mk
-include $(topsrcdir)/config/config.mk
-
-ifndef MOZ_SUITE
-# XXX - Until Suite builds off XULRunner we can't guarantee our implementation
-# of nsIDownloadManagerUI overrides toolkit's.
-EXTRA_COMPONENTS = \
-  nsDownloadManagerUI.js \
-  nsDownloadManagerUI.manifest \
-  $(NULL)
-endif
-
-include $(topsrcdir)/config/rules.mk
-
-EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
-

rename from toolkit/components/feeds/src/FeedProcessor.js
rename to toolkit/components/feeds/FeedProcessor.js

rename from toolkit/components/feeds/src/FeedProcessor.manifest
rename to toolkit/components/feeds/FeedProcessor.manifest

--- a/toolkit/components/feeds/Makefile.in
+++ b/toolkit/components/feeds/Makefile.in
@@ -30,30 +30,57 @@
 # 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@
+DEPTH = ../../..
+topsrcdir = @top_srcdir@
+srcdir = @srcdir@
+VPATH = @srcdir@
+
 include $(DEPTH)/config/autoconf.mk
-DIRS		= public src
+
+MODULE = feeds
+LIBRARY_NAME = feed_s
+MOZILLA_INTERNAL_API = 1
+FORCE_STATIC_LIB = 1
+LIBXUL_LIBRARY = 1
+
+XPIDLSRCS = \
+  nsIFeed.idl \
+  nsIFeedContainer.idl \
+  nsIFeedElementBase.idl \
+  nsIFeedEntry.idl \
+  nsIFeedGenerator.idl \
+  nsIFeedListener.idl \
+  nsIFeedPerson.idl \
+  nsIFeedProcessor.idl \
+  nsIFeedResult.idl \
+  nsIFeedTextConstruct.idl \
+  nsIScriptableUnescapeHTML.idl \
+  $(NULL)
+
+CPPSRCS = \
+  nsScriptableUnescapeHTML.cpp \
+  $(NULL)
+
+EXTRA_COMPONENTS = FeedProcessor.js FeedProcessor.manifest
+
 include $(topsrcdir)/config/rules.mk
 
 ABS_SRCDIR := $(shell cd $(srcdir) && pwd)
 ifeq ($(OS_ARCH),WINNT)
 
 ABS_DEPTH := $(shell cd $(DEPTH) && pwd)
 
 check::
-	cd $(srcdir)/test; $(CYGWIN_WRAPPER) $(ABS_DEPTH)/dist/bin/xpcshell$(BIN_SUFFIX) shell.js 
+	cd $(srcdir)/test; $(ABS_DEPTH)/dist/bin/xpcshell$(BIN_SUFFIX) shell.js 
 
 else
 
 check::
 	$(RUN_TEST_PROGRAM) $(DIST)/bin/xpcshell$(BIN_SUFFIX) $(srcdir)/test/shell.js $(ABS_SRCDIR)/test
 
 endif # WINNT

rename from toolkit/components/feeds/public/nsIFeed.idl
rename to toolkit/components/feeds/nsIFeed.idl

rename from toolkit/components/feeds/public/nsIFeedContainer.idl
rename to toolkit/components/feeds/nsIFeedContainer.idl

rename from toolkit/components/feeds/public/nsIFeedElementBase.idl
rename to toolkit/components/feeds/nsIFeedElementBase.idl

rename from toolkit/components/feeds/public/nsIFeedEntry.idl
rename to toolkit/components/feeds/nsIFeedEntry.idl

rename from toolkit/components/feeds/public/nsIFeedGenerator.idl
rename to toolkit/components/feeds/nsIFeedGenerator.idl

rename from toolkit/components/feeds/public/nsIFeedListener.idl
rename to toolkit/components/feeds/nsIFeedListener.idl

rename from toolkit/components/feeds/public/nsIFeedPerson.idl
rename to toolkit/components/feeds/nsIFeedPerson.idl

rename from toolkit/components/feeds/public/nsIFeedProcessor.idl
rename to toolkit/components/feeds/nsIFeedProcessor.idl

rename from toolkit/components/feeds/public/nsIFeedResult.idl
rename to toolkit/components/feeds/nsIFeedResult.idl

rename from toolkit/components/feeds/public/nsIFeedTextConstruct.idl
rename to toolkit/components/feeds/nsIFeedTextConstruct.idl

rename from toolkit/components/feeds/public/nsIScriptableUnescapeHTML.idl
rename to toolkit/components/feeds/nsIScriptableUnescapeHTML.idl

rename from toolkit/components/feeds/src/nsScriptableUnescapeHTML.cpp
rename to toolkit/components/feeds/nsScriptableUnescapeHTML.cpp

rename from toolkit/components/feeds/src/nsScriptableUnescapeHTML.h
rename to toolkit/components/feeds/nsScriptableUnescapeHTML.h

deleted file mode 100644
--- a/toolkit/components/feeds/public/Makefile.in
+++ /dev/null
@@ -1,60 +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 = feeds
-XPIDL_MODULE = feeds
-XPIDLSRCS = nsIFeedProcessor.idl \
-            nsIFeedResult.idl \
-            nsIFeedListener.idl \
-            nsIFeed.idl \
-            nsIFeedContainer.idl \
-            nsIFeedEntry.idl \
-            nsIFeedTextConstruct.idl \
-            nsIScriptableUnescapeHTML.idl \
-            nsIFeedElementBase.idl \
-            nsIFeedGenerator.idl \
-            nsIFeedPerson.idl \
-            $(NULL)
-
-include $(topsrcdir)/config/rules.mk

deleted file mode 100644
--- a/toolkit/components/feeds/src/Makefile.in
+++ /dev/null
@@ -1,57 +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		= feeds
-LIBRARY_NAME	= feed_s
-MOZILLA_INTERNAL_API = 1
-FORCE_STATIC_LIB = 1
-LIBXUL_LIBRARY = 1
-
-
-CPPSRCS		= nsScriptableUnescapeHTML.cpp \
-		$(NULL)
-
-EXTRA_COMPONENTS = FeedProcessor.js FeedProcessor.manifest
-
-include $(topsrcdir)/config/rules.mk

--- a/toolkit/components/filepicker/Makefile.in
+++ b/toolkit/components/filepicker/Makefile.in
@@ -15,16 +15,18 @@
 # 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):
+#   Brian Ryner <bryner@brianryner.com>
+#   Stuart Parmenter <pavlov@pavlov.net>
 #
 # 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
@@ -40,13 +42,33 @@ DEPTH     = ../../..
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 ifdef MOZ_XUL
 ifeq (,$(filter android qt os2 cocoa windows,$(MOZ_WIDGET_TOOLKIT)))
-DIRS = public src
+MODULE = filepicker
+LIBRARY_NAME = fileview
+SHORT_LIBNAME = fileview
+EXPORT_LIBRARY = 1
+IS_COMPONENT = 1
+MODULE_NAME = nsFileViewModule
+LIBXUL_LIBRARY = 1
+XPIDLSRCS = \
+  nsIFileView.idl \
+  $(NULL)
+CPPSRCS = \
+  nsFileView.cpp \
+  $(NULL)
+EXTRA_COMPONENTS = nsFilePicker.js
+EXTRA_PP_COMPONENTS = nsFilePicker.manifest
 endif
 endif
 
 include $(topsrcdir)/config/rules.mk
+
+ifdef MOZ_XUL
+ifeq (,$(filter android qt os2 cocoa windows,$(MOZ_WIDGET_TOOLKIT)))
+EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
+endif
+endif

rename from toolkit/components/filepicker/src/nsFilePicker.js
rename to toolkit/components/filepicker/nsFilePicker.js

rename from toolkit/components/filepicker/src/nsFilePicker.manifest
rename to toolkit/components/filepicker/nsFilePicker.manifest

rename from toolkit/components/filepicker/src/nsFileView.cpp
rename to toolkit/components/filepicker/nsFileView.cpp

rename from toolkit/components/filepicker/public/nsIFileView.idl
rename to toolkit/components/filepicker/nsIFileView.idl

deleted file mode 100644
--- a/toolkit/components/filepicker/public/Makefile.in
+++ /dev/null
@@ -1,52 +0,0 @@
-#! gmake
-# ***** 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.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#  Brian Ryner <bryner@brianryner.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		= filepicker
-XPIDL_MODULE	= filepicker
-
-XPIDLSRCS	= nsIFileView.idl
-
-include $(topsrcdir)/config/rules.mk
-

deleted file mode 100644
--- a/toolkit/components/filepicker/src/Makefile.in
+++ /dev/null
@@ -1,65 +0,0 @@
-#! gmake
-# 
-# ***** 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) 2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Stuart Parmenter <pavlov@netscape.com>
-#
-# 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 *****
-
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= filepicker
-LIBRARY_NAME	= fileview
-SHORT_LIBNAME	= fileview
-EXPORT_LIBRARY	= 1
-IS_COMPONENT	= 1
-MODULE_NAME	= nsFileViewModule
-LIBXUL_LIBRARY	= 1
-
-
-CPPSRCS		= \
-		nsFileView.cpp \
-		$(NULL)
-
-EXTRA_COMPONENTS = nsFilePicker.js
-EXTRA_PP_COMPONENTS = nsFilePicker.manifest
-
-include $(topsrcdir)/config/rules.mk
-
-EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)