diff -ruN aalib-1.4.0-orig/Makefile.am aalib-1.4.0/Makefile.am
--- aalib-1.4.0-orig/Makefile.am	2001-04-26 09:37:52.000000000 -0500
+++ aalib-1.4.0/Makefile.am	2020-09-22 19:29:25.000000000 -0500
@@ -1,4 +1,5 @@
 #AUTOMAKE_OPTIONS = foreign #include-deps
+ACLOCAL_AMFLAGS = -I m4
 SUBDIRS=src man doc
 EXTRA_DIST = README.OS2 ANNOUNCE aalib.lsm acconfig.h aalib.m4
 bin_SCRIPTS = aalib-config
diff -ruN aalib-1.4.0-orig/configure.in aalib-1.4.0/configure.in
--- aalib-1.4.0-orig/configure.in	2001-04-26 09:37:53.000000000 -0500
+++ aalib-1.4.0/configure.in	2020-09-22 19:29:25.000000000 -0500
@@ -1,10 +1,12 @@
 include(aclocal.m4)
-AC_INIT(src/aalib.c)
-AM_INIT_AUTOMAKE(aalib,1.4.0)
+AC_INIT(aalib,1.4.0)
+AC_CONFIG_SRCDIR(src/aalib.c)
+AM_INIT_AUTOMAKE
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 
 AM_CONFIG_HEADER(src/config.h)
+AC_CONFIG_MACRO_DIRS([m4])
 
 dnl Initialize the compiler and linker flags for AALIB applications
 
diff -ruN aalib-1.4.0-orig/src/Makefile.am aalib-1.4.0/src/Makefile.am
--- aalib-1.4.0-orig/src/Makefile.am	2001-04-26 09:37:31.000000000 -0500
+++ aalib-1.4.0/src/Makefile.am	2020-09-22 19:29:25.000000000 -0500
@@ -57,7 +57,7 @@
        aaattrs.c \
        aaputpixel.c \
        aarecfunc.c 
-libaa_la_LDFLAGS=@LDFLAGS@ -version-info 1:4:0
+libaa_la_LDFLAGS=@LDFLAGS@ -version-info 1:4:0 -no-undefined
 bin_PROGRAMS=aainfo aatest aafire aasavefont
 
 aainfo_LDADD= libaa.la
diff -ruN aalib-1.4.0-orig/src/aaedit.c aalib-1.4.0/src/aaedit.c
--- aalib-1.4.0-orig/src/aaedit.c	2001-04-26 09:37:31.000000000 -0500
+++ aalib-1.4.0/src/aaedit.c	2020-09-22 19:29:25.000000000 -0500
@@ -1,6 +1,6 @@
 #include <string.h>
 #include <ctype.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include "aalib.h"
 #include "aaint.h"
 static void aa_editdisplay(struct aa_edit *e)
diff -ruN aalib-1.4.0-orig/src/aafire.c aalib-1.4.0/src/aafire.c
--- aalib-1.4.0-orig/src/aafire.c	2001-04-26 10:30:03.000000000 -0500
+++ aalib-1.4.0/src/aafire.c	2020-09-22 19:29:25.000000000 -0500
@@ -1,3 +1,4 @@
+#include <stdlib.h>
 #include <stdio.h>
 #include "aalib.h"
 
diff -ruN aalib-1.4.0-orig/src/aainfo.c aalib-1.4.0/src/aainfo.c
--- aalib-1.4.0-orig/src/aainfo.c	2001-04-26 09:37:31.000000000 -0500
+++ aalib-1.4.0/src/aainfo.c	2020-09-22 19:29:25.000000000 -0500
@@ -1,4 +1,5 @@
 
+#include <stdlib.h>
 #include "aalib.h"
 #include "aaint.h"
 int main(int argc, char **argv)
diff -ruN aalib-1.4.0-orig/src/aakbdreg.c aalib-1.4.0/src/aakbdreg.c
--- aalib-1.4.0-orig/src/aakbdreg.c	2001-04-26 09:37:31.000000000 -0500
+++ aalib-1.4.0/src/aakbdreg.c	2020-09-22 19:29:49.000000000 -0500
@@ -1,4 +1,5 @@
-#include <malloc.h>
+#include <stdlib.h>
+#include <string.h>
 #include "config.h"
 #include "aalib.h"
 #include "aaint.h"
