Index: clamav-milter/clamav-milter.c
--- clamav-milter/clamav-milter.c.orig	2020-09-13 02:27:09.000000000 +0200
+++ clamav-milter/clamav-milter.c	2020-09-14 21:30:51.510622000 +0200
@@ -35,7 +35,7 @@
 #include <syslog.h>
 #endif
 #include <time.h>
-#include <libmilter/mfapi.h>
+#include "milter/mfapi.h"
 
 // libclamav
 #include "clamav.h"
Index: clamav-milter/clamfi.c
--- clamav-milter/clamfi.c.orig	2020-09-13 02:27:09.000000000 +0200
+++ clamav-milter/clamfi.c	2020-09-14 21:30:51.510841000 +0200
@@ -32,7 +32,7 @@
 #include <ctype.h>
 #include <errno.h>
 
-#include <libmilter/mfapi.h>
+#include "milter/mfapi.h"
 
 // libclamav
 #include "clamav.h"
Index: clamav-milter/clamfi.h
--- clamav-milter/clamfi.h.orig	2020-09-14 21:30:51.511004000 +0200
+++ clamav-milter/clamfi.h	2020-09-14 22:01:32.267091000 +0200
@@ -23,7 +23,7 @@
 #define _CLAMFI_H
 
 #include "optparser.h"
-#include <libmilter/mfapi.h>
+#include "milter/mfapi.h"
 
 extern uint64_t maxfilesize;
 extern int addxvirus;
Index: configure
--- configure.orig	2020-09-13 02:27:48.000000000 +0200
+++ configure	2020-09-14 21:30:51.513976000 +0200
@@ -26584,9 +26584,6 @@
 
         save_LIBS="$LIBS"
     CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS $THREAD_LIBS"
-    if test -d /usr/lib/libmilter ; then
-	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -L/usr/lib/libmilter"
-    fi
     LIBS="$LIBS -lmilter $CLAMAV_MILTER_LIBS"
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mi_stop in -lmilter" >&5
 $as_echo_n "checking for mi_stop in -lmilter... " >&6; }
@@ -26734,7 +26731,7 @@
 fi
 
     LIBS="$save_LIBS"
-    for ac_header in libmilter/mfapi.h
+    for ac_header in milter/mfapi.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "libmilter/mfapi.h" "ac_cv_header_libmilter_mfapi_h" "$ac_includes_default"
 if test "x$ac_cv_header_libmilter_mfapi_h" = xyes; then :
Index: libclamav/others.c
--- libclamav/others.c.orig	2020-09-14 21:30:51.514327000 +0200
+++ libclamav/others.c	2020-09-14 22:02:02.607088000 +0200
@@ -311,9 +311,11 @@
 
     if (have_rar) return;
 
+#if 0
     rhandle = load_module("libclamunrar_iface", "unrar");
     if (NULL == rhandle)
         return;
+#endif
 
     if ((NULL == (cli_unrar_open = (cl_unrar_error_t(*)(const char *, void **, char **, uint32_t *, uint8_t))get_module_function(rhandle, "libclamunrar_iface_LTX_unrar_open"))) ||
         (NULL == (cli_unrar_peek_file_header = (cl_unrar_error_t(*)(void *, unrar_metadata_t *))get_module_function(rhandle, "libclamunrar_iface_LTX_unrar_peek_file_header"))) ||