--- a/src/oct-stream.h	Thu Apr 24 09:01:13 1997 +0000
+++ b/src/oct-stream.h	Thu Apr 24 09:10:13 1997 +0000
@@ -23,18 +23,21 @@
 #if !defined (octave_octave_stream_h)
 #define octave_octave_stream_h 1
 
-#include <string>
+class Matrix;
+class string_vector;
+class octave_value;
+class octave_value_list;
 
-#include <iostream.h>
-#include <strstream.h>
+class istream;
+class ostream;
+class ostrstream;
+
+#include <string>
 
 #include "Array.h"
 #include "data-conv.h"
 #include "mach-info.h"
 
-#include "oct-obj.h"
-#include "str-vec.h"
-
 struct
 scanf_format_elt
 {