diff -ruN aalib-1.4.0-orig/src/aalib.c aalib-1.4.0/src/aalib.c
--- aalib-1.4.0-orig/src/aalib.c	2001-04-26 09:37:31.000000000 -0500
+++ aalib-1.4.0/src/aalib.c	2020-09-22 19:29:25.000000000 -0500
@@ -1,6 +1,6 @@
 #include <stdio.h>
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include "aalib.h"
 #include "aaint.h"
 
diff -ruN aalib-1.4.0-orig/src/aamoureg.c aalib-1.4.0/src/aamoureg.c
--- aalib-1.4.0-orig/src/aamoureg.c	2001-04-26 09:37:31.000000000 -0500
+++ aalib-1.4.0/src/aamoureg.c	2020-09-22 19:30:52.000000000 -0500
@@ -1,4 +1,5 @@
-#include <malloc.h>
+#include <stdlib.h>
+#include <string.h>
 #include "config.h"
 #include "aalib.h"
 #include "aaint.h"
diff -ruN aalib-1.4.0-orig/src/aarec.c aalib-1.4.0/src/aarec.c
--- aalib-1.4.0-orig/src/aarec.c	2001-04-26 09:37:31.000000000 -0500
+++ aalib-1.4.0/src/aarec.c	2020-09-22 19:29:25.000000000 -0500
@@ -1,5 +1,5 @@
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include "aalib.h"
 #include "aaint.h"
 aa_linkedlist *aa_kbdrecommended = NULL, *aa_mouserecommended = NULL,
diff -ruN aalib-1.4.0-orig/src/aaregist.c aalib-1.4.0/src/aaregist.c
--- aalib-1.4.0-orig/src/aaregist.c	2001-04-26 09:37:31.000000000 -0500
+++ aalib-1.4.0/src/aaregist.c	2020-09-22 19:29:38.000000000 -0500
@@ -1,4 +1,5 @@
-#include <malloc.h>
+#include <stdlib.h>
+#include <string.h>
 #include "config.h"
 #include "aalib.h"
 #include "aaint.h"
diff -ruN aalib-1.4.0-orig/src/aasavefont.c aalib-1.4.0/src/aasavefont.c
--- aalib-1.4.0-orig/src/aasavefont.c	2001-04-26 09:37:31.000000000 -0500
+++ aalib-1.4.0/src/aasavefont.c	2020-09-22 19:29:25.000000000 -0500
@@ -1,3 +1,4 @@
+#include <stdlib.h>
 #include "aalib.h"
 int main(int argc, char **argv)
 {
diff -ruN aalib-1.4.0-orig/src/aatest.c aalib-1.4.0/src/aatest.c
--- aalib-1.4.0-orig/src/aatest.c	2001-04-26 09:37:31.000000000 -0500
+++ aalib-1.4.0/src/aatest.c	2020-09-22 19:29:25.000000000 -0500
@@ -1,3 +1,5 @@
+#include <stdlib.h>
+#include <string.h>
 #include "aalib.h"
 int main(int argc, char **argv)
 {
diff -ruN aalib-1.4.0-orig/src/aax.c aalib-1.4.0/src/aax.c
--- aalib-1.4.0-orig/src/aax.c	2001-04-26 09:37:54.000000000 -0500
+++ aalib-1.4.0/src/aax.c	2020-09-22 19:29:25.000000000 -0500
@@ -1,4 +1,3 @@
-#include <malloc.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
diff -ruN aalib-1.4.0-orig/src/aaxkbd.c aalib-1.4.0/src/aaxkbd.c
--- aalib-1.4.0-orig/src/aaxkbd.c	2001-04-26 09:37:31.000000000 -0500
+++ aalib-1.4.0/src/aaxkbd.c	2020-09-22 19:29:25.000000000 -0500
@@ -1,10 +1,10 @@
-#include <malloc.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include "config.h"
 #ifdef X11_KBDDRIVER
 #include <X11/Xlib.h>
+#include <X11/Xutil.h>
 #include <X11/keysymdef.h>
 #include <X11/keysym.h>
 #include "aalib.h"
diff -ruN aalib-1.4.0-orig/src/aaxmouse.c aalib-1.4.0/src/aaxmouse.c
--- aalib-1.4.0-orig/src/aaxmouse.c	2001-04-26 09:37:31.000000000 -0500
+++ aalib-1.4.0/src/aaxmouse.c	2020-09-22 19:29:25.000000000 -0500
@@ -1,4 +1,3 @@
-#include <malloc.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>