diff --git a/src/shared_modules/common/commonDefs.h b/src/shared_modules/common/commonDefs.h index 7622530447..9afdfef316 100644 --- a/src/shared_modules/common/commonDefs.h +++ b/src/shared_modules/common/commonDefs.h @@ -12,7 +12,7 @@ #ifndef _COMMON_DEFS_H_ #define _COMMON_DEFS_H_ -#include "cJSON.h" +#include /** * @brief Represents the different host types to be used. diff --git a/src/headers/debug_op.h b/src/headers/debug_op.h index c64c93c34f..d57484db0c 100644 --- a/src/headers/debug_op.h +++ b/src/headers/debug_op.h @@ -24,7 +24,7 @@ #endif #include -#include +#include /* For internal logs */ #ifndef LOGFILE #ifndef WIN32 diff --git a/src/headers/agent_op.h b/src/headers/agent_op.h index 27d2a3c02f..b8014e2799 100644 --- a/src/headers/agent_op.h +++ b/src/headers/agent_op.h @@ -11,7 +11,7 @@ #ifndef AGENT_OP_H #define AGENT_OP_H -#include "external/cJSON/cJSON.h" +#include #include "config/authd-config.h" /** diff --git a/src/headers/file_op.h b/src/headers/file_op.h index c5fc4ad68c..02e9c8122f 100644 --- a/src/headers/file_op.h +++ b/src/headers/file_op.h @@ -17,7 +17,7 @@ #include #include #include -#include +#include #ifdef WIN32 #include diff --git a/src/headers/expression.h b/src/headers/expression.h index de3a8aaf2d..6f780b751c 100644 --- a/src/headers/expression.h +++ b/src/headers/expression.h @@ -12,7 +12,7 @@ #define EXPRESSION_H_ #define PCRE2_CODE_UNIT_WIDTH 8 -#include "external/libpcre2/include/pcre2.h" +#include #include "os_regex/os_regex.h" #define OSMATCH_STR "osmatch" diff --git a/src/headers/regex_op.h b/src/headers/regex_op.h index e0a225606a..8512e6f5b5 100644 --- a/src/headers/regex_op.h +++ b/src/headers/regex_op.h @@ -13,7 +13,7 @@ #ifndef WIN32 #include -#include "external/sqlite/sqlite3.h" +#include /** * @brief Compare a string with a regular expression. diff --git a/src/headers/json-queue.h b/src/headers/json-queue.h index 58b75f34fc..f8db6f2921 100644 --- a/src/headers/json-queue.h +++ b/src/headers/json-queue.h @@ -10,7 +10,7 @@ #ifndef JSON_QUEUE_H #define JSON_QUEUE_H -#include +#include #include "file-queue.h" // Initializes queue. Equivalent to initialize every field to 0. diff --git a/src/headers/read-agents.h b/src/headers/read-agents.h index 0ea6e983d1..a5d36faa74 100644 --- a/src/headers/read-agents.h +++ b/src/headers/read-agents.h @@ -11,7 +11,7 @@ #ifndef CRAGENT_H #define CRAGENT_H -#include +#include /* Status */ typedef enum agent_status_t { diff --git a/src/headers/string_op.h b/src/headers/string_op.h index 56616aad74..1e1b352bec 100644 --- a/src/headers/string_op.h +++ b/src/headers/string_op.h @@ -11,7 +11,7 @@ #ifndef H_STRINGOP_OS #define H_STRINGOP_OS -#include +#include #include #ifdef WIN32 diff --git a/src/headers/json_op.h b/src/headers/json_op.h index fea303bca8..585ac4dcf2 100644 --- a/src/headers/json_op.h +++ b/src/headers/json_op.h @@ -14,7 +14,7 @@ #define JSON_MAX_FSIZE 536870912 -#include +#include cJSON * json_fread(const char * path, char retry); int json_fwrite(const char * path, const cJSON * item); diff --git a/src/headers/url.h b/src/headers/url.h index 02d27907b7..e013b97bf6 100644 --- a/src/headers/url.h +++ b/src/headers/url.h @@ -12,7 +12,7 @@ #ifndef URL_GET_H_ #define URL_GET_H_ -#include +#include #define WURL_WRITE_FILE_ERROR "Cannot open file '%s'" #define WURL_DOWNLOAD_FILE_ERROR "Cannot download file '%s' from URL: '%s'" diff --git a/src/headers/yaml2json.h b/src/headers/yaml2json.h index ddbce4c1d9..e363fac7d5 100644 --- a/src/headers/yaml2json.h +++ b/src/headers/yaml2json.h @@ -11,8 +11,8 @@ #ifndef YAML2JSON_H #define YAML2JSON_H -#include -#include +#include +#include int yaml_parse_stdin(yaml_document_t * document); int yaml_parse_file(const char * path, yaml_document_t * document); diff --git a/src/config/syscheck-config.h b/src/config/syscheck-config.h index 9c451c8020..159da5d7d8 100644 --- a/src/config/syscheck-config.h +++ b/src/config/syscheck-config.h @@ -143,7 +143,7 @@ typedef enum fdb_stmt { #include "os_crypto/md5_sha1_sha256/md5_sha1_sha256_op.h" #include "headers/integrity_op.h" -#include "external/sqlite/sqlite3.h" +#include #include "headers/list_op.h" #ifdef WIN32 diff --git a/src/syscheckd/syscheck.h b/src/syscheckd/syscheck.h index e2077eb4fe..6923b5ddcd 100644 --- a/src/syscheckd/syscheck.h +++ b/src/syscheckd/syscheck.h @@ -13,7 +13,7 @@ #include "config/syscheck-config.h" #include "syscheck_op.h" -#include "external/cJSON/cJSON.h" +#include #define MAX_LINE PATH_MAX+256 diff --git a/src/monitord/compress_log.c b/src/monitord/compress_log.c index 8865df9762..52ae95c122 100644 --- a/src/monitord/compress_log.c +++ b/src/monitord/compress_log.c @@ -10,7 +10,7 @@ #include "shared.h" #include "monitord.h" -#include "../external/zlib/zlib.h" +#include /* gzip a log file */ diff --git a/src/wazuh_db/wdb.h b/src/wazuh_db/wdb.h index c0e14eefe1..a35cc7bc57 100644 --- a/src/wazuh_db/wdb.h +++ b/src/wazuh_db/wdb.h @@ -15,7 +15,7 @@ #include #include #include -#include "external/sqlite/sqlite3.h" +#include #include "syscheck_op.h" #include "rootcheck_op.h" #include "wazuhdb_op.h" diff --git a/src/wazuh_modules/wm_control.c b/src/wazuh_modules/wm_control.c index a91e054f47..d040ab3c09 100644 --- a/src/wazuh_modules/wm_control.c +++ b/src/wazuh_modules/wm_control.c @@ -20,7 +20,7 @@ #include "wm_control.h" #include "sysInfo.h" #include "sym_load.h" -#include "external/cJSON/cJSON.h" +#include #include "file_op.h" #include "../os_net/os_net.h" static void *wm_control_main(); diff --git a/src/addagent/manage_agents.h b/src/addagent/manage_agents.h index afdb5b3aa3..96d29791c6 100644 --- a/src/addagent/manage_agents.h +++ b/src/addagent/manage_agents.h @@ -13,7 +13,7 @@ #include "shared.h" #include "sec.h" -#include "external/cJSON/cJSON.h" +#include /** Prototypes **/ diff --git a/src/wazuh_modules/agent_upgrade/agent/wm_agent_upgrade_com.c b/src/wazuh_modules/agent_upgrade/agent/wm_agent_upgrade_com.c index 8ec79628d1..b4bf3efc17 100644 --- a/src/wazuh_modules/agent_upgrade/agent/wm_agent_upgrade_com.c +++ b/src/wazuh_modules/agent_upgrade/agent/wm_agent_upgrade_com.c @@ -21,7 +21,7 @@ #endif #include -#include "external/zlib/zlib.h" +#include #include "os_crypto/sha1/sha1_op.h" #include "os_crypto/signature/signature.h" #include "wazuh_modules/wmodules.h" diff --git a/src/wazuh_modules/wm_database.c b/src/wazuh_modules/wm_database.c index 3f0ac3c04f..65c90dfbae 100644 --- a/src/wazuh_modules/wm_database.c +++ b/src/wazuh_modules/wm_database.c @@ -14,7 +14,7 @@ #include "remoted_op.h" #include "wazuh_db/helpers/wdb_global_helpers.h" #include "addagent/manage_agents.h" // FILE_SIZE -#include "external/cJSON/cJSON.h" +#include #ifndef CLIENT diff --git a/src/wazuh_db/wdb_parser.c b/src/wazuh_db/wdb_parser.c index 094d9190a1..950142454e 100644 --- a/src/wazuh_db/wdb_parser.c +++ b/src/wazuh_db/wdb_parser.c @@ -12,7 +12,7 @@ #include "wazuhdb_op.h" #include "wdb.h" #include "wdb_agents.h" -#include "external/cJSON/cJSON.h" +#include #include "wdb_state.h" #define HOTFIXES_FIELD_COUNT 3 diff --git a/src/shared/debug_op.c b/src/shared/debug_op.c index 67b8d031cf..c9bb9724de 100644 --- a/src/shared/debug_op.c +++ b/src/shared/debug_op.c @@ -9,7 +9,7 @@ */ #include "headers/shared.h" -#include +#include #ifdef WIN32 #define localtime_r(x, y) localtime_s(y, x) diff --git a/src/shared/file_op.c b/src/shared/file_op.c index 6b95b832a6..c34a92b536 100644 --- a/src/shared/file_op.c +++ b/src/shared/file_op.c @@ -14,7 +14,7 @@ #include "shared.h" #include "version_op.h" -#include "../external/zlib/zlib.h" +#include #ifdef WAZUH_UNIT_TESTING #ifdef WIN32 diff --git a/src/os_zlib/os_zlib.c b/src/os_zlib/os_zlib.c index 1244fdcdbe..dc44eb54bc 100644 --- a/src/os_zlib/os_zlib.c +++ b/src/os_zlib/os_zlib.c @@ -10,7 +10,7 @@ #include "os_zlib.h" -#include "../external/zlib/zlib.h" +#include unsigned long int os_zlib_compress(const char *src, char *dst, unsigned long int src_size, diff --git a/src/rootcheck/rootcheck.h b/src/rootcheck/rootcheck.h index 3a183fc72b..347acc1596 100644 --- a/src/rootcheck/rootcheck.h +++ b/src/rootcheck/rootcheck.h @@ -13,7 +13,7 @@ #include "list_op.h" #include "config/rootcheck-config.h" -#include "external/cJSON/cJSON.h" +#include #ifdef WIN32 #define PATH_SEP '\\' diff --git a/src/syscheckd/db/fim_db.h b/src/syscheckd/db/fim_db.h index 3ae93cb9cd..cf4b0b0d88 100644 --- a/src/syscheckd/db/fim_db.h +++ b/src/syscheckd/db/fim_db.h @@ -14,7 +14,7 @@ #include "shared.h" #include #include "../syscheck.h" -#include "external/sqlite/sqlite3.h" +#include #include "config/syscheck-config.h" #include "fim_db_files.h" #include "fim_db_registries.h" diff --git a/src/syscheckd/whodata/syscheck_audit.c b/src/syscheckd/whodata/syscheck_audit.c index 2926f24f68..5b47417048 100644 --- a/src/syscheckd/whodata/syscheck_audit.c +++ b/src/syscheckd/whodata/syscheck_audit.c @@ -9,7 +9,7 @@ */ #ifdef __linux__ #include "syscheck_audit.h" -#include "external/procps/readproc.h" +#include #include #include diff --git a/src/rootcheck/config.c b/src/rootcheck/config.c index 26b672330b..c0cd806939 100644 --- a/src/rootcheck/config.c +++ b/src/rootcheck/config.c @@ -12,7 +12,7 @@ #include "shared.h" #include "rootcheck.h" #include "config/config.h" -#include "external/cJSON/cJSON.h" +#include /* Read the rootcheck config */ diff --git a/src/os_execd/execd.c b/src/os_execd/execd.c index d0c86b2547..e2cc526421 100644 --- a/src/os_execd/execd.c +++ b/src/os_execd/execd.c @@ -13,7 +13,7 @@ #include "os_regex/os_regex.h" #include "os_net/os_net.h" #include "wazuh_modules/wmodules.h" -#include "../external/cJSON/cJSON.h" +#include #include "execd.h" #include "active-response/active_responses.h" diff --git a/src/os_execd/wcom.c b/src/os_execd/wcom.c index 3d04e822af..b58ac99bdf 100644 --- a/src/os_execd/wcom.c +++ b/src/os_execd/wcom.c @@ -15,7 +15,7 @@ #include "os_crypto/sha1/sha1_op.h" #include "os_crypto/signature/signature.h" #include "wazuh_modules/wmodules.h" -#include "external/zlib/zlib.h" +#include #include "client-agent/agentd.h" #include "logcollector/logcollector.h" #include "syscheckd/syscheck.h" diff --git a/src/addagent/manage_agents.c b/src/addagent/manage_agents.c index 3f32cac1ea..0daeca3266 100644 --- a/src/addagent/manage_agents.c +++ b/src/addagent/manage_agents.c @@ -16,7 +16,7 @@ #include "debug_op.h" #include "defs.h" #include "os_crypto/md5/md5_op.h" -#include "external/cJSON/cJSON.h" +#include #include "os_err.h" #include #include diff --git a/src/addagent/manage_keys.c b/src/addagent/manage_keys.c index c1cd1e8245..ee0fe79af3 100644 --- a/src/addagent/manage_keys.c +++ b/src/addagent/manage_keys.c @@ -10,7 +10,7 @@ #include "manage_agents.h" #include "os_crypto/md5/md5_op.h" -#include "external/cJSON/cJSON.h" +#include #include #include "config/authd-config.h"