diff -ruN surf-1.0.4/gtkgui/MainWindowController.cc surf-1.0.4-patched/gtkgui/MainWindowController.cc
--- surf-1.0.4/gtkgui/MainWindowController.cc	2000-07-21 17:04:44.000000000 -0400
+++ surf-1.0.4-patched/gtkgui/MainWindowController.cc	2005-03-17 15:13:29.000000000 -0500
@@ -28,7 +28,7 @@
 
 #include <gtk/gtkitemfactory.h>
 
-#include <strstream.h>
+#include <strstream>
 
 // #define DEBUG
 #include "debug.h"
diff -ruN surf-1.0.4/gtkgui/Requester.cc surf-1.0.4-patched/gtkgui/Requester.cc
--- surf-1.0.4/gtkgui/Requester.cc	2000-03-12 12:02:00.000000000 -0500
+++ surf-1.0.4-patched/gtkgui/Requester.cc	2005-03-17 15:13:29.000000000 -0500
@@ -25,7 +25,7 @@
 
 #include <assert.h>
 #include <iostream.h>
-#include <strstream.h>
+#include <strstream>
 
 #include <gtk/gtk.h>
 
diff -ruN surf-1.0.4/gtkgui/SaveImageDialog.cc surf-1.0.4-patched/gtkgui/SaveImageDialog.cc
--- surf-1.0.4/gtkgui/SaveImageDialog.cc	2000-03-12 12:02:00.000000000 -0500
+++ surf-1.0.4-patched/gtkgui/SaveImageDialog.cc	2005-03-17 15:14:23.000000000 -0500
@@ -23,10 +23,12 @@
  */
 
 
-#include <strstream.h>
+#include <strstream>
 
 #include "SaveImageDialog.h"
 
+using std::ostrstream;
+
 void SaveImageDialog::toggled_dither_method (GtkWidget *w, gpointer data)
 {
 	SaveImageDialog *sid = (SaveImageDialog *)data;
diff -ruN surf-1.0.4/gtkgui/mycolor.cc surf-1.0.4-patched/gtkgui/mycolor.cc
--- surf-1.0.4/gtkgui/mycolor.cc	2000-06-14 08:32:52.000000000 -0400
+++ surf-1.0.4-patched/gtkgui/mycolor.cc	2005-03-17 15:13:29.000000000 -0500
@@ -26,7 +26,7 @@
 #include <assert.h>
 #include <iostream.h>
 #include <stdlib.h>
-#include <strstream.h>
+#include <strstream>
 
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
diff -ruN surf-1.0.4/misc/Misc.h surf-1.0.4-patched/misc/Misc.h
--- surf-1.0.4/misc/Misc.h	2000-03-12 12:02:00.000000000 -0500
+++ surf-1.0.4-patched/misc/Misc.h	2005-03-17 15:13:29.000000000 -0500
@@ -26,7 +26,9 @@
 #ifndef MISC_H
 #define MISC_H
 
-#include <strstream.h>
+#include <strstream>
+
+using std::ostrstream;
 
 class Misc
 {