diff -NrU3 surf-1.0.5.orig/curve/Bezout.h surf-1.0.5/curve/Bezout.h
--- surf-1.0.5.orig/curve/Bezout.h	2008-07-09 15:20:35.000000000 +0200
+++ surf-1.0.5/curve/Bezout.h	2008-07-09 17:42:33.000000000 +0200
@@ -26,7 +26,9 @@
 #ifndef Bezout_h
 #define Bezout_h
 
-#include <iostream.h>
+
+#include <iostream>
+using namespace std;
 
 #include "TreePolynom.h"
 #include "Monom.h"
diff -NrU3 surf-1.0.5.orig/curve/BigInteger.h surf-1.0.5/curve/BigInteger.h
--- surf-1.0.5.orig/curve/BigInteger.h	2008-07-09 15:20:35.000000000 +0200
+++ surf-1.0.5/curve/BigInteger.h	2008-07-09 17:42:33.000000000 +0200
@@ -26,7 +26,9 @@
 #ifndef BIGINTEGER_H
 #define BIGINTEGER_H
 
-#include <iostream.h>
+
+#include <iostream>
+using namespace std;
 
 #include "mygmp.h"
 
diff -NrU3 surf-1.0.5.orig/curve/Monom.h surf-1.0.5/curve/Monom.h
--- surf-1.0.5.orig/curve/Monom.h	2008-07-09 15:20:35.000000000 +0200
+++ surf-1.0.5/curve/Monom.h	2008-07-09 17:42:33.000000000 +0200
@@ -26,11 +26,13 @@
 #ifndef CMonom_H
 #define CMonom_H
 
-#include <stdlib.h>
-#include <string.h>
-#include <iostream.h>
 
-#include "doubleMath.h"
+#include <cstdlib>
+#include <cstring>
+#include <iostream>
+using namespace std;
+
+#include "BigInteger.h"
 
 
 template<class Coeff, int num> 
@@ -122,7 +124,7 @@
 template<class Coeff,  int num> 
 inline void negate(CMonom<Coeff,num> &m)
 {
-	negate(m.getCoeff());
+	::negate(m.getCoeff());
 }
 
 
diff -NrU3 surf-1.0.5.orig/curve/mygmp.h surf-1.0.5/curve/mygmp.h
--- surf-1.0.5.orig/curve/mygmp.h	2008-07-09 15:20:35.000000000 +0200
+++ surf-1.0.5/curve/mygmp.h	2008-07-09 17:42:33.000000000 +0200
@@ -32,7 +32,9 @@
 #include <gmp.h>
 #endif
 
-#include <iostream.h>
+
+#include <iostream>
+using namespace std;
 
 extern void mpz_lcm (mpz_t lcm, mpz_t op1, mpz_t op2);
 extern ostream & operator << (ostream &os, mpz_t z);
diff -NrU3 surf-1.0.5.orig/curve/RBTree.cc surf-1.0.5/curve/RBTree.cc
--- surf-1.0.5.orig/curve/RBTree.cc	2008-07-09 15:20:35.000000000 +0200
+++ surf-1.0.5/curve/RBTree.cc	2008-07-09 17:42:38.000000000 +0200
@@ -23,7 +23,9 @@
  */
 
 
-#include <iostream.h>
+
+#include <iostream>
+using namespace std;
 #include <assert.h>
 
 #include "RBTree.h"
diff -NrU3 surf-1.0.5.orig/curve/RBTree.h surf-1.0.5/curve/RBTree.h
--- surf-1.0.5.orig/curve/RBTree.h	2008-07-09 15:20:35.000000000 +0200
+++ surf-1.0.5/curve/RBTree.h	2008-07-09 17:42:33.000000000 +0200
@@ -26,8 +26,10 @@
 #ifndef RBTREE_H
 #define RBTREE_H
 
+
 #include <assert.h>
-#include <iostream.h>
+#include <iostream>
+using namespace std;
 
 #include "debug.h"
 
diff -NrU3 surf-1.0.5.orig/curve/RootFinder2d.cc surf-1.0.5/curve/RootFinder2d.cc
--- surf-1.0.5.orig/curve/RootFinder2d.cc	2008-07-09 15:20:35.000000000 +0200
+++ surf-1.0.5/curve/RootFinder2d.cc	2008-07-09 17:42:38.000000000 +0200
@@ -24,7 +24,8 @@
 
 
 #include <assert.h>
