diff --git a/clamav-milter/Makefile.am b/clamav-milter/Makefile.am
index 3035a9a00..a28389086 100644
--- a/clamav-milter/Makefile.am
+++ b/clamav-milter/Makefile.am
@@ -37,7 +37,6 @@ AM_CFLAGS=@WERR_CFLAGS_MILTER@
 endif
 endif
 
-DEFS = @DEFS@ -DCL_NOLIBCLAMAV
 LIBS = $(top_builddir)/shared/libshared_minimal_threads.la $(top_builddir)/libclamav/libclamav_internal_utils.la @CLAMAV_MILTER_LIBS@ @THREAD_LIBS@
 AM_CPPFLAGS = -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav -I$(top_srcdir)/shared -I$(top_srcdir)
 CLEANFILES=*.gcda *.gcno
diff --git a/clamav-milter/Makefile.in b/clamav-milter/Makefile.in
index 6c70a6c49..f633c3257 100644
--- a/clamav-milter/Makefile.in
+++ b/clamav-milter/Makefile.in
@@ -173,7 +173,7 @@ CURSES_CPPFLAGS = @CURSES_CPPFLAGS@
 CURSES_LIBS = @CURSES_LIBS@
 CYGPATH_W = @CYGPATH_W@
 DBDIR = @DBDIR@
-DEFS = @DEFS@ -DCL_NOLIBCLAMAV
+DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
diff --git a/clamconf/Makefile.am b/clamconf/Makefile.am
index 819fb191d..23eec2197 100644
--- a/clamconf/Makefile.am
+++ b/clamconf/Makefile.am
@@ -23,7 +23,6 @@ clamconf_SOURCES = \
 
 AM_CFLAGS=@WERR_CFLAGS@
 
-DEFS = @DEFS@ -DCL_NOTHREADS
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav\
 	      -DBUILD_CPPFLAGS="\"$(CPPFLAGS)\"" -DBUILD_CFLAGS="\"$(CFLAGS)\""\
 	      -DBUILD_CXXFLAGS="\"$(CXXFLAGS)\"" -DBUILD_LDFLAGS="\"$(LDFLAGS)\""\
diff --git a/clamconf/Makefile.in b/clamconf/Makefile.in
index fe845ca2e..5e689c043 100644
--- a/clamconf/Makefile.in
+++ b/clamconf/Makefile.in
@@ -140,7 +140,7 @@ CURSES_CPPFLAGS = @CURSES_CPPFLAGS@
 CURSES_LIBS = @CURSES_LIBS@
 CYGPATH_W = @CYGPATH_W@
 DBDIR = @DBDIR@
-DEFS = @DEFS@ -DCL_NOTHREADS
+DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
diff --git a/clamdscan/Makefile.am b/clamdscan/Makefile.am
index 3d2b53e77..b59ba64c6 100644
--- a/clamdscan/Makefile.am
+++ b/clamdscan/Makefile.am
@@ -31,7 +31,6 @@ AM_CFLAGS=@WERR_CFLAGS@
 endif
 
 
-DEFS = @DEFS@ -DCL_NOTHREADS -DCL_NOLIBCLAMAV
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/clamscan -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav
 LIBS = $(top_builddir)/shared/libshared_minimal.la $(top_builddir)/libclamav/libclamav_internal_utils_nothreads.la @CLAMDSCAN_LIBS@
 
diff --git a/clamdscan/Makefile.in b/clamdscan/Makefile.in
index 1bcb745e0..2bc1567c1 100644
--- a/clamdscan/Makefile.in
+++ b/clamdscan/Makefile.in
@@ -143,7 +143,7 @@ CURSES_CPPFLAGS = @CURSES_CPPFLAGS@
 CURSES_LIBS = @CURSES_LIBS@
 CYGPATH_W = @CYGPATH_W@
 DBDIR = @DBDIR@
-DEFS = @DEFS@ -DCL_NOTHREADS -DCL_NOLIBCLAMAV
+DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
diff --git a/clamdtop/Makefile.am b/clamdtop/Makefile.am
index eafbe87f3..b914c5adb 100644
--- a/clamdtop/Makefile.am
+++ b/clamdtop/Makefile.am
@@ -8,5 +8,4 @@ AM_CFLAGS=@WERR_CFLAGS@
 AM_CPPFLAGS = -I$(top_srcdir) @CURSES_CPPFLAGS@
 clamdtop_LDADD = @CURSES_LIBS@ $(top_builddir)/shared/libshared_minimal.la $(top_builddir)/libclamav/libclamav_internal_utils_nothreads.la
 endif
