diff --git a/tests/XSerializerTest/Makefile.in b/tests/XSerializerTest/Makefile.in
index 051706b3e97831bef31812f420e840648abc9e65..90c6f9a11a5b2dc31446ed5e2cb48e7075c180f4 100644
--- a/tests/XSerializerTest/Makefile.in
+++ b/tests/XSerializerTest/Makefile.in
@@ -89,6 +89,7 @@ EXEC=	${XERCESCROOT}/bin
 OBJS=	${OUTDIR}/XSerializerTest.o ${OUTDIR}/SAXCountHandlers.o
 SRC=	${XERCESCROOT}/tests/${APP_DIR}
 EXTSRC= ${XERCESCROOT}/samples/SAXCount
+INCLUDES= -I. -I../../samples/SAXCount -I${XERCESCROOT}/include
 HEADER_FILES= ${SRC}/XSerializerTest.hpp ${EXTSRC}/SAXCountHandlers.hpp
 
 ## OS390BATCH
@@ -112,7 +113,7 @@ $(OUTDIR)/XSerializerTest.o:: ${SRC}/XSerializerTest.cpp ${HEADER_FILES}
 	${CC} ${INCLUDES} ${CMP} -o $(OUTDIR)/XSerializerTest.o ${SRC}/XSerializerTest.cpp
 
 $(OUTDIR)/SAXCountHandlers.o:: ${EXTSRC}/SAXCountHandlers.cpp ${HEADER_FILES}
-	${CC} ${INCLUDES} ${CMP} -o $(OUTDIR)/SAXCountHandlers.o ${SRC}/SAXCountHandlers.cpp
+	${CC} ${INCLUDES} ${CMP} -o $(OUTDIR)/SAXCountHandlers.o ${EXTSRC}/SAXCountHandlers.cpp
 
 clean::
 	rm -f ${OBJS} ${EXEC}/${APP_NAME}
diff --git a/tests/XSerializerTest/XSerializerTest.cpp b/tests/XSerializerTest/XSerializerTest.cpp
index 28c832fddced3c7b4533eee3e83e3aa1d330e9f5..5d5dd564538b2265b4544dbbd4756a26734f8019 100644
--- a/tests/XSerializerTest/XSerializerTest.cpp
+++ b/tests/XSerializerTest/XSerializerTest.cpp
@@ -57,6 +57,9 @@
 /*
 * $Id$
 * $Log$
+* Revision 1.2  2003/12/13 20:17:18  neilg
+* fix compilation errors under gcc
+*
 * Revision 1.1  2003/12/12 18:17:25  peiyongz
 * XSerializerTest
 *
@@ -227,8 +230,8 @@ static bool getAndSaveGrammar(const char* const xmlFile)
         //do emit error here so that we know serialization failure
         if (showSerializationError)
         {
-            cerr << "An error occurred during serialization\n   Message: "
-             << StrX(e.getMessage()) << endl;
+            XERCES_STD_QUALIFIER cerr << "An error occurred during serialization\n   Message: "
+             << StrX(e.getMessage()) << XERCES_STD_QUALIFIER endl;
         }
         retVal = false;
     }
@@ -251,8 +254,8 @@ static bool restoreGrammar()
     {
         if (showSerializationError)
         {
-            cerr << "An error occurred during de-serialization\n   Message: "
-                << StrX(e.getMessage()) << endl;
+            XERCES_STD_QUALIFIER cerr << "An error occurred during de-serialization\n   Message: "
+                << StrX(e.getMessage()) << XERCES_STD_QUALIFIER endl;
         }
 
         destroyParser();