diff --git a/src/libs/zbxautoreg/Makefile.am b/src/libs/zbxautoreg/Makefile.am
index 17500a2dbfc..b370c45e82b 100644
--- a/src/libs/zbxautoreg/Makefile.am
+++ b/src/libs/zbxautoreg/Makefile.am
@@ -4,3 +4,6 @@ noinst_LIBRARIES = libzbxautoreg.a
 
 libzbxautoreg_a_SOURCES = \
 	autoreg.c
+
+libzbxautoreg_a_CFLAGS = \
+	$(TLS_CFLAGS)
\ No newline at end of file
diff --git a/src/libs/zbxdbupgrade/Makefile.am b/src/libs/zbxdbupgrade/Makefile.am
index fab58f8df78..db33789ca39 100644
--- a/src/libs/zbxdbupgrade/Makefile.am
+++ b/src/libs/zbxdbupgrade/Makefile.am
@@ -44,3 +44,6 @@ libzbxdbupgrade_a_SOURCES = \
 	dbupgrade_common.c \
 	dbupgrade_common.h \
 	dbupgrade.h
+
+libzbxdbupgrade_a_CFLAGS = \
+	$(TLS_CFLAGS)
diff --git a/src/libs/zbxdiscoverer/Makefile.am b/src/libs/zbxdiscoverer/Makefile.am
index 858f2dc5a14..74bb27f2038 100644
--- a/src/libs/zbxdiscoverer/Makefile.am
+++ b/src/libs/zbxdiscoverer/Makefile.am
@@ -22,4 +22,5 @@ libzbxdiscoverer_a_SOURCES = \
 
 libzbxdiscoverer_a_CFLAGS = \
 	$(TLS_CFLAGS) \
-	$(ARES_CFLAGS)
+	$(ARES_CFLAGS) \
+	$(LIBEVENT_CFLAGS)
diff --git a/src/libs/zbxpoller/Makefile.am b/src/libs/zbxpoller/Makefile.am
index 13d0089c31b..eb2d9234d89 100644
--- a/src/libs/zbxpoller/Makefile.am
+++ b/src/libs/zbxpoller/Makefile.am
@@ -49,7 +49,8 @@ libzbxpoller_a_CFLAGS = \
 	$(TLS_CFLAGS) \
 	$(LIBXML2_CFLAGS) \
 	$(SNMP_CFLAGS) \
-	$(ARES_CFLAGS)
+	$(ARES_CFLAGS) \
+	$(LIBEVENT_CFLAGS)
 
 if HAVE_SSH
 libzbxpoller_a_SOURCES += ssh_run.c
diff --git a/src/libs/zbxscripts/Makefile.am b/src/libs/zbxscripts/Makefile.am
index d2fa3a15c26..980d6de5621 100644
--- a/src/libs/zbxscripts/Makefile.am
+++ b/src/libs/zbxscripts/Makefile.am
@@ -7,4 +7,5 @@ libzbxscripts_a_SOURCES = \
 
 libzbxscripts_a_CFLAGS = \
 	$(TLS_CFLAGS) \
-	$(ARES_CFLAGS)
+	$(ARES_CFLAGS) \
+	$(LIBEVENT_CFLAGS)
diff --git a/src/libs/zbxtrapper/Makefile.am b/src/libs/zbxtrapper/Makefile.am
index 7ae306eb0c9..436d3d5604e 100644
--- a/src/libs/zbxtrapper/Makefile.am
+++ b/src/libs/zbxtrapper/Makefile.am
@@ -18,4 +18,5 @@ libzbxtrapper_a_SOURCES = \
 libzbxtrapper_a_CFLAGS = \
 	$(LIBXML2_CFLAGS) \
 	$(TLS_CFLAGS) \
-	$(ARES_CFLAGS)
+	$(ARES_CFLAGS) \
+	$(LIBEVENT_CFLAGS)
diff --git a/src/zabbix_proxy/Makefile.am b/src/zabbix_proxy/Makefile.am
index b6f4f577756..eb696f604e7 100644
--- a/src/zabbix_proxy/Makefile.am
+++ b/src/zabbix_proxy/Makefile.am
@@ -146,7 +146,8 @@ zabbix_proxy_CFLAGS = \
 	-DDEFAULT_EXTERNAL_SCRIPTS_PATH="\"$(EXTERNAL_SCRIPTS_PATH)\"" \
 	-DDEFAULT_LOAD_MODULE_PATH="\"$(LOAD_MODULE_PATH)\"" \
 	$(TLS_CFLAGS) \
