Index: clamav-milter/clamav-milter.c
--- clamav-milter/clamav-milter.c.orig	2009-10-28 16:34:13 +0100
+++ clamav-milter/clamav-milter.c	2009-11-08 10:27:04 +0100
@@ -32,7 +32,7 @@
 #include <syslog.h>
 #endif
 #include <time.h>
-#include <libmilter/mfapi.h>
+#include "milter/mfapi.h"
 
 #include "clamav.h"
 
Index: clamav-milter/clamfi.c
--- clamav-milter/clamfi.c.orig	2009-10-28 16:34:13 +0100
+++ clamav-milter/clamfi.c	2009-11-08 10:27:04 +0100
@@ -29,7 +29,7 @@
 #include <unistd.h>
 #include <ctype.h>
 
-#include <libmilter/mfapi.h>
+#include "milter/mfapi.h"
 
 #include "shared/optparser.h"
 #include "shared/output.h"
Index: clamav-milter/clamfi.h
--- clamav-milter/clamfi.h.orig	2009-07-06 15:21:58 +0200
+++ clamav-milter/clamfi.h	2009-11-08 10:27:04 +0100
@@ -22,7 +22,7 @@
 #define _CLAMFI_H
 
 #include "shared/optparser.h"
-#include <libmilter/mfapi.h>
+#include "milter/mfapi.h"
 
 extern uint64_t maxfilesize;
 extern int addxvirus;
Index: configure
--- configure.orig	2009-10-28 16:34:13 +0100
+++ configure	2009-11-08 10:27:32 +0100
@@ -16692,9 +16692,6 @@
 
         save_LIBS="$LIBS"
     CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
-    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; }
@@ -16842,7 +16839,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" = x""yes; then :
Index: libclamav/others.c
--- libclamav/others.c.orig	2009-10-28 16:34:13 +0100
+++ libclamav/others.c	2009-11-08 10:27:04 +0100
@@ -177,8 +177,10 @@
     if(is_rar_initd) return;
     is_rar_initd = 1;
 
+#if 0
     rhandle = lt_dlfind("libclamunrar_iface", "unrar");
     if (!rhandle)
+#endif
 	return;
 
     if (!(cli_unrar_open = (int(*)(int, const char *, unrar_state_t *))lt_dlsym(rhandle, "libclamunrar_iface_LTX_unrar_open")) ||
Index: shared/output.c
--- shared/output.c.orig	2009-10-28 16:34:13 +0100
+++ shared/output.c	2009-11-08 10:27:04 +0100
@@ -67,7 +67,7 @@
 pthread_mutex_t logg_mutex = PTHREAD_MUTEX_INITIALIZER;
 #endif
 
-#ifdef  C_LINUX
+#if 0
 #include <libintl.h>
 #include <locale.h>