--- a/src/defun.cc	Sun Apr 16 19:10:01 2006 +0000
+++ b/src/defun.cc	Mon Apr 17 05:05:17 2006 +0000
@@ -25,6 +25,7 @@
 #include <config.h>
 #endif
 
+#include <sstream>
 #include <iostream>
 #include <string>
 
@@ -56,7 +57,7 @@
 
       if (h.length () > 0)
 	{
-	  OSSTREAM buf;
+	  std::ostringstream buf;
 
 	  buf << "\nInvalid call to " << nm << ".  Correct usage is:\n\n";
 
@@ -69,11 +70,7 @@
 	  if (! just_usage)
 	    additional_help_message (buf);
 
-	  buf << OSSTREAM_ENDS;
-
-	  defun_usage_message (OSSTREAM_STR (buf));
-
-	  OSSTREAM_FREEZE (buf);
+	  defun_usage_message (buf.str ());
 	}
     }
   else