diff -rc TeXmacs-1.0.0.18-src/src/Basic/System/fast_alloc.hh TeXmacs-1.0.0.18-da-src/src/Basic/System/fast_alloc.hh
*** TeXmacs-1.0.0.18-src/src/Basic/System/fast_alloc.hh
--- TeXmacs-1.0.0.18-src/src/Basic/System/fast_alloc.hh
***************
*** 15,21 ****
  #include "tm_configure.hh"
  
  #include <stdlib.h>
! #include <iostream.h>
  
  #define BLOCK_SIZE 65536 // should be >>> MAX_FAST
  
--- 15,23 ----
  #include "tm_configure.hh"
  
  #include <stdlib.h>
! #include <iostream>
! using std::cerr;
! using std::cout;
  
  #define BLOCK_SIZE 65536 // should be >>> MAX_FAST
  
diff -rc TeXmacs-1.0.0.18-src/src/Basic/System/file.cc TeXmacs-1.0.0.18-da-src/src/Basic/System/file.cc
*** TeXmacs-1.0.0.18-src/src/Basic/System/file.cc
--- TeXmacs-1.0.0.18-src/src/Basic/System/file.cc
***************
*** 15,21 ****
  #include "analyze.hh"
  #include "hashmap.hh"
  
! #include <iostream.h>
  
  string var_eval_system (string s);
  
--- 15,21 ----
  #include "analyze.hh"
  #include "hashmap.hh"
  
! #include <iostream>
  
  string var_eval_system (string s);
  
diff -rc TeXmacs-1.0.0.18-src/src/Basic/Types/basic.hh TeXmacs-1.0.0.18-da-src/src/Basic/Types/basic.hh
*** TeXmacs-1.0.0.18-src/src/Basic/Types/basic.hh
--- TeXmacs-1.0.0.18-src/src/Basic/Types/basic.hh
***************
*** 15,21 ****
  #include "tm_configure.hh"
  
  #include <stdlib.h>
! #include <iostream.h>
  
  #define DEBUG(x)
  typedef int SI;
--- 15,24 ----
  #include "tm_configure.hh"
  
  #include <stdlib.h>
! #include <iostream>
! using std::ostream;
! using std::cout;
! using std::cerr;
  
  #define DEBUG(x)
  typedef int SI;
diff -rc TeXmacs-1.0.0.18-src/src/Resource/Languages/hyphenate.cc TeXmacs-1.0.0.18-da-src/src/Resource/Languages/hyphenate.cc
*** TeXmacs-1.0.0.18-src/src/Resource/Languages/hyphenate.cc
--- TeXmacs-1.0.0.18-src/src/Resource/Languages/hyphenate.cc
***************
*** 15,21 ****
  
  #include <stdio.h>
  #include <stdlib.h>
! #include <iostream.h>
  #include <string.h>
  typedef int SI;
  #define MAX_SEARCH 10
--- 15,21 ----
  
  #include <stdio.h>
  #include <stdlib.h>
! #include <iostream>
  #include <string.h>
  typedef int SI;
  #define MAX_SEARCH 10