diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9ff1d8f09d4..ff9e323159e 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2000-11-22  Loren J. Rittle  <ljrittle@acm.org>
+
+        * g++.old-deja/g++.robertl/eb39.C: Don't include libio.h.
+
 2000-11-22  Jakub Jelinek  <jakub@redhat.com>
 
 	* gcc.c-torture/execute/ieee/20001122-1.c: New test.
@@ -61,6 +65,7 @@
 
 	* gcc.dg/20001117-1.c: New test.
 
+>>>>>>> 1.855
 2000-11-18  Richard Henderson  <rth@redhat.com>
 
 	* gcc.c-torture/execute/nestfunc-3.c (main): Mask result to 32 bits.
diff --git a/gcc/testsuite/g++.old-deja/g++.robertl/eb39.C b/gcc/testsuite/g++.old-deja/g++.robertl/eb39.C
index edf6ad42420..504e2c46cbb 100644
--- a/gcc/testsuite/g++.old-deja/g++.robertl/eb39.C
+++ b/gcc/testsuite/g++.old-deja/g++.robertl/eb39.C
@@ -2,7 +2,7 @@
 #include <ctype.h>
 #include <iostream.h>
 // #include <streambuf.h>
-#include <libio.h>
+// #include <libio.h>
 #include <strstream.h>
 #include <string.h>