-	$(ARES_CFLAGS)
+	$(ARES_CFLAGS) \
+	$(LIBEVENT_CFLAGS)
 
 install-data-hook:
 	$(MKDIR_P) "$(DESTDIR)$(PROXY_CONFIG_FILE).d"
diff --git a/src/zabbix_proxy/taskmanager/Makefile.am b/src/zabbix_proxy/taskmanager/Makefile.am
index f6c4b6ef0d9..5ec4f124f9d 100644
--- a/src/zabbix_proxy/taskmanager/Makefile.am
+++ b/src/zabbix_proxy/taskmanager/Makefile.am
@@ -9,4 +9,5 @@ libzbxtaskmanager_proxy_a_SOURCES = \
 
 libzbxtaskmanager_proxy_a_CFLAGS = \
 	$(TLS_CFLAGS) \
-	$(ARES_CFLAGS)
+	$(ARES_CFLAGS) \
+	$(LIBEVENT_CFLAGS)
diff --git a/src/zabbix_server/Makefile.am b/src/zabbix_server/Makefile.am
index cf208670f33..6ead9279c48 100644
--- a/src/zabbix_server/Makefile.am
+++ b/src/zabbix_server/Makefile.am
@@ -180,7 +180,8 @@ zabbix_server_CFLAGS = \
 	-DDEFAULT_ALERT_SCRIPTS_PATH="\"$(ALERT_SCRIPTS_PATH)\"" \
 	-DDEFAULT_LOAD_MODULE_PATH="\"$(LOAD_MODULE_PATH)\"" \
 	$(TLS_CFLAGS) \
-	$(ARES_CFLAGS)
+	$(ARES_CFLAGS) \
+	$(LIBEVENT_CFLAGS)
 
 install-data-hook:
 	$(MKDIR_P) "$(DESTDIR)$(SERVER_CONFIG_FILE).d"
diff --git a/src/zabbix_server/actions/Makefile.am b/src/zabbix_server/actions/Makefile.am
index 5089d6669a1..7c5e07f92c4 100644
--- a/src/zabbix_server/actions/Makefile.am
+++ b/src/zabbix_server/actions/Makefile.am
@@ -5,3 +5,6 @@ noinst_LIBRARIES = libzbxactions.a
 libzbxactions_a_SOURCES = \
 	actions.c \
 	actions.h
+
+libzbxactions_a_CFLAGS = \
+	$(TLS_CFLAGS)
\ No newline at end of file
diff --git a/src/zabbix_server/cachehistory/Makefile.am b/src/zabbix_server/cachehistory/Makefile.am
index 5d0fd0258d9..dfaf087b3be 100644
--- a/src/zabbix_server/cachehistory/Makefile.am
+++ b/src/zabbix_server/cachehistory/Makefile.am
@@ -7,7 +7,7 @@ libzbxcachehistory_server_a_SOURCES = \
 	cachehistory_server.h \
 	trigger_eval.c
 
-libzbxcachehistory_a_CFLAGS = \
+libzbxcachehistory_server_a_CFLAGS = \
 	-I$(top_srcdir)/src/zabbix_server/ \
 	$(TLS_CFLAGS) \
 	$(TEST_FLAGS)
diff --git a/src/zabbix_server/trapper/Makefile.am b/src/zabbix_server/trapper/Makefile.am
index 6476c60fdb5..3a92de879e0 100644
--- a/src/zabbix_server/trapper/Makefile.am
+++ b/src/zabbix_server/trapper/Makefile.am
@@ -13,4 +13,5 @@ libzbxtrapper_server_a_SOURCES = \
 libzbxtrapper_server_a_CFLAGS = \
 	-I$(top_srcdir)/src/zabbix_server \
 	$(TLS_CFLAGS) \
-	$(ARES_CFLAGS)
+	$(ARES_CFLAGS) \
+	$(LIBEVENT_CFLAGS)