diff -aur k2_old/k2pdfopt_v2.42/willuslib/array.c k2_new/k2pdfopt_v2.42/willuslib/array.c
--- k2_old/k2pdfopt_v2.42/willuslib/array.c	2014-12-01 13:24:26.000000000 -0300
+++ k2_new/k2pdfopt_v2.42/willuslib/array.c	2018-04-11 20:27:23.402395756 -0300
@@ -1072,7 +1072,7 @@
 void arrayf_sort(float *a,int n)
 
     {
-    sort(a,(long)n);
+    willus_sort(a,(long)n);
     }
 
 
diff -aur k2_old/k2pdfopt_v2.42/willuslib/math.c k2_new/k2pdfopt_v2.42/willuslib/math.c
--- k2_old/k2pdfopt_v2.42/willuslib/math.c	2013-08-15 20:33:50.000000000 -0300
+++ k2_new/k2pdfopt_v2.42/willuslib/math.c	2018-04-11 20:27:23.405395790 -0300
@@ -532,7 +532,7 @@
 
 
 
-void sort(float *x,int n)
+void willus_sort(float *x,int n)
 
     {
     int top,n1;
diff -aur k2_old/k2pdfopt_v2.42/willuslib/ocrgocr.c k2_new/k2pdfopt_v2.42/willuslib/ocrgocr.c
--- k2_old/k2pdfopt_v2.42/willuslib/ocrgocr.c	2016-10-29 15:12:25.000000000 -0300
+++ k2_new/k2pdfopt_v2.42/willuslib/ocrgocr.c	2018-04-11 20:27:23.411395858 -0300
@@ -29,6 +29,8 @@
 #ifdef HAVE_GOCR_LIB
 #include <gocr.h>
 
+job_t *OCR_JOB;
+
 /*
 ** bmp8 must be grayscale
 ** (x1,y1) and (x2,y2) from top left of bitmap
@@ -63,6 +65,7 @@
     h=y2-y1+1;
     dh=h+bw*2;
     job=&_job;
+    OCR_JOB=job;
     job_init(job);
     job_init_image(job);
     // willus_mem_alloc_warn((void **)&job->src.p.p,w*h,funcname,10);
diff -aur k2_old/k2pdfopt_v2.42/willuslib/string.c k2_new/k2pdfopt_v2.42/willuslib/string.c
--- k2_old/k2pdfopt_v2.42/willuslib/string.c	2016-03-19 13:19:33.000000000 -0300
+++ k2_new/k2pdfopt_v2.42/willuslib/string.c	2018-04-11 20:27:23.408395824 -0300
@@ -81,7 +81,7 @@
 ** Returns NULL if EOF, otherwise returns pointer to the string.
 **
 */
-char *get_line(char *buf,int max,FILE *f)
+char *willus_get_line(char *buf,int max,FILE *f)
 
     {
     int     i;
diff -aur k2_old/k2pdfopt_v2.42/willuslib/willus.h k2_new/k2pdfopt_v2.42/willuslib/willus.h
--- k2_old/k2pdfopt_v2.42/willuslib/willus.h	2017-05-20 19:12:16.000000000 -0300
+++ k2_new/k2pdfopt_v2.42/willuslib/willus.h	2018-04-11 20:27:23.400395734 -0300
@@ -227,9 +227,6 @@
 ** CMAKE handles the defines, not this source
 ** (Mod from Dirk Thierbach, 31-Dec-2013)
 */
-#ifdef USE_CMAKE
-#include "config.h"
-#else /* USE_CMAKE */
 
 #ifndef HAVE_Z_LIB
 #define HAVE_Z_LIB
@@ -281,7 +278,7 @@
 #undef HAVE_GSL_LIB
 #endif
 
-#endif /* USE_CMAKE */
+
 /*
 ** Consistency check
 */
@@ -556,7 +553,7 @@
                       int *n,FILE *err);
 int    readxyz_ex    (char *filename,double **x,double **y,double **z,
                       int *n,FILE *err,int ignore_after_semicolon);
-void   sort          (float *x,int n);
+void willus_sort (float *x,int n);
 void   sortd         (double *x,int n);
 void   sorti         (int *x,int n);
 void   sortxy        (float *x,float *y,int n);
@@ -625,7 +622,7 @@
 /* string.c */
 void   clean_line    (char *buf);
 void   clean_line_end(char *buf);
-char  *get_line      (char *buf,int max,FILE *f);
+char *willus_get_line (char *buf,int max,FILE *f);
 char  *get_line_cf   (char *buf,int max,FILE *f);
 int   mem_get_line_cf(char *buf,int maxlen,char *cptr,long *cindex,long csize);
 int    in_string     (char *buffer,char *pattern);