diff --git a/libclamav/others.h b/libclamav/others.h
index d0b2221d1..2e47b3dad 100644
--- a/libclamav/others.h
+++ b/libclamav/others.h
@@ -20,6 +20,10 @@
 #ifndef __OTHERS_H_LC
 #define __OTHERS_H_LC
 
+#if HAVE_CONFIG_H
+#include "clamav-config.h"
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include "cltypes.h"
@@ -46,6 +50,10 @@
 
 #define CLI_MAX_ALLOCATION 184549376
 
+#ifdef	HAVE_SYS_PARAM_H
+#include <sys/param.h>	/* for NAME_MAX */
+#endif
+
 /* Maximum filenames under various systems - njh */
 #ifndef	NAME_MAX	/* e.g. Linux */
 # ifdef	MAXNAMELEN	/* e.g. Solaris */