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

13 files changed, 34 insertions, 15 deletions

diff --git a/src/libs/zbxaudit/audit.h b/src/libs/zbxaudit/audit.h
index bda6c0e39af..1911ad325a3 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 2f44528c1c7..71469032fc3 100644
--- a/src/libs/zbxaudit/audit_graph.c
+++ b/src/libs/zbxaudit/audit_graph.c
@@ -17,9 +17,11 @@
 ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 **/
 
-#include "dbcache.h"
+//#include "dbcache.h"
 
 #include "log.h"
+//#include "zbxalgo.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 09bc9c5dd16..0a53785eab8 100644
--- a/src/libs/zbxaudit/audit_graph.h
+++ b/src/libs/zbxaudit/audit_graph.h
@@ -21,7 +21,7 @@
 #define ZABBIX_AUDIT_GRAPH_H
 
 #include "common.h"
-#include "audit.h"
+//#include "audit.h"
 
 #include "../zbxdbhigh/template.h"
 
diff --git a/src/libs/zbxaudit/audit_ha.c b/src/libs/zbxaudit/audit_ha.c
index c880828c1d7..f4ea461daf4 100644
--- a/src/libs/zbxaudit/audit_ha.c
+++ b/src/libs/zbxaudit/audit_ha.c
@@ -18,7 +18,7 @@
 **/
 
 #include "zbxalgo.h"
-#include "zbxjson.h"
+//#include "zbxjson.h"
 #include "audit.h"
 #include "audit_ha.h"
 
diff --git a/src/libs/zbxaudit/audit_host.c b/src/libs/zbxaudit/audit_host.c
index 59abda07ebc..ba6f217b1db 100644
--- a/src/libs/zbxaudit/audit_host.c
+++ b/src/libs/zbxaudit/audit_host.c
@@ -17,7 +17,7 @@
 ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 **/
 
-#include "dbcache.h"
+//#include "dbcache.h"
 #include "audit.h"
 #include "audit_host.h"
 
diff --git a/src/libs/zbxaudit/audit_host.h b/src/libs/zbxaudit/audit_host.h
index ab448cae35d..c05dcb68f58 100644
--- a/src/libs/zbxaudit/audit_host.h
+++ b/src/libs/zbxaudit/audit_host.h
@@ -21,8 +21,8 @@
 #define ZABBIX_AUDIT_HOST_H
 
 #include "common.h"
-#include "dbcache.h"
-#include "audit.h"
+//#include "dbcache.h"
+//#include "audit.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 4db08cec07b..c6f3d763f4c 100644
--- a/src/libs/zbxaudit/audit_httptest.c
+++ b/src/libs/zbxaudit/audit_httptest.c
@@ -17,9 +17,14 @@
 ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 **/
 
-#include "dbcache.h"
+//#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 2850da900cd..3a1ba0cd9b9 100644
--- a/src/libs/zbxaudit/audit_httptest.h
+++ b/src/libs/zbxaudit/audit_httptest.h
@@ -21,9 +21,10 @@
 #define ZABBIX_AUDIT_HTTPTEST_H
 
 #include "common.h"
-#include "audit.h"
+#include "zbxalgo.h"
+//#include "audit.h"
 
-#include "../zbxdbhigh/template.h"
+//#include "../zbxdbhigh/template.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 1eadbc106cc..1f072543080 100644
--- a/src/libs/zbxaudit/audit_item.c
+++ b/src/libs/zbxaudit/audit_item.c
@@ -17,9 +17,13 @@
 ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 **/
 
-#include "dbcache.h"
+//#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 80444ec01dd..95471f252bf 100644
--- a/src/libs/zbxaudit/audit_item.h
+++ b/src/libs/zbxaudit/audit_item.h
@@ -21,7 +21,7 @@
 #define ZABBIX_AUDIT_ITEM_H
 
 #include "common.h"
-#include "audit.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 24fd0efcfa8..ff965baba2d 100644
--- a/src/libs/zbxaudit/audit_settings.c
+++ b/src/libs/zbxaudit/audit_settings.c
@@ -18,7 +18,7 @@
 **/
 
 #include "zbxalgo.h"
-#include "zbxjson.h"
+//#include "zbxjson.h"
 #include "audit.h"
 #include "audit_settings.h"
 
diff --git a/src/libs/zbxaudit/audit_trigger.c b/src/libs/zbxaudit/audit_trigger.c
index 7a6e6199ce8..7f930cff1d1 100644
--- a/src/libs/zbxaudit/audit_trigger.c
+++ b/src/libs/zbxaudit/audit_trigger.c
@@ -17,9 +17,13 @@
 ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 **/
 
-#include "dbcache.h"
+//#include "dbcache.h"
 
 #include "log.h"
+#include "audit.h"
+#include "db.h"
+#include "zbxdb.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 3e75377f24e..4df7278b24d 100644
--- a/src/libs/zbxaudit/audit_trigger.h
+++ b/src/libs/zbxaudit/audit_trigger.h
@@ -21,9 +21,9 @@
 #define ZABBIX_AUDIT_TRIGGER_H
 
 #include "common.h"
-#include "audit.h"
+//#include "audit.h"
 
-#include "../zbxdbhigh/template.h"
+//#include "../zbxdbhigh/template.h"
 
 void	zbx_audit_trigger_create_entry(int audit_action, zbx_uint64_t triggerid, const char *name, int flags);