-#include <iostream.h>
+#include <iostream>
+using namespace std;
 
 #include "RootFinder2d.h"
 #include "degree.h"
diff -NrU3 surf-1.0.5.orig/curve/RootFinder3d.cc surf-1.0.5/curve/RootFinder3d.cc
--- surf-1.0.5.orig/curve/RootFinder3d.cc	2008-07-09 15:20:35.000000000 +0200
+++ surf-1.0.5/curve/RootFinder3d.cc	2008-07-09 17:42:38.000000000 +0200
@@ -24,7 +24,8 @@
 
 
 #include <assert.h>
-#include <iostream.h>
+#include <iostream>
+using namespace std;
 #include <math.h>
 
 #include "degree.h"
diff -NrU3 surf-1.0.5.orig/curve/TreePolynom.h surf-1.0.5/curve/TreePolynom.h
--- surf-1.0.5.orig/curve/TreePolynom.h	2008-07-09 15:20:35.000000000 +0200
+++ surf-1.0.5/curve/TreePolynom.h	2008-07-09 17:42:33.000000000 +0200
@@ -26,12 +26,14 @@
 #ifndef TREEPOLYNOM_H
 #define TREEPOLYNOM_H
 
-#include <iostream.h>
+#include <iostream>
+using namespace std;
 
 #include "defs.h"
 #include "debug.h"
 #include "RBTree.h"
 #include "RefCounter.h"
+#include "Monom.h"
 
 template<class Monom> 
 class TreePolynomNode : public RBNode
@@ -200,7 +202,7 @@
 	
 	TreePolynomNode<Monom> *x = new TreePolynomNode<Monom>();
 	x->monom = mon;
