zephyr: update include paths to use <zephyr/...>

Zephyr has prefixed all of its includes with <zephyr/...>. While the old
mode can still be used (CONFIG_LEGACY_INCLUDE_PATH) and is still enabled
by default, it's better to be prepared for its removal in the future.

Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>

Author: gmarull

applications/asset_tracker_v2/src/carrier_certs/carrier_certs.c

@@ -6,13 +6,13 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <toolchain.h>
-#include <sys/util.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/sys/util.h>
 #include <modem/modem_key_mgmt.h>
 
 #include "carrier_certs.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(carrier_certs, CONFIG_MODEM_MODULE_LOG_LEVEL);
 
 /* The order of the tags in this array specifies which tag is used first */

applications/asset_tracker_v2/src/cloud/aws_iot_integration.c

@@ -1,11 +1,11 @@
 #include "cloud/cloud_wrapper.h"
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <net/aws_iot.h>
 #include <nrf_modem_at.h>
 
 #define MODULE aws_iot_integration
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(MODULE, CONFIG_CLOUD_INTEGRATION_LOG_LEVEL);
 
 #if !defined(CONFIG_CLOUD_CLIENT_ID_USE_CUSTOM)

applications/asset_tracker_v2/src/cloud/azure_iot_hub_integration.c

@@ -1,12 +1,12 @@
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <net/azure_iot_hub.h>
 #include <nrf_modem_at.h>
 
 #include "cloud/cloud_wrapper.h"
 
 #define MODULE azure_iot_hub_integration
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(MODULE, CONFIG_CLOUD_INTEGRATION_LOG_LEVEL);
 
 #if !defined(CONFIG_CLOUD_CLIENT_ID_USE_CUSTOM)

applications/asset_tracker_v2/src/cloud/cloud_codec/aws_iot/aws_iot_codec.c

