Remove unecessary relative paths when including headers. (#11124)

Currently, we add the repository's top-level dir in the compiler's header search path. This means that code in every top-level directory within the repo can include headers sibling top-level directories. This patch makes header inclusion consistent when it comes to files that are included from sibling top-level directories within the repo.
2021-05-24 17:44:50 +03:00 · 2021-05-24 17:44:50 +03:00 · b8cd2bdc50
parent 277e4f10bc
commit b8cd2bdc50
69 changed files with 84 additions and 84 deletions
--- a/aclk/aclk.h
+++ b/aclk/aclk.h
@ -6,7 +6,7 @@ typedef struct aclk_rrdhost_state {
    char *claimed_id; // Claimed ID if host has one otherwise NULL
 } aclk_rrdhost_state;

-#include "../daemon/common.h"
+#include "daemon/common.h"
 #include "aclk_util.h"

 // version for aclk legacy (old cloud arch)
--- a/aclk/aclk_otp.c
+++ b/aclk/aclk_otp.c
@ -3,9 +3,9 @@

 #include "aclk_otp.h"

-#include "../daemon/common.h"
+#include "daemon/common.h"

-#include "../mqtt_websockets/c-rbuf/include/ringbuffer.h"
+#include "mqtt_websockets/c-rbuf/include/ringbuffer.h"

 // CentOS 7 has older version that doesn't define this
 // same goes for MacOS
--- a/aclk/aclk_otp.h
+++ b/aclk/aclk_otp.h
@ -3,7 +3,7 @@
 #ifndef ACLK_OTP_H
 #define ACLK_OTP_H

-#include "../daemon/common.h"
+#include "daemon/common.h"

 #include "https_client.h"

--- a/aclk/aclk_query_queue.h
+++ b/aclk/aclk_query_queue.h
@ -4,7 +4,7 @@
 #define NETDATA_ACLK_QUERY_QUEUE_H

 #include "libnetdata/libnetdata.h"
-#include "../daemon/common.h"
+#include "daemon/common.h"

 typedef enum {
    UNKNOWN,
--- a/aclk/aclk_rx_msgs.h
+++ b/aclk/aclk_rx_msgs.h
@ -5,7 +5,7 @@
 #ifndef ACLK_RX_MSGS_H
 #define ACLK_RX_MSGS_H

-#include "../daemon/common.h"
+#include "daemon/common.h"
 #include "libnetdata/libnetdata.h"

 int aclk_handle_cloud_message(char *payload);
--- a/aclk/aclk_stats.h
+++ b/aclk/aclk_stats.h
@ -3,7 +3,7 @@
 #ifndef NETDATA_ACLK_STATS_H
 #define NETDATA_ACLK_STATS_H

-#include "../daemon/common.h"
+#include "daemon/common.h"
 #include "libnetdata/libnetdata.h"

 #define ACLK_STATS_THREAD_NAME "ACLK_Stats"
--- a/aclk/aclk_tx_msgs.c
+++ b/aclk/aclk_tx_msgs.c
@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later

 #include "aclk_tx_msgs.h"
-#include "../daemon/common.h"
+#include "daemon/common.h"
 #include "aclk_util.h"
 #include "aclk_stats.h"

--- a/aclk/aclk_tx_msgs.h
+++ b/aclk/aclk_tx_msgs.h
@ -4,7 +4,7 @@

 #include <json-c/json.h>
 #include "libnetdata/libnetdata.h"
-#include "../daemon/common.h"
+#include "daemon/common.h"
 #include "mqtt_wss_client.h"

 void aclk_send_info_metadata(mqtt_wss_client client, int metadata_submitted, RRDHOST *host);
--- a/aclk/aclk_util.c
+++ b/aclk/aclk_util.c
@ -4,7 +4,7 @@

 #include <stdio.h>

-#include "../daemon/common.h"
+#include "daemon/common.h"

 // CentOS 7 has older version that doesn't define this
 // same goes for MacOS
--- a/aclk/https_client.c
+++ b/aclk/https_client.c
@ -4,7 +4,7 @@

 #include "https_client.h"

-#include "../mqtt_websockets/c-rbuf/include/ringbuffer.h"
+#include "mqtt_websockets/c-rbuf/include/ringbuffer.h"

 enum http_parse_state {
    HTTP_PARSE_INITIAL = 0,
--- a/aclk/legacy/aclk_common.c
+++ b/aclk/legacy/aclk_common.c
@ -1,6 +1,6 @@
 #include "aclk_common.h"

-#include "../../daemon/common.h"
+#include "daemon/common.h"

 #ifdef ENABLE_ACLK
 #include <libwebsockets.h>
--- a/aclk/legacy/aclk_common.h
+++ b/aclk/legacy/aclk_common.h
@ -2,7 +2,7 @@
 #define ACLK_COMMON_H

 #include "aclk_rrdhost_state.h"
-#include "../../daemon/common.h"
+#include "daemon/common.h"

 extern netdata_mutex_t aclk_shared_state_mutex;
 #define ACLK_SHARED_STATE_LOCK netdata_mutex_lock(&aclk_shared_state_mutex)
--- a/aclk/legacy/aclk_lws_https_client.h
+++ b/aclk/legacy/aclk_lws_https_client.h
@ -3,7 +3,7 @@
 #ifndef NETDATA_LWS_HTTPS_CLIENT_H
 #define NETDATA_LWS_HTTPS_CLIENT_H

-#include "../../daemon/common.h"
+#include "daemon/common.h"
 #include "libnetdata/libnetdata.h"

 #define DATAMAXLEN 1024*16
--- a/aclk/legacy/aclk_lws_wss_client.c
+++ b/aclk/legacy/aclk_lws_wss_client.c
@ -3,7 +3,7 @@
 #include "aclk_lws_wss_client.h"

 #include "libnetdata/libnetdata.h"
-#include "../../daemon/common.h"
+#include "daemon/common.h"
 #include "aclk_common.h"
 #include "aclk_stats.h"

--- a/aclk/legacy/aclk_rrdhost_state.h
+++ b/aclk/legacy/aclk_rrdhost_state.h
@ -1,7 +1,7 @@
 #ifndef ACLK_RRDHOST_STATE_H
 #define ACLK_RRDHOST_STATE_H

-#include "../../libnetdata/libnetdata.h"
+#include "libnetdata/libnetdata.h"

 typedef enum aclk_cmd {
    ACLK_CMD_CLOUD,
--- a/aclk/legacy/aclk_rx_msgs.h
+++ b/aclk/legacy/aclk_rx_msgs.h
@ -3,7 +3,7 @@
 #ifndef NETDATA_ACLK_RX_MSGS_H
 #define NETDATA_ACLK_RX_MSGS_H

-#include "../../daemon/common.h"
+#include "daemon/common.h"
 #include "libnetdata/libnetdata.h"

 int aclk_handle_cloud_message(char *payload);
--- a/aclk/legacy/aclk_stats.h
+++ b/aclk/legacy/aclk_stats.h
@ -3,7 +3,7 @@
 #ifndef NETDATA_ACLK_STATS_H
 #define NETDATA_ACLK_STATS_H

-#include "../../daemon/common.h"
+#include "daemon/common.h"
 #include "libnetdata/libnetdata.h"
 #include "aclk_common.h"

--- a/aclk/legacy/agent_cloud_link.h
+++ b/aclk/legacy/agent_cloud_link.h
@ -3,7 +3,7 @@
 #ifndef NETDATA_AGENT_CLOUD_LINK_H
 #define NETDATA_AGENT_CLOUD_LINK_H

-#include "../../daemon/common.h"
+#include "daemon/common.h"
 #include "mqtt.h"
 #include "aclk_common.h"

--- a/aclk/legacy/mqtt.c
+++ b/aclk/legacy/mqtt.c
@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later

 #include <libnetdata/json/json.h>
-#include "../../daemon/common.h"
+#include "daemon/common.h"
 #include "mqtt.h"
 #include "aclk_lws_wss_client.h"
 #include "aclk_stats.h"
--- a/claim/claim.c
+++ b/claim/claim.c
@ -1,11 +1,11 @@
 // SPDX-License-Identifier: GPL-3.0-or-later

 #include "claim.h"
-#include "../registry/registry_internals.h"
+#include "registry/registry_internals.h"
 #ifndef ACLK_NG
-#include "../aclk/legacy/aclk_common.h"
+#include "aclk/legacy/aclk_common.h"
 #else
-#include "../aclk/aclk.h"
+#include "aclk/aclk.h"
 #endif

 char *claiming_pending_arguments = NULL;
--- a/claim/claim.h
+++ b/claim/claim.h
@ -3,7 +3,7 @@
 #ifndef NETDATA_CLAIM_H
 #define NETDATA_CLAIM_H 1

-#include "../daemon/common.h"
+#include "daemon/common.h"

 extern char *claiming_pending_arguments;
 extern struct config cloud_config;
--- a/cli/cli.c
+++ b/cli/cli.c
@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later

 #include "cli.h"
-#include "../libnetdata/required_dummies.h"
+#include "libnetdata/required_dummies.h"

 static uv_pipe_t client_pipe;
 static uv_write_t write_req;
@ -198,4 +198,4 @@ int main(int argc, char **argv)
    uv_close((uv_handle_t *)&client_pipe, NULL);

    return exit_status;
-}
+}
--- a/cli/cli.h
+++ b/cli/cli.h
@ -3,6 +3,6 @@
 #ifndef NETDATA_CLI_H
 #define NETDATA_CLI_H 1

-#include "../daemon/common.h"
+#include "daemon/common.h"

 #endif //NETDATA_CLI_H
--- a/collectors/all.h
+++ b/collectors/all.h
@ -3,7 +3,7 @@
 #ifndef NETDATA_ALL_H
 #define NETDATA_ALL_H 1

-#include "../daemon/common.h"
+#include "daemon/common.h"

 // netdata internal data collection plugins

--- a/collectors/apps.plugin/apps_plugin.c
+++ b/collectors/apps.plugin/apps_plugin.c
@ -6,7 +6,7 @@
 * Released under GPL v3+
 */

-#include "../../libnetdata/libnetdata.h"
+#include "libnetdata/libnetdata.h"

 // ----------------------------------------------------------------------------

--- a/collectors/cgroups.plugin/sys_fs_cgroup.h
+++ b/collectors/cgroups.plugin/sys_fs_cgroup.h
@ -3,7 +3,7 @@
 #ifndef NETDATA_SYS_FS_CGROUP_H
 #define NETDATA_SYS_FS_CGROUP_H 1

-#include "../../daemon/common.h"
+#include "daemon/common.h"

 #if (TARGET_OS == OS_LINUX)

--- a/collectors/checks.plugin/plugin_checks.h
+++ b/collectors/checks.plugin/plugin_checks.h
@ -3,7 +3,7 @@
 #ifndef NETDATA_PLUGIN_CHECKS_H
 #define NETDATA_PLUGIN_CHECKS_H 1

-#include "../../daemon/common.h"
+#include "daemon/common.h"

 #ifdef NETDATA_INTERNAL_CHECKS

--- a/collectors/cups.plugin/cups_plugin.c
+++ b/collectors/cups.plugin/cups_plugin.c
@ -6,7 +6,7 @@
 * Released under GPL v3+
 */

-#include "../../libnetdata/libnetdata.h"
+#include "libnetdata/libnetdata.h"
 #include <cups/cups.h>
 #include <limits.h>

--- a/collectors/diskspace.plugin/plugin_diskspace.h
+++ b/collectors/diskspace.plugin/plugin_diskspace.h
@ -3,7 +3,7 @@
 #ifndef NETDATA_PLUGIN_PROC_DISKSPACE_H
 #define NETDATA_PLUGIN_PROC_DISKSPACE_H

-#include "../../daemon/common.h"
+#include "daemon/common.h"


 #if (TARGET_OS == OS_LINUX)
--- a/collectors/freeipmi.plugin/freeipmi_plugin.c
+++ b/collectors/freeipmi.plugin/freeipmi_plugin.c
@ -15,7 +15,7 @@
 *  UCRL-CODE-222073
 */

-#include "../../libnetdata/libnetdata.h"
+#include "libnetdata/libnetdata.h"

 #include <stdio.h>
 #include <stdlib.h>
--- a/collectors/idlejitter.plugin/plugin_idlejitter.h
+++ b/collectors/idlejitter.plugin/plugin_idlejitter.h
@ -3,7 +3,7 @@
 #ifndef NETDATA_PLUGIN_IDLEJITTER_H
 #define NETDATA_PLUGIN_IDLEJITTER_H 1

-#include "../../daemon/common.h"
+#include "daemon/common.h"

 #define NETDATA_PLUGIN_HOOK_IDLEJITTER \
    { \
--- a/collectors/macos.plugin/plugin_macos.h
+++ b/collectors/macos.plugin/plugin_macos.h
@ -4,7 +4,7 @@
 #ifndef NETDATA_PLUGIN_MACOS_H
 #define NETDATA_PLUGIN_MACOS_H 1

-#include "../../daemon/common.h"
+#include "daemon/common.h"

 #if (TARGET_OS == OS_MACOS)

--- a/collectors/nfacct.plugin/plugin_nfacct.c
+++ b/collectors/nfacct.plugin/plugin_nfacct.c
@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later

-#include "../../libnetdata/libnetdata.h"
+#include "libnetdata/libnetdata.h"
 #include <linux/netfilter/nfnetlink_conntrack.h>
 #include <libmnl/libmnl.h>
 #include <libnetfilter_acct/libnetfilter_acct.h>
--- a/collectors/perf.plugin/perf_plugin.c
+++ b/collectors/perf.plugin/perf_plugin.c
@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later

-#include "../../libnetdata/libnetdata.h"
+#include "libnetdata/libnetdata.h"

 #include <linux/perf_event.h>

--- a/collectors/plugins.d/plugins_d.h
+++ b/collectors/plugins.d/plugins_d.h
@ -3,7 +3,7 @@
 #ifndef NETDATA_PLUGINS_D_H
 #define NETDATA_PLUGINS_D_H 1

-#include "../../daemon/common.h"
+#include "daemon/common.h"

 #define NETDATA_PLUGIN_HOOK_PLUGINSD \
    { \
--- a/collectors/plugins.d/pluginsd_parser.h
+++ b/collectors/plugins.d/pluginsd_parser.h
@ -3,7 +3,7 @@
 #ifndef NETDATA_PLUGINSD_PARSER_H
 #define NETDATA_PLUGINSD_PARSER_H

-#include "../../parser/parser.h"
+#include "parser/parser.h"


 typedef struct parser_user_object {
--- a/collectors/proc.plugin/plugin_proc.h
+++ b/collectors/proc.plugin/plugin_proc.h
@ -3,7 +3,7 @@
 #ifndef NETDATA_PLUGIN_PROC_H
 #define NETDATA_PLUGIN_PROC_H 1

-#include "../../daemon/common.h"
+#include "daemon/common.h"

 #if (TARGET_OS == OS_LINUX)

--- a/collectors/proc.plugin/zfs_common.h
+++ b/collectors/proc.plugin/zfs_common.h
@ -3,7 +3,7 @@
 #ifndef NETDATA_ZFS_COMMON_H
 #define NETDATA_ZFS_COMMON_H 1

-#include "../../daemon/common.h"
+#include "daemon/common.h"

 #define ZFS_FAMILY_SIZE "size"
 #define ZFS_FAMILY_EFFICIENCY "efficiency"
--- a/collectors/statsd.plugin/statsd.h
+++ b/collectors/statsd.plugin/statsd.h
@ -3,7 +3,7 @@
 #ifndef NETDATA_STATSD_H
 #define NETDATA_STATSD_H 1

-#include "../../daemon/common.h"
+#include "daemon/common.h"

 #define STATSD_LISTEN_PORT 8125
 #define STATSD_LISTEN_BACKLOG 4096
--- a/collectors/tc.plugin/plugin_tc.h
+++ b/collectors/tc.plugin/plugin_tc.h
@ -3,7 +3,7 @@
 #ifndef NETDATA_PLUGIN_TC_H
 #define NETDATA_PLUGIN_TC_H 1

-#include "../../daemon/common.h"
+#include "daemon/common.h"

 #if (TARGET_OS == OS_LINUX)

--- a/collectors/timex.plugin/plugin_timex.h
+++ b/collectors/timex.plugin/plugin_timex.h
@ -3,7 +3,7 @@
 #ifndef NETDATA_PLUGIN_TIMEX_H
 #define NETDATA_PLUGIN_TIMEX_H

-#include "../../daemon/common.h"
+#include "daemon/common.h"

 #if (TARGET_OS == OS_LINUX)

--- a/collectors/xenstat.plugin/xenstat_plugin.c
+++ b/collectors/xenstat.plugin/xenstat_plugin.c
@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later

-#include "../../libnetdata/libnetdata.h"
+#include "libnetdata/libnetdata.h"

 #include <xenstat.h>
 #include <libxl.h>
--- a/daemon/analytics.h
+++ b/daemon/analytics.h
@ -3,7 +3,7 @@
 #ifndef NETDATA_ANALYTICS_H
 #define NETDATA_ANALYTICS_H 1

-#include "../daemon/common.h"
+#include "daemon/common.h"

 /* Max number of seconds before the first META analytics is sent */
 #define ANALYTICS_INIT_SLEEP_SEC 120
--- a/daemon/commands.c
+++ b/daemon/commands.c
@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later

 #include "common.h"
-#include "../database/engine/rrdenginelib.h"
+#include "database/engine/rrdenginelib.h"

 static uv_thread_t thread;
 static uv_loop_t* loop;
--- a/daemon/common.h
+++ b/daemon/common.h
@ -3,7 +3,7 @@
 #ifndef NETDATA_COMMON_H
 #define NETDATA_COMMON_H 1

-#include "../libnetdata/libnetdata.h"
+#include "libnetdata/libnetdata.h"

 // ----------------------------------------------------------------------------
 // shortcuts for the default netdata configuration
--- a/database/engine/metadata_log/metalogpluginsd.h
+++ b/database/engine/metadata_log/metalogpluginsd.h
@ -3,9 +3,9 @@
 #ifndef NETDATA_METALOGPLUGINSD_H
 #define NETDATA_METALOGPLUGINSD_H

-#include "../../../collectors/plugins.d/pluginsd_parser.h"
-#include "../../../collectors/plugins.d/plugins_d.h"
-#include "../../../parser/parser.h"
+#include "collectors/plugins.d/pluginsd_parser.h"
+#include "collectors/plugins.d/plugins_d.h"
+#include "parser/parser.h"

 struct metalog_pluginsd_state {
    struct metalog_instance *ctx;
--- a/database/engine/rrdengine.h
+++ b/database/engine/rrdengine.h
@ -11,7 +11,7 @@
 #include <Judy.h>
 #include <openssl/sha.h>
 #include <openssl/evp.h>
-#include "../../daemon/common.h"
+#include "daemon/common.h"
 #include "../rrd.h"
 #include "rrddiskprotocol.h"
 #include "rrdenginelib.h"
--- a/database/rrd.h
+++ b/database/rrd.h
@ -26,17 +26,17 @@ struct rrdengine_instance;
 struct pg_cache_page_index;
 #endif

-#include "../daemon/common.h"
+#include "daemon/common.h"
 #include "web/api/queries/query.h"
 #include "rrdvar.h"
 #include "rrdsetvar.h"
 #include "rrddimvar.h"
 #include "rrdcalc.h"
 #include "rrdcalctemplate.h"
-#include "../streaming/rrdpush.h"
+#include "streaming/rrdpush.h"

 #ifndef ACLK_NG
-#include "../aclk/legacy/aclk_rrdhost_state.h"
+#include "aclk/legacy/aclk_rrdhost_state.h"
 #else
 #include "aclk/aclk.h"
 #endif
--- a/database/sqlite/sqlite_functions.h
+++ b/database/sqlite/sqlite_functions.h
@ -3,7 +3,7 @@
 #ifndef NETDATA_SQLITE_FUNCTIONS_H
 #define NETDATA_SQLITE_FUNCTIONS_H

-#include "../../daemon/common.h"
+#include "daemon/common.h"
 #include "sqlite3.h"

 // return a node list
--- a/health/health.h
+++ b/health/health.h
@ -3,7 +3,7 @@
 #ifndef NETDATA_HEALTH_H
 #define NETDATA_HEALTH_H 1

-#include "../daemon/common.h"
+#include "daemon/common.h"

 #define NETDATA_PLUGIN_HOOK_HEALTH \
    { \
--- a/parser/parser.h
+++ b/parser/parser.h
@ -3,7 +3,7 @@
 #ifndef NETDATA_INCREMENTAL_PARSER_H
 #define NETDATA_INCREMENTAL_PARSER_H 1

-#include "../daemon/common.h"
+#include "daemon/common.h"

 #define PARSER_MAX_CALLBACKS 20
 #define PARSER_MAX_RECOVER_KEYWORDS 128
--- a/registry/registry.c
+++ b/registry/registry.c
@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later

-#include "../daemon/common.h"
+#include "daemon/common.h"
 #include "registry_internals.h"

 #define REGISTRY_STATUS_OK "ok"
--- a/registry/registry.h
+++ b/registry/registry.h
@ -49,7 +49,7 @@
 #ifndef NETDATA_REGISTRY_H
 #define NETDATA_REGISTRY_H 1

-#include "../daemon/common.h"
+#include "daemon/common.h"

 #define NETDATA_REGISTRY_COOKIE_NAME "netdata_registry_id"

--- a/registry/registry_db.c
+++ b/registry/registry_db.c
@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later

-#include "../daemon/common.h"
+#include "daemon/common.h"
 #include "registry_internals.h"

 int registry_db_should_be_saved(void) {
--- a/registry/registry_init.c
+++ b/registry/registry_init.c
@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later

-#include "../daemon/common.h"
+#include "daemon/common.h"
 #include "registry_internals.h"

 int registry_init(void) {
--- a/registry/registry_internals.c
+++ b/registry/registry_internals.c
@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later

-#include "../daemon/common.h"
+#include "daemon/common.h"
 #include "registry_internals.h"

 struct registry registry;
--- a/registry/registry_log.c
+++ b/registry/registry_log.c
@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later

-#include "../daemon/common.h"
+#include "daemon/common.h"
 #include "registry_internals.h"

 void registry_log(char action, REGISTRY_PERSON *p, REGISTRY_MACHINE *m, REGISTRY_URL *u, char *name) {
--- a/registry/registry_machine.c
+++ b/registry/registry_machine.c
@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later

-#include "../daemon/common.h"
+#include "daemon/common.h"
 #include "registry_internals.h"

 // ----------------------------------------------------------------------------
--- a/registry/registry_person.c
+++ b/registry/registry_person.c
@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later

-#include "../daemon/common.h"
+#include "daemon/common.h"
 #include "registry_internals.h"

 // ----------------------------------------------------------------------------
--- a/registry/registry_url.c
+++ b/registry/registry_url.c
@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later

-#include "../daemon/common.h"
+#include "daemon/common.h"
 #include "registry_internals.h"

 // ----------------------------------------------------------------------------
--- a/spawn/spawn.c
+++ b/spawn/spawn.c
@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later

 #include "spawn.h"
-#include "../database/engine/rrdenginelib.h"
+#include "database/engine/rrdenginelib.h"

 static uv_thread_t thread;
 int spawn_thread_error;
--- a/spawn/spawn.h
+++ b/spawn/spawn.h
@ -3,7 +3,7 @@
 #ifndef NETDATA_SPAWN_H
 #define NETDATA_SPAWN_H 1

-#include "../daemon/common.h"
+#include "daemon/common.h"

 #define SPAWN_SERVER_COMMAND_LINE_ARGUMENT "--special-spawn-server"

--- a/spawn/spawn_client.c
+++ b/spawn/spawn_client.c
@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later

 #include "spawn.h"
-#include "../database/engine/rrdenginelib.h"
+#include "database/engine/rrdenginelib.h"

 static uv_process_t process;
 static uv_pipe_t spawn_channel;
--- a/streaming/receiver.c
+++ b/streaming/receiver.c
@ -49,7 +49,7 @@ static void rrdpush_receiver_thread_cleanup(void *ptr) {
    }
 }

-#include "../collectors/plugins.d/pluginsd_parser.h"
+#include "collectors/plugins.d/pluginsd_parser.h"

 PARSER_RC streaming_timestamp(char **words, void *user, PLUGINSD_ACTION *plugins_action)
 {
--- a/streaming/rrdpush.c
+++ b/streaming/rrdpush.c
@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later

 #include "rrdpush.h"
-#include "../parser/parser.h"
+#include "parser/parser.h"

 /*
 * rrdpush
--- a/streaming/rrdpush.h
+++ b/streaming/rrdpush.h
@ -3,8 +3,8 @@
 #ifndef NETDATA_RRDPUSH_H
 #define NETDATA_RRDPUSH_H 1

-#include "../database/rrd.h"
-#include "../libnetdata/libnetdata.h"
+#include "database/rrd.h"
+#include "libnetdata/libnetdata.h"
 #include "web/server/web_client.h"
 #include "daemon/common.h"

--- a/web/api/queries/rrdr.h
+++ b/web/api/queries/rrdr.h
@ -99,7 +99,7 @@ typedef struct rrdresult {

 #define rrdr_rows(r) ((r)->rows)

-#include "../../../database/rrd.h"
+#include "database/rrd.h"
 extern void rrdr_free(RRDR *r);
 extern RRDR *rrdr_create(struct rrdset *st, long n, struct context_param *context_param_list);

--- a/web/api/tests/valid_urls.c
+++ b/web/api/tests/valid_urls.c
@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-3.0-or-later

-#include "../../../libnetdata/libnetdata.h"
-#include "../../../libnetdata/required_dummies.h"
-#include "../../../database/rrd.h"
-#include "../../../web/server/web_client.h"
+#include "libnetdata/libnetdata.h"
+#include "libnetdata/required_dummies.h"
+#include "database/rrd.h"
+#include "web/server/web_client.h"
 #include <setjmp.h>
 #include <cmocka.h>
 #include <stdbool.h>
--- a/web/api/tests/web_api.c
+++ b/web/api/tests/web_api.c
@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-3.0-or-later

-#include "../../../libnetdata/libnetdata.h"
-#include "../../../libnetdata/required_dummies.h"
-#include "../../../database/rrd.h"
-#include "../../../web/server/web_client.h"
+#include "libnetdata/libnetdata.h"
+#include "libnetdata/required_dummies.h"
+#include "database/rrd.h"
+#include "web/server/web_client.h"
 #include <setjmp.h>
 #include <cmocka.h>
 #include <stdbool.h>