From 6413c64a00065d69552bbcb20ba7cfd85f2445d9 Mon Sep 17 00:00:00 2001
From: Dmitrijs Goloscapovs <dmitrijs.goloscapovs@zabbix.com>
Date: Wed, 22 Dec 2021 16:16:57 +0200
Subject: .......... [ZBXNEXT-7122] resolved conflicts

---
 include/zbxserver.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'include/zbxserver.h')

diff --git a/include/zbxserver.h b/include/zbxserver.h
index a58b54d17da..df1451e55d5 100644
--- a/include/zbxserver.h
+++ b/include/zbxserver.h
@@ -22,6 +22,8 @@
 
 #include "dbcache.h"
 #include "zbxvariant.h"
+#include "zbxeval.h"
+#include "zbxdb.h"
 
 #define MACRO_TYPE_MESSAGE_NORMAL	0x00000001
 #define MACRO_TYPE_MESSAGE_RECOVERY	0x00000002
@@ -142,5 +144,4 @@ int	xml_xpath_check(const char *xpath, char *error, size_t errlen);
 
 int	zbx_substitute_expression_lld_macros(char **data, zbx_uint64_t rules, const struct zbx_json_parse *jp_row,
 		const zbx_vector_ptr_t *lld_macro_paths, char **error);
-
 #endif
-- 
cgit v1.2.3