@@ -7,7 +7,7 @@
 #include <cloud_codec.h>
 #include <stdbool.h>
 #include <string.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <zephyr/types.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -17,7 +17,7 @@
 #include "json_common.h"
 #include "json_protocol_names.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(cloud_codec, CONFIG_CLOUD_CODEC_LOG_LEVEL);
 
 /* Function that checks the version number of the incoming message and determines if it has already

applications/asset_tracker_v2/src/cloud/cloud_codec/azure_iot_hub/azure_iot_hub_codec.c

@@ -7,7 +7,7 @@
 #include <cloud_codec.h>
 #include <stdbool.h>
 #include <string.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <zephyr/types.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -17,7 +17,7 @@
 #include "json_common.h"
 #include "json_protocol_names.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(cloud_codec, CONFIG_CLOUD_CODEC_LOG_LEVEL);
 
 int cloud_codec_encode_neighbor_cells(struct cloud_codec_data *output,

applications/asset_tracker_v2/src/cloud/cloud_codec/cloud_codec.h

@@ -7,13 +7,13 @@
 #ifndef CLOUD_CODEC_H__
 #define CLOUD_CODEC_H__
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <cJSON_os.h>
-#include <net/net_ip.h>
+#include <zephyr/net/net_ip.h>
 #include <modem/lte_lc.h>
 #include <nrf_modem_gnss.h>
 

applications/asset_tracker_v2/src/cloud/cloud_codec/cloud_codec_ringbuffer.c

@@ -5,12 +5,12 @@
  */
 
 #include <cloud_codec.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <cJSON.h>
 #include <cJSON_os.h>
 #include <math.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(cloud_codec_ringbuffer, CONFIG_CLOUD_CODEC_LOG_LEVEL);
 
 void cloud_codec_populate_sensor_buffer(

applications/asset_tracker_v2/src/cloud/cloud_codec/json_common.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <cJSON.h>
 #include <date_time.h>
 
@@ -13,7 +13,7 @@
 #include "json_helpers.h"
 #include "json_protocol_names.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(json_common, CONFIG_CLOUD_CODEC_LOG_LEVEL);
 
 static int op_code_handle(cJSON *parent, enum json_common_op_code op,

applications/asset_tracker_v2/src/cloud/cloud_codec/json_common.h

@@ -22,7 +22,7 @@
 extern "C" {
 #endif
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <cJSON.h>
 
 #include "cloud_codec.h"

applications/asset_tracker_v2/src/cloud/cloud_codec/json_helpers.c

@@ -5,13 +5,13 @@
  */
 
 #include <errno.h>
-#include <sys/printk.h>
+#include <zephyr/sys/printk.h>
 
 #include "json_helpers.h"
 #include "cJSON.h"
 #include "cJSON_os.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(json_helpers, CONFIG_CLOUD_CODEC_LOG_LEVEL);
 
 void json_add_obj(cJSON *parent, const char *str, cJSON *item)

applications/asset_tracker_v2/src/cloud/cloud_codec/nrf_cloud/nrf_cloud_codec.c

@@ -6,7 +6,7 @@
 
 #include <stdbool.h>
 #include <string.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <zephyr/types.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -19,7 +19,7 @@
 #include "json_common.h"
 #include "json_protocol_names.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(cloud_codec, CONFIG_CLOUD_CODEC_LOG_LEVEL);
 
 /* Data types that are supported in batch messages. */

applications/asset_tracker_v2/src/cloud/cloud_wrapper.h

@@ -11,7 +11,7 @@
 #ifndef CLOUD_WRAPPER_H__
 #define CLOUD_WRAPPER_H__
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdbool.h>
 
 /**

applications/asset_tracker_v2/src/cloud/nrf_cloud_integration.c

@@ -1,6 +1,6 @@
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <net/nrf_cloud.h>
-#include <net/mqtt.h>
+#include <zephyr/net/mqtt.h>
 #include <stdio.h>
 #include <nrf_modem_at.h>
 
@@ -11,7 +11,7 @@
 
 #define MODULE nrf_cloud_integration
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(MODULE, CONFIG_CLOUD_INTEGRATION_LOG_LEVEL);
 
 #define REQUEST_DEVICE_STATE_STRING ""

applications/asset_tracker_v2/src/events/common_module_event.h

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <sys/util_macro.h>
+#include <zephyr/sys/util_macro.h>
 #include <app_event_manager.h>
 #include <app_event_manager_profiler_tracer.h>
 

applications/asset_tracker_v2/src/events/modem_module_event.h

@@ -12,7 +12,7 @@
  * @defgroup modem_module_event Modem module event
  * @{
  */
-#include <net/net_ip.h>
+#include <zephyr/net/net_ip.h>
 #include <modem/lte_lc.h>
 
 #include <app_event_manager.h>

applications/asset_tracker_v2/src/ext_sensors/ext_sensors.c

@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdio.h>
 #include <string.h>
-#include <drivers/sensor.h>
+#include <zephyr/drivers/sensor.h>
 #include <stdlib.h>
 
 #if defined(CONFIG_EXTERNAL_SENSORS_BME680_BSEC)
@@ -16,7 +16,7 @@
 
 #include "ext_sensors.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(ext_sensors, CONFIG_EXTERNAL_SENSORS_LOG_LEVEL);
 
 /* Convert to s/m2 depending on the maximum measured range used for adxl362. */

applications/asset_tracker_v2/src/ext_sensors/ext_sensors_bsec.c

@@ -4,18 +4,18 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <string.h>
-#include <sys/atomic.h>
-#include <spinlock.h>
-#include <settings/settings.h>
-#include <sys/byteorder.h>
-#include <drivers/i2c.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/spinlock.h>
+#include <zephyr/settings/settings.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/drivers/i2c.h>
 
 #include "bsec_integration.h"
 #include "ext_sensors_bsec.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(ext_sensors_bsec, CONFIG_EXTERNAL_SENSORS_LOG_LEVEL);
 
 BUILD_ASSERT(CONFIG_FP_HARDABI, "CONFIG_FP_HARDABI must be set when using the BME680 BSEC library");

applications/asset_tracker_v2/src/main.c

@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <app_event_manager.h>
 #if defined(CONFIG_NRF_MODEM_LIB)
 #include <modem/nrf_modem_lib.h>
 #endif /* CONFIG_NRF_MODEM_LIB */
-#include <sys/reboot.h>
+#include <zephyr/sys/reboot.h>
 
 #if defined(CONFIG_NRF_CLOUD_AGPS) || defined(CONFIG_NRF_CLOUD_PGPS)
 #include <net/nrf_cloud_agps.h>
@@ -32,8 +32,8 @@
 #include "events/modem_module_event.h"
 #include "events/led_state_event.h"
 
-#include <logging/log.h>
-#include <logging/log_ctrl.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/logging/log_ctrl.h>
 
 LOG_MODULE_REGISTER(MODULE, CONFIG_APPLICATION_MODULE_LOG_LEVEL);
 

applications/asset_tracker_v2/src/modules/cloud_module.c

@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr.h>
-#include <net/socket.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/net/socket.h>
 #include <stdio.h>
-#include <dfu/mcuboot.h>
+#include <zephyr/dfu/mcuboot.h>
 #include <math.h>
 #include <app_event_manager.h>
 #include <qos.h>
@@ -33,7 +33,7 @@
 #include "events/gnss_module_event.h"
 #include "events/debug_module_event.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(MODULE, CONFIG_CLOUD_MODULE_LOG_LEVEL);
 
 BUILD_ASSERT(CONFIG_CLOUD_CONNECT_RETRIES < 14,

applications/asset_tracker_v2/src/modules/data_module.c

@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <app_event_manager.h>
-#include <settings/settings.h>
+#include <zephyr/settings/settings.h>
 #include <date_time.h>
 #include <modem/modem_info.h>
 #if defined(CONFIG_NRF_CLOUD_AGPS)
@@ -31,7 +31,7 @@
 #include "events/ui_module_event.h"
 #include "events/util_module_event.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(MODULE, CONFIG_DATA_MODULE_LOG_LEVEL);
 
 #define DEVICE_SETTINGS_KEY			"data_module"

applications/asset_tracker_v2/src/modules/debug_module.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #if defined(CONFIG_MEMFAULT)
 #include <memfault/metrics/metrics.h>
 #include <memfault/ports/zephyr/http.h>
@@ -29,7 +29,7 @@
 #include "events/ui_module_event.h"
 #include "events/debug_module_event.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(MODULE, CONFIG_DEBUG_MODULE_LOG_LEVEL);
 
 struct debug_msg_data {

applications/asset_tracker_v2/src/modules/gnss_module.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdio.h>
 #include <date_time.h>
 #include <app_event_manager.h>
@@ -23,7 +23,7 @@
 #include "events/util_module_event.h"
 #include "events/modem_module_event.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(MODULE, CONFIG_GNSS_MODULE_LOG_LEVEL);
 
 #define GNSS_TIMEOUT_DEFAULT	     60

applications/asset_tracker_v2/src/modules/led_module.c

@@ -10,7 +10,7 @@
 
 #define MODULE led_state
 #include <caf/events/module_state_event.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(led, CONFIG_LED_CONTROL_LOG_LEVEL);