diff --git a/app/src/compiledic/aut2fsa.cc b/app/src/compiledic/aut2fsa.cc
index 3b0d982..a6a695f 100644
--- a/app/src/compiledic/aut2fsa.cc
+++ b/app/src/compiledic/aut2fsa.cc
@@ -1,10 +1,12 @@
 
-#include <iostream.h>
+#include <iostream>
 #include <stdlib.h>
 
 #include "../lib/tfti.h"
 
-#include <fstream.h>
+#include <fstream>
+
+using namespace std;
 
 int main()
 {
diff --git a/app/src/dgp/grammar.hh b/app/src/dgp/grammar.hh
index 27c19c4..81f56b7 100644
--- a/app/src/dgp/grammar.hh
+++ b/app/src/dgp/grammar.hh
@@ -11,6 +11,8 @@
 #include "sgraph.hh"
 
 
+using namespace std;
+
 class Link
 {
   Role role;
diff --git a/app/src/dgp/mgraph.hh b/app/src/dgp/mgraph.hh
index 373eac2..fd309f6 100644
--- a/app/src/dgp/mgraph.hh
+++ b/app/src/dgp/mgraph.hh
@@ -7,6 +7,9 @@
 #include "thesymbols.hh"
 #include "../common/common.h"
 
+
+using namespace std;
+
 class MNode
 {
 public:
diff --git a/app/src/dgp/sgraph.hh b/app/src/dgp/sgraph.hh
index 1c04e39..3e7d964 100644
--- a/app/src/dgp/sgraph.hh
+++ b/app/src/dgp/sgraph.hh
@@ -11,6 +11,8 @@
 #include "thesymbols.hh"
 
 
+using namespace std;
+
 class MNode;
 
 
diff --git a/app/src/dgp/thesymbols.hh b/app/src/dgp/thesymbols.hh
index b90f997..6d72dbc 100644
--- a/app/src/dgp/thesymbols.hh
+++ b/app/src/dgp/thesymbols.hh
@@ -8,6 +8,9 @@
 #include <set>
 #include <bitset>
 
+
+using namespace std;
+
 typedef Symbol<1> Cat;
 
 typedef Symbol<2> Role;
diff --git a/app/src/gue/guess.cc b/app/src/gue/guess.cc
index bf502d5..c52429a 100644
--- a/app/src/gue/guess.cc
+++ b/app/src/gue/guess.cc
@@ -2,7 +2,7 @@
 #include "guess.h"
 
 #include <string.h>
-#include <iostream.h>
+#include <iostream>
 #include <stdlib.h>
 #include <assert.h>
 #include <time.h>
@@ -17,6 +17,10 @@
 
 #define PREF_SIGN '_'
 
+
+using namespace std;
+
+
 Guess::Guess(const char* suf_file)
   : _suf(suf_file) {
   /*  _suf = NULL;
diff --git a/app/src/kor/corlist.cc b/app/src/kor/corlist.cc
index 470534e..79c92ec 100755
--- a/app/src/kor/corlist.cc
+++ b/app/src/kor/corlist.cc
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include <alloc.h>
+#include <malloc.h>
 #include "corlist.h"
 
 #define min(x,y) ((x<y)?(x):(y))
diff --git a/app/src/lem/lem.cc b/app/src/lem/lem.cc
index 3c4dde9..d5b21c8 100644
--- a/app/src/lem/lem.cc
+++ b/app/src/lem/lem.cc
@@ -1,5 +1,6 @@
 #include "lem.h"
 
+#include <stdlib.h>
 #include <assert.h>
 
 
diff --git a/app/src/lib/symtab.cc b/app/src/lib/symtab.cc
index 2cf6421..15579e0 100644
--- a/app/src/lib/symtab.cc
+++ b/app/src/lib/symtab.cc
@@ -1,7 +1,7 @@
 #include "symtab.h"
 #include <values.h>
 #include <stdio.h>
-#include <alloc.h>
+#include <malloc.h>
 #include <stdlib.h>
 //---------------------------------------------------------------------------
 
diff --git a/app/src/lib/tft.h b/app/src/lib/tft.h
index 1abda6c..85bab05 100755
--- a/app/src/lib/tft.h
+++ b/app/src/lib/tft.h
@@ -2,7 +2,7 @@
 #define _TFT_h
 //---------------------------------------------------------------------------
 #include <stddef.h>
-#include <iostream.h>
+#include <iostream>
 #include <typeinfo>
 #include <string.h>
 
@@ -10,6 +10,8 @@
 
 //#include "top.h"
 #include "ttrans.h"
+
+using namespace std;
 //---------------------------------------------------------------------------
 
 /// Klasa bazowa przetwornika skończonego.
diff --git a/app/src/lib/tfti.h b/app/src/lib/tfti.h
index 61a28dc..5f19735 100755
--- a/app/src/lib/tfti.h
+++ b/app/src/lib/tfti.h
@@ -1,14 +1,18 @@
 #ifndef TFTiH
 #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>
 class TFTi : public TFT<I,Ipass,O,Opass,TTrans_i<I,Ipass,O,Opass> >
 {
diff --git a/app/src/lib/ttrans.h b/app/src/lib/ttrans.h
index ce1ed97..1acdd15 100755
--- a/app/src/lib/ttrans.h
+++ b/app/src/lib/ttrans.h
@@ -1,9 +1,12 @@
 #ifndef _TTransi_h
 #define _TTransi_h
 //---------------------------------------------------------------------------
-#include <iostream.h>
+#include <iostream>
 //---------------------------------------------------------------------------
 
+
+using namespace std;
+
 //! The template for a transition with input and output symbols stored internally.
 /*!
     A state is identified with the set of its outgoing transitions.
diff --git a/app/src/lib/word.cc b/app/src/lib/word.cc
index f24f4fb..8b4df0a 100644
--- a/app/src/lib/word.cc
+++ b/app/src/lib/word.cc
@@ -1,8 +1,11 @@
 //---------------------------------------------------------------------------
 #include "word.h"
 #include "auttools.h"
-#include <istream.h>
+#include <istream>
 //---------------------------------------------------------------------------
+
+using namespace std;
+
 //---------------------------------------------------------------------------
 
 void Word::autodescr(const char* fo, const char* de)
@@ -120,12 +123,12 @@ int Words::next() {
 
 //---------------------------------------------------------------------------
 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
 }
 
 //---------------------------------------------------------------------------
diff --git a/app/src/lib/word.h b/app/src/lib/word.h
index 774f62e..216ac6c 100644
--- a/app/src/lib/word.h
+++ b/app/src/lib/word.h
@@ -5,7 +5,9 @@
 //#include "alphabet.h"
 //#include "erro.h"
 #include "const.h"
-#include <iostream.h>
+#include <iostream>
+
+#include <string.h>
 
 #include <vector>
 //---------------------------------------------------------------------------