-DEFS = @DEFS@ -DCL_NOTHREADS -DCL_NOLIBCLAMAV
 EXTRA_DIST = clamdtop.c
diff --git a/clamdtop/Makefile.in b/clamdtop/Makefile.in
index 0b6aa4a23..36fe0122d 100644
--- a/clamdtop/Makefile.in
+++ b/clamdtop/Makefile.in
@@ -149,7 +149,7 @@ CURSES_CPPFLAGS = @CURSES_CPPFLAGS@
 CURSES_LIBS = @CURSES_LIBS@
 CYGPATH_W = @CYGPATH_W@
 DBDIR = @DBDIR@
-DEFS = @DEFS@ -DCL_NOTHREADS -DCL_NOLIBCLAMAV
+DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
diff --git a/clamscan/Makefile.am b/clamscan/Makefile.am
index e4b0ff667..84b5e2145 100644
--- a/clamscan/Makefile.am
+++ b/clamscan/Makefile.am
@@ -26,7 +26,6 @@ clamscan_SOURCES =\
     manager.h
 
 AM_CFLAGS=@WERR_CFLAGS@
-DEFS = @DEFS@ -DCL_NOTHREADS
 LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/shared/libshared_nothreads.la @THREAD_LIBS@
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav
 
diff --git a/clamscan/Makefile.in b/clamscan/Makefile.in
index ea7b700e6..427ebc403 100644
--- a/clamscan/Makefile.in
+++ b/clamscan/Makefile.in
@@ -141,7 +141,7 @@ CURSES_CPPFLAGS = @CURSES_CPPFLAGS@
 CURSES_LIBS = @CURSES_LIBS@
 CYGPATH_W = @CYGPATH_W@
 DBDIR = @DBDIR@
-DEFS = @DEFS@ -DCL_NOTHREADS
+DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
diff --git a/freshclam/Makefile.am b/freshclam/Makefile.am
index 48fdac450..136b7eda2 100644
--- a/freshclam/Makefile.am
+++ b/freshclam/Makefile.am
@@ -35,7 +35,6 @@ freshclam_SOURCES = \
     mirman.h
 
 AM_CFLAGS=@WERR_CFLAGS@
-DEFS = @DEFS@ -DCL_NOTHREADS
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav
 LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/shared/libshared_nothreads.la @FRESHCLAM_LIBS@ @THREAD_LIBS@
 
diff --git a/freshclam/Makefile.in b/freshclam/Makefile.in
index 60ace0e23..a9cca487b 100644
--- a/freshclam/Makefile.in
+++ b/freshclam/Makefile.in
@@ -143,7 +143,7 @@ CURSES_CPPFLAGS = @CURSES_CPPFLAGS@
 CURSES_LIBS = @CURSES_LIBS@
 CYGPATH_W = @CYGPATH_W@
 DBDIR = @DBDIR@
-DEFS = @DEFS@ -DCL_NOTHREADS
+DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
diff --git a/shared/misc_libclamav.c b/shared/misc_libclamav.c
index 97d0ce134..ec9e3aad2 100644
--- a/shared/misc_libclamav.c
+++ b/shared/misc_libclamav.c
@@ -38,6 +38,7 @@
 #include <ctype.h>
 #include <errno.h>
 #include "shared/optparser.h"
+#include "shared/misc.h"
 #include "libclamav/others.h" /* for cli_rmdirs() */
 
 /* CL_NOLIBCLAMAV means to omit functions that depends on libclamav */
diff --git a/sigtool/Makefile.am b/sigtool/Makefile.am
index d8f10991b..ed9d7feb1 100644
--- a/sigtool/Makefile.am
+++ b/sigtool/Makefile.am
@@ -24,7 +24,6 @@ sigtool_SOURCES = \
     sigtool.c
 
 AM_CFLAGS=@WERR_CFLAGS@
-DEFS = @DEFS@ -DCL_NOTHREADS
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav
 LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/shared/libshared_nothreads.la @FRESHCLAM_LIBS@ @THREAD_LIBS@
 CLEANFILES=*.gcda *.gcno
diff --git a/sigtool/Makefile.in b/sigtool/Makefile.in
index 06241faa2..9ef88fa2b 100644
--- a/sigtool/Makefile.in
+++ b/sigtool/Makefile.in
@@ -140,7 +140,7 @@ CURSES_CPPFLAGS = @CURSES_CPPFLAGS@
 CURSES_LIBS = @CURSES_LIBS@
 CYGPATH_W = @CYGPATH_W@
 DBDIR = @DBDIR@
-DEFS = @DEFS@ -DCL_NOTHREADS
+DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@