.......... [DEV-2053] removed redundant includes

13 files changed, 25 insertions, 24 deletions

diff --git a/src/libs/zbxaudit/audit.h b/src/libs/zbxaudit/audit.h
index 3b537bef366..c60ff41e8d5 100644
--- a/src/libs/zbxaudit/audit.h
+++ b/src/libs/zbxaudit/audit.h
@@ -22,6 +22,9 @@
 
 #include "common.h"
 
+#include "zbxalgo.h"
+#include "zbxjson.h"
+
 #define AUDIT_ACTION_ADD		0
 #define AUDIT_ACTION_UPDATE		1
 #define AUDIT_ACTION_DELETE		2
diff --git a/src/libs/zbxaudit/audit_graph.c b/src/libs/zbxaudit/audit_graph.c
index 49fa0fd6be7..daf11c4e8eb 100644
--- a/src/libs/zbxaudit/audit_graph.c
+++ b/src/libs/zbxaudit/audit_graph.c
@@ -17,9 +17,10 @@
 ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 **/
 
-#include "dbcache.h"
-
 #include "log.h"
+#include "db.h"
+#include "audit.h"
+
 #include "audit_graph.h"
 
 static int	graph_flag_to_resource_type(int flag)
diff --git a/src/libs/zbxaudit/audit_graph.h b/src/libs/zbxaudit/audit_graph.h
index 2bbadf793b4..df75c73ed09 100644
--- a/src/libs/zbxaudit/audit_graph.h
+++ b/src/libs/zbxaudit/audit_graph.h
@@ -21,9 +21,6 @@
 #define ZABBIX_AUDIT_GRAPH_H
 
 #include "common.h"
-#include "audit.h"
-
-#include "../zbxdbhigh/template.h"
 
 void	zbx_audit_graph_create_entry(int audit_action, zbx_uint64_t graphid, const char *name, int flags);
 
diff --git a/src/libs/zbxaudit/audit_ha.c b/src/libs/zbxaudit/audit_ha.c
index 48c9ee5951d..1602d8b66fb 100644
--- a/src/libs/zbxaudit/audit_ha.c
+++ b/src/libs/zbxaudit/audit_ha.c
@@ -18,8 +18,8 @@
 **/
 
 #include "zbxalgo.h"
-#include "zbxjson.h"
 #include "audit.h"
+
 #include "audit_ha.h"
 
 void	zbx_audit_ha_create_entry(int audit_action, const char *nodeid, const char *name)
diff --git a/src/libs/zbxaudit/audit_host.c b/src/libs/zbxaudit/audit_host.c
index f00e726e731..623e7e86db1 100644
--- a/src/libs/zbxaudit/audit_host.c
+++ b/src/libs/zbxaudit/audit_host.c
@@ -17,8 +17,8 @@
 ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 **/
 
-#include "dbcache.h"
 #include "audit.h"
+
 #include "audit_host.h"
 
 #define PREPARE_UPDATE_JSON_SNMP_INTERFACE_OP(auditentry)							\
diff --git a/src/libs/zbxaudit/audit_host.h b/src/libs/zbxaudit/audit_host.h
index fc123211bbf..111e9505759 100644
--- a/src/libs/zbxaudit/audit_host.h
+++ b/src/libs/zbxaudit/audit_host.h
@@ -20,9 +20,8 @@
 #ifndef ZABBIX_AUDIT_HOST_H
 #define ZABBIX_AUDIT_HOST_H
 
-#include "common.h"
-#include "dbcache.h"
-#include "audit.h"
+#include "zbxtypes.h"
+#include "zbxalgo.h"
 
 #define PREPARE_AUDIT_SNMP_INTERFACE_H(funcname)								\
 void	zbx_audit_##funcname##_update_json_add_snmp_interface(zbx_uint64_t hostid, zbx_uint64_t version,	\
diff --git a/src/libs/zbxaudit/audit_httptest.c b/src/libs/zbxaudit/audit_httptest.c
index 01915384448..d9a87fd2fce 100644
--- a/src/libs/zbxaudit/audit_httptest.c
+++ b/src/libs/zbxaudit/audit_httptest.c
@@ -17,9 +17,12 @@
 ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 **/
 
