--- yaccsrc/polyx.h.orig	2008-07-05 21:05:02.000000000 +0000
+++ yaccsrc/polyx.h.orig	2008-07-05 21:05:36.000000000 +0000
@@ -25,8 +25,8 @@ 
 
 #ifndef POLYX_H
 #define POLYX_H
-
-#include <iostream.h>
+using namespace std;
+#include <iostream>
 
 /*****************************************************************************/
 /*  POLYNIMIALS IN X                                                         */
--- yaccsrc/mymemory.cc.orig	2008-07-05 21:06:44.000000000 +0000
+++ yaccsrc/mymemory.cc.orig	2008-07-05 21:06:57.000000000 +0000
@@ -32,8 +32,9 @@ 
 /* Date:     14.8.94                                                         */
 /* ------------------------------------------------------------------------- */
 
-#include <iostream.h>
-#include <stdlib.h>
+using namespace std;
+#include <iostream>
+#include <cstdlib>
 
 #include "mymemory.h"
 
--- yaccsrc/SymbolTable.cc.orig	2008-07-05 21:08:58.000000000 +0000
+++ yaccsrc/SymbolTable.cc.orig	2008-07-05 21:09:24.000000000 +0000
@@ -23,10 +23,10 @@ 
  */
 
 
-#include <iostream.h>
-#include <iostream.h>
+
+#include <iostream>
 #include <assert.h>
-#include <stdlib.h>
+#include <cstdlib>
 
 #include <string.h>
 #include "SymbolTable.h"
--- yaccsrc/SymbolTable.h.orig	2008-07-05 21:10:17.000000000 +0000
+++ yaccsrc/SymbolTable.h.orig	2008-07-05 21:10:31.000000000 +0000
@@ -26,10 +26,11 @@ 
 #ifndef SYMBOLTABLE_H
 #define SYMBOLTABLE_H
 
-#include <stdlib.h>
+#include <cstdlib>
 
