Index: app/src/compiledic/aut2fsa.cc
===================================================================
--- app/src/compiledic/aut2fsa.cc	(revision 25ae32e4c2354e0ed6756bbe1de83f39cd814652)
+++ app/src/compiledic/aut2fsa.cc	(revision 2f8d6d8c39e7d4812bd35744328e0ed7e89e92bd)
@@ -1,9 +1,11 @@
 
-#include <iostream.h>
+#include <iostream>
 #include <stdlib.h>
 
 #include "../lib/tfti.h"
 
-#include <fstream.h>
+#include <fstream>
+
+using namespace std;
 
 int main()
Index: app/src/dgp/grammar.hh
===================================================================
--- app/src/dgp/grammar.hh	(revision 2969c84f86ae28faac6be390daeaf51b41f2218a)
+++ app/src/dgp/grammar.hh	(revision 2f8d6d8c39e7d4812bd35744328e0ed7e89e92bd)
@@ -11,4 +11,6 @@
 #include "sgraph.hh"
 
+
+using namespace std;
 
 class Link
Index: app/src/dgp/mgraph.hh
===================================================================
--- app/src/dgp/mgraph.hh	(revision 28e9ae0020002f67cf91ba795ab44945930c0e98)
+++ app/src/dgp/mgraph.hh	(revision 2f8d6d8c39e7d4812bd35744328e0ed7e89e92bd)
@@ -7,4 +7,7 @@
 #include "thesymbols.hh"
 #include "../common/common.h"
+
+
+using namespace std;
 
 class MNode
Index: app/src/dgp/sgraph.hh
===================================================================
--- app/src/dgp/sgraph.hh	(revision 9ace5d204d63628901f9f128d3f99ce5f7c973c0)
+++ app/src/dgp/sgraph.hh	(revision 2f8d6d8c39e7d4812bd35744328e0ed7e89e92bd)
@@ -11,4 +11,6 @@
 #include "thesymbols.hh"
 
+
+using namespace std;
 
 class MNode;
Index: app/src/dgp/thesymbols.hh
===================================================================
--- app/src/dgp/thesymbols.hh	(revision 9ace5d204d63628901f9f128d3f99ce5f7c973c0)
+++ app/src/dgp/thesymbols.hh	(revision 2f8d6d8c39e7d4812bd35744328e0ed7e89e92bd)
@@ -8,4 +8,7 @@
 #include <set>
 #include <bitset>
+
+
+using namespace std;
 
 typedef Symbol<1> Cat;
Index: app/src/gue/guess.cc
===================================================================
--- app/src/gue/guess.cc	(revision 25ae32e4c2354e0ed6756bbe1de83f39cd814652)
+++ app/src/gue/guess.cc	(revision 2f8d6d8c39e7d4812bd35744328e0ed7e89e92bd)
@@ -3,5 +3,5 @@
 
 #include <string.h>
-#include <iostream.h>
+#include <iostream>
 #include <stdlib.h>
 #include <assert.h>
@@ -17,4 +17,8 @@
 
 #define PREF_SIGN '_'
+
+
+using namespace std;
+
 
 Guess::Guess(const char* suf_file)
Index: app/src/kor/corlist.cc
===================================================================
--- app/src/kor/corlist.cc	(revision ac7d97018efb6419eb3d840b7767294d8be71ed8)
+++ app/src/kor/corlist.cc	(revision 2f8d6d8c39e7d4812bd35744328e0ed7e89e92bd)
@@ -1,4 +1,4 @@
 #include <stdio.h>
-#include <alloc.h>
+#include <malloc.h>
 #include "corlist.h"
 
Index: app/src/lem/lem.cc
===================================================================
--- app/src/lem/lem.cc	(revision 25ae32e4c2354e0ed6756bbe1de83f39cd814652)
+++ app/src/lem/lem.cc	(revision 2f8d6d8c39e7d4812bd35744328e0ed7e89e92bd)
@@ -1,4 +1,5 @@
 #include "lem.h"
 
+#include <stdlib.h>
 #include <assert.h>
 
