Index: _old/app/src/kor/Makefile
===================================================================
--- _old/app/src/kor/Makefile	(revision 57728c1d40118b66361f4d949f1ad6409070f9c6)
+++ _old/app/src/kor/Makefile	(revision 1e121f45e2d091fcd34a893291b8453e350d5884)
@@ -1,4 +1,4 @@
-PAR=-Wno-deprecated -m32 -fpermissive -static
-PAR2=-c -Wno-deprecated -m32 -fpermissive
+PAR=-Wno-deprecated -fpermissive -static
+PAR2=-c -Wno-deprecated -fpermissive
 LIB_PATH=../lib
 COMMON_PATH=../common
@@ -6,20 +6,16 @@
 
 
-kor: main.cc corr.o corlist.o cmdline.o $(LIB_PATH)/word.o \
-	$(LIB_PATH)/auttools.o cmdline.c common_cor.o common.o 
+kor: main.cc corr.o corlist.o cmdline.o word.o auttools.o cmdline.c common_cor.o common.o 
 	g++ $(PAR) -D _CMDLINE_FILE=$(CMDLINE_FILE) main.cc corlist.o corr.o common.o \
 	$(LIB_PATH)/word.o $(LIB_PATH)/auttools.o cmdline.c common_cor.o \
 	-o kor
 
-corr.o: corr.cc corr.hh cmdline.h
+corr.o: corr.cc corr.h cmdline.h
 	g++ $(PAR2) -D _CMDLINE_FILE=$(CMDLINE_FILE) corr.cc
 	
 corlist.o: corlist.cc corlist.h cmdline.h
-	g++ $(PAR2) -D _CMDLINE_FILE=$(CMDLINE_FILE) corlist.cc
-	
+	g++ $(PAR2) -D _CMDLINE_FILE=$(CMDLINE_FILE) corlist.cc	
 
-
-common.o: cmdline.h $(COMMON_PATH)/cmdline_common.ggo $(COMMON_PATH)/common.cc \
-	 $(COMMON_PATH)/common.h
+common.o: cmdline.h $(COMMON_PATH)/cmdline_common.ggo cmdline_common
 	g++ $(PAR2) -D _CMDLINE_FILE=$(CMDLINE_FILE) $(COMMON_PATH)/common.cc
 
@@ -45,2 +41,4 @@
 	rm cmdline.* || true
 
+include $(COMMON_PATH)/common.mk
+include $(LIB_PATH)/lib.mk
Index: _old/app/src/kor/corlist.cc
===================================================================
--- _old/app/src/kor/corlist.cc	(revision 57728c1d40118b66361f4d949f1ad6409070f9c6)
+++ _old/app/src/kor/corlist.cc	(revision 1e121f45e2d091fcd34a893291b8453e350d5884)
@@ -1,8 +1,9 @@
-#include <stdio.h>
-#include <malloc.h>
+#include <cstdio>
+//#include <alloc.h>
 #include "corlist.h"
 
 #define min(x,y) ((x<y)?(x):(y))
 
+using namespace std;
 
 Weight CorList::GetValue(char X[100], char Y[100], Weight (*H2)[100], int i, int j)
Index: _old/app/src/kor/corr.cc
===================================================================
--- _old/app/src/kor/corr.cc	(revision 57728c1d40118b66361f4d949f1ad6409070f9c6)
+++ _old/app/src/kor/corr.cc	(revision 1e121f45e2d091fcd34a893291b8453e350d5884)
@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------------
 #include "common_cor.h"
-#include "corr.hh"
+#include "corr.h"
 
 #define MAXPATH 256
Index: _old/app/src/kor/corr.hh
===================================================================
--- _old/app/src/kor/corr.hh	(revision 57728c1d40118b66361f4d949f1ad6409070f9c6)
+++ 	(revision )
@@ -1,39 +1,0 @@
-//---------------------------------------------------------------------------
-#ifndef _corr_hh
-#define _corr_hh
-//---------------------------------------------------------------------------
-
-#include "../lib/tfti.h"
-#include "../lib/word.h"
-#include "corlist.h"
-#include "../common/common.h"
-
-class Corr : public TFTiv<char,char>
-{
-private:
-  Weight H[100][100];
-  char X[100];                         // misspelled string
-  char Y[100];                         // (possibly partial) candidate string
-  int m;                               // length of X
-  int n;                               // maximal length of Y
-
-  Weight ed(int,int);
-  Weight cuted(int);
-  void recomputeH(int);
-
-
-public:
-  Weight (*H2)[100];   // moje: zmiana z int na Weight (float)
-  int t;                               // threshold
-  CorList CL;  // moje
-
-  Corr() : H2((Weight(*)[100])&H[2][2]) {};   // moje (int->float)
-  Corr(const char* a) : TFTiv<char,char>(a), H2((Weight(*)[100])&H[2][2]) { };
-
-  int correct(const char* w, Words& tab);
-  
-  int load2(char *Name);  // moje
-};
-
-//---------------------------------------------------------------------------
-#endif
Index: _old/app/src/kor/main.cc
===================================================================
--- _old/app/src/kor/main.cc	(revision 57728c1d40118b66361f4d949f1ad6409070f9c6)
+++ _old/app/src/kor/main.cc	(revision 1e121f45e2d091fcd34a893291b8453e350d5884)
@@ -3,5 +3,5 @@
 #include "../lib/iotools.h"
 #include "common_cor.h"
-#include "corr.hh"
+#include "corr.h"
 #include <locale.h>