diff --git a/mozilla/xpcom/base/Makefile.in b/mozilla/xpcom/base/Makefile.in
new file mode 100644
index 00000000000..ecaa1254bde
--- /dev/null
+++ b/mozilla/xpcom/base/Makefile.in
@@ -0,0 +1,73 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH=../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+include $(topsrcdir)/config/config.mk
+
+LIBRARY_NAME = xpcombase_s
+
+MODULE = xpcom
+XPIDL_MODULE = xpcom_base
+
+XPIDLSRCS =               \
+	nsrootidl.idl   \
+	nsISupports.idl \
+	$(NULL)
+
+CPPSRCS =				\
+	nsAllocator.cpp			\
+	nsDebug.cpp			\
+	nsTraceRefcnt.cpp		\
+	nsCOMPtr.cpp			\
+	nsID.cpp			\
+	$(NULL)
+
+EXPORTS = \
+        nsAgg.h            \
+        nsIAllocator.h     \
+        nsCOMPtr.h         \
+        nsCom.h            \
+        nsDebug.h          \
+        nsError.h          \
+        nsID.h             \
+	nsIID.h            \
+	nsIPtr.h           \
+        nsISupportsUtils.h \
+        nsTraceRefcnt.h    \
+        nscore.h           \
+	$(NULL)
+
+EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
+
+DEFINES += -D_IMPL_NS_COM
+
+REQUIRES = xpcom
+
+MKSHLIB :=
+
+# we don't want the shared lib, but we want to force the creation of a static lib.
+override NO_SHARED_LIB=1
+override NO_STATIC_LIB=
+
+include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/xpcom/base/makefile.win b/mozilla/xpcom/base/makefile.win
new file mode 100644
index 00000000000..0286465bae9
--- /dev/null
+++ b/mozilla/xpcom/base/makefile.win
@@ -0,0 +1,80 @@
+#!nmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+IGNORE_MANIFEST=1
+
+DEPTH=..\..
+MODULE = xpcom 
+
+################################################################################
+## exports
+
+EXPORTS =                  \
+        nsAgg.h            \
+        nsIAllocator.h     \
+        nsCOMPtr.h         \
+        nsCom.h            \
+        nsDebug.h          \
+        nsError.h          \
+        nsID.h             \
+	nsIID.h            \
+	nsIPtr.h           \
+        nsISupportsUtils.h \
+        nsTraceRefcnt.h    \
+        nscore.h           \
+        $(NULL)			
+
+XPIDLSRCS =               \
+        .\nsrootidl.idl   \
+        .\nsISupports.idl \
+        $(NULL)
+
+################################################################################
+## library
+
+#MAKE_OBJ_TYPE	= DLL
+#LIBNAME = .\$(OBJDIR)\xpcombase
+#DLL = $(LIBNAME).dll
+
+LIBRARY_NAME=xpcombase_s
+
+LINCS =                   \
+	-I$(PUBLIC)\xpcom \
+	$(NULL)
+
+LCFLAGS = -D_IMPL_NS_COM -DWIN32_LEAN_AND_MEAN
+
+CPP_OBJS =                            \
+        .\$(OBJDIR)\nsDebug.obj       \
+        .\$(OBJDIR)\nsAllocator.obj   \
+        .\$(OBJDIR)\nsCOMPtr.obj      \
+        .\$(OBJDIR)\nsDebug.obj       \
+        .\$(OBJDIR)\nsID.obj          \
+        .\$(OBJDIR)\nsTraceRefcnt.obj \
+        $(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+
+#libs:: $(DLL)
+#	$(MAKE_INSTALL) $(LIBNAME).$(DLL_SUFFIX) $(DIST)\bin
+#	$(MAKE_INSTALL) $(LIBNAME).$(LIB_SUFFIX) $(DIST)\lib
+
+libs:: $(LIBRARY)
+	$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
+
+clobber::
+        rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
diff --git a/mozilla/xpcom/build/Makefile.in b/mozilla/xpcom/build/Makefile.in
new file mode 100644
index 00000000000..6e08160bfc0
--- /dev/null
+++ b/mozilla/xpcom/build/Makefile.in
@@ -0,0 +1,86 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH=../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+include $(topsrcdir)/config/config.mk
+
+LIBRARY_NAME = xpcom
+
+MODULE = xpcom
+
+CPPSRCS =			\
+	dlldeps.cpp		\
+	nsXPComInit.cpp		\
+	$(NULL)
+
+EXPORTS =			\
+	nsIXPComService.h	\
+	$(NULL)
+
+EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
+
+REQUIRES = xpcom
+
+LOCAL_INCLUDES +=			\
+	-I$(srcdir)/../base		\
+	-I$(srcdir)/../ds		\
+	-I$(srcdir)/../io		\
+	-I$(srcdir)/../components	\
+	-I$(srcdir)/../threads		\
+	$(NULL)
+
+DEFINES += -D_IMPL_NS_COM -D_IMPL_NS_BASE
+
+SHARED_LIBRARY_LIBS =			 \
+	$(DIST)/lib/libxpcombase_s.a	 \
+	$(DIST)/lib/libxpcomds_s.a	 \
+	$(DIST)/lib/libxpcomio_s.a	 \
+	$(DIST)/lib/libxpcomcomponents_s.a	 \
+	$(DIST)/lib/libxpcomthreads_s.a	 \
+	$(DIST)/lib/libreg.a	 \
+	$(NULL)
+
+ifeq ($(OS_ARCH),HP-UX)
+EXTRA_DSO_LDOPTS = -c objs/objslist
+else
+EXTRA_DSO_LDOPTS =	       \
+	$(MKSHLIB_FORCE_ALL)   \
+	$(SHARED_LIBRARY_LIBS) \
+	$(MKSHLIB_UNFORCE_ALL)
+endif
+
+EXTRA_DSO_LDOPTS += -L$(DIST)/bin $(NULL)
+
+include $(topsrcdir)/config/rules.mk
+
+ifeq ($(OS_ARCH),HP-UX)
+shared_library_objs: $(SHARED_LIBRARY_LIBS)
+	rm -rf objs
+	mkdir objs
+	(cd objs; for lib in $(SHARED_LIBRARY_LIBS); do ar xv ../$$lib; done) \
+	| awk '{ print "objs/"$$3 }' > objs/objslist
+
+$(LIBRARY) $(SHARED_LIBRARY): shared_library_objs Makefile
+else
+$(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
+endif
diff --git a/mozilla/xpcom/build/makefile.win b/mozilla/xpcom/build/makefile.win
new file mode 100644
index 00000000000..04f3d8ffa70
--- /dev/null
+++ b/mozilla/xpcom/build/makefile.win
@@ -0,0 +1,64 @@
+#!nmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+IGNORE_MANIFEST=1
+
+DEPTH=..\..
+MODULE = xpcom 
+
+LIBNAME = .\$(OBJDIR)\xpcom
+DLL = $(LIBNAME).dll
+
+LINCS =                   \
+	-I$(PUBLIC)\xpcom \
+        -I..\base         \
+        -I..\ds           \
+        -I..\io           \
+        -I..\components   \
+        -I..\threads      \
+	$(NULL)
+
+LCFLAGS = -D_IMPL_NS_COM -D_IMPL_NS_BASE -DWIN32_LEAN_AND_MEAN
+
+CPP_OBJS =                             \
+        .\$(OBJDIR)\nsXPComInit.obj    \
+        .\$(OBJDIR)\dlldeps.obj        \
+        $(NULL)
+
+LLIBS =                                \
+	$(LIBNSPR)                     \
+	$(DIST)\lib\plc3.lib           \
+        $(DIST)\lib\xpcombase_s.lib    \
+        $(DIST)\lib\xpcomds_s.lib      \
+        $(DIST)\lib\xpcomio_s.lib      \
+        $(DIST)\lib\xpcomcomp_s.lib    \
+        $(DIST)\lib\xpcomthreads_s.lib \
+	$(DIST)\lib\libreg32.lib       \
+        shell32.lib                    \
+!if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)
+	$(GLOWDIR)\glowcode.lib        \
+!endif
+!if defined(MOZ_TRACE_XPCOM_REFCNT)
+	imagehlp.lib                   \
+!endif	
+	$(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+
+libs:: $(DLL)
+	$(MAKE_INSTALL) $(LIBNAME).$(DLL_SUFFIX) $(DIST)\bin
+	$(MAKE_INSTALL) $(LIBNAME).$(LIB_SUFFIX) $(DIST)\lib
diff --git a/mozilla/xpcom/components/Makefile.in b/mozilla/xpcom/components/Makefile.in
new file mode 100644
index 00000000000..c54c70b2617
--- /dev/null
+++ b/mozilla/xpcom/components/Makefile.in
@@ -0,0 +1,73 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH=../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+include $(topsrcdir)/config/config.mk
+
+LIBRARY_NAME = xpcomcomponents_s
+
+MODULE = xpcom
+
+XPIDLSRCS =               \
+	$(NULL)
+
+CPPSRCS =				\
+        nsComponentManager.cpp \
+        nsGenericFactory.cpp   \
+        nsRegistry.cpp         \
+        nsRepository.cpp       \
+        nsServiceManager.cpp   \
+        xcDll.cpp              \
+        xcDllStore.cpp         \
+	$(NULL)
+
+EXPORTS = \
+        nsIComponentManager.h \
+        nsIFactory.h          \
+        nsIGenericFactory.h   \
+        nsIRegistry.h         \
+        nsIServiceManager.h   \
+        nsIServiceProvider.h  \
+        nsRepository.h        \
+        nsXPComFactory.h      \
+	$(NULL)
+
+EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
+
+DEFINES += -DUSE_NSREG -D_IMPL_NS_COM -D_IMPL_NS_BASE
+
+REQUIRES = xpcom libreg
+
+LOCAL_INCLUDES += 		\
+	-I$(srcdir)/../base	\
+	-I$(srcdir)/../thread	\
+	$(NULL)
+
+MKSHLIB :=
+
+# we don't want the shared lib, but we want to force the creation of a static lib.
+override NO_SHARED_LIB=1
+override NO_STATIC_LIB=
+
+include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/xpcom/components/makefile.win b/mozilla/xpcom/components/makefile.win
new file mode 100644
index 00000000000..4b992f15326
--- /dev/null
+++ b/mozilla/xpcom/components/makefile.win
@@ -0,0 +1,70 @@
+#!nmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+IGNORE_MANIFEST=1
+
+DEPTH=..\..
+MODULE = xpcom 
+
+################################################################################
+## exports
+
+EXPORTS =                     \
+        nsIComponentManager.h \
+        nsIFactory.h          \
+        nsIGenericFactory.h   \
+        nsIRegistry.h         \
+        nsIServiceManager.h   \
+        nsIServiceProvider.h  \
+        nsRepository.h        \
+        nsXPComFactory.h      \
+        $(NULL)			
+
+XPIDLSRCS =               \
+        $(NULL)
+
+################################################################################
+## library
+
+LIBRARY_NAME=xpcomcomp_s
+
+LINCS =                    \
+	-I$(PUBLIC)\xpcom  \
+	-I$(PUBLIC)\libreg \
+        -I..\base          \
+        -I..\threads       \
+	$(NULL)
+
+LCFLAGS = -DUSE_NSREG -D_IMPL_NS_COM -D_IMPL_NS_BASE -DWIN32_LEAN_AND_MEAN
+
+CPP_OBJS =                                 \
+        .\$(OBJDIR)\nsComponentManager.obj \
+        .\$(OBJDIR)\nsGenericFactory.obj   \
+        .\$(OBJDIR)\nsRegistry.obj         \
+        .\$(OBJDIR)\nsRepository.obj       \
+        .\$(OBJDIR)\nsServiceManager.obj   \
+        .\$(OBJDIR)\xcDll.obj              \
+        .\$(OBJDIR)\xcDllStore.obj         \
+        $(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+
+libs:: $(LIBRARY)
+	$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
+
+clobber::
+        rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
diff --git a/mozilla/xpcom/ds/Makefile.in b/mozilla/xpcom/ds/Makefile.in
new file mode 100644
index 00000000000..bc19277e43c
--- /dev/null
+++ b/mozilla/xpcom/ds/Makefile.in
@@ -0,0 +1,120 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH=../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+include $(topsrcdir)/config/config.mk
+
+LIBRARY_NAME = xpcomds_s
+
+MODULE = xpcom
+
+XPIDL_MODULE = xpcom_ds
+
+XPIDLSRCS =			\
+	nsICollection.idl	\
+	nsIEnumerator.idl	\
+	$(NULL)
+
+CPPSRCS =				\
+	nsArena.cpp                   \
+	nsAtomTable.cpp               \
+	nsBTree.cpp                   \
+	nsBuffer.cpp                  \
+	nsByteBuffer.cpp              \
+	nsCRT.cpp                     \
+	nsConjoiningEnumerator.cpp    \
+	nsDeque.cpp                   \
+	nsEmptyEnumerator.cpp         \
+	nsEnumeratorUtils.cpp         \
+	nsHashtable.cpp               \
+	nsObserver.cpp                \
+	nsObserverList.cpp            \
+	nsObserverService.cpp         \
+	nsPageMgr.cpp                 \
+	nsPipe.cpp                    \
+	nsProperties.cpp              \
+	nsQuickSort.cpp               \
+	nsRBTree.cpp                  \
+	nsSizeOfHandler.cpp           \
+	nsStr.cpp                     \
+	nsString.cpp                  \
+	nsString2.cpp                 \
+	nsStringImpl.cpp              \
+	nsSupportsArray.cpp           \
+	nsSupportsArrayEnumerator.cpp \
+	nsUnicharBuffer.cpp           \
+	nsVariant.cpp                 \
+	nsVoidArray.cpp               \
+	nsXPIDLString.cpp             \
+	plvector.cpp                  \
+	$(NULL)
+
+EXPORTS = \
+	nsBTree.h                  \
+	nsCRT.h                    \
+	nsDeque.h                  \
+	nsEnumeratorUtils.h        \
+	nsHashtable.h              \
+	nsIArena.h                 \
+	nsIAtom.h                  \
+	nsIBuffer.h                \
+	nsIByteBuffer.h            \
+	nsIObserver.h              \
+	nsIObserverList.h          \
+	nsIObserverService.h       \
+	nsIPageManager.h           \
+	nsIProperties.h            \
+	nsISimpleEnumerator.h      \
+	nsISizeOfHandler.h         \
+	nsIString.h                \
+	nsISupportsArray.h         \
+	nsIUnicharBuffer.h         \
+	nsIVariant.h               \
+	nsInt64.h                  \
+	nsQuickSort.h              \
+	nsRBTree.h                 \
+	nsStr.h                    \
+	nsString.h                 \
+	nsString2.h                \
+	nsTime.h                   \
+	nsUnitConversion.h         \
+	nsVector.h                 \
+	nsVoidArray.h              \
+	nsXPIDLString.h            \
+	plvector.h                 \
+	$(NULL)			
+
+EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
+
+DEFINES = -D_IMPL_NS_COM -D_IMPL_NS_BASE
+
+REQUIRES = xpcom uconv unicharutil
+
+MKSHLIB :=
+
+# we don't want the shared lib, but we want to force the creation of a static lib.
+override NO_SHARED_LIB=1
+override NO_STATIC_LIB=
+
+include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/xpcom/ds/makefile.win b/mozilla/xpcom/ds/makefile.win
new file mode 100644
index 00000000000..8091e558dab
--- /dev/null
+++ b/mozilla/xpcom/ds/makefile.win
@@ -0,0 +1,119 @@
+#!nmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+IGNORE_MANIFEST=1
+
+DEPTH=..\..
+MODULE = xpcom 
+
+################################################################################
+## exports
+
+EXPORTS =                          \
+        nsBTree.h                  \
+        nsCRT.h                    \
+        nsDeque.h                  \
+        nsEnumeratorUtils.h        \
+        nsHashtable.h              \
+        nsIArena.h                 \
+        nsIAtom.h                  \
+        nsIBuffer.h                \
+        nsIByteBuffer.h            \
+        nsIObserver.h              \
+        nsIObserverList.h          \
+        nsIObserverService.h       \
+        nsIPageManager.h           \
+        nsIProperties.h            \
+        nsISimpleEnumerator.h      \
+        nsISizeOfHandler.h         \
+        nsIString.h                \
+        nsISupportsArray.h         \
+        nsIUnicharBuffer.h         \
+        nsIVariant.h               \
+        nsInt64.h                  \
+        nsQuickSort.h              \
+        nsRBTree.h                 \
+        nsStr.h                    \
+        nsString.h                 \
+        nsString2.h                \
+        nsTime.h                   \
+        nsUnitConversion.h         \
+        nsVector.h                 \
+        nsVoidArray.h              \
+        nsXPIDLString.h            \
+        plvector.h                 \
+        $(NULL)			
+
+XPIDLSRCS =                 \
+        .\nsICollection.idl \
+        .\nsIEnumerator.idl \
+        $(NULL)
+
+################################################################################
+## library
+
+LIBRARY_NAME=xpcomds_s
+
+LINCS =                         \
+	-I$(PUBLIC)\xpcom       \
+        -I$(PUBLIC)\uconv       \
+        -I$(PUBLIC)\unicharutil \
+	$(NULL)
+
+LCFLAGS = -D_IMPL_NS_COM -D_IMPL_NS_BASE -DWIN32_LEAN_AND_MEAN
+
+CPP_OBJS =                                        \
+        .\$(OBJDIR)\nsArena.obj                   \
+        .\$(OBJDIR)\nsAtomTable.obj               \
+        .\$(OBJDIR)\nsBTree.obj                   \
+        .\$(OBJDIR)\nsBuffer.obj                  \
+        .\$(OBJDIR)\nsByteBuffer.obj              \
+        .\$(OBJDIR)\nsCRT.obj                     \
+        .\$(OBJDIR)\nsConjoiningEnumerator.obj    \
+        .\$(OBJDIR)\nsDeque.obj                   \
+        .\$(OBJDIR)\nsEmptyEnumerator.obj         \
+        .\$(OBJDIR)\nsEnumeratorUtils.obj         \
+        .\$(OBJDIR)\nsHashtable.obj               \
+        .\$(OBJDIR)\nsObserver.obj                \
+        .\$(OBJDIR)\nsObserverList.obj            \
+        .\$(OBJDIR)\nsObserverService.obj         \
+        .\$(OBJDIR)\nsPageMgr.obj                 \
+        .\$(OBJDIR)\nsPipe.obj                    \
+        .\$(OBJDIR)\nsProperties.obj              \
+        .\$(OBJDIR)\nsQuickSort.obj               \
+        .\$(OBJDIR)\nsRBTree.obj                  \
+        .\$(OBJDIR)\nsSizeOfHandler.obj           \
+        .\$(OBJDIR)\nsStr.obj                     \
+        .\$(OBJDIR)\nsString.obj                  \
+        .\$(OBJDIR)\nsString2.obj                 \
+        .\$(OBJDIR)\nsStringImpl.obj              \
+        .\$(OBJDIR)\nsSupportsArray.obj           \
+        .\$(OBJDIR)\nsSupportsArrayEnumerator.obj \
+        .\$(OBJDIR)\nsUnicharBuffer.obj           \
+        .\$(OBJDIR)\nsVariant.obj                 \
+        .\$(OBJDIR)\nsVoidArray.obj               \
+        .\$(OBJDIR)\nsXPIDLString.obj             \
+        .\$(OBJDIR)\plvector.obj                  \
+        $(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+
+libs:: $(LIBRARY)
+	$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
+
+clobber::
+        rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
diff --git a/mozilla/xpcom/io/Makefile.in b/mozilla/xpcom/io/Makefile.in
new file mode 100644
index 00000000000..7b0c5e24f7a
--- /dev/null
+++ b/mozilla/xpcom/io/Makefile.in
@@ -0,0 +1,75 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH=../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+include $(topsrcdir)/config/config.mk
+
+LIBRARY_NAME = xpcomio_s
+
+MODULE = xpcom
+
+XPIDLSRCS =			\
+	$(NULL)
+
+CPPSRCS =				\
+	nsByteBufferInputStream.cpp  \
+	nsEscape.cpp                 \
+	nsFileSpec.cpp               \
+	nsFileSpecStreaming.cpp      \
+	nsFileStream.cpp             \
+	nsIFileStream.cpp            \
+	nsIStringStream.cpp          \
+	nsSpecialSystemDirectory.cpp \
+	nsUnicharInputStream.cpp     \
+	$(NULL)
+
+EXPORTS = \
+	nsEscape.h                 \
+	nsFileSpec.h               \
+	nsFileSpecStreaming.h      \
+	nsFileStream.h             \
+	nsIBaseStream.h            \
+	nsIByteBufferInputStream.h \
+	nsIFileStream.h            \
+	nsIInputStream.h           \
+	nsIOutputStream.h          \
+	nsIStringStream.h          \
+	nsIUnicharInputStream.h    \
+	nsSpecialSystemDirectory.h \
+	$(NULL)			
+
+
+EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
+
+DEFINES = -D_IMPL_NS_COM -D_IMPL_NS_BASE
+
+REQUIRES = xpcom uconv unicharutil
+
+MKSHLIB :=
+
+# we don't want the shared lib, but we want to force the creation of a static lib.
+override NO_SHARED_LIB=1
+override NO_STATIC_LIB=
+
+include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/xpcom/io/makefile.win b/mozilla/xpcom/io/makefile.win
new file mode 100644
index 00000000000..65bce12162b
--- /dev/null
+++ b/mozilla/xpcom/io/makefile.win
@@ -0,0 +1,75 @@
+#!nmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+IGNORE_MANIFEST=1
+
+DEPTH=..\..
+MODULE = xpcom 
+
+################################################################################
+## exports
+
+EXPORTS =                          \
+        nsEscape.h                 \
+        nsFileSpec.h               \
+        nsFileSpecStreaming.h      \
+        nsFileStream.h             \
+        nsIBaseStream.h            \
+        nsIByteBufferInputStream.h \
+        nsIFileStream.h            \
+        nsIInputStream.h           \
+        nsIOutputStream.h          \
+        nsIStringStream.h          \
+        nsIUnicharInputStream.h    \
+        nsSpecialSystemDirectory.h \
+        $(NULL)			
+
+XPIDLSRCS =               \
+        $(NULL)
+
+################################################################################
+## library
+
+LIBRARY_NAME=xpcomio_s
+
+LINCS =                         \
+	-I$(PUBLIC)\xpcom       \
+        -I$(PUBLIC)\uconv       \
+        -I$(PUBLIC)\unicharutil \
+	$(NULL)
+
+LCFLAGS = -D_IMPL_NS_COM -D_IMPL_NS_BASE -DWIN32_LEAN_AND_MEAN
+
+CPP_OBJS =                                       \
+        .\$(OBJDIR)\nsByteBufferInputStream.obj  \
+        .\$(OBJDIR)\nsEscape.obj                 \
+        .\$(OBJDIR)\nsFileSpec.obj               \
+        .\$(OBJDIR)\nsFileSpecStreaming.obj      \
+        .\$(OBJDIR)\nsFileStream.obj             \
+        .\$(OBJDIR)\nsIFileStream.obj            \
+        .\$(OBJDIR)\nsIStringStream.obj          \
+        .\$(OBJDIR)\nsSpecialSystemDirectory.obj \
+        .\$(OBJDIR)\nsUnicharInputStream.obj     \
+        $(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+
+libs:: $(LIBRARY)
+	$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
+
+clobber::
+        rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
diff --git a/mozilla/xpcom/threads/Makefile.in b/mozilla/xpcom/threads/Makefile.in
new file mode 100644
index 00000000000..d874da2d825
--- /dev/null
+++ b/mozilla/xpcom/threads/Makefile.in
@@ -0,0 +1,79 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH=../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+include $(topsrcdir)/config/config.mk
+
+LIBRARY_NAME = xpcomthreads_s
+
+MODULE = xpcom
+
+XPIDLSRCS =			\
+	$(NULL)
+
+CPPSRCS =				\
+	nsEventQueue.cpp		\
+	nsEventQueueService.cpp		\
+	nsThread.cpp			\
+	$(NULL)
+
+EXPORTS = \
+	nsAutoLock.h           \
+	nsIEventQueue.h        \
+	nsIEventQueueService.h \
+	nsIThread.h            \
+	$(NULL)			
+
+ifdef TIMER_IN_XPCOM
+CPPSRCS += nsTimer_$(MOZ_TOOLKIT).cpp
+
+EXPORTS += \
+	nsITimer.h             \
+	nsITimerCallback.h     \
+	$(NULL)			
+endif
+
+
+EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
+
+LOCAL_INCLUDES = -I$(srcdir)/../components
+
+DEFINES += -D_IMPL_NS_WIDGET
+
+REQUIRES = xpcom
+
+MKSHLIB :=
+
+# we don't want the shared lib, but we want to force the creation of a static lib.
+override NO_SHARED_LIB=1
+override NO_STATIC_LIB=
+
+ifdef TIMER_IN_XPCOM
+# For nsTimer_$(MOZ_TOOLKIT).cpp
+# The following is required by gtk, xlib, photon
+# motif and rhapsody didn't need it
+CXXFLAGS	+= $(TK_CFLAGS)
+endif
+
+include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/xpcom/threads/makefile.win b/mozilla/xpcom/threads/makefile.win
new file mode 100644
index 00000000000..17b6e7d5318
--- /dev/null
+++ b/mozilla/xpcom/threads/makefile.win
@@ -0,0 +1,63 @@
+#!nmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+IGNORE_MANIFEST=1
+
+DEPTH=..\..
+MODULE = xpcom 
+
+################################################################################
+## exports
+
+EXPORTS =                      \
+        nsAutoLock.h           \
+        nsIEventQueue.h        \
+        nsIEventQueueService.h \
+        nsIThread.h            \
+        nsITimer.h             \
+        nsITimerCallback.h     \
+        $(NULL)			
+
+XPIDLSRCS =               \
+        $(NULL)
+
+################################################################################
+## library
+
+LIBRARY_NAME=xpcomthreads_s
+
+LINCS =                   \
+	-I$(PUBLIC)\xpcom \
+	-I..\components   \
+	$(NULL)
+
+LCFLAGS = -D_IMPL_NS_COM -D_IMPL_NS_BASE -DWIN32_LEAN_AND_MEAN
+
+CPP_OBJS =                                  \
+        .\$(OBJDIR)\nsEventQueue.obj        \
+        .\$(OBJDIR)\nsEventQueueService.obj \
+        .\$(OBJDIR)\nsThread.obj            \
+        .\$(OBJDIR)\nsTimer_win.obj         \
+        $(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+
+libs:: $(LIBRARY)
+	$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
+
+clobber::
+        rm -f $(DIST)\lib\$(LIBRARY_NAME).lib