-	negate(x->monom);
+	::negate(x->monom);
 	if (parent) {
 		// cmp might not be used uninitialized, because if parent != 0 we made a
 		// call to cmp = lexorder(mon, current->monom) (see above)
diff -NrU3 surf-1.0.5.orig/debug/debug.cc surf-1.0.5/debug/debug.cc
--- surf-1.0.5.orig/debug/debug.cc	2008-07-09 15:20:35.000000000 +0200
+++ surf-1.0.5/debug/debug.cc	2008-07-09 17:42:38.000000000 +0200
@@ -23,7 +23,8 @@
  */
 
 
-#include <iostream.h>
+#include <iostream>
+using namespace std;
 #include <string.h>
 
 #include "debug.h"
diff -NrU3 surf-1.0.5.orig/debug/debug.h surf-1.0.5/debug/debug.h
--- surf-1.0.5.orig/debug/debug.h	2008-07-09 15:20:35.000000000 +0200
+++ surf-1.0.5/debug/debug.h	2008-07-09 17:42:33.000000000 +0200
@@ -26,7 +26,9 @@
 #ifndef DEBUG_H
 #define DEBUG_H
 
-#include <iostream.h>
+
+#include <iostream>
+using namespace std;
 
 class FunctionCall
 {
diff -NrU3 surf-1.0.5.orig/debug/Timer.h surf-1.0.5/debug/Timer.h
--- surf-1.0.5.orig/debug/Timer.h	2008-07-09 15:20:35.000000000 +0200
+++ surf-1.0.5/debug/Timer.h	2008-07-09 17:42:33.000000000 +0200
@@ -26,8 +26,10 @@
 #ifndef TIMER_H
 #define TIMER_H
 
-#include <time.h>
-#include <iostream.h>
+
+#include <ctime>
+#include <iostream>
+using namespace std;
 
 #define TIMER(s) Timer aTimer(s)
 class Timer
diff -NrU3 surf-1.0.5.orig/draw/NewClip.cc surf-1.0.5/draw/NewClip.cc
--- surf-1.0.5.orig/draw/NewClip.cc	2008-07-09 15:20:35.000000000 +0200
+++ surf-1.0.5/draw/NewClip.cc	2008-07-09 17:42:38.000000000 +0200
@@ -23,7 +23,8 @@
  */
 
 
-#include <iostream.h>
+#include <iostream>
+using namespace std;
 
 #include "NewClip.h"
 #include "NewClipSphereParallel.h"
diff -NrU3 surf-1.0.5.orig/drawfunc/DrawFunc.cc surf-1.0.5/drawfunc/DrawFunc.cc
--- surf-1.0.5.orig/drawfunc/DrawFunc.cc	2008-07-09 15:20:35.000000000 +0200
+++ surf-1.0.5/drawfunc/DrawFunc.cc	2008-07-09 17:42:38.000000000 +0200
@@ -24,9 +24,11 @@
 
 
 
+
 #include <stdio.h>
-#include <math.h>
-#include <iostream.h>
+#include <cmath>
+#include <iostream>
+using namespace std;
 
 #include "Script.h"
 
diff -NrU3 surf-1.0.5.orig/drawfunc/Monomial.h surf-1.0.5/drawfunc/Monomial.h
--- surf-1.0.5.orig/drawfunc/Monomial.h	2008-07-09 15:20:35.000000000 +0200
+++ surf-1.0.5/drawfunc/Monomial.h	2008-07-09 17:42:33.000000000 +0200
@@ -28,8 +28,10 @@
 #ifndef CLMONOM_H
 #define CLMONOM_H
 
-#include <math.h>
-#include <iostream.h>
+
+#include <cmath>
+#include <iostream>
+using namespace std;
 
 #include "simple.h"
 #include "monomarith.h"
diff -NrU3 surf-1.0.5.orig/drawfunc/MultiVariatePolynom.h surf-1.0.5/drawfunc/MultiVariatePolynom.h
--- surf-1.0.5.orig/drawfunc/MultiVariatePolynom.h	2008-07-09 15:20:35.000000000 +0200
+++ surf-1.0.5/drawfunc/MultiVariatePolynom.h	2008-07-09 17:42:33.000000000 +0200
@@ -28,7 +28,9 @@
 #ifndef CLMULTIPOLY_H
 #define CLMULTIPOLY_H
 
-#include <iostream.h>
+
+#include <iostream>
+using namespace std;
 
 #define  VARIABLE_X         0
 #define  VARIABLE_Y         1
diff -NrU3 surf-1.0.5.orig/gtkgui/ClipWindow.cc surf-1.0.5/gtkgui/ClipWindow.cc
--- surf-1.0.5.orig/gtkgui/ClipWindow.cc	2008-07-09 15:20:35.000000000 +0200
+++ surf-1.0.5/gtkgui/ClipWindow.cc	2008-07-09 17:42:38.000000000 +0200
@@ -24,7 +24,8 @@
 
 
 #include <string.h>
-#include <iostream.h>
+#include <iostream>
+using namespace std;
 #include "ClipWindow.h"
 #include "RadioButtonBuilder.h"
 #include "OptionMenuBuilder.h"
diff -NrU3 surf-1.0.5.orig/gtkgui/ColorSelectionButton.cc surf-1.0.5/gtkgui/ColorSelectionButton.cc
--- surf-1.0.5.orig/gtkgui/ColorSelectionButton.cc	2008-07-09 15:20:35.000000000 +0200
+++ surf-1.0.5/gtkgui/ColorSelectionButton.cc	2008-07-09 17:42:38.000000000 +0200
@@ -25,7 +25,8 @@
 
 #include <assert.h>
 #include <stdio.h>
-#include <iostream.h>
+#include <iostream>
+using namespace std;
 
 #include "ColorSelectionButton.h"
 
diff -NrU3 surf-1.0.5.orig/gtkgui/ColorWindow.cc surf-1.0.5/gtkgui/ColorWindow.cc
--- surf-1.0.5.orig/gtkgui/ColorWindow.cc	2008-07-09 15:20:35.000000000 +0200
+++ surf-1.0.5/gtkgui/ColorWindow.cc	2008-07-09 17:51:38.000000000 +0200
@@ -23,8 +23,8 @@
  */
 
 
-#include<iostream>
-#include <string.h>
+#include <iostream>
+#include <cstring>
 
 #include "ColorWindow.h"
 #include "MainWindowController.h"
diff -NrU3 surf-1.0.5.orig/gtkgui/ConfigurationWindow.h surf-1.0.5/gtkgui/ConfigurationWindow.h
--- surf-1.0.5.orig/gtkgui/ConfigurationWindow.h	2008-07-09 15:20:35.000000000 +0200
+++ surf-1.0.5/gtkgui/ConfigurationWindow.h	2008-07-09 17:42:33.000000000 +0200
@@ -26,7 +26,8 @@
 #ifndef CONFIGURATIONWINDOW_H
 #define CONFIGURATIONWINDOW_H
 
-#include <iostream.h>
+#include <iostream>
+using namespace std;
 #include "mygtk.h"
 
 #include "ParameterWindow.h"
diff -NrU3 surf-1.0.5.orig/gtkgui/DitherWindow.cc surf-1.0.5/gtkgui/DitherWindow.cc
--- surf-1.0.5.orig/gtkgui/DitherWindow.cc	2008-07-09 15:20:35.000000000 +0200
+++ surf-1.0.5/gtkgui/DitherWindow.cc	2008-07-09 17:42:38.000000000 +0200
@@ -23,7 +23,8 @@
  */
 
 
-#include <iostream.h>
+#include <iostream>
+using namespace std;
 #include "DitherWindow.h"
 #include "RadioButtonBuilder.h"
 #include "TableBuilder.h"
diff -NrU3 surf-1.0.5.orig/gtkgui/Document.cc surf-1.0.5/gtkgui/Document.cc
--- surf-1.0.5.orig/gtkgui/Document.cc	2008-07-09 15:20:35.000000000 +0200
+++ surf-1.0.5/gtkgui/Document.cc	2008-07-09 17:42:38.000000000 +0200
@@ -24,7 +24,8 @@
 
 
 #include <assert.h>
-#include <iostream.h>
+#include <iostream>
+using namespace std;
 #include <stdio.h>
 #include <string.h>
 
diff -NrU3 surf-1.0.5.orig/gtkgui/DrawingArea.cc surf-1.0.5/gtkgui/DrawingArea.cc
--- surf-1.0.5.orig/gtkgui/DrawingArea.cc	2008-07-09 15:20:35.000000000 +0200
+++ surf-1.0.5/gtkgui/DrawingArea.cc	2008-07-09 17:42:38.000000000 +0200
@@ -23,7 +23,8 @@
  */
 
 
-#include <iostream.h>
+#include <iostream>
+using namespace std;
 
 #include <gdk/gdkx.h>
 
diff -NrU3 surf-1.0.5.orig/gtkgui/mycolor.cc surf-1.0.5/gtkgui/mycolor.cc
--- surf-1.0.5.orig/gtkgui/mycolor.cc	2008-07-09 15:20:35.000000000 +0200
+++ surf-1.0.5/gtkgui/mycolor.cc	2008-07-09 17:42:38.000000000 +0200
@@ -24,7 +24,8 @@
 
 
 #include <assert.h>
-#include <iostream.h>
+#include <iostream>
+using namespace std;
 #include <stdlib.h>
 #include <strstream>
 
diff -NrU3 surf-1.0.5.orig/gtkgui/mygtk.h surf-1.0.5/gtkgui/mygtk.h
--- surf-1.0.5.orig/gtkgui/mygtk.h	2008-07-09 15:20:35.000000000 +0200
+++ surf-1.0.5/gtkgui/mygtk.h	2008-07-09 17:42:33.000000000 +0200
@@ -28,7 +28,8 @@
 
 #include <stdlib.h>
 #include <gtk/gtk.h>
-#include <iostream.h>
+#include <iostream>
+using namespace std;
 
 #define RECALL(method,klass)							\
 static void _ ## method (klass *k)						\
diff -NrU3 surf-1.0.5.orig/gtkgui/NumericWindow.h surf-1.0.5/gtkgui/NumericWindow.h
--- surf-1.0.5.orig/gtkgui/NumericWindow.h	2008-07-09 15:20:35.000000000 +0200
+++ surf-1.0.5/gtkgui/NumericWindow.h	2008-07-09 17:42:33.000000000 +0200
@@ -26,7 +26,8 @@
 #ifndef NUMERICWINDOW_H
 #define NUMERICWINDOW_H
 
-#include <iostream.h>
+#include <iostream>
+using namespace std;
 #include <gtk/gtk.h>
 #include "mygtk.h"
 
diff -NrU3 surf-1.0.5.orig/gtkgui/ProgressDialog.cc surf-1.0.5/gtkgui/ProgressDialog.cc
--- surf-1.0.5.orig/gtkgui/ProgressDialog.cc	2008-07-09 15:20:35.000000000 +0200
+++ surf-1.0.5/gtkgui/ProgressDialog.cc	2008-07-09 17:42:38.000000000 +0200
@@ -23,7 +23,8 @@
  */
 
 
-#include <iostream.h>
+#include <iostream>
+using namespace std;
 
 #include "ProgressDialog.h"
 #include "Thread.h"
diff -NrU3 surf-1.0.5.orig/gtkgui/Requester.cc surf-1.0.5/gtkgui/Requester.cc
--- surf-1.0.5.orig/gtkgui/Requester.cc	2008-07-09 15:20:35.000000000 +0200
+++ surf-1.0.5/gtkgui/Requester.cc	2008-07-09 17:42:38.000000000 +0200
@@ -24,7 +24,8 @@
 
 
 #include <assert.h>
-#include <iostream.h>
+#include <iostream>
+using namespace std;
 #include <strstream>
 
 #include <gtk/gtk.h>
diff -NrU3 surf-1.0.5.orig/gtkgui/SaveImageDialog.cc surf-1.0.5/gtkgui/SaveImageDialog.cc
--- surf-1.0.5.orig/gtkgui/SaveImageDialog.cc	2008-07-09 15:20:35.000000000 +0200
+++ surf-1.0.5/gtkgui/SaveImageDialog.cc	2008-07-09 17:56:32.000000000 +0200
@@ -27,7 +27,7 @@
 
 #include "SaveImageDialog.h"
 
-using std::ostrstream;
+using namespace std;
 
 void SaveImageDialog::toggled_dither_method (GtkWidget *w, gpointer data)
 {
diff -NrU3 surf-1.0.5.orig/gtkgui/showAbout.cc surf-1.0.5/gtkgui/showAbout.cc
--- surf-1.0.5.orig/gtkgui/showAbout.cc	2008-07-09 15:20:35.000000000 +0200
+++ surf-1.0.5/gtkgui/showAbout.cc	2008-07-09 17:42:38.000000000 +0200
@@ -24,7 +24,8 @@
 
 
 #include <stdio.h>
-#include <iostream.h>
+#include <iostream>
+using namespace std;
 
 #include <gtk/gtk.h>
 
diff -NrU3 surf-1.0.5.orig/gtkgui/start.cc surf-1.0.5/gtkgui/start.cc
--- surf-1.0.5.orig/gtkgui/start.cc	2008-07-09 15:20:35.000000000 +0200
+++ surf-1.0.5/gtkgui/start.cc	2008-07-09 17:42:38.000000000 +0200
@@ -23,7 +23,8 @@
  */
 
 
-#include <iostream.h>
+#include <iostream>
+using namespace std;
 
 #include "mygtk.h"
 #include "GuiThread.h"
diff -NrU3 surf-1.0.5.orig/misc/Misc.cc surf-1.0.5/misc/Misc.cc
--- surf-1.0.5.orig/misc/Misc.cc	2008-07-09 15:20:35.000000000 +0200
+++ surf-1.0.5/misc/Misc.cc	2008-07-09 17:42:38.000000000 +0200
@@ -23,7 +23,8 @@
  */
 
 
-#include <iostream.h>
+#include <iostream>
+using namespace std;
 
 #include "Misc.h"
 
diff -NrU3 surf-1.0.5.orig/misc/Misc.h surf-1.0.5/misc/Misc.h
--- surf-1.0.5.orig/misc/Misc.h	2008-07-09 15:20:35.000000000 +0200
+++ surf-1.0.5/misc/Misc.h	2008-07-09 17:48:50.000000000 +0200
@@ -28,7 +28,7 @@
 
 #include <strstream>
 
-using std::ostrstream;
+using namespace std;
 
 class Misc
 {
diff -NrU3 surf-1.0.5.orig/mt/GuiThread.cc surf-1.0.5/mt/GuiThread.cc
--- surf-1.0.5.orig/mt/GuiThread.cc	2008-07-09 15:20:35.000000000 +0200
+++ surf-1.0.5/mt/GuiThread.cc	2008-07-09 17:42:38.000000000 +0200
@@ -27,7 +27,8 @@
 
 #include <unistd.h>
 #include <assert.h>
-#include <iostream.h>
+#include <iostream>
+using namespace std;
 #include <fcntl.h>
 #include <stdio.h>
 #include <errno.h>
diff -NrU3 surf-1.0.5.orig/mt/Thread.cc surf-1.0.5/mt/Thread.cc
--- surf-1.0.5.orig/mt/Thread.cc	2008-07-09 15:20:35.000000000 +0200
+++ surf-1.0.5/mt/Thread.cc	2008-07-09 17:42:38.000000000 +0200
@@ -23,7 +23,8 @@
  */
 
 
-#include <iostream.h>
+#include <iostream>
+using namespace std;
 #include <pthread.h>
 
 #include "Thread.h"
diff -NrU3 surf-1.0.5.orig/src/bit_buffer.cc surf-1.0.5/src/bit_buffer.cc
--- surf-1.0.5.orig/src/bit_buffer.cc	2008-07-09 15:20:35.000000000 +0200
+++ surf-1.0.5/src/bit_buffer.cc	2008-07-09 17:42:38.000000000 +0200
@@ -23,8 +23,10 @@
  */
 
 
-#include <limits.h>
-#include <iostream.h>
+
+#include <climits>
+#include <iostream>
+using namespace std;
 
 #include "bit_buffer.h"
 
diff -NrU3 surf-1.0.5.orig/src/main.cc surf-1.0.5/src/main.cc
--- surf-1.0.5.orig/src/main.cc	2008-07-09 15:20:35.000000000 +0200
+++ surf-1.0.5/src/main.cc	2008-07-09 17:42:38.000000000 +0200
@@ -22,7 +22,9 @@
  *
  */
 
-#include <iostream.h>
+
+#include <iostream>
+using namespace std;
 #include <string.h>
 #include <stdlib.h>
 #include <signal.h>
diff -NrU3 surf-1.0.5.orig/src/Options.cc surf-1.0.5/src/Options.cc
--- surf-1.0.5.orig/src/Options.cc	2008-07-09 15:20:35.000000000 +0200
+++ surf-1.0.5/src/Options.cc	2008-07-09 17:50:51.000000000 +0200
@@ -23,10 +23,12 @@
  */
 
 #include "Options.h"
-#include<iostream>
+#include <iostream>
 #include <string.h>
 #include <stdlib.h>
 
+using namespace std;
+
 #ifndef NO_GUI
 
 #include <gtk/gtk.h>
@@ -72,7 +74,7 @@
 			    strcmp(argv[i], "--exec") == 0) {
 				execute = true;
 			} else if(strcmp(argv[i], "--help") == 0) {
-				std::cerr << usage_text;
+				cerr << usage_text;
 				exit(0);
 			} else if(strcmp(argv[i], "--progress-dialog") == 0) {
 				progress_dialog = true;
@@ -80,11 +82,11 @@
 				auto_resize = true;
 			} else if(strcmp(argv[i], "-n") == 0 ||
 				  strcmp(argv[i], "--no-gui") == 0) {
-				std::cerr << "Error: \'" << argv[i] << "\' must be the only option\n\n"
+				cerr << "Error: \'" << argv[i] << "\' must be the only option\n\n"
 					  << usage_text;
 				exit(1);
 			} else {
-				std::cerr << "Error: unknown option \'" << argv[i] << "\'\n\n"
+				cerr << "Error: unknown option \'" << argv[i] << "\'\n\n"
 					  << usage_text;
 				exit(1);
 			}
diff -NrU3 surf-1.0.5.orig/src/RgbBuffer.cc surf-1.0.5/src/RgbBuffer.cc
--- surf-1.0.5.orig/src/RgbBuffer.cc	2008-07-09 15:20:35.000000000 +0200
+++ surf-1.0.5/src/RgbBuffer.cc	2008-07-09 17:42:38.000000000 +0200
@@ -34,9 +34,11 @@
 
 
 
-#include <math.h>
-#include <stdlib.h>
-#include <iostream.h>
+
+#include <cmath>
+#include <cstdlib>
+#include <iostream>
+using namespace std;
 #include <stdio.h>
 #include <string.h>
 
diff -NrU3 surf-1.0.5.orig/yaccsrc/bezierarith.cc surf-1.0.5/yaccsrc/bezierarith.cc
--- surf-1.0.5.orig/yaccsrc/bezierarith.cc	2008-07-09 15:20:35.000000000 +0200
+++ surf-1.0.5/yaccsrc/bezierarith.cc	2008-07-09 17:52:41.000000000 +0200
@@ -32,9 +32,9 @@
 /* Date:     8 march 96                                                      */
 /* ------------------------------------------------------------------------- */
 
-#include<stdio.h>
-#include<stdlib.h>
-#include<math.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cmath>
 
 #include"degree.h"
 #include"mymemory.h"
diff -NrU3 surf-1.0.5.orig/yaccsrc/mymemory.cc surf-1.0.5/yaccsrc/mymemory.cc
--- surf-1.0.5.orig/yaccsrc/mymemory.cc	2008-07-09 15:20:35.000000000 +0200
+++ surf-1.0.5/yaccsrc/mymemory.cc	2008-07-09 17:42:38.000000000 +0200
@@ -32,8 +32,10 @@
 /* Date:     14.8.94                                                         */
 /* ------------------------------------------------------------------------- */
 
-#include <iostream.h>
-#include <stdlib.h>
+
+#include <iostream>
+using namespace std;
+#include <cstdlib>
 
 #include "mymemory.h"
 
diff -NrU3 surf-1.0.5.orig/yaccsrc/polyx.h surf-1.0.5/yaccsrc/polyx.h
--- surf-1.0.5.orig/yaccsrc/polyx.h	2008-07-09 15:20:35.000000000 +0200
+++ surf-1.0.5/yaccsrc/polyx.h	2008-07-09 17:42:33.000000000 +0200
@@ -26,7 +26,8 @@
 #ifndef POLYX_H
 #define POLYX_H
 
-#include <iostream.h>
+#include <iostream>
+using namespace std;
 
 /*****************************************************************************/
 /*  POLYNIMIALS IN X                                                         */
diff -NrU3 surf-1.0.5.orig/yaccsrc/Script.cc surf-1.0.5/yaccsrc/Script.cc
--- surf-1.0.5.orig/yaccsrc/Script.cc	2008-07-09 15:20:35.000000000 +0200
+++ surf-1.0.5/yaccsrc/Script.cc	2008-07-09 17:46:13.000000000 +0200
@@ -27,13 +27,12 @@
 #include <stdio.h>
 #include <errno.h>
 
-#include <iostream.h>
+#include <iostream>
+using namespace std;
 
 #include <sys/stat.h>
 #include <unistd.h>
 
-
-
 #include "FileWriter.h"
 #include "TreePolynom.h"
 #include "Misc.h"
@@ -662,7 +661,7 @@
 	int width  = getBuffer()->getWidth();
 	int height = getBuffer()->getHeight();
 
-	std::cerr << width << ", " << height << "\n";
+	cerr << width << ", " << height << "\n";
 
 	float_buffer buffer (width, height);           
 
diff -NrU3 surf-1.0.5.orig/yaccsrc/SymbolTable.cc surf-1.0.5/yaccsrc/SymbolTable.cc
--- surf-1.0.5.orig/yaccsrc/SymbolTable.cc	2008-07-09 15:20:35.000000000 +0200
+++ surf-1.0.5/yaccsrc/SymbolTable.cc	2008-07-09 17:42:38.000000000 +0200
@@ -23,10 +23,11 @@
  */
 
 
-#include <iostream.h>
-#include <iostream.h>
+
+#include <iostream>
+using namespace std;
 #include <assert.h>
-#include <stdlib.h>
+#include <cstdlib>
 
 #include <string.h>
 #include "SymbolTable.h"
diff -NrU3 surf-1.0.5.orig/yaccsrc/SymbolTable.h surf-1.0.5/yaccsrc/SymbolTable.h
--- surf-1.0.5.orig/yaccsrc/SymbolTable.h	2008-07-09 15:20:35.000000000 +0200
+++ surf-1.0.5/yaccsrc/SymbolTable.h	2008-07-09 17:42:33.000000000 +0200
@@ -26,10 +26,12 @@
 #ifndef SYMBOLTABLE_H
 #define SYMBOLTABLE_H
 
-#include <stdlib.h>
+#include <cstdlib>
 
-#include <iostream.h>
-#include <stdio.h>
+
+#include <iostream>
+using namespace std;
+#include <cstdio>
 
 class SymbolTable
 {