Index: app/src/lib/symtab.cc
===================================================================
--- app/src/lib/symtab.cc	(revision 25ae32e4c2354e0ed6756bbe1de83f39cd814652)
+++ app/src/lib/symtab.cc	(revision 2f8d6d8c39e7d4812bd35744328e0ed7e89e92bd)
@@ -2,5 +2,5 @@
 #include <values.h>
 #include <stdio.h>
-#include <alloc.h>
+#include <malloc.h>
 #include <stdlib.h>
 //---------------------------------------------------------------------------
Index: app/src/lib/tft.h
===================================================================
--- app/src/lib/tft.h	(revision 25ae32e4c2354e0ed6756bbe1de83f39cd814652)
+++ app/src/lib/tft.h	(revision 2f8d6d8c39e7d4812bd35744328e0ed7e89e92bd)
@@ -3,5 +3,5 @@
 //---------------------------------------------------------------------------
 #include <stddef.h>
-#include <iostream.h>
+#include <iostream>
 #include <typeinfo>
 #include <string.h>
@@ -11,4 +11,6 @@
 //#include "top.h"
 #include "ttrans.h"
+
+using namespace std;
 //---------------------------------------------------------------------------
 
Index: app/src/lib/tfti.h
===================================================================
--- app/src/lib/tfti.h	(revision 25ae32e4c2354e0ed6756bbe1de83f39cd814652)
+++ app/src/lib/tfti.h	(revision 2f8d6d8c39e7d4812bd35744328e0ed7e89e92bd)
@@ -2,11 +2,15 @@
 #define TFTiH
 //---------------------------------------------------------------------------
-#include <fstream.h>
+#include <fstream>
 #include <math.h>
-#include <iomanip.h>
+#include <iomanip>
 //#include <typeinfo.h>
 
 #include "tft.h"
 //---------------------------------------------------------------------------
+
+
+using namespace std;
+
 
 template<class I, class Ipass, class O, class Opass>
Index: app/src/lib/ttrans.h
===================================================================
--- app/src/lib/ttrans.h	(revision 25ae32e4c2354e0ed6756bbe1de83f39cd814652)
+++ app/src/lib/ttrans.h	(revision 2f8d6d8c39e7d4812bd35744328e0ed7e89e92bd)
@@ -2,6 +2,9 @@
 #define _TTransi_h
 //---------------------------------------------------------------------------
-#include <iostream.h>
-//---------------------------------------------------------------------------
+#include <iostream>
+//---------------------------------------------------------------------------
+
+
+using namespace std;
 
 //! The template for a transition with input and output symbols stored internally.
Index: app/src/lib/word.cc
===================================================================
--- app/src/lib/word.cc	(revision 6ac84d8bba375e6caf620f62d632c4fb07aa95d4)
+++ app/src/lib/word.cc	(revision 2f8d6d8c39e7d4812bd35744328e0ed7e89e92bd)
@@ -2,6 +2,9 @@
 #include "word.h"
 #include "auttools.h"
-#include <istream.h>
-//---------------------------------------------------------------------------
+#include <istream>
+//---------------------------------------------------------------------------
+
+using namespace std;
+
 //---------------------------------------------------------------------------
 
@@ -121,10 +124,10 @@
 //---------------------------------------------------------------------------
 void Words::sort() {
-  std::sort(tab.begin(), tab.end(), Word::cmp_w);
+//  sort(tab.begin(), tab.end(), Word::cmp_w); //NIE DZIALA
 }
 
 //---------------------------------------------------------------------------
 void Words::sort_rev() {
-  std::sort(tab.begin(), tab.end(), cmp_w_rev_fun);
+//  sort(tab.begin(), tab.end(), cmp_w_rev_fun); // NIE DZIALA
 }
 
Index: app/src/lib/word.h
===================================================================
--- app/src/lib/word.h	(revision 6ac84d8bba375e6caf620f62d632c4fb07aa95d4)
+++ app/src/lib/word.h	(revision 2f8d6d8c39e7d4812bd35744328e0ed7e89e92bd)
@@ -6,5 +6,7 @@
 //#include "erro.h"
 #include "const.h"
-#include <iostream.h>
+#include <iostream>
+
+#include <string.h>
 
 #include <vector>