diff --git a/samples/PSVIWriter/PSVIWriter.cpp b/samples/PSVIWriter/PSVIWriter.cpp
index 4e573a2d8d824f99da02e002b639fb1feee50279..189d15518e237e9206edc4db46e7324b915a03f8 100644
--- a/samples/PSVIWriter/PSVIWriter.cpp
+++ b/samples/PSVIWriter/PSVIWriter.cpp
@@ -57,6 +57,9 @@
 //REVISIT
 /*
  * $Log$
+ * Revision 1.3  2004/02/10 17:36:38  cargilld
+ * Fix build problems.
+ *
  * Revision 1.2  2004/02/09 13:23:45  cargilld
  * Fix build problems and update usage.
  *
@@ -276,7 +279,7 @@ int main(int argC, char* argV[])
     unsigned long duration;
 
     bool more = true;
-    ifstream fin;
+    XERCES_STD_QUALIFIER ifstream fin;
 
     // the input is a list file
     if (doList) //REVISIT
diff --git a/samples/PSVIWriter/PSVIWriter.hpp b/samples/PSVIWriter/PSVIWriter.hpp
index 27eea1d058f52ea03bdab9e9d270ce533015f5b3..df01869e9d4933c8d1a819bcd4c93fdbd1bbc41c 100644
--- a/samples/PSVIWriter/PSVIWriter.hpp
+++ b/samples/PSVIWriter/PSVIWriter.hpp
@@ -65,11 +65,15 @@
 #include "PSVIWriterHandlers.hpp"
 #include <stdlib.h>
 #include <string.h>
-#include <iostream.h>
 #include <xercesc/util/PlatformUtils.hpp>
 #include <xercesc/util/XMLUni.hpp>
 #include <xercesc/sax2/XMLReaderFactory.hpp>
 #include <xercesc/sax2/SAX2XMLReader.hpp>
+#if defined(XERCES_NEW_IOSTREAMS)
+#include <iostream>
+#else
+#include <iostream.h>
+#endif
 
 
 // ---------------------------------------------------------------------------
@@ -111,7 +115,7 @@ private :
     char*   fLocalForm;
 };
 
-inline ostream& operator<<(ostream& target, const StrX& toDump)
+inline XERCES_STD_QUALIFIER ostream& operator<<(XERCES_STD_QUALIFIER ostream& target, const StrX& toDump)
 {
     target << toDump.localForm();
     return target;