Index: src/zabbix_server/poller/checks_snmp.h
===================================================================
--- src/zabbix_server/poller/checks_snmp.h	(revision 61527)
+++ src/zabbix_server/poller/checks_snmp.h	(revision 61528)
@@ -25,16 +25,13 @@
 #include "dbcache.h"
 #include "sysinfo.h"
 
-#ifdef HAVE_NETSNMP
-#	define SNMP_NO_DEBUGGING		/* disabling debugging messages from Net-SNMP library */
-#	include <net-snmp/net-snmp-config.h>
-#	include <net-snmp/net-snmp-includes.h>
-#endif
-
 extern char	*CONFIG_SOURCE_IP;
 extern int	CONFIG_TIMEOUT;
 
+#ifdef HAVE_NETSNMP
+void	zbx_init_snmp(void);
 int	get_value_snmp(const DC_ITEM *item, AGENT_RESULT *result);
 void	get_values_snmp(const DC_ITEM *items, AGENT_RESULT *results, int *errcodes, int num);
+#endif
 
 #endif
Index: src/zabbix_server/poller/checks_snmp.c
===================================================================
--- src/zabbix_server/poller/checks_snmp.c	(revision 61527)
+++ src/zabbix_server/poller/checks_snmp.c	(revision 61528)
@@ -19,12 +19,16 @@
 
 #include "checks_snmp.h"
 
+#ifdef HAVE_NETSNMP
+
+#define SNMP_NO_DEBUGGING		/* disabling debugging messages from Net-SNMP library */
+#include <net-snmp/net-snmp-config.h>
+#include <net-snmp/net-snmp-includes.h>
+
 #include "comms.h"
 #include "zbxalgo.h"
 #include "zbxjson.h"
 
-#ifdef HAVE_NETSNMP
-
 /*
  * SNMP Dynamic Index Cache
  * ========================
@@ -2136,4 +2140,9 @@
 	zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __function_name);
 }
 
+void	zbx_init_snmp(void)
+{
+	init_snmp(progname);
+}
+
 #endif	/* HAVE_NETSNMP */
Index: src/zabbix_server/poller/poller.c
===================================================================
--- src/zabbix_server/poller/poller.c	(revision 61527)
+++ src/zabbix_server/poller/poller.c	(revision 61528)
@@ -828,7 +828,7 @@
 			server_num, get_process_type_string(process_type), process_num);
 #ifdef HAVE_NETSNMP
 	if (ZBX_POLLER_TYPE_NORMAL == poller_type || ZBX_POLLER_TYPE_UNREACHABLE == poller_type)
-		init_snmp(progname);
+		zbx_init_snmp();
 #endif
 
 #if defined(HAVE_POLARSSL) || defined(HAVE_GNUTLS) || defined(HAVE_OPENSSL)
Index: src/zabbix_server/discoverer/discoverer.c
===================================================================
--- src/zabbix_server/discoverer/discoverer.c	(revision 61527)
+++ src/zabbix_server/discoverer/discoverer.c	(revision 61528)
@@ -776,7 +776,7 @@
 	process_num = ((zbx_thread_args_t *)args)->process_num;
 
 #ifdef HAVE_NETSNMP
-	init_snmp(progname);
+	zbx_init_snmp();
 #endif
 	zabbix_log(LOG_LEVEL_INFORMATION, "%s #%d started [%s #%d]", get_program_type_string(program_type),
 			server_num, get_process_type_string(process_type), process_num);