From 5887066f5624d9a8d4af3f836fae505569ad8aad Mon Sep 17 00:00:00 2001
From: Andrejs Kozlovs <andrejs.kozlovs@zabbix.com>
Date: Tue, 8 Nov 2022 14:00:24 +0200
Subject: .......... [DEV-2135] fixed PR warnings

---
 include/zbxdbwrap.h                        | 2 +-
 src/libs/zbxdbhigh/trigger.c               | 1 -
 src/libs/zbxhistory/history_elastic.c      | 3 ++-
 src/libs/zbxhistory/history_sql.c          | 1 -
 src/zabbix_proxy/datasender/datasender.c   | 2 +-
 src/zabbix_proxy/proxyconfig/proxyconfig.c | 2 +-
 src/zabbix_server/trapper/proxydata.c      | 4 ++--
 7 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/include/zbxdbwrap.h b/include/zbxdbwrap.h
index 6c68c328dc6..9b058ed9846 100644
--- a/include/zbxdbwrap.h
+++ b/include/zbxdbwrap.h
@@ -21,7 +21,7 @@
 #define ZABBIX_DBWRAP_H
 
 #include "zbxdbhigh.h"
-#include "zbxcachehistory.h"
+#include "zbxcacheconfig.h"
 
 #define ZBX_PROXYMODE_ACTIVE	0
 #define ZBX_PROXYMODE_PASSIVE	1
diff --git a/src/libs/zbxdbhigh/trigger.c b/src/libs/zbxdbhigh/trigger.c
index b3af0d4e78c..096c838bcce 100644
--- a/src/libs/zbxdbhigh/trigger.c
+++ b/src/libs/zbxdbhigh/trigger.c
@@ -21,7 +21,6 @@
 
 #include "log.h"
 #include "events.h"
-#include "zbxserver.h"
 #include "zbxnum.h"
 
 /******************************************************************************
diff --git a/src/libs/zbxhistory/history_elastic.c b/src/libs/zbxhistory/history_elastic.c
index f6baf62fe43..a98840cecc2 100644
--- a/src/libs/zbxhistory/history_elastic.c
+++ b/src/libs/zbxhistory/history_elastic.c
@@ -22,7 +22,8 @@
 
 #include "log.h"
 #include "zbxalgo.h"
-#include "zbxcachehistory.h"
+#include "zbxdb.h"
+#include "zbxstr.h"
 #include "zbxnum.h"
 
 /* curl_multi_wait() is supported starting with version 7.28.0 (0x071c00) */
diff --git a/src/libs/zbxhistory/history_sql.c b/src/libs/zbxhistory/history_sql.c
index 23565890f38..770262cb9ba 100644
--- a/src/libs/zbxhistory/history_sql.c
+++ b/src/libs/zbxhistory/history_sql.c
@@ -22,7 +22,6 @@
 
 #include "zbxalgo.h"
 #include "zbxdbhigh.h"
-#include "zbxcachehistory.h"
 #include "zbxnum.h"
 
 typedef struct
diff --git a/src/zabbix_proxy/datasender/datasender.c b/src/zabbix_proxy/datasender/datasender.c
index d490f62b23a..010cf551306 100644
--- a/src/zabbix_proxy/datasender/datasender.c
+++ b/src/zabbix_proxy/datasender/datasender.c
@@ -20,10 +20,10 @@
 #include "datasender.h"
 
 #include "zbxcommshigh.h"
-#include "zbxdbhigh.h"
 #include "log.h"
 #include "zbxnix.h"
 #include "zbxdbwrap.h"
+#include "zbxcachehistory.h"
 #include "zbxself.h"
 #include "zbxtasks.h"
 #include "zbxcompress.h"
diff --git a/src/zabbix_proxy/proxyconfig/proxyconfig.c b/src/zabbix_proxy/proxyconfig/proxyconfig.c
index 0f5f4542ff3..0883fdf4611 100644
--- a/src/zabbix_proxy/proxyconfig/proxyconfig.c
+++ b/src/zabbix_proxy/proxyconfig/proxyconfig.c
@@ -21,7 +21,7 @@
 
 #include "log.h"
 #include "zbxnix.h"
-#include "zbxdbwrap.h"
+#include "zbxcachehistory.h"
 #include "zbxself.h"
 #include "zbxtime.h"
 
diff --git a/src/zabbix_server/trapper/proxydata.c b/src/zabbix_server/trapper/proxydata.c
index f1a02741668..2fe95123d93 100644
--- a/src/zabbix_server/trapper/proxydata.c
+++ b/src/zabbix_server/trapper/proxydata.c
@@ -18,9 +18,9 @@
 **/
 
 #include "proxydata.h"
-#include "zbxdbwrap.h"
 
-#include "zbxdbhigh.h"
+#include "zbxdbwrap.h"
+#include "zbxcachehistory.h"
 #include "log.h"
 #include "zbxtasks.h"
 #include "zbxmutexs.h"
-- 
cgit v1.2.3