-#include "dbcache.h"
-
 #include "log.h"
+#include "zbxalgo.h"
+#include "audit.h"
+#include "db.h"
+#include "zbxdb.h"
+
 #include "audit_httptest.h"
 
 void	zbx_audit_httptest_create_entry(int audit_action, zbx_uint64_t httptestid, const char *name)
diff --git a/src/libs/zbxaudit/audit_httptest.h b/src/libs/zbxaudit/audit_httptest.h
index 304b8c3c3e6..d6082269e70 100644
--- a/src/libs/zbxaudit/audit_httptest.h
+++ b/src/libs/zbxaudit/audit_httptest.h
@@ -21,9 +21,7 @@
 #define ZABBIX_AUDIT_HTTPTEST_H
 
 #include "common.h"
-#include "audit.h"
-
-#include "../zbxdbhigh/template.h"
+#include "zbxalgo.h"
 
 void	zbx_audit_httptest_create_entry(int audit_action, zbx_uint64_t httptestid, const char *name);
 
diff --git a/src/libs/zbxaudit/audit_item.c b/src/libs/zbxaudit/audit_item.c
index 07149d1586b..76eac93f195 100644
--- a/src/libs/zbxaudit/audit_item.c
+++ b/src/libs/zbxaudit/audit_item.c
@@ -17,9 +17,11 @@
 ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 **/
 
-#include "dbcache.h"
-
 #include "log.h"
+#include "audit.h"
+#include "db.h"
+#include "zbxdb.h"
+
 #include "audit_item.h"
 
 static int	item_flag_to_resource_type(int flag)
diff --git a/src/libs/zbxaudit/audit_item.h b/src/libs/zbxaudit/audit_item.h
index cf56aa3400f..48ef9186678 100644
--- a/src/libs/zbxaudit/audit_item.h
+++ b/src/libs/zbxaudit/audit_item.h
@@ -21,7 +21,6 @@
 #define ZABBIX_AUDIT_ITEM_H
 
 #include "common.h"
-#include "audit.h"
 
 #include "../zbxdbhigh/template.h"
 #include "../../zabbix_server/lld/lld.h"
diff --git a/src/libs/zbxaudit/audit_settings.c b/src/libs/zbxaudit/audit_settings.c
index 8c88b6201b2..7a7cddb2f05 100644
--- a/src/libs/zbxaudit/audit_settings.c
+++ b/src/libs/zbxaudit/audit_settings.c
@@ -18,8 +18,8 @@
 **/
 
 #include "zbxalgo.h"
-#include "zbxjson.h"
 #include "audit.h"
+
 #include "audit_settings.h"
 
 void	zbx_audit_settings_create_entry(int audit_action, zbx_uint64_t configid)
diff --git a/src/libs/zbxaudit/audit_trigger.c b/src/libs/zbxaudit/audit_trigger.c
index 08227bf9921..fd75fa02a35 100644
--- a/src/libs/zbxaudit/audit_trigger.c
+++ b/src/libs/zbxaudit/audit_trigger.c
@@ -17,9 +17,11 @@
 ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 **/
 
-#include "dbcache.h"
-
 #include "log.h"
+#include "db.h"
+#include "zbxdb.h"
+#include "audit.h"
+
 #include "audit_trigger.h"
 
 static int	trigger_flag_to_resource_type(int flag)
diff --git a/src/libs/zbxaudit/audit_trigger.h b/src/libs/zbxaudit/audit_trigger.h
index 098a0e2d710..0ca9d26f0f2 100644
--- a/src/libs/zbxaudit/audit_trigger.h
+++ b/src/libs/zbxaudit/audit_trigger.h
@@ -21,9 +21,6 @@
 #define ZABBIX_AUDIT_TRIGGER_H
 
 #include "common.h"
-#include "audit.h"
-
-#include "../zbxdbhigh/template.h"
 
 void	zbx_audit_trigger_create_entry(int audit_action, zbx_uint64_t triggerid, const char *name, int flags);