diff --git a/mozilla/base/public/makefile.win b/mozilla/base/public/makefile.win
index 404ffd9763c..2640812349b 100644
--- a/mozilla/base/public/makefile.win
+++ b/mozilla/base/public/makefile.win
@@ -22,6 +22,8 @@ DEFINES = -D_IMPL_NS_BASE
 
 EXPORTS =		\
     nsISizeOfHandler.h	\
+	nsFileSpec.h \
+	nsFileStream.h \
     $(NULL)
 
 MODULE = raptor 
diff --git a/mozilla/base/src/makefile.win b/mozilla/base/src/makefile.win
index 615f99a7919..11147c85de1 100644
--- a/mozilla/base/src/makefile.win
+++ b/mozilla/base/src/makefile.win
@@ -36,6 +36,8 @@ CPPSRCS =				\
 	nsUnicharBuffer.cpp		\
 	nsUnicharInputStream.cpp	\
 	nsVoidArray.cpp			\
+	nsFileSpec.cpp \
+	nsFileStream.cpp \
 	$(NULL)
 
 CPP_OBJS =					\
@@ -51,6 +53,8 @@ CPP_OBJS =					\
 	.\$(OBJDIR)\nsUnicharBuffer.obj		\
 	.\$(OBJDIR)\nsUnicharInputStream.obj	\
 	.\$(OBJDIR)\nsVoidArray.obj		\
+	.\$(OBJDIR)\nsFileSpec.obj \
+	.\$(OBJDIR)\nsFileStream.obj \
 	$(NULL)
 
 EXPORTS=nscore.h nsIArena.h nsIAtom.h nsIByteBuffer.h \
@@ -66,7 +70,7 @@ MODULE=raptor
 REQUIRES=xpcom netlib raptor 
 
 LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\netlib \
-    -I$(PUBLIC)\raptor 
+    -I$(PUBLIC)\raptor
 
 MAKE_OBJ_TYPE = DLL
 DLLNAME = raptorbase
diff --git a/mozilla/base/src/nsFileSpec.cpp b/mozilla/base/src/nsFileSpec.cpp
index 953dbbe3834..2990bee76b3 100644
--- a/mozilla/base/src/nsFileSpec.cpp
+++ b/mozilla/base/src/nsFileSpec.cpp
@@ -156,7 +156,7 @@ char* nsFileSpecHelpers::GetLeaf(const char* inPath, char inSeparator)
 
 
 #if defined(XP_PC)
-#include "nsFileSpecWin.cpp" // Windows-specific implementations
+#include "windows/nsFileSpecWin.cpp" // Windows-specific implementations
 #elif defined(XP_MAC)
 #include "nsFileSpecMac.cpp" // Macintosh-specific implementations
 #elif defined(XP_UNIX)
diff --git a/mozilla/base/src/nsFileStream.cpp b/mozilla/base/src/nsFileStream.cpp
index 0569bb4b23a..9158d06256f 100644
--- a/mozilla/base/src/nsFileStream.cpp
+++ b/mozilla/base/src/nsFileStream.cpp
@@ -34,6 +34,10 @@
 #include <Errors.h>
 #endif
 
+#ifdef NS_USING_STL
+using std::endl;
+using std::cout;
+#endif
 
 //========================================================================================
 //          nsBasicFileStream
diff --git a/mozilla/xpcom/io/nsFileSpec.cpp b/mozilla/xpcom/io/nsFileSpec.cpp
index 953dbbe3834..2990bee76b3 100644
--- a/mozilla/xpcom/io/nsFileSpec.cpp
+++ b/mozilla/xpcom/io/nsFileSpec.cpp
@@ -156,7 +156,7 @@ char* nsFileSpecHelpers::GetLeaf(const char* inPath, char inSeparator)
 
 
 #if defined(XP_PC)
-#include "nsFileSpecWin.cpp" // Windows-specific implementations
+#include "windows/nsFileSpecWin.cpp" // Windows-specific implementations
 #elif defined(XP_MAC)
 #include "nsFileSpecMac.cpp" // Macintosh-specific implementations
 #elif defined(XP_UNIX)
diff --git a/mozilla/xpcom/io/nsFileStream.cpp b/mozilla/xpcom/io/nsFileStream.cpp
index 0569bb4b23a..9158d06256f 100644
--- a/mozilla/xpcom/io/nsFileStream.cpp
+++ b/mozilla/xpcom/io/nsFileStream.cpp
@@ -34,6 +34,10 @@
 #include <Errors.h>
 #endif
 
+#ifdef NS_USING_STL
+using std::endl;
+using std::cout;
+#endif
 
 //========================================================================================
 //          nsBasicFileStream