[OSCBS-41] Update to Zephyr v3.2.0 (#382)

Updating to integrate with Zephyr v3.2.0 required:

- Update `west.yml` to import Zephyr v3.2.0 manifest
- Prefix include pathname of ztest.h with `zephyr/`
- Prefix every Zephyr header included pathname with `zephyr/`
- Change all Zephyr tests/samples to use `find_package`
- For unit_testing, use a distinct prj.conf which only references
  Kconfigs defined in the Zephyr repo. (Zephyr constraint.)
- Move ztest headers into a zephyr-prefixed pathname

Co-authored-by: Gregory Shue <gregory.shue@legrand.com>

ports/zephyr/bacnet/bits.h

@@ -24,7 +24,7 @@
 #ifndef BITS_H
 #define BITS_H
 
-#include <sys/util.h>  /* defines BIT(n) */
+#include <zephyr/sys/util.h>  /* defines BIT(n) */
 
 /********************************************************************
 * Bit Masks

ports/zephyr/bacport.h

@@ -26,9 +26,9 @@
 #ifndef NET_H
 #define NET_H
 
-#include <net/net_ip.h>
+#include <zephyr/net/net_ip.h>
-#include <net/socket.h>
+#include <zephyr/net/socket.h>
-#include <zephyr.h>
+#include <zephyr/kernel.h>
 #include <bacnet/basic/object/device.h>
 
 static inline char *inet_ntoa(struct in_addr in) {

ports/zephyr/bip-init.c

@@ -34,13 +34,13 @@
 
 #include <stdint.h>
 #include <stdbool.h>
-#include <device.h>
+#include <zephyr/device.h>
-#include <init.h>
+#include <zephyr/init.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
-#include <sys/printk.h>
+#include <zephyr/sys/printk.h>
-#include <net/net_ip.h>
+#include <zephyr/net/net_ip.h>
-#include <net/socket.h>
+#include <zephyr/net/socket.h>
-#include <net/socket_select.h>
+#include <zephyr/net/socket_select.h>
 #include "bacnet/bacdcode.h"
 #include "bacnet/bacint.h"
 #include "bacnet/datalink/bip.h"
@@ -48,8 +48,8 @@
 #include "bacnet/basic/bbmd/h_bbmd.h"
 
 /* Logging module registration is already done in ports/zephyr/main.c */
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
-#include <logging/log_ctrl.h>
+#include <zephyr/logging/log_ctrl.h>
 
 LOG_MODULE_DECLARE(bacnet, CONFIG_BACNETSTACK_LOG_LEVEL);
 

ports/zephyr/datetime-init.c

@@ -14,6 +14,8 @@
 #include <stdlib.h>
 #if CONFIG_NATIVE_APPLICATION
 #include <sys/time.h>
+#elif defined(__ZEPHYR__)
+#include <zephyr/posix/sys/time.h>
 #else
 #include <posix/sys/time.h>
 #endif

ports/zephyr/main.c

@@ -8,14 +8,14 @@
 #include <stdint.h>
 
 /* Zephyr includes */
-#include <init.h>
+#include <zephyr/init.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
-#include <sys/printk.h>
+#include <zephyr/sys/printk.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
-#include <zephyr.h>
+#include <zephyr/kernel.h>
 
 #define LOG_LEVEL CONFIG_BACNETSTACK_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(bacnet);
 
 /* To do:  init()

ports/zephyr/mstimer-init.c

@@ -23,7 +23,7 @@
 * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 *
 *********************************************************************/
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include "bacnet/basic/sys/mstimer.h"
 
 /**

test/bacnet/abort/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet integer encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/abort.h>
 
 /**

test/bacnet/alarm_ack/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet integer encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/alarm_ack.h>
 
 /**

test/bacnet/arf/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet integer encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/arf.h>
 
 /**

test/bacnet/awf/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet integer encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/awf.h>
 
 /**

test/bacnet/bacapp/src/main.c

@@ -10,7 +10,7 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/bacdcode.h>
 #include <bacnet/bacapp.h>
 #include <bacnet/bactext.h>

test/bacnet/bacdcode/src/main.c

@@ -9,7 +9,7 @@
  */
 
 #include <ctype.h>  /* For isprint */
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/bacdcode.h>
 
 /**

test/bacnet/bacdevobjpropref/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet integer encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/bacdcode.h>
 #include <bacnet/bacdevobjpropref.h>
 

test/bacnet/bacerror/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet integer encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/bacerror.h>
 
 /**

test/bacnet/bacint/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet integer encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/bacint.h>
 
 /**

test/bacnet/bacpropstates/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet integer encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/bacpropstates.h>
 
 /**

test/bacnet/bacreal/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet real value encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/bacreal.h>
 #include <bacnet/bacdef.h>
 

test/bacnet/bacstr/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet integer encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/bacstr.h>
 
 /**

test/bacnet/bactimevalue/src/main.c

@@ -13,7 +13,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "bacnet/bactimevalue.h"
 #include "bacnet/datetime.h"
 #include "bacnet/bacapp.h"

test/bacnet/basic/binding/address/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet integer encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/bacaddr.h>
 #include <bacnet/basic/binding/address.h>
 

test/bacnet/basic/object/acc/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet integer encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/basic/object/acc.h>
 #include <bacnet/bactext.h>
 

test/bacnet/basic/object/access_credential/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet integer encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/basic/object/access_credential.h>
 
 /**

test/bacnet/basic/object/access_door/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet access_door object APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/basic/object/access_door.h>
 
 /**

test/bacnet/basic/object/access_point/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet integer encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/basic/object/access_point.h>
 
 /**

test/bacnet/basic/object/access_rights/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet integer encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/basic/object/access_rights.h>
 
 /**

test/bacnet/basic/object/access_user/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet integer encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/basic/object/access_user.h>
 
 /**

test/bacnet/basic/object/access_zone/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet integer encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/basic/object/access_zone.h>
 
 /**

test/bacnet/basic/object/ai/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet integer encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/basic/object/ai.h>
 #include <bacnet/bactext.h>
 

test/bacnet/basic/object/ao/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet integer encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/basic/object/ao.h>
 
 /**

test/bacnet/basic/object/av/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet integer encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/basic/object/av.h>
 
 /**

test/bacnet/basic/object/bacfile/src/main.c

@@ -9,7 +9,7 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/basic/object/bacfile.h>
 
 /**

test/bacnet/basic/object/bi/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet integer encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/basic/object/bi.h>
 #include <bacnet/bactext.h>
 

test/bacnet/basic/object/bo/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet integer encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/basic/object/bo.h>
 
 /**

test/bacnet/basic/object/bv/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet integer encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/basic/object/bv.h>
 
 /**

test/bacnet/basic/object/color_object/src/main.c

@@ -6,7 +6,7 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/bactext.h>
 #include <bacnet/basic/object/color_object.h>
 

test/bacnet/basic/object/color_temperature/src/main.c

@@ -6,7 +6,7 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/bactext.h>
 #include <bacnet/basic/object/color_temperature.h>
 

test/bacnet/basic/object/command/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet command object APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/basic/object/command.h>
 
 /**

test/bacnet/basic/object/credential_data_input/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet integer encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/basic/object/credential_data_input.h>
 
 /**

test/bacnet/basic/object/device/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet integer encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/basic/object/device.h>
 
 /**

test/bacnet/basic/object/lc/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet load control object
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/bacdcode.h>
 #include <bacnet/bacstr.h>
 #include <bacnet/basic/object/ao.h>

test/bacnet/basic/object/lo/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet integer encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/bactext.h>
 #include <bacnet/basic/object/lo.h>
 

test/bacnet/basic/object/lsp/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet integer encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/basic/object/lsp.h>
 
 /**

test/bacnet/basic/object/mock/apdu_mock.c

@@ -6,7 +6,7 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/basic/service/h_apdu.h>
 
 uint16_t apdu_decode_confirmed_service_request(

test/bacnet/basic/object/mock/device_mock.c

@@ -6,7 +6,7 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/bactext.h>
 #include <bacnet/basic/object/device.h>
 

test/bacnet/basic/object/mock/tsm_mock.c

@@ -6,7 +6,7 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/basic/tsm/tsm.h>
 
 bool tsm_get_transaction_pdu(

test/bacnet/basic/object/ms-input/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet integer encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/basic/object/ms-input.h>
 
 /**

test/bacnet/basic/object/mso/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet integer encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/basic/object/mso.h>
 
 /**

test/bacnet/basic/object/msv/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet integer encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/basic/object/msv.h>
 
 /**

test/bacnet/basic/object/netport/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet integer encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/readrange.h>
 #include <bacnet/basic/object/netport.h>
 

test/bacnet/basic/object/objects/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet integer encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/basic/sys/keylist.h>
 #include <bacnet/basic/object/objects.h>
 

test/bacnet/basic/object/osv/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet integer encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/basic/object/osv.h>
 
 /**

test/bacnet/basic/object/piv/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet integer encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/basic/object/piv.h>
 
 /**

test/bacnet/basic/object/schedule/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet integer encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/basic/object/schedule.h>
 
 /**

test/bacnet/basic/sys/color_rgb/src/main.c

@@ -8,7 +8,7 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/basic/sys/color_rgb.h>
 
 /**

test/bacnet/basic/sys/days/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet integer encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/basic/sys/days.h>
 
 /**

test/bacnet/basic/sys/fifo/src/main.c

@@ -9,7 +9,7 @@
  */
 
 #include <limits.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/basic/sys/fifo.h>
 
 /**

test/bacnet/basic/sys/filename/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet integer encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/basic/sys/filename.h>
 
 /**

test/bacnet/basic/sys/keylist/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet integer encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/basic/sys/keylist.h>
 
 /**

test/bacnet/basic/sys/ringbuf/src/main.c

@@ -9,7 +9,7 @@
  */
 
 #include <limits.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/basic/sys/ringbuf.h>
 
 /**

test/bacnet/basic/sys/sbuf/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet integer encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/basic/sys/sbuf.h>
 
 /**

test/bacnet/cov/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet integer encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 //#include <bacnet/bacapp.h>
 #include <bacnet/cov.h>
 

test/bacnet/datalink/bvlc/src/main.c

@@ -9,7 +9,7 @@
  */
 
 #include <stdlib.h>  /* For calloc() */
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/bactext.h>
 #include <bacnet/datalink/bvlc.h>
 

test/bacnet/datalink/cobs/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet COBS encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <stdlib.h>
 #include <bacnet/datalink/cobs.h>
 #include <bacnet/bytes.h>

test/bacnet/datalink/crc/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet integer encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/datalink/crc.h>
 #include <bacnet/bytes.h>
 

test/bacnet/datalink/mock/src/arcnet-mock.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <stdint.h>
 #include "bacnet/datalink/arcnet.h"
 

test/bacnet/datalink/mock/src/bip-mock.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <stdint.h> /* for standard integer types uint8_t etc. */
 #include <stdbool.h> /* for the standard bool type. */
 #include <stdio.h>

test/bacnet/datalink/mock/src/bip6-mock.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h> /* for standard integer types uint8_t etc. */

test/bacnet/datalink/mock/src/dlmstp-mock.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include "bacnet/datalink/dlmstp.h"

test/bacnet/datalink/mock/src/ethernet-mock.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include "bacnet/datalink/ethernet.h"

test/bacnet/datalink/mock/src/main.c

@@ -9,7 +9,7 @@
  */
 
 #include <stdlib.h>  /* For calloc() */
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/datalink/datalink.h>
 #include "bacnet/apdu.h"
 

test/bacnet/datetime/src/main.c

@@ -42,7 +42,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "bacnet/datetime.h"
 #include "bacnet/bacdcode.h"
 

test/bacnet/dcc/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet integer encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/dcc.h>
 
 /**

test/bacnet/event/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet integer encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/event.h>
 
 /**

test/bacnet/getalarm/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet service GetAlarmSummary encode and decode
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/get_alarm_sum.h>
 
 /**

test/bacnet/getevent/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet integer encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/getevent.h>
 
 /**

test/bacnet/iam/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet integer encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/iam.h>
 
 /**

test/bacnet/ihave/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet integer encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/ihave.h>
 
 /**

test/bacnet/indtext/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet integer encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/indtext.h>
 
 /**

test/bacnet/lighting/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet integer encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/bacdef.h>
 #include <bacnet/lighting.h>
 

test/bacnet/lso/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet integer encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/lso.h>
 
 /**

test/bacnet/memcopy/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet integer encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/memcopy.h>
 
 /**

test/bacnet/npdu/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet integer encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/npdu.h>
 
 /**

test/bacnet/property/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet integer encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/property.h>
 
 /**

test/bacnet/ptransfer/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet integer encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/bacapp.h>
 #include <bacnet/bacenum.h>
 #include <bacnet/ptransfer.h>

test/bacnet/rd/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet integer encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/bacstr.h>
 #include <bacnet/rd.h>
 

test/bacnet/reject/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet integer encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/reject.h>
 
 /**

test/bacnet/rp/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet integer encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/bacdcode.h>
 #include <bacnet/rp.h>
 

test/bacnet/rpm/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet integer encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/bacerror.h>  /* For bacerror_decode_error_class_and_code() */
 #include <bacnet/bacdcode.h>
 #include <bacnet/rpm.h>

test/bacnet/timestamp/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet integer encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/timestamp.h>
 
 /**

test/bacnet/timesync/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet integer encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/datetime.h>
 #include <bacnet/timesync.h>
 

test/bacnet/weeklyschedule/src/main.c

@@ -13,7 +13,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include "bacnet/bactimevalue.h"
 #include "bacnet/weeklyschedule.h"
 #include "bacnet/dailyschedule.h"

test/bacnet/whohas/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet integer encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/whohas.h>
 
 /**

test/bacnet/whois/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet integer encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/bacdef.h>
 #include <bacnet/whois.h>
 

test/bacnet/wp/src/main.c

@@ -8,7 +8,7 @@
  * @brief test BACnet integer encode/decode APIs
  */
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <bacnet/wp.h>
 
 /**

test/ztest/include/zephyr/tc_util.h

@@ -9,13 +9,13 @@
 #ifndef ZEPHYR_TESTSUITE_INCLUDE_TC_UTIL_H_
 #define ZEPHYR_TESTSUITE_INCLUDE_TC_UTIL_H_
 
-#include <zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <string.h>
 #ifdef CONFIG_SHELL
-#include <shell/shell.h>
+#include <zephyr/shell/shell.h>
 #endif
-#include <sys/printk.h>
+#include <zephyr/sys/printk.h>
 
 #if defined CONFIG_ZTEST_TC_UTIL_USER_OVERRIDE
 #include <tc_util_user_override.h>

test/ztest/include/zephyr/test_utils.h

@@ -32,7 +32,7 @@
 #ifndef __TEST_UTILS_H__
 #define __TEST_UTILS_H__
 
-#include <tc_util.h>
+#include <zephyr/tc_util.h>
 #include <tinycrypt/constants.h>
 
 static inline void show_str(const char *label, const uint8_t *s, size_t len)

test/ztest/include/zephyr/ztest.h

@@ -58,15 +58,15 @@ typedef struct esf z_arch_esf_t;
 #endif
 #endif /* KERNEL */
 
-#include <sys/printk.h>
+#include <zephyr/sys/printk.h>
 #define PRINT printk
 
-#include <zephyr.h>
+#include <zephyr/kernel.h>
 
-#include <ztest_assert.h>
+#include <zephyr/ztest_assert.h>
-#include <ztest_mock.h>
+#include <zephyr/ztest_mock.h>
-#include <ztest_test.h>
+#include <zephyr/ztest_test.h>
-#include <tc_util.h>
+#include <zephyr/tc_util.h>
 
 #ifdef __cplusplus
 extern "C" {

test/ztest/include/zephyr/ztest_assert.h

@@ -13,7 +13,7 @@
 #ifndef ZEPHYR_TESTSUITE_ZTEST_ASSERT_H_
 #define ZEPHYR_TESTSUITE_ZTEST_ASSERT_H_
 
-#include <ztest.h>
+#include <zephyr/ztest.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>