-#include <iostream.h>
-#include <stdio.h>
+using namespace std;
+#include <iostream>
+#include <cstdio>
 
 class SymbolTable
 {
--- yaccsrc/Script.cc.orig	2008-07-05 21:16:13.000000000 +0000
+++ yaccsrc/Script.cc.orig	2008-07-05 21:16:23.000000000 +0000
@@ -27,7 +27,7 @@ 
 #include <stdio.h>
 #include <errno.h>
 
-#include <iostream.h>
+#include <iostream>
 
 #include <sys/stat.h>
 #include <unistd.h>
--- curve/TreePolynom.h.orig	2008-07-05 21:24:57.000000000 +0000
+++ curve/TreePolynom.h.orig	2008-07-05 21:25:14.000000000 +0000
@@ -26,7 +26,9 @@ 
 #ifndef TREEPOLYNOM_H
 #define TREEPOLYNOM_H
 
-#include <iostream.h>
+using namespace std;
+#include <iostream>
+
 
 #include "defs.h"
 #include "debug.h"
--- debug/debug.h.orig	2008-07-05 21:25:48.000000000 +0000
+++ debug/debug.h.orig	2008-07-05 21:25:53.000000000 +0000
@@ -26,7 +26,8 @@ 
 #ifndef DEBUG_H
 #define DEBUG_H
 
-#include <iostream.h>
+using namespace std;
+#include <iostream>
 
 class FunctionCall
 {
--- curve/RBTree.h.orig	2008-07-05 21:26:29.000000000 +0000
+++ curve/RBTree.h.orig	2008-07-05 21:26:36.000000000 +0000
@@ -26,8 +26,9 @@ 
 #ifndef RBTREE_H
 #define RBTREE_H
 
+
 #include <assert.h>
-#include <iostream.h>
+#include <iostream>
 
 #include "debug.h"
 
--- drawfunc/MultiVariatePolynom.h.orig	2008-07-05 21:27:12.000000000 +0000
+++ drawfunc/MultiVariatePolynom.h.orig	2008-07-05 21:27:18.000000000 +0000
@@ -28,7 +28,8 @@ 
 #ifndef CLMULTIPOLY_H
 #define CLMULTIPOLY_H
 
-#include <iostream.h>
+
+#include <iostream>
 
 #define  VARIABLE_X         0
 #define  VARIABLE_Y         1
--- drawfunc/Monomial.h.orig	2008-07-05 21:27:55.000000000 +0000
+++ drawfunc/Monomial.h.orig	2008-07-05 21:28:04.000000000 +0000
@@ -28,8 +28,9 @@ 
 #ifndef CLMONOM_H
 #define CLMONOM_H
 
-#include <math.h>
-#include <iostream.h>
+using namespace std;
+#include <cmath>
+#include <iostream>
 
 #include "simple.h"
 #include "monomarith.h"
 
 
--- curve/Monom.h.orig	2008-07-05 21:59:10.000000000 +0000
+++ curve/Monom.h.orig	2008-07-05 22:01:11.000000000 +0000
@@ -26,9 +26,10 @@ 
 #ifndef CMonom_H
 #define CMonom_H
 
-#include <stdlib.h>
-#include <string.h>
-#include <iostream.h>
+
+#include <cstdlib>
+#include <cstring>
+#include <iostream>
 
 #include "doubleMath.h"
 
@@ -122,7 +123,7 @@ 
 template<class Coeff,  int num> 
 inline void negate(CMonom<Coeff,num> &m)
 {
-	negate(m.getCoeff());
+	Coeff::negate(m.getCoeff());
 }
 
 
--- src/bit_buffer.cc.orig	2008-07-05 22:04:48.000000000 +0000
+++ src/bit_buffer.cc.orig	2008-07-05 22:04:57.000000000 +0000
@@ -23,8 +23,9 @@ 
  */
 
 
-#include <limits.h>
-#include <iostream.h>
+
+#include <climits>
+#include <iostream>
 
 #include "bit_buffer.h"
 
--- src/main.cc.orig	2008-07-05 22:05:44.000000000 +0000
+++ src/main.cc.orig	2008-07-05 22:05:49.000000000 +0000
@@ -22,7 +22,8 @@ 
  *
  */
 
-#include <iostream.h>
+
+#include <iostream>
 #include <string.h>
 #include <stdlib.h>
 #include <signal.h>
--- src/RgbBuffer.cc.orig	2008-07-05 22:06:46.000000000 +0000
+++ src/RgbBuffer.cc.orig	2008-07-05 22:07:02.000000000 +0000
@@ -34,9 +34,10 @@ 
 
 
 
-#include <math.h>
-#include <stdlib.h>
-#include <iostream.h>
+
+#include <cmath>
+#include <cstdlib>
+#include <iostream>
 #include <stdio.h>
 #include <string.h>
 
--- drawfunc/DrawFunc.cc.orig	2008-07-05 22:08:03.000000000 +0000
+++ drawfunc/DrawFunc.cc.orig	2008-07-05 22:08:12.000000000 +0000
@@ -24,9 +24,10 @@ 
 
 
 
+
 #include <stdio.h>
-#include <math.h>
-#include <iostream.h>
+#include <cmath>
+#include <iostream>
 
 #include "Script.h"
 
--- curve/RBTree.cc.orig	2008-07-05 22:11:33.000000000 +0000
+++ curve/RBTree.cc.orig	2008-07-05 22:11:39.000000000 +0000
@@ -23,7 +23,8 @@ 
  */
 
 
-#include <iostream.h>
+
+#include <iostream>
 #include <assert.h>
 
 #include "RBTree.h"
--- curve/Bezout.h.orig	2008-07-05 22:12:25.000000000 +0000
+++ curve/Bezout.h.orig	2008-07-05 22:12:31.000000000 +0000
@@ -26,7 +26,8 @@ 
 #ifndef Bezout_h
 #define Bezout_h
 
-#include <iostream.h>
+
+#include <iostream>
 
 #include "TreePolynom.h"
 #include "Monom.h"
--- curve/BigInteger.h.orig	2008-07-05 22:13:46.000000000 +0000
+++ curve/BigInteger.h.orig	2008-07-05 22:13:52.000000000 +0000
@@ -26,7 +26,8 @@ 
 #ifndef BIGINTEGER_H
 #define BIGINTEGER_H
 
-#include <iostream.h>
+
+#include <iostream>
 
 #include "mygmp.h"
 
--- curve/mygmp.h.orig	2008-07-05 22:14:41.000000000 +0000
+++ curve/mygmp.h.orig	2008-07-05 22:14:48.000000000 +0000
@@ -32,7 +32,8 @@ 
 #include <gmp.h>
 #endif
 
-#include <iostream.h>
+
+#include <iostream>
 
 extern void mpz_lcm (mpz_t lcm, mpz_t op1, mpz_t op2);
 extern ostream & operator << (ostream &os, mpz_t z);
--- debug/Timer.h.orig	2008-07-05 22:15:52.000000000 +0000
+++ debug/Timer.h.orig	2008-07-05 22:16:00.000000000 +0000
@@ -26,8 +26,9 @@ 
 #ifndef TIMER_H
 #define TIMER_H
 
-#include <time.h>
-#include <iostream.h>
+
+#include <ctime>
+#include <iostream>
 
 #define TIMER(s) Timer aTimer(s)
 class Timer