diff options
Diffstat (limited to 'src')
122 files changed, 236 insertions, 169 deletions
diff --git a/src/libs/zbxalgo/serialize.c b/src/libs/zbxalgo/serialize.c index 567b46229df..71ed45e374b 100644 --- a/src/libs/zbxalgo/serialize.c +++ b/src/libs/zbxalgo/serialize.c @@ -17,8 +17,10 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" -//#include "zbxserialize.h" +#include "string.h" +#include "zbxtypes.h" +/* #include "common.h" +#include "zbxserialize.h" */ /****************************************************************************** * * * Function: zbx_serialize_uint31_compact * diff --git a/src/libs/zbxaudit/audit_graph.c b/src/libs/zbxaudit/audit_graph.c index 71469032fc3..ad4ecc8fca2 100644 --- a/src/libs/zbxaudit/audit_graph.c +++ b/src/libs/zbxaudit/audit_graph.c @@ -21,6 +21,7 @@ #include "log.h" //#include "zbxalgo.h" +#include "db.h" #include "audit.h" #include "audit_graph.h" diff --git a/src/libs/zbxaudit/audit_graph.h b/src/libs/zbxaudit/audit_graph.h index 0a53785eab8..d4423b14ddf 100644 --- a/src/libs/zbxaudit/audit_graph.h +++ b/src/libs/zbxaudit/audit_graph.h @@ -23,7 +23,7 @@ #include "common.h" //#include "audit.h" -#include "../zbxdbhigh/template.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_host.h b/src/libs/zbxaudit/audit_host.h index c05dcb68f58..93bf4b928be 100644 --- a/src/libs/zbxaudit/audit_host.h +++ b/src/libs/zbxaudit/audit_host.h @@ -20,9 +20,11 @@ #ifndef ZABBIX_AUDIT_HOST_H #define ZABBIX_AUDIT_HOST_H -#include "common.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/zbxcompress/compress.c b/src/libs/zbxcompress/compress.c index d6c52dfbb75..ba88736dd53 100644 --- a/src/libs/zbxcompress/compress.c +++ b/src/libs/zbxcompress/compress.c @@ -17,8 +17,11 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ + #include "common.h" #include "log.h" +//#include <errno.h> +//#include "log.h" //#include "zbxcompress.h" #ifdef HAVE_ZLIB diff --git a/src/libs/zbxcrypto/md5.c b/src/libs/zbxcrypto/md5.c index fb821090672..81db3c0c925 100644 --- a/src/libs/zbxcrypto/md5.c +++ b/src/libs/zbxcrypto/md5.c @@ -51,7 +51,8 @@ 1999-05-03 lpd Original version. */ -#include "common.h" +//#include "common.h" +#include "string.h" #include "md5.h" #undef BYTE_ORDER /* 1 = big-endian, -1 = little-endian, 0 = unknown */ diff --git a/src/libs/zbxdbhigh/db.c b/src/libs/zbxdbhigh/db.c index c7f0804ef44..3218a5412ea 100644 --- a/src/libs/zbxdbhigh/db.c +++ b/src/libs/zbxdbhigh/db.c @@ -22,7 +22,7 @@ #include "common.h" #include "events.h" #include "threads.h" -#include "zbxserver.h" +//#include "zbxserver.h" #include "dbcache.h" #include "zbxalgo.h" #include "cfg.h" diff --git a/src/libs/zbxdbhigh/graph_linking.c b/src/libs/zbxdbhigh/graph_linking.c index 6807dfdbf5b..89174d508b0 100644 --- a/src/libs/zbxdbhigh/graph_linking.c +++ b/src/libs/zbxdbhigh/graph_linking.c @@ -20,6 +20,7 @@ #include "db.h" #include "../../libs/zbxaudit/audit.h" #include "../../libs/zbxaudit/audit_graph.h" +#include "../../libs/zbxalgo/vectorimpl.h" #include "graph_linking.h" typedef struct diff --git a/src/libs/zbxdbhigh/graph_linking.h b/src/libs/zbxdbhigh/graph_linking.h index 2696acac6bb..bf722ce6c10 100644 --- a/src/libs/zbxdbhigh/graph_linking.h +++ b/src/libs/zbxdbhigh/graph_linking.h @@ -20,10 +20,10 @@ #ifndef ZABBIX_GRAPH_LINKING_H #define ZABBIX_GRAPH_LINKING_H -#include "log.h" +//#include "log.h" #include "common.h" #include "zbxalgo.h" -#include "../../libs/zbxalgo/vectorimpl.h" +//#include "../../libs/zbxalgo/vectorimpl.h" int DBcopy_template_graphs(zbx_uint64_t hostid, const zbx_vector_uint64_t *templateids); diff --git a/src/libs/zbxdbhigh/lld_override.c b/src/libs/zbxdbhigh/lld_override.c index 52f07c519dc..0ec8f37bc5e 100644 --- a/src/libs/zbxdbhigh/lld_override.c +++ b/src/libs/zbxdbhigh/lld_override.c @@ -18,8 +18,10 @@ **/ #include "common.h" -#include "dbcache.h" +//#include "dbcache.h" #include "log.h" +#include "zbxalgo.h" +#include "zbxdb.h" #include "db.h" void zbx_lld_override_operation_free(zbx_lld_override_operation_t *override_operation) diff --git a/src/libs/zbxdbhigh/tag.c b/src/libs/zbxdbhigh/tag.c index 393a0aee395..d265bd85583 100644 --- a/src/libs/zbxdbhigh/tag.c +++ b/src/libs/zbxdbhigh/tag.c @@ -19,7 +19,7 @@ #include "common.h" #include "db.h" -#include "log.h" +//#include "log.h" #include "../zbxalgo/vectorimpl.h" zbx_db_tag_t *zbx_db_tag_create(const char *tag_tag, const char *tag_value) diff --git a/src/libs/zbxdbhigh/trigger_dep_linking.c b/src/libs/zbxdbhigh/trigger_dep_linking.c index 17b9ef7847d..8d006418872 100644 --- a/src/libs/zbxdbhigh/trigger_dep_linking.c +++ b/src/libs/zbxdbhigh/trigger_dep_linking.c @@ -20,6 +20,8 @@ #include "db.h" #include "log.h" #include "../../libs/zbxaudit/audit_trigger.h" +#include "../../libs/zbxalgo/vectorimpl.h" + #include "trigger_dep_linking.h" typedef struct diff --git a/src/libs/zbxdbhigh/trigger_dep_linking.h b/src/libs/zbxdbhigh/trigger_dep_linking.h index e0a4619d5f5..df58c48cd14 100644 --- a/src/libs/zbxdbhigh/trigger_dep_linking.h +++ b/src/libs/zbxdbhigh/trigger_dep_linking.h @@ -23,7 +23,7 @@ //#include "log.h" #include "common.h" #include "zbxalgo.h" -#include "../../libs/zbxalgo/vectorimpl.h" +//#include "../../libs/zbxalgo/vectorimpl.h" #define TRIGGER_DEP_SYNC_INSERT_OP 0 #define TRIGGER_DEP_SYNC_UPDATE_OP 1 diff --git a/src/libs/zbxdbhigh/trigger_linking.c b/src/libs/zbxdbhigh/trigger_linking.c index 713143b3b9d..db5ec0a339a 100644 --- a/src/libs/zbxdbhigh/trigger_linking.c +++ b/src/libs/zbxdbhigh/trigger_linking.c @@ -22,6 +22,7 @@ #include "log.h" #include "../../libs/zbxaudit/audit.h" #include "../../libs/zbxaudit/audit_trigger.h" +#include "../../libs/zbxalgo/vectorimpl.h" #include "trigger_dep_linking.h" #include "trigger_linking.h" diff --git a/src/libs/zbxeval/calc.c b/src/libs/zbxeval/calc.c index faee357fe28..1d348c4cc00 100644 --- a/src/libs/zbxeval/calc.c +++ b/src/libs/zbxeval/calc.c @@ -19,8 +19,8 @@ #include "common.h" #include "zbxalgo.h" -#include "zbxeval.h" -#include "log.h" +//#include "zbxeval.h" +//#include "log.h" #include "../../libs/zbxalgo/vectorimpl.h" typedef struct diff --git a/src/libs/zbxeval/misc.c b/src/libs/zbxeval/misc.c index a49c2b1a764..4010371269e 100644 --- a/src/libs/zbxeval/misc.c +++ b/src/libs/zbxeval/misc.c @@ -21,10 +21,10 @@ #include "log.h" #include "zbxalgo.h" -#include "../zbxalgo/vectorimpl.h" +//#include "../zbxalgo/vectorimpl.h" #include "zbxvariant.h" #include "zbxserialize.h" -#include "zbxserver.h" +//#include "zbxserver.h" #include "eval.h" #define ZBX_EVAL_STATIC_BUFFER_SIZE 4096 diff --git a/src/libs/zbxeval/parse.c b/src/libs/zbxeval/parse.c index 5a2b2edf7f7..4da9969ce0a 100644 --- a/src/libs/zbxeval/parse.c +++ b/src/libs/zbxeval/parse.c @@ -25,7 +25,8 @@ #include "zbxvariant.h" //#include "zbxserialize.h" //#include "zbxserver.h" -#include "eval.h" +//#include "eval.h" +#include "zbxeval.h" ZBX_VECTOR_IMPL(eval_token, zbx_eval_token_t) diff --git a/src/libs/zbxeval/query.c b/src/libs/zbxeval/query.c index 928f7b05de8..e21f0210dbd 100644 --- a/src/libs/zbxeval/query.c +++ b/src/libs/zbxeval/query.c @@ -17,11 +17,12 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ +#include "zbxeval.h" #include "common.h" -#include "log.h" +//#include "log.h" #include "zbxalgo.h" #include "zbxserver.h" -#include "zbxeval.h" +//#include "zbxeval.h" #include "eval.h" /* The tag expression token is virtual token used during item query filter processing. */ diff --git a/src/libs/zbxhistory/history_elastic.c b/src/libs/zbxhistory/history_elastic.c index 1e96fb5bec0..286bd8b9a60 100644 --- a/src/libs/zbxhistory/history_elastic.c +++ b/src/libs/zbxhistory/history_elastic.c @@ -22,7 +22,7 @@ #include "zbxalgo.h" #include "dbcache.h" #include "zbxhistory.h" -#include "zbxself.h" +//#include "zbxself.h" #include "history.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 8713b7fa748..31de3ab86ab 100644 --- a/src/libs/zbxhistory/history_sql.c +++ b/src/libs/zbxhistory/history_sql.c @@ -18,7 +18,7 @@ **/ #include "common.h" -#include "log.h" +//#include "log.h" #include "zbxalgo.h" #include "db.h" #include "dbcache.h" diff --git a/src/libs/zbxmedia/sms.c b/src/libs/zbxmedia/sms.c index dff1335216e..aa5da2db1d3 100644 --- a/src/libs/zbxmedia/sms.c +++ b/src/libs/zbxmedia/sms.c @@ -20,7 +20,7 @@ #include "common.h" #include "log.h" -#include "zbxmedia.h" +//#include "zbxmedia.h" #include <termios.h> diff --git a/src/libs/zbxnix/control.c b/src/libs/zbxnix/control.c index 81981d4f31a..2f13ed8bccd 100644 --- a/src/libs/zbxnix/control.c +++ b/src/libs/zbxnix/control.c @@ -17,7 +17,9 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ +//#include <string.h> #include "control.h" +#include "common.h" //#include "zbxdiag.h" static int parse_log_level_options(const char *opt, size_t len, unsigned int *scope, unsigned int *data) diff --git a/src/libs/zbxnix/control.h b/src/libs/zbxnix/control.h index 8e851c9de3c..1ef16f046ff 100644 --- a/src/libs/zbxnix/control.h +++ b/src/libs/zbxnix/control.h @@ -20,7 +20,7 @@ #ifndef ZABBIX_CONTROL_H #define ZABBIX_CONTROL_H -#include "common.h" +//#include "common.h" #define ZBX_RTC_LOG_SCOPE_FLAG 0x80 #define ZBX_RTC_LOG_SCOPE_PROC 0 diff --git a/src/libs/zbxrtc/rtc.c b/src/libs/zbxrtc/rtc.c index f333fd8d192..3037213d275 100644 --- a/src/libs/zbxrtc/rtc.c +++ b/src/libs/zbxrtc/rtc.c @@ -17,13 +17,14 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "zbxipcservice.h" -#include "zbxjson.h" -#include "daemon.h" -#include "zbxrtc.h" +//#include "zbxipcservice.h" +//#include "zbxjson.h" +//#include "daemon.h" +//#include "zbxrtc.h" #include "rtc.h" -#include "log.h" -#include "zbxdiag.h" +//#include "log.h" +//#include "zbxdiag.h" +#include "common.h" /****************************************************************************** * * diff --git a/src/libs/zbxrtc/rtc.h b/src/libs/zbxrtc/rtc.h index 57d67b55e4e..e7d9ebf79cf 100644 --- a/src/libs/zbxrtc/rtc.h +++ b/src/libs/zbxrtc/rtc.h @@ -20,6 +20,8 @@ #ifndef ZABBIX_RTC_H #define ZABBIX_RTC_H +#include "zbxtypes.h" + #define ZBX_IPC_SERVICE_RTC "rtc" int zbx_rtc_parse_loglevel_option(const char *opt, size_t len, pid_t *pid, int *proc_type, int *proc_num, diff --git a/src/libs/zbxrtc/rtc_client.c b/src/libs/zbxrtc/rtc_client.c index f5c6a698539..3eab0fd7d4a 100644 --- a/src/libs/zbxrtc/rtc_client.c +++ b/src/libs/zbxrtc/rtc_client.c @@ -19,7 +19,7 @@ #include "zbxipcservice.h" #include "zbxjson.h" -#include "zbxrtc.h" +//#include "zbxrtc.h" #include "rtc.h" extern int CONFIG_TIMEOUT; diff --git a/src/libs/zbxrtc/rtc_proxy.c b/src/libs/zbxrtc/rtc_proxy.c index 6a9b3096476..28df99e6f31 100644 --- a/src/libs/zbxrtc/rtc_proxy.c +++ b/src/libs/zbxrtc/rtc_proxy.c @@ -17,9 +17,10 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "zbxipcservice.h" -#include "zbxrtc.h" -#include "rtc.h" +//#include "zbxipcservice.h" +//#include "zbxrtc.h" +//#include "rtc.h" +#include "zbxtypes.h" #include "proxy.h" extern int CONFIG_PROXYMODE; diff --git a/src/libs/zbxrtc/rtc_server.c b/src/libs/zbxrtc/rtc_server.c index 76a638b4901..7a556ed6575 100644 --- a/src/libs/zbxrtc/rtc_server.c +++ b/src/libs/zbxrtc/rtc_server.c @@ -17,14 +17,16 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "zbxipcservice.h" -#include "daemon.h" +//#include "zbxipcservice.h" #include "log.h" #include "zbxdiag.h" #include "zbxjson.h" #include "zbxha.h" -#include "zbxrtc.h" -#include "rtc.h" +//#include "zbxrtc.h" +//#include "rtc.h" +#include "zbxtypes.h" +#include "common.h" +#include "daemon.h" int rtc_parse_options_ex(const char *opt, zbx_uint32_t *code, char **data, char **error) { diff --git a/src/libs/zbxserver/anomalystl.c b/src/libs/zbxserver/anomalystl.c index 5528880f490..02aa50baec5 100644 --- a/src/libs/zbxserver/anomalystl.c +++ b/src/libs/zbxserver/anomalystl.c @@ -18,12 +18,13 @@ **/ #include "common.h" -#include "db.h" +//#include "db.h" #include "log.h" -#include "zbxserver.h" -#include "zbxregexp.h" -#include "valuecache.h" -#include "zbxtrends.h" +//#include "zbxserver.h" +//#include "zbxregexp.h" +//#include "valuecache.h" +//#include "zbxtrends.h" +#include "zbxeval.h" #include "../zbxalgo/vectorimpl.h" #include "anomalystl.h" diff --git a/src/libs/zbxserver/anomalystl.h b/src/libs/zbxserver/anomalystl.h index 527d6f8ef10..aa584fcbf2b 100644 --- a/src/libs/zbxserver/anomalystl.h +++ b/src/libs/zbxserver/anomalystl.h @@ -20,9 +20,12 @@ #ifndef ZABBIX_ANOMALYSTL_H #define ZABBIX_ANOMALYSTL_H -#include "common.h" +//#include "common.h" -#include "evalfunc_common.h" +//#include "evalfunc_common.h" + +#include "zbxalgo.h" +#include "zbxhistory.h" /* default values which can be used in zbx_STL() arguments */ #define STL_DEF_DEVIATIONS 3 diff --git a/src/libs/zbxserver/evalfunc_common.h b/src/libs/zbxserver/evalfunc_common.h index bec0de4b7af..5dfdf91b7fb 100644 --- a/src/libs/zbxserver/evalfunc_common.h +++ b/src/libs/zbxserver/evalfunc_common.h @@ -20,7 +20,8 @@ #ifndef ZABBIX_EVALFUNC_COMMON_H #define ZABBIX_EVALFUNC_COMMON_H -#include "common.h" +//#include "common.h" +#include "zbxtypes.h" typedef enum { diff --git a/src/libs/zbxserver/zabbix_stats.c b/src/libs/zbxserver/zabbix_stats.c index 56183420cda..e1a3a9ca3e6 100644 --- a/src/libs/zbxserver/zabbix_stats.c +++ b/src/libs/zbxserver/zabbix_stats.c @@ -21,10 +21,10 @@ #include "zbxjson.h" #include "dbcache.h" #include "zbxself.h" -#include "valuecache.h" +//#include "valuecache.h" #include "../../zabbix_server/vmware/vmware.h" #include "preproc.h" -#include "zbxtrends.h" +//#include "zbxtrends.h" #include "zabbix_stats.h" diff --git a/src/libs/zbxserver/zabbix_stats_proxy.c b/src/libs/zbxserver/zabbix_stats_proxy.c index 8422af873d1..d0910f69a2a 100644 --- a/src/libs/zbxserver/zabbix_stats_proxy.c +++ b/src/libs/zbxserver/zabbix_stats_proxy.c @@ -19,7 +19,7 @@ #include "common.h" #include "zbxjson.h" -#include "zabbix_stats.h" +//#include "zabbix_stats.h" /****************************************************************************** * * diff --git a/src/libs/zbxserver/zabbix_stats_server.c b/src/libs/zbxserver/zabbix_stats_server.c index f79b35f5e91..90d617c362b 100644 --- a/src/libs/zbxserver/zabbix_stats_server.c +++ b/src/libs/zbxserver/zabbix_stats_server.c @@ -21,13 +21,13 @@ #include "zbxjson.h" #include "dbcache.h" #include "valuecache.h" -#include "preproc.h" +//#include "preproc.h" #include "zbxlld.h" #include "log.h" #include "zbxtrends.h" #include "zbxha.h" -#include "zabbix_stats.h" +//#include "zabbix_stats.h" /****************************************************************************** * * diff --git a/src/libs/zbxsysinfo/common/Makefile.am b/src/libs/zbxsysinfo/common/Makefile.am index d6326a28ab2..92116fcee2a 100644 --- a/src/libs/zbxsysinfo/common/Makefile.am +++ b/src/libs/zbxsysinfo/common/Makefile.am @@ -5,8 +5,8 @@ noinst_LIBRARIES = libcommonsysinfo.a libcommonsysinfo_http.a libcommonsysinfo_h libcommonsysinfo_a_CFLAGS = -I@top_srcdir@/src/zabbix_agent/ libcommonsysinfo_a_SOURCES = \ - common.c \ - common.h \ + zbxsysinfo_common.c \ + zbxsysinfo_common.h \ cpu.c \ cpu.h \ dir.c \ diff --git a/src/libs/zbxsysinfo/common/dir.h b/src/libs/zbxsysinfo/common/dir.h index d38a45c0ac2..8a800a91988 100644 --- a/src/libs/zbxsysinfo/common/dir.h +++ b/src/libs/zbxsysinfo/common/dir.h @@ -20,7 +20,8 @@ #ifndef ZABBIX_SYSINFO_COMMON_DIR_H #define ZABBIX_SYSINFO_COMMON_DIR_H -#include "sysinfo.h" +#include "module.h" +//#include "sysinfo.h" #include "zbxjson.h" #define DISK_BLOCK_SIZE 512 /* 512-byte blocks */ diff --git a/src/libs/zbxsysinfo/common/dns.c b/src/libs/zbxsysinfo/common/dns.c index 7e566cfb179..086b1f82e81 100644 --- a/src/libs/zbxsysinfo/common/dns.c +++ b/src/libs/zbxsysinfo/common/dns.c @@ -22,7 +22,7 @@ #include "comms.h" #include "log.h" -#include "cfg.h" +//#include "cfg.h" #include "dns.h" #include "zbxalgo.h" diff --git a/src/libs/zbxsysinfo/common/dns.h b/src/libs/zbxsysinfo/common/dns.h index dd7adfea092..71a8b61c3cf 100644 --- a/src/libs/zbxsysinfo/common/dns.h +++ b/src/libs/zbxsysinfo/common/dns.h @@ -20,7 +20,8 @@ #ifndef ZABBIX_SYSINFO_COMMON_DNS_H #define ZABBIX_SYSINFO_COMMON_DNS_H -#include "sysinfo.h" +#include "config.h" +//#include "sysinfo.h" #if defined(HAVE_RES_QUERY) || defined(_WINDOWS) || defined(__MINGW32__) diff --git a/src/libs/zbxsysinfo/common/file.h b/src/libs/zbxsysinfo/common/file.h index 05e4f8332d1..c602ed746e9 100644 --- a/src/libs/zbxsysinfo/common/file.h +++ b/src/libs/zbxsysinfo/common/file.h @@ -20,7 +20,8 @@ #ifndef ZABBIX_SYSINFO_COMMON_FILE_H #define ZABBIX_SYSINFO_COMMON_FILE_H -#include "sysinfo.h" +#include "module.h" +//#include "sysinfo.h" #define MAX_FILE_LEN (1024 * 1024) diff --git a/src/libs/zbxsysinfo/common/http.c b/src/libs/zbxsysinfo/common/http.c index 310bbdcc1e0..951a45341a5 100644 --- a/src/libs/zbxsysinfo/common/http.c +++ b/src/libs/zbxsysinfo/common/http.c @@ -18,12 +18,13 @@ **/ #include "common.h" -#include "sysinfo.h" +//#include "sysinfo.h" #include "zbxregexp.h" #include "zbxhttp.h" #include "comms.h" -#include "cfg.h" +//#include "cfg.h" +extern int CONFIG_TIMEOUT; #include "http.h" diff --git a/src/libs/zbxsysinfo/common/net.c b/src/libs/zbxsysinfo/common/net.c index 27c4d836066..bf35aad982c 100644 --- a/src/libs/zbxsysinfo/common/net.c +++ b/src/libs/zbxsysinfo/common/net.c @@ -18,14 +18,15 @@ **/ #include "common.h" -#include "sysinfo.h" +//#include "sysinfo.h" +#include "module.h" #include "comms.h" #include "log.h" #include "cfg.h" #include "net.h" -#include "zbxalgo.h" +//#include "zbxalgo.h" int tcp_expect(const char *host, unsigned short port, int timeout, const char *request, int (*validate_func)(const char *), const char *sendtoclose, int *value_int) diff --git a/src/libs/zbxsysinfo/common/net.h b/src/libs/zbxsysinfo/common/net.h index cd36736e555..ad0b1b9b608 100644 --- a/src/libs/zbxsysinfo/common/net.h +++ b/src/libs/zbxsysinfo/common/net.h @@ -20,7 +20,8 @@ #ifndef ZABBIX_SYSINFO_COMMON_NET_H #define ZABBIX_SYSINFO_COMMON_NET_H -#include "sysinfo.h" +#include "module.h" +//#include "sysinfo.h" extern char *CONFIG_SOURCE_IP; diff --git a/src/libs/zbxsysinfo/common/system.c b/src/libs/zbxsysinfo/common/system.c index c8a9c7561ea..e978133e542 100644 --- a/src/libs/zbxsysinfo/common/system.c +++ b/src/libs/zbxsysinfo/common/system.c @@ -17,8 +17,10 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" +//#include "../../../../include/common.h" #include "system.h" +#include "common.h" +#include "zbxsysinfo_common.h" #if defined(_WINDOWS) || defined(__MINGW32__) # include "perfmon.h" diff --git a/src/libs/zbxsysinfo/common/system.h b/src/libs/zbxsysinfo/common/system.h index 1c4f1bfa14f..1a3be5a4a8e 100644 --- a/src/libs/zbxsysinfo/common/system.h +++ b/src/libs/zbxsysinfo/common/system.h @@ -20,7 +20,8 @@ #ifndef ZABBIX_SYSINFO_COMMON_SYSTEM_H #define ZABBIX_SYSINFO_COMMON_SYSTEM_H -#include "sysinfo.h" +#include "module.h" +//#include "sysinfo.h" int SYSTEM_LOCALTIME(AGENT_REQUEST *request, AGENT_RESULT *result); int SYSTEM_USERS_NUM(AGENT_REQUEST *request, AGENT_RESULT *result); diff --git a/src/libs/zbxsysinfo/common/common.c b/src/libs/zbxsysinfo/common/zbxsysinfo_common.c index 4a3200d1c22..19af9aa2410 100644 --- a/src/libs/zbxsysinfo/common/common.c +++ b/src/libs/zbxsysinfo/common/zbxsysinfo_common.c @@ -17,7 +17,7 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" +#include "zbxsysinfo_common.h" #include "sysinfo.h" #include "log.h" diff --git a/src/libs/zbxsysinfo/common/common.h b/src/libs/zbxsysinfo/common/zbxsysinfo_common.h index c40b2cdd823..c40b2cdd823 100644 --- a/src/libs/zbxsysinfo/common/common.h +++ b/src/libs/zbxsysinfo/common/zbxsysinfo_common.h diff --git a/src/libs/zbxsysinfo/linux/hardware.c b/src/libs/zbxsysinfo/linux/hardware.c index 4f1102fb316..931eb1c422b 100644 --- a/src/libs/zbxsysinfo/linux/hardware.c +++ b/src/libs/zbxsysinfo/linux/hardware.c @@ -17,7 +17,7 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "../common/common.h" +#include "../common/zbxsysinfo_common.h" #include "sysinfo.h" #include <sys/mman.h> #include <setjmp.h> diff --git a/src/libs/zbxsysinfo/simple/ntp.c b/src/libs/zbxsysinfo/simple/ntp.c index da855d0636d..5320ec46183 100644 --- a/src/libs/zbxsysinfo/simple/ntp.c +++ b/src/libs/zbxsysinfo/simple/ntp.c @@ -17,7 +17,7 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "sysinfo.h" +//#include "sysinfo.h" #include "comms.h" #include "log.h" diff --git a/src/libs/zbxsysinfo/sysinfo.c b/src/libs/zbxsysinfo/sysinfo.c index 298e4fc4586..f8ed0587bc8 100644 --- a/src/libs/zbxsysinfo/sysinfo.c +++ b/src/libs/zbxsysinfo/sysinfo.c @@ -17,7 +17,7 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" +#include "common/zbxsysinfo_common.h" #include "module.h" #include "sysinfo.h" #include "log.h" @@ -36,9 +36,9 @@ extern int CONFIG_TIMEOUT; # include "agent/agent.h" #endif -#ifdef WITH_COMMON_METRICS -# include "common/common.h" -#endif +/* #ifdef WITH_COMMON_METRICS */ +/* # include "common/common.h" */ +/* #endif */ #ifdef WITH_HTTP_METRICS # include "common/http_metrics.h" diff --git a/src/libs/zbxtasks/task.c b/src/libs/zbxtasks/task.c index c96f4492da7..807215f1985 100644 --- a/src/libs/zbxtasks/task.c +++ b/src/libs/zbxtasks/task.c @@ -17,7 +17,7 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include <assert.h> +//#include <assert.h> #include "common.h" #include "log.h" diff --git a/src/zabbix_agent/active.c b/src/zabbix_agent/active.c index 9591e3d8da1..bcf62ce314d 100644 --- a/src/zabbix_agent/active.c +++ b/src/zabbix_agent/active.c @@ -30,6 +30,7 @@ #include "zbxjson.h" #include "alias.h" #include "metrics.h" +#include "zbxregexp.h" extern unsigned char program_type; extern ZBX_THREAD_LOCAL unsigned char process_type; diff --git a/src/zabbix_agent/listener.c b/src/zabbix_agent/listener.c index b91b1bcb5b2..4a8527ea2e8 100644 --- a/src/zabbix_agent/listener.c +++ b/src/zabbix_agent/listener.c @@ -23,7 +23,7 @@ #include "comms.h" #include "cfg.h" #include "zbxconf.h" -#include "stats.h" +//#include "stats.h" #include "sysinfo.h" #include "log.h" diff --git a/src/zabbix_agent/logfiles/logfiles.c b/src/zabbix_agent/logfiles/logfiles.c index 03b13a667e8..b127fce8e70 100644 --- a/src/zabbix_agent/logfiles/logfiles.c +++ b/src/zabbix_agent/logfiles/logfiles.c @@ -23,6 +23,7 @@ #include "sysinfo.h" #include "persistent_state.h" #include "cfg.h" +#include "zbxregexp.h" #if defined(_WINDOWS) || defined(__MINGW32__) # include "symbols.h" diff --git a/src/zabbix_agent/logfiles/logfiles.h b/src/zabbix_agent/logfiles/logfiles.h index 52e56ff10f9..09067088949 100644 --- a/src/zabbix_agent/logfiles/logfiles.h +++ b/src/zabbix_agent/logfiles/logfiles.h @@ -20,7 +20,7 @@ #ifndef ZABBIX_LOGFILES_H #define ZABBIX_LOGFILES_H -#include "zbxregexp.h" +//#include "zbxregexp.h" #include "md5.h" #include "../metrics.h" #include "persistent_state.h" diff --git a/src/zabbix_agent/procstat.c b/src/zabbix_agent/procstat.c index 793a18f873e..e2ea6450fdc 100644 --- a/src/zabbix_agent/procstat.c +++ b/src/zabbix_agent/procstat.c @@ -19,7 +19,7 @@ #include "common.h" #include "log.h" -#include "mutexs.h" +//#include "mutexs.h" #include "stats.h" #include "ipc.h" #include "procstat.h" diff --git a/src/zabbix_agent/stats.c b/src/zabbix_agent/stats.c index 0638a604ab0..10b9d0d4742 100644 --- a/src/zabbix_agent/stats.c +++ b/src/zabbix_agent/stats.c @@ -20,12 +20,12 @@ #include "common.h" #include "stats.h" #include "log.h" -#include "zbxconf.h" +//#include "zbxconf.h" #ifndef _WINDOWS # include "diskdevices.h" #endif -#include "cfg.h" +//#include "cfg.h" #include "mutexs.h" #ifdef _WINDOWS diff --git a/src/zabbix_agent/stats.h b/src/zabbix_agent/stats.h index 16b7b5b6c3a..d144f285735 100644 --- a/src/zabbix_agent/stats.h +++ b/src/zabbix_agent/stats.h @@ -21,7 +21,7 @@ #define ZABBIX_STATS_H #include "threads.h" -#include "mutexs.h" +//#include "mutexs.h" #ifndef _WINDOWS # include "diskdevices.h" diff --git a/src/zabbix_agent/zbxconf.c b/src/zabbix_agent/zbxconf.c index bb8975a127b..7adf47c2fcf 100644 --- a/src/zabbix_agent/zbxconf.c +++ b/src/zabbix_agent/zbxconf.c @@ -27,7 +27,7 @@ #ifdef _WINDOWS # include "perfstat.h" #endif -#include "comms.h" +//#include "comms.h" /****************************************************************************** * * diff --git a/src/zabbix_agent/zbxkstat.c b/src/zabbix_agent/zbxkstat.c index 90dc6fe8ee7..a1840c2a31c 100644 --- a/src/zabbix_agent/zbxkstat.c +++ b/src/zabbix_agent/zbxkstat.c @@ -17,7 +17,7 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" +//#include "common.h" #if defined(HAVE_KSTAT_H) && defined(HAVE_VMINFO_T_UPDATES) diff --git a/src/zabbix_get/zabbix_get.c b/src/zabbix_get/zabbix_get.c index b79ad7b0419..ada3d6e981a 100644 --- a/src/zabbix_get/zabbix_get.c +++ b/src/zabbix_get/zabbix_get.c @@ -19,10 +19,10 @@ #include "common.h" -#include "threads.h" +//#include "threads.h" #include "comms.h" -#include "cfg.h" -#include "log.h" +//#include "cfg.h" +//#include "log.h" #include "zbxgetopt.h" #include "zbxcrypto.h" diff --git a/src/zabbix_js/zabbix_js.c b/src/zabbix_js/zabbix_js.c index 4d8ff082ea2..c663f303e42 100644 --- a/src/zabbix_js/zabbix_js.c +++ b/src/zabbix_js/zabbix_js.c @@ -19,7 +19,7 @@ #include "common.h" -#include "cfg.h" +//#include "cfg.h" #include "log.h" #include "zbxgetopt.h" #include "zbxembed.h" diff --git a/src/zabbix_proxy/datasender/datasender.c b/src/zabbix_proxy/datasender/datasender.c index e61dcf8b03e..8bec83d2227 100644 --- a/src/zabbix_proxy/datasender/datasender.c +++ b/src/zabbix_proxy/datasender/datasender.c @@ -27,7 +27,7 @@ #include "zbxself.h" #include "dbcache.h" #include "zbxtasks.h" -#include "dbcache.h" +//#include "dbcache.h" #include "datasender.h" #include "zbxcrypto.h" diff --git a/src/zabbix_proxy/proxy_lld.c b/src/zabbix_proxy/proxy_lld.c index 0de6c424f16..fbd6f5ca959 100644 --- a/src/zabbix_proxy/proxy_lld.c +++ b/src/zabbix_proxy/proxy_lld.c @@ -18,8 +18,9 @@ **/ #include "common.h" -#include "sysinfo.h" -#include "zbxlld.h" +#include "module.h" +//#include "sysinfo.h" +//#include "zbxlld.h" void zbx_lld_process_agent_result(zbx_uint64_t itemid, zbx_uint64_t hostid, AGENT_RESULT *result, zbx_timespec_t *ts, char *error) { diff --git a/src/zabbix_proxy/taskmanager/server_tasks.c b/src/zabbix_proxy/taskmanager/server_tasks.c index a2f057b98b6..65ed7b28cc5 100644 --- a/src/zabbix_proxy/taskmanager/server_tasks.c +++ b/src/zabbix_proxy/taskmanager/server_tasks.c @@ -17,13 +17,15 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include <assert.h> +//#include <assert.h> #include "common.h" -#include "log.h" +//#include "log.h" +#include "zbxalgo.h" +#include "zbxdb.h" #include "db.h" -#include "zbxjson.h" +//#include "zbxjson.h" #include "zbxtasks.h" /****************************************************************************** diff --git a/src/zabbix_server/actions.c b/src/zabbix_server/actions.c index f5fcf66cbaa..bd0dec4a432 100644 --- a/src/zabbix_server/actions.c +++ b/src/zabbix_server/actions.c @@ -23,7 +23,7 @@ #include "zbxserver.h" #include "operations.h" -#include "events.h" +//#include "events.h" #include "zbxregexp.h" #include "../../libs/zbxaudit/audit.h" diff --git a/src/zabbix_server/alerter/alert_syncer.c b/src/zabbix_server/alerter/alert_syncer.c index e022224f727..5ec2da18510 100644 --- a/src/zabbix_server/alerter/alert_syncer.c +++ b/src/zabbix_server/alerter/alert_syncer.c @@ -22,10 +22,10 @@ #include "zbxself.h" #include "log.h" #include "db.h" -#include "dbcache.h" +//#include "dbcache.h" #include "zbxipcservice.h" #include "zbxjson.h" -#include "alert_manager.h" +//#include "alert_manager.h" #include "alert_syncer.h" #include "alerter_protocol.h" #include "zbxservice.h" diff --git a/src/zabbix_server/alerter/alerter.c b/src/zabbix_server/alerter/alerter.c index fdc3d6dc1ad..19671458798 100644 --- a/src/zabbix_server/alerter/alerter.c +++ b/src/zabbix_server/alerter/alerter.c @@ -19,19 +19,20 @@ #include "common.h" -#include "cfg.h" -#include "db.h" +//#include "cfg.h" +//#include "db.h" #include "log.h" #include "daemon.h" #include "zbxmedia.h" -#include "zbxserver.h" +//#include "zbxserver.h" #include "zbxself.h" #include "zbxexec.h" #include "zbxipcservice.h" +#include "dbcache.h" #include "alerter.h" #include "alerter_protocol.h" -#include "alert_manager.h" +//#include "alert_manager.h" #include "zbxembed.h" #define ALARM_ACTION_TIMEOUT 40 diff --git a/src/zabbix_server/alerter/alerter.h b/src/zabbix_server/alerter/alerter.h index 52bbc326cde..557c89541e0 100644 --- a/src/zabbix_server/alerter/alerter.h +++ b/src/zabbix_server/alerter/alerter.h @@ -20,7 +20,7 @@ #ifndef ZABBIX_ALERTER_H #define ZABBIX_ALERTER_H -#include "db.h" +//#include "db.h" #include "threads.h" extern char *CONFIG_ALERT_SCRIPTS_PATH; diff --git a/src/zabbix_server/availability/avail_manager.c b/src/zabbix_server/availability/avail_manager.c index 37842b9c2a3..333959e9da7 100644 --- a/src/zabbix_server/availability/avail_manager.c +++ b/src/zabbix_server/availability/avail_manager.c @@ -17,7 +17,7 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" +//#include "common.h" #include "log.h" #include "zbxself.h" #include "zbxavailability.h" diff --git a/src/zabbix_server/housekeeper/housekeeper.c b/src/zabbix_server/housekeeper/housekeeper.c index 3e1d041aa6a..cd636c052f0 100644 --- a/src/zabbix_server/housekeeper/housekeeper.c +++ b/src/zabbix_server/housekeeper/housekeeper.c @@ -26,7 +26,7 @@ #include "zbxalgo.h" #include "zbxserver.h" -#include "zbxhistory.h" +//#include "zbxhistory.h" #include "history_compress.h" #include "housekeeper.h" #include "../../libs/zbxdbcache/valuecache.h" diff --git a/src/zabbix_server/housekeeper/problem_housekeeper.c b/src/zabbix_server/housekeeper/problem_housekeeper.c index 6a3032c9312..ae75adc1044 100644 --- a/src/zabbix_server/housekeeper/problem_housekeeper.c +++ b/src/zabbix_server/housekeeper/problem_housekeeper.c @@ -23,10 +23,10 @@ #include "log.h" #include "zbxself.h" #include "zbxservice.h" -#include "zbxipcservice.h" +//#include "zbxipcservice.h" #include "daemon.h" -#include "sighandler.h" -#include "dbcache.h" +//#include "sighandler.h" +//#include "dbcache.h" #include "zbxalgo.h" #include "service_protocol.h" diff --git a/src/zabbix_server/housekeeper/problem_housekeeper.h b/src/zabbix_server/housekeeper/problem_housekeeper.h index 3a8cbb28851..aaa7e8fcd3b 100644 --- a/src/zabbix_server/housekeeper/problem_housekeeper.h +++ b/src/zabbix_server/housekeeper/problem_housekeeper.h @@ -20,7 +20,7 @@ #ifndef ZABBIX_TRIGGER_HOUSEKEEPER_H #define ZABBIX_TRIGGER_HOUSEKEEPER_H -#include "common.h" +//#include "common.h" #include "threads.h" ZBX_THREAD_ENTRY(trigger_housekeeper_thread, args); diff --git a/src/zabbix_server/httppoller/httpmacro.c b/src/zabbix_server/httppoller/httpmacro.c index ef474b7907f..fc60f55f05b 100644 --- a/src/zabbix_server/httppoller/httpmacro.c +++ b/src/zabbix_server/httppoller/httpmacro.c @@ -18,7 +18,7 @@ **/ #include "common.h" -#include "db.h" +//#include "db.h" #include "log.h" #include "zbxregexp.h" #include "zbxhttp.h" diff --git a/src/zabbix_server/httppoller/httpmacro.h b/src/zabbix_server/httppoller/httpmacro.h index 745d97286a6..224ae5e5c03 100644 --- a/src/zabbix_server/httppoller/httpmacro.h +++ b/src/zabbix_server/httppoller/httpmacro.h @@ -20,6 +20,8 @@ #ifndef ZABBIX_HTTPMACRO_H #define ZABBIX_HTTPMACRO_H +#include "db.h" + typedef struct { DB_HTTPTEST httptest; diff --git a/src/zabbix_server/ipmi/ipmi.c b/src/zabbix_server/ipmi/ipmi.c index c65aba48df5..96937246c44 100644 --- a/src/zabbix_server/ipmi/ipmi.c +++ b/src/zabbix_server/ipmi/ipmi.c @@ -22,7 +22,7 @@ #ifdef HAVE_OPENIPMI #include "log.h" -#include "zbxserialize.h" +//#include "zbxserialize.h" #include "dbcache.h" #include "zbxipcservice.h" diff --git a/src/zabbix_server/ipmi/ipmi.h b/src/zabbix_server/ipmi/ipmi.h index 1c051262fd3..e52c6668840 100644 --- a/src/zabbix_server/ipmi/ipmi.h +++ b/src/zabbix_server/ipmi/ipmi.h @@ -20,7 +20,9 @@ #ifndef ZABBIX_IPMI_H #define ZABBIX_IPMI_H -#include "checks_ipmi.h" +//#include "checks_ipmi.h" +#include "dbcache.h" +#include "zbxtypes.h" int zbx_ipmi_port_expand_macros(zbx_uint64_t hostid, const char *port_orig, unsigned short *port, char **error); int zbx_ipmi_execute_command(const DC_HOST *host, const char *command, char *error, size_t max_error_len); diff --git a/src/zabbix_server/ipmi/ipmi_manager.h b/src/zabbix_server/ipmi/ipmi_manager.h index 12d0d7ef595..b7cde75951f 100644 --- a/src/zabbix_server/ipmi/ipmi_manager.h +++ b/src/zabbix_server/ipmi/ipmi_manager.h @@ -20,7 +20,7 @@ #ifndef ZABBIX_IPMI_MANAGER_H #define ZABBIX_IPMI_MANAGER_H -#include "common.h" +//#include "common.h" #ifdef HAVE_OPENIPMI diff --git a/src/zabbix_server/ipmi/ipmi_poller.c b/src/zabbix_server/ipmi/ipmi_poller.c index b2efef12b89..d5cf97636bc 100644 --- a/src/zabbix_server/ipmi/ipmi_poller.c +++ b/src/zabbix_server/ipmi/ipmi_poller.c @@ -21,13 +21,13 @@ #ifdef HAVE_OPENIPMI -#include "dbcache.h" +//#include "dbcache.h" #include "daemon.h" #include "zbxself.h" #include "log.h" #include "zbxipcservice.h" -#include "ipmi_manager.h" +//#include "ipmi_manager.h" #include "ipmi_protocol.h" #include "checks_ipmi.h" #include "ipmi_poller.h" diff --git a/src/zabbix_server/ipmi/ipmi_poller.h b/src/zabbix_server/ipmi/ipmi_poller.h index 77287a5d042..c12313fd036 100644 --- a/src/zabbix_server/ipmi/ipmi_poller.h +++ b/src/zabbix_server/ipmi/ipmi_poller.h @@ -20,7 +20,7 @@ #ifndef ZABBIX_IPMI_POLLER_H #define ZABBIX_IPMI_POLLER_H -#include "common.h" +//#include "common.h" #ifdef HAVE_OPENIPMI diff --git a/src/zabbix_server/ipmi/ipmi_protocol.c b/src/zabbix_server/ipmi/ipmi_protocol.c index 1dd66475de7..a0a2ab25bc0 100644 --- a/src/zabbix_server/ipmi/ipmi_protocol.c +++ b/src/zabbix_server/ipmi/ipmi_protocol.c @@ -21,7 +21,7 @@ #ifdef HAVE_OPENIPMI -#include "log.h" +//#include "log.h" #include "zbxserialize.h" #include "ipmi_protocol.h" diff --git a/src/zabbix_server/lld/lld.c b/src/zabbix_server/lld/lld.c index b5995300683..c8f9cdc2575 100644 --- a/src/zabbix_server/lld/lld.c +++ b/src/zabbix_server/lld/lld.c @@ -24,7 +24,7 @@ #include "zbxalgo.h" #include "zbxserver.h" #include "zbxregexp.h" -#include "proxy.h" +//#include "proxy.h" #include "../../libs/zbxaudit/audit.h" diff --git a/src/zabbix_server/lld/lld_common.c b/src/zabbix_server/lld/lld_common.c index 546cd2d4ef2..3e2a30df8e0 100644 --- a/src/zabbix_server/lld/lld_common.c +++ b/src/zabbix_server/lld/lld_common.c @@ -17,7 +17,7 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "lld.h" +//#include "lld.h" #include "log.h" #include "db.h" diff --git a/src/zabbix_server/lld/lld_item.c b/src/zabbix_server/lld/lld_item.c index abd4fd81049..5a0b56b5d14 100644 --- a/src/zabbix_server/lld/lld_item.c +++ b/src/zabbix_server/lld/lld_item.c @@ -17,7 +17,7 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "lld.h" +//#include "lld.h" #include "db.h" #include "log.h" #include "zbxalgo.h" diff --git a/src/zabbix_server/lld/lld_protocol.c b/src/zabbix_server/lld/lld_protocol.c index 71d79029204..5ad51526071 100644 --- a/src/zabbix_server/lld/lld_protocol.c +++ b/src/zabbix_server/lld/lld_protocol.c @@ -23,7 +23,7 @@ #include "zbxipcservice.h" #include "lld_protocol.h" #include "sysinfo.h" -#include "zbxlld.h" +//#include "zbxlld.h" #include "lld_manager.h" /****************************************************************************** diff --git a/src/zabbix_server/operations.c b/src/zabbix_server/operations.c index a0f24b6217b..6627cbe726a 100644 --- a/src/zabbix_server/operations.c +++ b/src/zabbix_server/operations.c @@ -24,7 +24,7 @@ #include "dbcache.h" #include "operations.h" -#include "zbxserver.h" +//#include "zbxserver.h" #include "../../libs/zbxaudit/audit.h" #include "../../libs/zbxaudit/audit_host.h" diff --git a/src/zabbix_server/operations.h b/src/zabbix_server/operations.h index b58cec64218..9c14ea36126 100644 --- a/src/zabbix_server/operations.h +++ b/src/zabbix_server/operations.h @@ -20,7 +20,7 @@ #ifndef ZABBIX_OPERATIONS_H #define ZABBIX_OPERATIONS_H -#include "common.h" +//#include "common.h" #include "db.h" #include "zbxalgo.h" diff --git a/src/zabbix_server/poller/checks_calculated.h b/src/zabbix_server/poller/checks_calculated.h index 6c6cc47baa2..66b90fe82e9 100644 --- a/src/zabbix_server/poller/checks_calculated.h +++ b/src/zabbix_server/poller/checks_calculated.h @@ -20,9 +20,10 @@ #ifndef ZABBIX_CHECKS_CALCULATED_H #define ZABBIX_CHECKS_CALCULATED_H -#include "common.h" +//#include "common.h" #include "dbcache.h" -#include "sysinfo.h" +#include "module.h" +//#include "sysinfo.h" int get_value_calculated(DC_ITEM *dc_item, AGENT_RESULT *result); diff --git a/src/zabbix_server/poller/checks_db.h b/src/zabbix_server/poller/checks_db.h index 93314747bf3..85d2629f8db 100644 --- a/src/zabbix_server/poller/checks_db.h +++ b/src/zabbix_server/poller/checks_db.h @@ -20,10 +20,10 @@ #ifndef ZABBIX_CHECKS_DB_H #define ZABBIX_CHECKS_DB_H -#include "common.h" +//#include "common.h" #include "dbcache.h" -#include "sysinfo.h" +//#include "sysinfo.h" #ifdef HAVE_UNIXODBC int get_value_db(const DC_ITEM *item, AGENT_RESULT *result); diff --git a/src/zabbix_server/poller/checks_external.h b/src/zabbix_server/poller/checks_external.h index d6439f55bef..105b3d18bdd 100644 --- a/src/zabbix_server/poller/checks_external.h +++ b/src/zabbix_server/poller/checks_external.h @@ -21,7 +21,8 @@ #define ZABBIX_CHECKS_EXTERNAL_H #include "dbcache.h" -#include "sysinfo.h" +#include "module.h" +//#include "sysinfo.h" int get_value_external(const DC_ITEM *item, AGENT_RESULT *result); diff --git a/src/zabbix_server/poller/checks_http.h b/src/zabbix_server/poller/checks_http.h index 095ef1f2bb3..3e628238039 100644 --- a/src/zabbix_server/poller/checks_http.h +++ b/src/zabbix_server/poller/checks_http.h @@ -20,7 +20,8 @@ #ifndef ZABBIX_CHECKS_HTTP_H #define ZABBIX_CHECKS_HTTP_H -#include "common.h" +//#include "common.h" +#include "module.h" #ifdef HAVE_LIBCURL #include "dbcache.h" diff --git a/src/zabbix_server/poller/checks_internal.c b/src/zabbix_server/poller/checks_internal.c index 7de6660b3e4..d1e8e62039b 100644 --- a/src/zabbix_server/poller/checks_internal.c +++ b/src/zabbix_server/poller/checks_internal.c @@ -22,7 +22,8 @@ #include "checks_java.h" #include "dbcache.h" #include "zbxself.h" -#include "proxy.h" +//#include "proxy.h" +#include "preproc.h" #include "zbxtrends.h" #include "../vmware/vmware.h" diff --git a/src/zabbix_server/poller/checks_internal.h b/src/zabbix_server/poller/checks_internal.h index 2bcde0ce1ca..ca7513687bb 100644 --- a/src/zabbix_server/poller/checks_internal.h +++ b/src/zabbix_server/poller/checks_internal.h @@ -20,10 +20,10 @@ #ifndef ZABBIX_CHECKS_INTERNAL_H #define ZABBIX_CHECKS_INTERNAL_H -#include "common.h" +//#include "common.h" #include "dbcache.h" -#include "sysinfo.h" -#include "preproc.h" +//#include "sysinfo.h" +//#include "preproc.h" extern int CONFIG_SERVER_STARTUP_TIME; diff --git a/src/zabbix_server/poller/checks_internal_proxy.c b/src/zabbix_server/poller/checks_internal_proxy.c index fedb1d900fa..4344bf9f422 100644 --- a/src/zabbix_server/poller/checks_internal_proxy.c +++ b/src/zabbix_server/poller/checks_internal_proxy.c @@ -19,7 +19,7 @@ #include "common.h" #include "proxy.h" -#include "checks_internal.h" +//#include "checks_internal.h" /****************************************************************************** * * diff --git a/src/zabbix_server/poller/checks_internal_server.c b/src/zabbix_server/poller/checks_internal_server.c index 5c9efac7699..d36267c2c84 100644 --- a/src/zabbix_server/poller/checks_internal_server.c +++ b/src/zabbix_server/poller/checks_internal_server.c @@ -19,9 +19,10 @@ #include "common.h" #include "valuecache.h" -#include "preproc.h" +//#include "preproc.h" #include "zbxlld.h" -#include "checks_internal.h" +//#include "checks_internal.h" +#include "dbcache.h" #include "zbxha.h" /****************************************************************************** diff --git a/src/zabbix_server/poller/checks_java.h b/src/zabbix_server/poller/checks_java.h index 63088c5d6e0..3af95377be2 100644 --- a/src/zabbix_server/poller/checks_java.h +++ b/src/zabbix_server/poller/checks_java.h @@ -21,7 +21,7 @@ #define ZABBIX_CHECKS_JAVA_H #include "dbcache.h" -#include "sysinfo.h" +//#include "sysinfo.h" #define ZBX_JAVA_GATEWAY_REQUEST_INTERNAL 0 #define ZBX_JAVA_GATEWAY_REQUEST_JMX 1 diff --git a/src/zabbix_server/poller/checks_script.h b/src/zabbix_server/poller/checks_script.h index 7dbf5284e8c..c171184f81a 100644 --- a/src/zabbix_server/poller/checks_script.h +++ b/src/zabbix_server/poller/checks_script.h @@ -20,7 +20,8 @@ #ifndef ZABBIX_CHECKS_SCRIPT_H #define ZABBIX_CHECKS_SCRIPT_H -#include "common.h" +//#include "common.h" +#include "module.h" #include "dbcache.h" void scriptitem_es_engine_init(void); diff --git a/src/zabbix_server/poller/checks_simple.c b/src/zabbix_server/poller/checks_simple.c index 2e5c5413a16..ebfc2eac543 100644 --- a/src/zabbix_server/poller/checks_simple.c +++ b/src/zabbix_server/poller/checks_simple.c @@ -17,6 +17,8 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ +#include "common.h" + #include "checks_simple_vmware.h" #include "checks_simple.h" #include "simple.h" diff --git a/src/zabbix_server/poller/checks_simple.h b/src/zabbix_server/poller/checks_simple.h index 8a228628654..b6e13e048e9 100644 --- a/src/zabbix_server/poller/checks_simple.h +++ b/src/zabbix_server/poller/checks_simple.h @@ -20,9 +20,11 @@ #ifndef ZABBIX_CHECKS_SIMPLE_H #define ZABBIX_CHECKS_SIMPLE_H -#include "common.h" +//#include "common.h" #include "dbcache.h" -#include "sysinfo.h" +#include "module.h" +#include "zbxalgo.h" +//#include "sysinfo.h" int get_value_simple(const DC_ITEM *item, AGENT_RESULT *result, zbx_vector_ptr_t *add_results); diff --git a/src/zabbix_server/poller/checks_simple_vmware.h b/src/zabbix_server/poller/checks_simple_vmware.h index 45d853a54f7..d8b0698da87 100644 --- a/src/zabbix_server/poller/checks_simple_vmware.h +++ b/src/zabbix_server/poller/checks_simple_vmware.h @@ -20,7 +20,7 @@ #ifndef ZABBIX_CHECKS_SIMPLE_VMWARE_H #define ZABBIX_CHECKS_SIMPLE_VMWARE_H -#include "common.h" +//#include "common.h" #if defined(HAVE_LIBXML2) && defined(HAVE_LIBCURL) #include "sysinfo.h" #include "zbxalgo.h" diff --git a/src/zabbix_server/poller/checks_snmp.c b/src/zabbix_server/poller/checks_snmp.c index f06f3174606..35590dbe825 100644 --- a/src/zabbix_server/poller/checks_snmp.c +++ b/src/zabbix_server/poller/checks_snmp.c @@ -25,6 +25,7 @@ #include <net-snmp/net-snmp-config.h> #include <net-snmp/net-snmp-includes.h> +#include "log.h" #include "comms.h" #include "zbxalgo.h" #include "zbxjson.h" diff --git a/src/zabbix_server/poller/checks_snmp.h b/src/zabbix_server/poller/checks_snmp.h index 6e5f9f6dfc9..beff9d6332c 100644 --- a/src/zabbix_server/poller/checks_snmp.h +++ b/src/zabbix_server/poller/checks_snmp.h @@ -20,10 +20,12 @@ #ifndef ZABBIX_CHECKS_SNMP_H #define ZABBIX_CHECKS_SNMP_H -#include "common.h" -#include "log.h" +//#include "common.h" +//#include "log.h" +#include "config.h" +#include "module.h" #include "dbcache.h" -#include "sysinfo.h" +//#include "sysinfo.h" extern char *CONFIG_SOURCE_IP; extern int CONFIG_TIMEOUT; diff --git a/src/zabbix_server/poller/checks_ssh.h b/src/zabbix_server/poller/checks_ssh.h index a5cf97a6599..c7892864fb7 100644 --- a/src/zabbix_server/poller/checks_ssh.h +++ b/src/zabbix_server/poller/checks_ssh.h @@ -20,11 +20,13 @@ #ifndef ZABBIX_CHECKS_SSH_H #define ZABBIX_CHECKS_SSH_H -#include "common.h" +//#include "common.h" +#include "module.h" +#include "config.h" #if defined(HAVE_SSH2) || defined(HAVE_SSH) #include "dbcache.h" -#include "sysinfo.h" +//#include "sysinfo.h" extern char *CONFIG_SOURCE_IP; extern char *CONFIG_SSH_KEY_LOCATION; diff --git a/src/zabbix_server/poller/checks_telnet.h b/src/zabbix_server/poller/checks_telnet.h index 72eeb2b1cf5..3414c198899 100644 --- a/src/zabbix_server/poller/checks_telnet.h +++ b/src/zabbix_server/poller/checks_telnet.h @@ -20,9 +20,10 @@ #ifndef ZABBIX_CHECKS_TELNET_H #define ZABBIX_CHECKS_TELNET_H -#include "common.h" +//#include "common.h" +#include "module.h" #include "dbcache.h" -#include "sysinfo.h" +//#include "sysinfo.h" extern char *CONFIG_SOURCE_IP; diff --git a/src/zabbix_server/poller/poller.c b/src/zabbix_server/poller/poller.c index 6c587ee1c84..a980e9b57ce 100644 --- a/src/zabbix_server/poller/poller.c +++ b/src/zabbix_server/poller/poller.c @@ -25,7 +25,7 @@ #include "zbxserver.h" #include "zbxself.h" #include "preproc.h" -#include "../events.h" +//#include "../events.h" #include "poller.h" @@ -45,6 +45,7 @@ #include "zbxjson.h" #include "zbxhttp.h" #include "avail_protocol.h" +#include "log.h" #include "zbxavailability.h" extern ZBX_THREAD_LOCAL unsigned char process_type; diff --git a/src/zabbix_server/postinit.c b/src/zabbix_server/postinit.c index 7b9884d3124..dd3a5c5cd41 100644 --- a/src/zabbix_server/postinit.c +++ b/src/zabbix_server/postinit.c @@ -23,7 +23,7 @@ #include "log.h" #include "zbxserver.h" #include "postinit.h" -#include "valuecache.h" +//#include "valuecache.h" #define ZBX_HIST_MACRO_NONE (-1) #define ZBX_HIST_MACRO_ITEM_VALUE 0 diff --git a/src/zabbix_server/preprocessor/preproc_cache.c b/src/zabbix_server/preprocessor/preproc_cache.c index 347d5198b6f..0b08628a69d 100644 --- a/src/zabbix_server/preprocessor/preproc_cache.c +++ b/src/zabbix_server/preprocessor/preproc_cache.c @@ -17,7 +17,7 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "log.h" +//#include "log.h" #include "../../libs/zbxalgo/vectorimpl.h" #include "zbxprometheus.h" #include "item_preproc.h" diff --git a/src/zabbix_server/preprocessor/preproc_history.c b/src/zabbix_server/preprocessor/preproc_history.c index f85828239ca..180d7e8f9b9 100644 --- a/src/zabbix_server/preprocessor/preproc_history.c +++ b/src/zabbix_server/preprocessor/preproc_history.c @@ -18,7 +18,7 @@ **/ #include "common.h" -#include "log.h" +//#include "log.h" #include "preproc_history.h" diff --git a/src/zabbix_server/preprocessor/preproc_history.h b/src/zabbix_server/preprocessor/preproc_history.h index 70179a586b0..602c26f8abd 100644 --- a/src/zabbix_server/preprocessor/preproc_history.h +++ b/src/zabbix_server/preprocessor/preproc_history.h @@ -21,7 +21,7 @@ #define ZABBIX_PREPROC_HISTORY_H #include "common.h" -#include "dbcache.h" +//#include "dbcache.h" #include "zbxvariant.h" typedef struct diff --git a/src/zabbix_server/preprocessor/preproc_manager.c b/src/zabbix_server/preprocessor/preproc_manager.c index 250336d23e8..ae51249ef8e 100644 --- a/src/zabbix_server/preprocessor/preproc_manager.c +++ b/src/zabbix_server/preprocessor/preproc_manager.c @@ -23,9 +23,9 @@ #include "daemon.h" #include "zbxself.h" #include "log.h" -#include "zbxserver.h" +//#include "zbxserver.h" #include "sysinfo.h" -#include "zbxserialize.h" +//#include "zbxserialize.h" #include "zbxipcservice.h" #include "zbxlld.h" diff --git a/src/zabbix_server/preprocessor/preproc_worker.c b/src/zabbix_server/preprocessor/preproc_worker.c index e5450f415b4..65ce00f8a23 100644 --- a/src/zabbix_server/preprocessor/preproc_worker.c +++ b/src/zabbix_server/preprocessor/preproc_worker.c @@ -22,11 +22,11 @@ #include "zbxself.h" #include "log.h" #include "zbxipcservice.h" -#include "zbxserialize.h" +//#include "zbxserialize.h" #include "preprocessing.h" #include "zbxembed.h" -#include "sysinfo.h" +//#include "sysinfo.h" #include "preproc_worker.h" #include "item_preproc.h" #include "preproc_history.h" diff --git a/src/zabbix_server/preprocessor/preproc_worker.h b/src/zabbix_server/preprocessor/preproc_worker.h index d8e639e9555..628f77c77c3 100644 --- a/src/zabbix_server/preprocessor/preproc_worker.h +++ b/src/zabbix_server/preprocessor/preproc_worker.h @@ -20,7 +20,7 @@ #ifndef ZABBIX_PREPROCESSING_WORKER_H #define ZABBIX_PREPROCESSING_WORKER_H -#include "common.h" +//#include "common.h" #include "threads.h" ZBX_THREAD_ENTRY(preprocessing_worker_thread, args); diff --git a/src/zabbix_server/preprocessor/preprocessing.c b/src/zabbix_server/preprocessor/preprocessing.c index b938432272b..aa1ea07d35c 100644 --- a/src/zabbix_server/preprocessor/preprocessing.c +++ b/src/zabbix_server/preprocessor/preprocessing.c @@ -19,8 +19,8 @@ #include "common.h" #include "log.h" -#include "proxy.h" -#include "zbxserver.h" +//#include "proxy.h" +//#include "zbxserver.h" #include "zbxserialize.h" #include "zbxipcservice.h" diff --git a/src/zabbix_server/reporter/report_protocol.c b/src/zabbix_server/reporter/report_protocol.c index 84f73e79da0..b319684ddf5 100644 --- a/src/zabbix_server/reporter/report_protocol.c +++ b/src/zabbix_server/reporter/report_protocol.c @@ -18,7 +18,7 @@ **/ #include "common.h" -#include "zbxreport.h" +//#include "zbxreport.h" #include "report_protocol.h" #include "zbxipcservice.h" #include "zbxserialize.h" @@ -123,7 +123,7 @@ void report_deserialize_test_report(const unsigned char *data, char **name, zbx_ } } -#include "log.h" +//#include "log.h" /****************************************************************************** * * diff --git a/src/zabbix_server/reporter/report_protocol.h b/src/zabbix_server/reporter/report_protocol.h index 98304872857..6e36ce643ac 100644 --- a/src/zabbix_server/reporter/report_protocol.h +++ b/src/zabbix_server/reporter/report_protocol.h @@ -20,7 +20,7 @@ #ifndef ZABBIX_REPORT_PROTOCOL_H #define ZABBIX_REPORT_PROTOCOL_H -#include "common.h" +//#include "common.h" #include "zbxalgo.h" #include "db.h" diff --git a/src/zabbix_server/reporter/report_writer.c b/src/zabbix_server/reporter/report_writer.c index ea0fee3bb9b..6ed41a21c5d 100644 --- a/src/zabbix_server/reporter/report_writer.c +++ b/src/zabbix_server/reporter/report_writer.c @@ -22,7 +22,7 @@ #include "zbxself.h" #include "log.h" #include "zbxipcservice.h" -#include "zbxserialize.h" +//#include "zbxserialize.h" #include "zbxjson.h" #include "zbxalert.h" #include "db.h" diff --git a/src/zabbix_server/reporter/report_writer.h b/src/zabbix_server/reporter/report_writer.h index f3423d8814a..948044ddebb 100644 --- a/src/zabbix_server/reporter/report_writer.h +++ b/src/zabbix_server/reporter/report_writer.h @@ -20,7 +20,7 @@ #ifndef ZABBIX_REPORT_WRITER_H #define ZABBIX_REPORT_WRITER_H -#include "common.h" +//#include "common.h" #include "threads.h" ZBX_THREAD_ENTRY(report_writer_thread, args); diff --git a/src/zabbix_server/scripts/scripts.c b/src/zabbix_server/scripts/scripts.c index 04073e839cb..a8a8e206bb2 100644 --- a/src/zabbix_server/scripts/scripts.c +++ b/src/zabbix_server/scripts/scripts.c @@ -30,7 +30,7 @@ #include "scripts.h" #include "zbxjson.h" #include "zbxembed.h" -#include "../events.h" +//#include "../events.h" extern int CONFIG_TRAPPER_TIMEOUT; extern int CONFIG_IPMIPOLLER_FORKS; diff --git a/src/zabbix_server/service/service_actions.h b/src/zabbix_server/service/service_actions.h index f1a8fbc10b3..490d6e42ce8 100644 --- a/src/zabbix_server/service/service_actions.h +++ b/src/zabbix_server/service/service_actions.h @@ -17,7 +17,7 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" +//#include "common.h" #include "zbxalgo.h" #include "service_manager_impl.h" diff --git a/src/zabbix_server/service/service_manager.c b/src/zabbix_server/service/service_manager.c index 486cccfcde3..c4c5204ca07 100644 --- a/src/zabbix_server/service/service_manager.c +++ b/src/zabbix_server/service/service_manager.c @@ -17,7 +17,7 @@ ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **/ -#include "common.h" +//#include "common.h" #include "log.h" #include "zbxself.h" #include "zbxservice.h" @@ -25,7 +25,7 @@ #include "service_manager.h" #include "daemon.h" #include "sighandler.h" -#include "dbcache.h" +//#include "dbcache.h" #include "zbxalgo.h" #include "service_protocol.h" #include "service_actions.h" diff --git a/src/zabbix_server/timer/timer.c b/src/zabbix_server/timer/timer.c index 24a99b9ed56..0b790ecc103 100644 --- a/src/zabbix_server/timer/timer.c +++ b/src/zabbix_server/timer/timer.c @@ -19,12 +19,12 @@ #include "common.h" -#include "cfg.h" -#include "pid.h" -#include "db.h" +//#include "cfg.h" +//#include "pid.h" +//#include "db.h" #include "log.h" #include "dbcache.h" -#include "zbxserver.h" +//#include "zbxserver.h" #include "daemon.h" #include "zbxself.h" #include "db.h" diff --git a/src/zabbix_server/trapper/active.h b/src/zabbix_server/trapper/active.h index 79185676d25..09ac3e22483 100644 --- a/src/zabbix_server/trapper/active.h +++ b/src/zabbix_server/trapper/active.h @@ -20,8 +20,8 @@ #ifndef ZABBIX_TRAPPER_ACTIVE_H #define ZABBIX_TRAPPER_ACTIVE_H -#include "common.h" -#include "db.h" +//#include "common.h" +//#include "db.h" #include "comms.h" #include "zbxjson.h" diff --git a/src/zabbix_server/trapper/trapper_auth.h b/src/zabbix_server/trapper/trapper_auth.h index 9aa00162a0b..0dc40a3088d 100644 --- a/src/zabbix_server/trapper/trapper_auth.h +++ b/src/zabbix_server/trapper/trapper_auth.h @@ -20,7 +20,8 @@ #ifndef ZABBIX_TRAPPER_AUTH_H #define ZABBIX_TRAPPER_AUTH_H -#include "comms.h" +//#include "comms.h" +#include "common.h" #include "zbxjson.h" int zbx_get_user_from_json(const struct zbx_json_parse *jp, zbx_user_t *user, char **result); |