From 1528c8831d81f5e84cf1a04acbc9f779cfc64c59 Mon Sep 17 00:00:00 2001 From: Abtin Keshavarzian Date: Thu, 26 Oct 2023 05:08:24 -0700 Subject: [PATCH] [core] define `core/instance` folder for `instance` modules (#9561) This commit moves the `instance` module to a newly added folder `core/instance` (from `core/common`. Header file `extension.hpp` and its example is also moved to the same folder. --- script/check-simulation-build-cmake | 4 ++-- src/cli/cli.hpp | 2 +- src/core/BUILD.gn | 8 ++++---- src/core/CMakeLists.txt | 4 ++-- src/core/api/border_router_api.cpp | 2 +- src/core/api/border_routing_api.cpp | 2 +- src/core/api/dns_api.cpp | 2 +- src/core/api/dns_server_api.cpp | 2 +- src/core/api/logging_api.cpp | 2 +- src/core/api/nat64_api.cpp | 2 +- src/core/api/trel_api.cpp | 2 +- src/core/backbone_router/bbr_leader.cpp | 2 +- src/core/backbone_router/bbr_local.cpp | 2 +- src/core/backbone_router/bbr_manager.cpp | 2 +- src/core/backbone_router/multicast_listeners_table.cpp | 2 +- src/core/border_router/infra_if.cpp | 2 +- src/core/border_router/routing_manager.cpp | 2 +- src/core/coap/coap.cpp | 2 +- src/core/coap/coap_message.cpp | 2 +- src/core/coap/coap_secure.cpp | 2 +- src/core/common/heap.cpp | 2 +- src/core/common/locator_getters.hpp | 2 +- src/core/common/log.cpp | 2 +- src/core/common/message.cpp | 2 +- src/core/common/settings.cpp | 2 +- src/core/common/time_ticker.cpp | 2 +- src/core/common/timer.cpp | 2 +- src/core/common/uptime.cpp | 2 +- src/core/crypto/crypto_platform.cpp | 2 +- src/core/diags/factory_diags.cpp | 2 +- src/core/{common => instance}/extension.hpp | 0 src/core/{common => instance}/extension_example.cpp | 2 +- src/core/{common => instance}/instance.cpp | 0 src/core/{common => instance}/instance.hpp | 2 +- src/core/mac/data_poll_handler.cpp | 2 +- src/core/mac/data_poll_sender.cpp | 2 +- src/core/mac/link_raw.cpp | 2 +- src/core/mac/mac.cpp | 2 +- src/core/mac/mac_links.cpp | 2 +- src/core/mac/sub_mac.cpp | 2 +- src/core/mac/sub_mac_callbacks.cpp | 2 +- src/core/meshcop/announce_begin_client.cpp | 2 +- src/core/meshcop/border_agent.cpp | 2 +- src/core/meshcop/commissioner.cpp | 2 +- src/core/meshcop/dataset.cpp | 2 +- src/core/meshcop/dataset_local.cpp | 2 +- src/core/meshcop/dataset_manager.cpp | 2 +- src/core/meshcop/dataset_manager_ftd.cpp | 2 +- src/core/meshcop/dataset_updater.cpp | 2 +- src/core/meshcop/dtls.cpp | 2 +- src/core/meshcop/energy_scan_client.cpp | 2 +- src/core/meshcop/joiner.cpp | 2 +- src/core/meshcop/joiner_router.cpp | 2 +- src/core/meshcop/meshcop_leader.cpp | 2 +- src/core/meshcop/panid_query_client.cpp | 2 +- src/core/net/dhcp6_client.cpp | 2 +- src/core/net/dhcp6_server.cpp | 2 +- src/core/net/dns_client.cpp | 2 +- src/core/net/dns_dso.cpp | 2 +- src/core/net/dns_platform.cpp | 2 +- src/core/net/dns_types.cpp | 2 +- src/core/net/dnssd_server.cpp | 2 +- src/core/net/icmp6.cpp | 2 +- src/core/net/ip6.cpp | 2 +- src/core/net/ip6_address.cpp | 2 +- src/core/net/ip6_filter.cpp | 2 +- src/core/net/ip6_mpl.cpp | 2 +- src/core/net/netif.cpp | 2 +- src/core/net/sntp_client.cpp | 2 +- src/core/net/srp_client.cpp | 2 +- src/core/net/srp_server.cpp | 2 +- src/core/net/tcp6.cpp | 2 +- src/core/net/udp6.cpp | 2 +- src/core/radio/radio_callbacks.cpp | 2 +- src/core/radio/radio_platform.cpp | 2 +- src/core/radio/trel_interface.cpp | 2 +- src/core/radio/trel_link.cpp | 2 +- src/core/radio/trel_packet.cpp | 2 +- src/core/thread/address_resolver.cpp | 2 +- src/core/thread/announce_begin_server.cpp | 2 +- src/core/thread/announce_sender.cpp | 2 +- src/core/thread/anycast_locator.cpp | 2 +- src/core/thread/child.cpp | 2 +- src/core/thread/child_supervision.cpp | 2 +- src/core/thread/child_table.cpp | 2 +- src/core/thread/discover_scanner.cpp | 2 +- src/core/thread/dua_manager.cpp | 2 +- src/core/thread/energy_scan_server.cpp | 2 +- src/core/thread/indirect_sender.cpp | 2 +- src/core/thread/key_manager.cpp | 2 +- src/core/thread/link_metrics.cpp | 2 +- src/core/thread/link_quality.cpp | 2 +- src/core/thread/lowpan.cpp | 2 +- src/core/thread/mesh_forwarder.cpp | 2 +- src/core/thread/mle.cpp | 2 +- src/core/thread/mle_router.cpp | 2 +- src/core/thread/mlr_manager.cpp | 2 +- src/core/thread/neighbor.cpp | 2 +- src/core/thread/neighbor_table.cpp | 2 +- src/core/thread/network_data.cpp | 2 +- src/core/thread/network_data_leader.cpp | 2 +- src/core/thread/network_data_leader_ftd.cpp | 2 +- src/core/thread/network_data_local.cpp | 2 +- src/core/thread/network_data_notifier.cpp | 2 +- src/core/thread/network_data_publisher.cpp | 2 +- src/core/thread/network_data_service.cpp | 2 +- src/core/thread/network_data_types.cpp | 2 +- src/core/thread/network_diagnostic.cpp | 2 +- src/core/thread/panid_query_server.cpp | 2 +- src/core/thread/radio_selector.cpp | 2 +- src/core/thread/router.cpp | 2 +- src/core/thread/router_table.cpp | 2 +- src/core/thread/src_match_controller.cpp | 2 +- src/core/thread/thread_netif.cpp | 2 +- src/core/thread/time_sync_service.cpp | 2 +- src/core/utils/channel_manager.cpp | 2 +- src/core/utils/flash.cpp | 2 +- src/core/utils/history_tracker.cpp | 2 +- src/core/utils/jam_detector.cpp | 2 +- src/core/utils/mesh_diag.cpp | 2 +- src/core/utils/slaac_address.cpp | 2 +- src/core/utils/srp_client_buffers.cpp | 2 +- src/ncp/ncp_base.hpp | 2 +- src/ncp/ncp_base_ftd.cpp | 2 +- src/ncp/ncp_base_mtd.cpp | 2 +- src/ncp/ncp_base_radio.cpp | 2 +- src/ncp/ncp_hdlc.cpp | 2 +- src/ncp/ncp_spi.cpp | 2 +- tests/unit/test_array.cpp | 2 +- tests/unit/test_checksum.cpp | 2 +- tests/unit/test_child.cpp | 2 +- tests/unit/test_child_table.cpp | 2 +- tests/unit/test_cmd_line_parser.cpp | 2 +- tests/unit/test_dns.cpp | 2 +- tests/unit/test_dns_client.cpp | 2 +- tests/unit/test_dso.cpp | 2 +- tests/unit/test_hdlc.cpp | 2 +- tests/unit/test_link_metrics_manager.cpp | 2 +- tests/unit/test_linked_list.cpp | 2 +- tests/unit/test_lowpan.hpp | 2 +- tests/unit/test_message.cpp | 2 +- tests/unit/test_message_queue.cpp | 2 +- tests/unit/test_multicast_listeners_table.cpp | 2 +- tests/unit/test_nat64.cpp | 2 +- tests/unit/test_ndproxy_table.cpp | 2 +- tests/unit/test_netif.cpp | 2 +- tests/unit/test_network_data.cpp | 2 +- tests/unit/test_platform.h | 2 +- tests/unit/test_pool.cpp | 2 +- tests/unit/test_priority_queue.cpp | 2 +- tests/unit/test_routing_manager.cpp | 2 +- tests/unit/test_spinel_buffer.cpp | 2 +- tests/unit/test_spinel_decoder.cpp | 2 +- tests/unit/test_spinel_encoder.cpp | 2 +- tests/unit/test_srp_server.cpp | 2 +- tests/unit/test_timer.cpp | 2 +- tests/unit/test_tlv.cpp | 2 +- tests/unit/test_trickle_timer.cpp | 2 +- 158 files changed, 161 insertions(+), 161 deletions(-) rename src/core/{common => instance}/extension.hpp (100%) rename src/core/{common => instance}/extension_example.cpp (98%) rename src/core/{common => instance}/instance.cpp (100%) rename src/core/{common => instance}/instance.hpp (99%) diff --git a/script/check-simulation-build-cmake b/script/check-simulation-build-cmake index fc7af8e052b..ee1e2ffa59d 100755 --- a/script/check-simulation-build-cmake +++ b/script/check-simulation-build-cmake @@ -188,7 +188,7 @@ build_all_features() reset_source "$(dirname "$0")"/cmake-build simulation \ -DOT_THREAD_VERSION=1.1 \ - -DOT_VENDOR_EXTENSION=../../src/core/common/extension_example.cpp + -DOT_VENDOR_EXTENSION=../../src/core/instance/extension_example.cpp # Build Thread 1.3 with no additional features reset_source @@ -249,7 +249,7 @@ build_nest_common() mkdir build && cd build CFLAGS="${cppflags[*]} ${CFLAGS}" CXXFLAGS="${cppflags[*]} ${CXXFLAGS}" \ cmake -GNinja -DOT_PLATFORM=simulation \ - -DOT_VENDOR_EXTENSION=common/extension_example.cpp \ + -DOT_VENDOR_EXTENSION=instance/extension_example.cpp \ -DOT_NCP_VENDOR_HOOK_SOURCE=example_vendor_hook.cpp \ .. ninja diff --git a/src/cli/cli.hpp b/src/cli/cli.hpp index a581088a1bb..cc16bf1a4f0 100644 --- a/src/cli/cli.hpp +++ b/src/cli/cli.hpp @@ -82,8 +82,8 @@ #include "common/array.hpp" #include "common/code_utils.hpp" #include "common/debug.hpp" -#include "common/instance.hpp" #include "common/type_traits.hpp" +#include "instance/instance.hpp" namespace ot { diff --git a/src/core/BUILD.gn b/src/core/BUILD.gn index d44f410fdf6..abb606ed779 100644 --- a/src/core/BUILD.gn +++ b/src/core/BUILD.gn @@ -396,7 +396,6 @@ openthread_core_files = [ "common/equatable.hpp", "common/error.cpp", "common/error.hpp", - "common/extension.hpp", "common/frame_builder.cpp", "common/frame_builder.hpp", "common/frame_data.cpp", @@ -409,8 +408,6 @@ openthread_core_files = [ "common/heap_data.hpp", "common/heap_string.cpp", "common/heap_string.hpp", - "common/instance.cpp", - "common/instance.hpp", "common/iterator_utils.hpp", "common/linked_list.hpp", "common/locator.hpp", @@ -474,6 +471,9 @@ openthread_core_files = [ "crypto/storage.hpp", "diags/factory_diags.cpp", "diags/factory_diags.hpp", + "instance/extension.hpp", + "instance/instance.cpp", + "instance/instance.hpp", "mac/channel_mask.cpp", "mac/channel_mask.hpp", "mac/data_poll_handler.cpp", @@ -737,7 +737,6 @@ openthread_radio_sources = [ "common/error.hpp", "common/frame_builder.cpp", "common/frame_builder.hpp", - "common/instance.cpp", "common/log.cpp", "common/random.cpp", "common/string.cpp", @@ -749,6 +748,7 @@ openthread_radio_sources = [ "crypto/crypto_platform.cpp", "crypto/storage.cpp", "diags/factory_diags.cpp", + "instance/instance.cpp", "mac/link_raw.cpp", "mac/mac_frame.cpp", "mac/mac_types.cpp", diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index c8e4079ab04..813979ad7a7 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -106,7 +106,6 @@ set(COMMON_SOURCES common/heap.cpp common/heap_data.cpp common/heap_string.cpp - common/instance.cpp common/log.cpp common/message.cpp common/notifier.cpp @@ -129,6 +128,7 @@ set(COMMON_SOURCES crypto/sha256.cpp crypto/storage.cpp diags/factory_diags.cpp + instance/instance.cpp mac/channel_mask.cpp mac/data_poll_handler.cpp mac/data_poll_sender.cpp @@ -265,7 +265,6 @@ set(RADIO_COMMON_SOURCES common/binary_search.cpp common/error.cpp common/frame_builder.cpp - common/instance.cpp common/log.cpp common/random.cpp common/string.cpp @@ -277,6 +276,7 @@ set(RADIO_COMMON_SOURCES crypto/crypto_platform.cpp crypto/storage.cpp diags/factory_diags.cpp + instance/instance.cpp mac/link_raw.cpp mac/mac_frame.cpp mac/mac_types.cpp diff --git a/src/core/api/border_router_api.cpp b/src/core/api/border_router_api.cpp index 5694768e9bc..dcccf5bb6a3 100644 --- a/src/core/api/border_router_api.cpp +++ b/src/core/api/border_router_api.cpp @@ -39,7 +39,7 @@ #include "border_router/routing_manager.hpp" #include "common/debug.hpp" -#include "common/instance.hpp" +#include "instance/instance.hpp" using namespace ot; diff --git a/src/core/api/border_routing_api.cpp b/src/core/api/border_routing_api.cpp index 1ed017c5750..3a76fa668a4 100644 --- a/src/core/api/border_routing_api.cpp +++ b/src/core/api/border_routing_api.cpp @@ -39,7 +39,7 @@ #include #include "border_router/routing_manager.hpp" -#include "common/instance.hpp" +#include "instance/instance.hpp" using namespace ot; diff --git a/src/core/api/dns_api.cpp b/src/core/api/dns_api.cpp index 41be0c4fdb5..fe064b66026 100644 --- a/src/core/api/dns_api.cpp +++ b/src/core/api/dns_api.cpp @@ -35,7 +35,7 @@ #include -#include "common/instance.hpp" +#include "instance/instance.hpp" #include "net/dns_types.hpp" using namespace ot; diff --git a/src/core/api/dns_server_api.cpp b/src/core/api/dns_server_api.cpp index 62e69fc17ec..80e88e43273 100644 --- a/src/core/api/dns_server_api.cpp +++ b/src/core/api/dns_server_api.cpp @@ -33,7 +33,7 @@ #include "openthread-core-config.h" -#include "common/instance.hpp" +#include "instance/instance.hpp" #include "net/dns_types.hpp" #include "net/dnssd_server.hpp" diff --git a/src/core/api/logging_api.cpp b/src/core/api/logging_api.cpp index 29343ed5926..6abbb324528 100644 --- a/src/core/api/logging_api.cpp +++ b/src/core/api/logging_api.cpp @@ -35,10 +35,10 @@ #include "common/code_utils.hpp" #include "common/debug.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" #include "common/string.hpp" +#include "instance/instance.hpp" using namespace ot; diff --git a/src/core/api/nat64_api.cpp b/src/core/api/nat64_api.cpp index 7405b9d6cd8..02aa785b45a 100644 --- a/src/core/api/nat64_api.cpp +++ b/src/core/api/nat64_api.cpp @@ -39,7 +39,7 @@ #include "border_router/routing_manager.hpp" #include "common/debug.hpp" -#include "common/instance.hpp" +#include "instance/instance.hpp" #include "net/ip4_types.hpp" #include "net/ip6_headers.hpp" #include "net/nat64_translator.hpp" diff --git a/src/core/api/trel_api.cpp b/src/core/api/trel_api.cpp index 29c1563a654..687c1169ccf 100644 --- a/src/core/api/trel_api.cpp +++ b/src/core/api/trel_api.cpp @@ -39,7 +39,7 @@ #include "common/as_core_type.hpp" #include "common/code_utils.hpp" -#include "common/instance.hpp" +#include "instance/instance.hpp" using namespace ot; diff --git a/src/core/backbone_router/bbr_leader.cpp b/src/core/backbone_router/bbr_leader.cpp index efced1bb5c5..5b605ac5e11 100644 --- a/src/core/backbone_router/bbr_leader.cpp +++ b/src/core/backbone_router/bbr_leader.cpp @@ -35,8 +35,8 @@ #if (OPENTHREAD_CONFIG_THREAD_VERSION >= OT_THREAD_VERSION_1_2) -#include "common/instance.hpp" #include "common/locator_getters.hpp" +#include "instance/instance.hpp" namespace ot { namespace BackboneRouter { diff --git a/src/core/backbone_router/bbr_local.cpp b/src/core/backbone_router/bbr_local.cpp index 595355b8b58..ffdc4757be4 100644 --- a/src/core/backbone_router/bbr_local.cpp +++ b/src/core/backbone_router/bbr_local.cpp @@ -36,10 +36,10 @@ #if OPENTHREAD_FTD && OPENTHREAD_CONFIG_BACKBONE_ROUTER_ENABLE #include "common/code_utils.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" #include "common/random.hpp" +#include "instance/instance.hpp" #include "thread/mle_types.hpp" #include "thread/thread_netif.hpp" diff --git a/src/core/backbone_router/bbr_manager.cpp b/src/core/backbone_router/bbr_manager.cpp index c78fd16d256..551cfa22d30 100644 --- a/src/core/backbone_router/bbr_manager.cpp +++ b/src/core/backbone_router/bbr_manager.cpp @@ -37,11 +37,11 @@ #include "common/as_core_type.hpp" #include "common/code_utils.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" #include "common/num_utils.hpp" #include "common/random.hpp" +#include "instance/instance.hpp" #include "thread/mle_types.hpp" #include "thread/thread_netif.hpp" #include "thread/thread_tlvs.hpp" diff --git a/src/core/backbone_router/multicast_listeners_table.cpp b/src/core/backbone_router/multicast_listeners_table.cpp index 4f477cdee10..22e4e320a73 100644 --- a/src/core/backbone_router/multicast_listeners_table.cpp +++ b/src/core/backbone_router/multicast_listeners_table.cpp @@ -37,10 +37,10 @@ #include "common/array.hpp" #include "common/code_utils.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" #include "common/random.hpp" +#include "instance/instance.hpp" #include "thread/mle_types.hpp" #include "thread/thread_netif.hpp" #include "thread/uri_paths.hpp" diff --git a/src/core/border_router/infra_if.cpp b/src/core/border_router/infra_if.cpp index 011400c4d84..07b5dc50931 100644 --- a/src/core/border_router/infra_if.cpp +++ b/src/core/border_router/infra_if.cpp @@ -37,9 +37,9 @@ #include "border_router/routing_manager.hpp" #include "common/as_core_type.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/logging.hpp" +#include "instance/instance.hpp" #include "net/icmp6.hpp" namespace ot { diff --git a/src/core/border_router/routing_manager.cpp b/src/core/border_router/routing_manager.cpp index 97fbad55fe0..2b073b4b987 100644 --- a/src/core/border_router/routing_manager.cpp +++ b/src/core/border_router/routing_manager.cpp @@ -44,13 +44,13 @@ #include "common/code_utils.hpp" #include "common/debug.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" #include "common/num_utils.hpp" #include "common/numeric_limits.hpp" #include "common/random.hpp" #include "common/settings.hpp" +#include "instance/instance.hpp" #include "meshcop/extended_panid.hpp" #include "net/ip6.hpp" #include "net/nat64_translator.hpp" diff --git a/src/core/coap/coap.cpp b/src/core/coap/coap.cpp index 38e5618581b..696d0fc838c 100644 --- a/src/core/coap/coap.cpp +++ b/src/core/coap/coap.cpp @@ -32,10 +32,10 @@ #include "common/as_core_type.hpp" #include "common/code_utils.hpp" #include "common/debug.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" #include "common/random.hpp" +#include "instance/instance.hpp" #include "net/ip6.hpp" #include "net/udp6.hpp" #include "thread/thread_netif.hpp" diff --git a/src/core/coap/coap_message.cpp b/src/core/coap/coap_message.cpp index 72fb6148e7d..61c2ae0ab81 100644 --- a/src/core/coap/coap_message.cpp +++ b/src/core/coap/coap_message.cpp @@ -38,9 +38,9 @@ #include "common/code_utils.hpp" #include "common/debug.hpp" #include "common/encoding.hpp" -#include "common/instance.hpp" #include "common/random.hpp" #include "common/string.hpp" +#include "instance/instance.hpp" namespace ot { namespace Coap { diff --git a/src/core/coap/coap_secure.cpp b/src/core/coap/coap_secure.cpp index 3f5730afb1c..7d0fbe1b3f5 100644 --- a/src/core/coap/coap_secure.cpp +++ b/src/core/coap/coap_secure.cpp @@ -30,10 +30,10 @@ #if OPENTHREAD_CONFIG_DTLS_ENABLE -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" #include "common/new.hpp" +#include "instance/instance.hpp" #include "meshcop/dtls.hpp" #include "thread/thread_netif.hpp" diff --git a/src/core/common/heap.cpp b/src/core/common/heap.cpp index 7b431ee308d..cc403467be1 100644 --- a/src/core/common/heap.cpp +++ b/src/core/common/heap.cpp @@ -33,7 +33,7 @@ #include "heap.hpp" -#include "common/instance.hpp" +#include "instance/instance.hpp" namespace ot { namespace Heap { diff --git a/src/core/common/locator_getters.hpp b/src/core/common/locator_getters.hpp index 990b8c6d622..ad9067f54a4 100644 --- a/src/core/common/locator_getters.hpp +++ b/src/core/common/locator_getters.hpp @@ -37,9 +37,9 @@ #include "openthread-core-config.h" -#include "common/instance.hpp" #include "common/locator.hpp" #include "common/tasklet.hpp" +#include "instance/instance.hpp" namespace ot { diff --git a/src/core/common/log.cpp b/src/core/common/log.cpp index cdf447e3a97..1809cd54b53 100644 --- a/src/core/common/log.cpp +++ b/src/core/common/log.cpp @@ -38,10 +38,10 @@ #include #include "common/code_utils.hpp" -#include "common/instance.hpp" #include "common/num_utils.hpp" #include "common/numeric_limits.hpp" #include "common/string.hpp" +#include "instance/instance.hpp" /* * Verify debug UART dependency. diff --git a/src/core/common/message.cpp b/src/core/common/message.cpp index bdb513ab882..1c7028d0fa9 100644 --- a/src/core/common/message.cpp +++ b/src/core/common/message.cpp @@ -37,11 +37,11 @@ #include "common/code_utils.hpp" #include "common/debug.hpp" #include "common/heap.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" #include "common/num_utils.hpp" #include "common/numeric_limits.hpp" +#include "instance/instance.hpp" #include "net/checksum.hpp" #include "net/ip6.hpp" diff --git a/src/core/common/settings.cpp b/src/core/common/settings.cpp index c9b6f3ad7fd..504eb7c5662 100644 --- a/src/core/common/settings.cpp +++ b/src/core/common/settings.cpp @@ -35,9 +35,9 @@ #include "common/array.hpp" #include "common/code_utils.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/num_utils.hpp" +#include "instance/instance.hpp" #include "meshcop/dataset.hpp" #include "thread/mle.hpp" diff --git a/src/core/common/time_ticker.cpp b/src/core/common/time_ticker.cpp index 368650481d5..4cc59c1c676 100644 --- a/src/core/common/time_ticker.cpp +++ b/src/core/common/time_ticker.cpp @@ -35,9 +35,9 @@ #include "common/code_utils.hpp" #include "common/debug.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/random.hpp" +#include "instance/instance.hpp" #include "thread/mle_router.hpp" namespace ot { diff --git a/src/core/common/timer.cpp b/src/core/common/timer.cpp index 7722cae3f9f..5484f20d066 100644 --- a/src/core/common/timer.cpp +++ b/src/core/common/timer.cpp @@ -36,8 +36,8 @@ #include "common/as_core_type.hpp" #include "common/code_utils.hpp" #include "common/debug.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" +#include "instance/instance.hpp" namespace ot { diff --git a/src/core/common/uptime.cpp b/src/core/common/uptime.cpp index 4cf0a34c78d..3d9e6afde58 100644 --- a/src/core/common/uptime.cpp +++ b/src/core/common/uptime.cpp @@ -37,8 +37,8 @@ #include "common/code_utils.hpp" #include "common/debug.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" +#include "instance/instance.hpp" namespace ot { diff --git a/src/core/crypto/crypto_platform.cpp b/src/core/crypto/crypto_platform.cpp index 0b9250d42ff..2d71d0eebe4 100644 --- a/src/core/crypto/crypto_platform.cpp +++ b/src/core/crypto/crypto_platform.cpp @@ -51,12 +51,12 @@ #include "common/code_utils.hpp" #include "common/debug.hpp" -#include "common/instance.hpp" #include "common/new.hpp" #include "config/crypto.h" #include "crypto/ecdsa.hpp" #include "crypto/hmac_sha256.hpp" #include "crypto/storage.hpp" +#include "instance/instance.hpp" using namespace ot; using namespace Crypto; diff --git a/src/core/diags/factory_diags.cpp b/src/core/diags/factory_diags.cpp index 5eed151f394..249594f77a4 100644 --- a/src/core/diags/factory_diags.cpp +++ b/src/core/diags/factory_diags.cpp @@ -43,8 +43,8 @@ #include "common/as_core_type.hpp" #include "common/code_utils.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" +#include "instance/instance.hpp" #include "radio/radio.hpp" #include "utils/parse_cmdline.hpp" diff --git a/src/core/common/extension.hpp b/src/core/instance/extension.hpp similarity index 100% rename from src/core/common/extension.hpp rename to src/core/instance/extension.hpp diff --git a/src/core/common/extension_example.cpp b/src/core/instance/extension_example.cpp similarity index 98% rename from src/core/common/extension_example.cpp rename to src/core/instance/extension_example.cpp index f392b31fb66..c1bebfbd5aa 100644 --- a/src/core/common/extension_example.cpp +++ b/src/core/instance/extension_example.cpp @@ -37,8 +37,8 @@ #include #include "common/code_utils.hpp" -#include "common/extension.hpp" #include "common/new.hpp" +#include "instance/extension.hpp" namespace ot { namespace Extension { diff --git a/src/core/common/instance.cpp b/src/core/instance/instance.cpp similarity index 100% rename from src/core/common/instance.cpp rename to src/core/instance/instance.cpp diff --git a/src/core/common/instance.hpp b/src/core/instance/instance.hpp similarity index 99% rename from src/core/common/instance.hpp rename to src/core/instance/instance.hpp index d213c692e01..6b26825abdb 100644 --- a/src/core/common/instance.hpp +++ b/src/core/instance/instance.hpp @@ -47,7 +47,6 @@ #include "common/array.hpp" #include "common/as_core_type.hpp" #include "common/error.hpp" -#include "common/extension.hpp" #include "common/log.hpp" #include "common/message.hpp" #include "common/non_copyable.hpp" @@ -57,6 +56,7 @@ #include "common/timer.hpp" #include "common/uptime.hpp" #include "diags/factory_diags.hpp" +#include "instance/extension.hpp" #include "mac/link_raw.hpp" #include "radio/radio.hpp" #include "utils/otns.hpp" diff --git a/src/core/mac/data_poll_handler.cpp b/src/core/mac/data_poll_handler.cpp index d832c1c7991..226ab087eab 100644 --- a/src/core/mac/data_poll_handler.cpp +++ b/src/core/mac/data_poll_handler.cpp @@ -36,9 +36,9 @@ #if OPENTHREAD_FTD #include "common/code_utils.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" +#include "instance/instance.hpp" namespace ot { diff --git a/src/core/mac/data_poll_sender.cpp b/src/core/mac/data_poll_sender.cpp index 93fad6b83d3..80e18f7a5be 100644 --- a/src/core/mac/data_poll_sender.cpp +++ b/src/core/mac/data_poll_sender.cpp @@ -34,11 +34,11 @@ #include "data_poll_sender.hpp" #include "common/code_utils.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" #include "common/message.hpp" #include "common/num_utils.hpp" +#include "instance/instance.hpp" #include "net/ip6.hpp" #include "net/netif.hpp" #include "thread/mesh_forwarder.hpp" diff --git a/src/core/mac/link_raw.cpp b/src/core/mac/link_raw.cpp index b9c4f6ee458..be433815fd4 100644 --- a/src/core/mac/link_raw.cpp +++ b/src/core/mac/link_raw.cpp @@ -40,10 +40,10 @@ #include #include "common/debug.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" #include "common/random.hpp" +#include "instance/instance.hpp" #include "mac/mac_frame.hpp" namespace ot { diff --git a/src/core/mac/mac.cpp b/src/core/mac/mac.cpp index 8dfbecc7177..fe41b62b9da 100644 --- a/src/core/mac/mac.cpp +++ b/src/core/mac/mac.cpp @@ -40,12 +40,12 @@ #include "common/code_utils.hpp" #include "common/debug.hpp" #include "common/encoding.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/random.hpp" #include "common/string.hpp" #include "crypto/aes_ccm.hpp" #include "crypto/sha256.hpp" +#include "instance/instance.hpp" #include "mac/mac_frame.hpp" #include "radio/radio.hpp" #include "thread/child.hpp" diff --git a/src/core/mac/mac_links.cpp b/src/core/mac/mac_links.cpp index 19b9df38fef..481f0f0eb3e 100644 --- a/src/core/mac/mac_links.cpp +++ b/src/core/mac/mac_links.cpp @@ -34,8 +34,8 @@ #include "mac_links.hpp" #include "common/code_utils.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" +#include "instance/instance.hpp" namespace ot { namespace Mac { diff --git a/src/core/mac/sub_mac.cpp b/src/core/mac/sub_mac.cpp index a5b3a5f3263..86e58c27659 100644 --- a/src/core/mac/sub_mac.cpp +++ b/src/core/mac/sub_mac.cpp @@ -39,12 +39,12 @@ #include "common/code_utils.hpp" #include "common/debug.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" #include "common/num_utils.hpp" #include "common/random.hpp" #include "common/time.hpp" +#include "instance/instance.hpp" #include "mac/mac_frame.hpp" namespace ot { diff --git a/src/core/mac/sub_mac_callbacks.cpp b/src/core/mac/sub_mac_callbacks.cpp index ba0269e0f3b..a6e76153185 100644 --- a/src/core/mac/sub_mac_callbacks.cpp +++ b/src/core/mac/sub_mac_callbacks.cpp @@ -34,8 +34,8 @@ #include "sub_mac.hpp" #include "common/code_utils.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" +#include "instance/instance.hpp" #if OPENTHREAD_FTD || OPENTHREAD_MTD #include "mac/mac.hpp" diff --git a/src/core/meshcop/announce_begin_client.cpp b/src/core/meshcop/announce_begin_client.cpp index f0cde456fda..5d3b9d9c537 100644 --- a/src/core/meshcop/announce_begin_client.cpp +++ b/src/core/meshcop/announce_begin_client.cpp @@ -38,9 +38,9 @@ #include "coap/coap_message.hpp" #include "common/code_utils.hpp" #include "common/debug.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" +#include "instance/instance.hpp" #include "meshcop/meshcop.hpp" #include "meshcop/meshcop_tlvs.hpp" #include "thread/thread_netif.hpp" diff --git a/src/core/meshcop/border_agent.cpp b/src/core/meshcop/border_agent.cpp index 235e7a56d6c..142c6060b38 100644 --- a/src/core/meshcop/border_agent.cpp +++ b/src/core/meshcop/border_agent.cpp @@ -38,11 +38,11 @@ #include "coap/coap_message.hpp" #include "common/as_core_type.hpp" #include "common/heap.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" #include "common/owned_ptr.hpp" #include "common/settings.hpp" +#include "instance/instance.hpp" #include "meshcop/meshcop.hpp" #include "meshcop/meshcop_tlvs.hpp" #include "thread/thread_netif.hpp" diff --git a/src/core/meshcop/commissioner.cpp b/src/core/meshcop/commissioner.cpp index 5464476b66f..3009a474296 100644 --- a/src/core/meshcop/commissioner.cpp +++ b/src/core/meshcop/commissioner.cpp @@ -41,9 +41,9 @@ #include "common/array.hpp" #include "common/as_core_type.hpp" #include "common/encoding.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/string.hpp" +#include "instance/instance.hpp" #include "meshcop/joiner.hpp" #include "meshcop/joiner_router.hpp" #include "meshcop/meshcop.hpp" diff --git a/src/core/meshcop/dataset.cpp b/src/core/meshcop/dataset.cpp index 974b23e8a7c..cc958313cac 100644 --- a/src/core/meshcop/dataset.cpp +++ b/src/core/meshcop/dataset.cpp @@ -38,9 +38,9 @@ #include "common/code_utils.hpp" #include "common/encoding.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" +#include "instance/instance.hpp" #include "mac/mac_types.hpp" #include "meshcop/meshcop_tlvs.hpp" #include "meshcop/timestamp.hpp" diff --git a/src/core/meshcop/dataset_local.cpp b/src/core/meshcop/dataset_local.cpp index 58370c3fbb7..ac1095732c3 100644 --- a/src/core/meshcop/dataset_local.cpp +++ b/src/core/meshcop/dataset_local.cpp @@ -37,11 +37,11 @@ #include #include "common/code_utils.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" #include "common/settings.hpp" #include "crypto/storage.hpp" +#include "instance/instance.hpp" #include "meshcop/dataset.hpp" #include "meshcop/meshcop_tlvs.hpp" #include "thread/mle_tlvs.hpp" diff --git a/src/core/meshcop/dataset_manager.cpp b/src/core/meshcop/dataset_manager.cpp index 043f88c2a26..a4ad59545d2 100644 --- a/src/core/meshcop/dataset_manager.cpp +++ b/src/core/meshcop/dataset_manager.cpp @@ -37,10 +37,10 @@ #include #include "common/as_core_type.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" #include "common/notifier.hpp" +#include "instance/instance.hpp" #include "meshcop/meshcop.hpp" #include "meshcop/meshcop_tlvs.hpp" #include "radio/radio.hpp" diff --git a/src/core/meshcop/dataset_manager_ftd.cpp b/src/core/meshcop/dataset_manager_ftd.cpp index 22488d308af..5a2fd2176a4 100644 --- a/src/core/meshcop/dataset_manager_ftd.cpp +++ b/src/core/meshcop/dataset_manager_ftd.cpp @@ -44,11 +44,11 @@ #include "common/as_core_type.hpp" #include "common/code_utils.hpp" #include "common/debug.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" #include "common/random.hpp" #include "common/timer.hpp" +#include "instance/instance.hpp" #include "meshcop/dataset.hpp" #include "meshcop/meshcop.hpp" #include "meshcop/meshcop_leader.hpp" diff --git a/src/core/meshcop/dataset_updater.cpp b/src/core/meshcop/dataset_updater.cpp index 114bae5506b..0ba5b1db222 100644 --- a/src/core/meshcop/dataset_updater.cpp +++ b/src/core/meshcop/dataset_updater.cpp @@ -37,10 +37,10 @@ #if (OPENTHREAD_CONFIG_DATASET_UPDATER_ENABLE || OPENTHREAD_CONFIG_CHANNEL_MANAGER_ENABLE) && OPENTHREAD_FTD #include "common/code_utils.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" #include "common/random.hpp" +#include "instance/instance.hpp" #include "meshcop/timestamp.hpp" namespace ot { diff --git a/src/core/meshcop/dtls.cpp b/src/core/meshcop/dtls.cpp index 28337a62e69..e3c2275f169 100644 --- a/src/core/meshcop/dtls.cpp +++ b/src/core/meshcop/dtls.cpp @@ -44,12 +44,12 @@ #include "common/code_utils.hpp" #include "common/debug.hpp" #include "common/encoding.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" #include "common/timer.hpp" #include "crypto/mbedtls.hpp" #include "crypto/sha256.hpp" +#include "instance/instance.hpp" #include "thread/thread_netif.hpp" #if OPENTHREAD_CONFIG_DTLS_ENABLE diff --git a/src/core/meshcop/energy_scan_client.cpp b/src/core/meshcop/energy_scan_client.cpp index 905d8a66f28..beea65caacb 100644 --- a/src/core/meshcop/energy_scan_client.cpp +++ b/src/core/meshcop/energy_scan_client.cpp @@ -40,10 +40,10 @@ #include "common/code_utils.hpp" #include "common/debug.hpp" #include "common/encoding.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" #include "common/num_utils.hpp" +#include "instance/instance.hpp" #include "meshcop/meshcop.hpp" #include "meshcop/meshcop_tlvs.hpp" #include "thread/thread_netif.hpp" diff --git a/src/core/meshcop/joiner.cpp b/src/core/meshcop/joiner.cpp index 86bd25ffe77..50b02e9239c 100644 --- a/src/core/meshcop/joiner.cpp +++ b/src/core/meshcop/joiner.cpp @@ -42,10 +42,10 @@ #include "common/code_utils.hpp" #include "common/debug.hpp" #include "common/encoding.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" #include "common/string.hpp" +#include "instance/instance.hpp" #include "meshcop/meshcop.hpp" #include "radio/radio.hpp" #include "thread/thread_netif.hpp" diff --git a/src/core/meshcop/joiner_router.cpp b/src/core/meshcop/joiner_router.cpp index 78fc270cf41..291ecf332d0 100644 --- a/src/core/meshcop/joiner_router.cpp +++ b/src/core/meshcop/joiner_router.cpp @@ -40,9 +40,9 @@ #include "common/as_core_type.hpp" #include "common/code_utils.hpp" #include "common/encoding.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" +#include "instance/instance.hpp" #include "meshcop/meshcop.hpp" #include "meshcop/meshcop_tlvs.hpp" #include "thread/mle.hpp" diff --git a/src/core/meshcop/meshcop_leader.cpp b/src/core/meshcop/meshcop_leader.cpp index f3622987152..f2fe3c0f601 100644 --- a/src/core/meshcop/meshcop_leader.cpp +++ b/src/core/meshcop/meshcop_leader.cpp @@ -40,10 +40,10 @@ #include "coap/coap_message.hpp" #include "common/as_core_type.hpp" #include "common/code_utils.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" #include "common/random.hpp" +#include "instance/instance.hpp" #include "meshcop/meshcop.hpp" #include "meshcop/meshcop_tlvs.hpp" #include "thread/thread_netif.hpp" diff --git a/src/core/meshcop/panid_query_client.cpp b/src/core/meshcop/panid_query_client.cpp index 8c6a004ef44..431e8c2fabe 100644 --- a/src/core/meshcop/panid_query_client.cpp +++ b/src/core/meshcop/panid_query_client.cpp @@ -39,9 +39,9 @@ #include "common/as_core_type.hpp" #include "common/code_utils.hpp" #include "common/debug.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" +#include "instance/instance.hpp" #include "meshcop/meshcop.hpp" #include "meshcop/meshcop_tlvs.hpp" #include "thread/thread_netif.hpp" diff --git a/src/core/net/dhcp6_client.cpp b/src/core/net/dhcp6_client.cpp index db671357aea..680ea049e1c 100644 --- a/src/core/net/dhcp6_client.cpp +++ b/src/core/net/dhcp6_client.cpp @@ -38,9 +38,9 @@ #include "common/as_core_type.hpp" #include "common/code_utils.hpp" #include "common/encoding.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" +#include "instance/instance.hpp" #include "mac/mac.hpp" #include "net/dhcp6.hpp" #include "thread/thread_netif.hpp" diff --git a/src/core/net/dhcp6_server.cpp b/src/core/net/dhcp6_server.cpp index a8a8a595baa..c268e1c6f53 100644 --- a/src/core/net/dhcp6_server.cpp +++ b/src/core/net/dhcp6_server.cpp @@ -39,9 +39,9 @@ #include "common/as_core_type.hpp" #include "common/code_utils.hpp" #include "common/encoding.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" +#include "instance/instance.hpp" #include "thread/mle.hpp" #include "thread/thread_netif.hpp" diff --git a/src/core/net/dns_client.cpp b/src/core/net/dns_client.cpp index ef3fb3da202..df7c737a186 100644 --- a/src/core/net/dns_client.cpp +++ b/src/core/net/dns_client.cpp @@ -34,9 +34,9 @@ #include "common/as_core_type.hpp" #include "common/code_utils.hpp" #include "common/debug.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" +#include "instance/instance.hpp" #include "net/udp6.hpp" #include "thread/network_data_types.hpp" #include "thread/thread_netif.hpp" diff --git a/src/core/net/dns_dso.cpp b/src/core/net/dns_dso.cpp index 179e57cee0e..175afbcda32 100644 --- a/src/core/net/dns_dso.cpp +++ b/src/core/net/dns_dso.cpp @@ -34,11 +34,11 @@ #include "common/as_core_type.hpp" #include "common/code_utils.hpp" #include "common/debug.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" #include "common/num_utils.hpp" #include "common/random.hpp" +#include "instance/instance.hpp" /** * @file diff --git a/src/core/net/dns_platform.cpp b/src/core/net/dns_platform.cpp index ef48077b6df..109f018e7d7 100644 --- a/src/core/net/dns_platform.cpp +++ b/src/core/net/dns_platform.cpp @@ -37,8 +37,8 @@ #include #include "common/code_utils.hpp" -#include "common/instance.hpp" #include "common/message.hpp" +#include "instance/instance.hpp" #if OPENTHREAD_CONFIG_DNS_UPSTREAM_QUERY_ENABLE diff --git a/src/core/net/dns_types.cpp b/src/core/net/dns_types.cpp index ec640b29443..a9585a22c1a 100644 --- a/src/core/net/dns_types.cpp +++ b/src/core/net/dns_types.cpp @@ -35,10 +35,10 @@ #include "common/code_utils.hpp" #include "common/debug.hpp" -#include "common/instance.hpp" #include "common/num_utils.hpp" #include "common/random.hpp" #include "common/string.hpp" +#include "instance/instance.hpp" namespace ot { namespace Dns { diff --git a/src/core/net/dnssd_server.cpp b/src/core/net/dnssd_server.cpp index 3406c3d9089..ea59c08d515 100644 --- a/src/core/net/dnssd_server.cpp +++ b/src/core/net/dnssd_server.cpp @@ -41,10 +41,10 @@ #include "common/as_core_type.hpp" #include "common/code_utils.hpp" #include "common/debug.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" #include "common/string.hpp" +#include "instance/instance.hpp" #include "net/srp_server.hpp" #include "net/udp6.hpp" diff --git a/src/core/net/icmp6.cpp b/src/core/net/icmp6.cpp index 2f195b0aba3..5bcea06c037 100644 --- a/src/core/net/icmp6.cpp +++ b/src/core/net/icmp6.cpp @@ -35,10 +35,10 @@ #include "common/code_utils.hpp" #include "common/debug.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" #include "common/message.hpp" +#include "instance/instance.hpp" #include "net/checksum.hpp" #include "net/ip6.hpp" diff --git a/src/core/net/ip6.cpp b/src/core/net/ip6.cpp index 49a411b08ed..df619845120 100644 --- a/src/core/net/ip6.cpp +++ b/src/core/net/ip6.cpp @@ -38,11 +38,11 @@ #include "backbone_router/ndproxy_table.hpp" #include "common/code_utils.hpp" #include "common/debug.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" #include "common/message.hpp" #include "common/random.hpp" +#include "instance/instance.hpp" #include "net/checksum.hpp" #include "net/icmp6.hpp" #include "net/ip6_address.hpp" diff --git a/src/core/net/ip6_address.cpp b/src/core/net/ip6_address.cpp index e6d924296a6..3686c19552e 100644 --- a/src/core/net/ip6_address.cpp +++ b/src/core/net/ip6_address.cpp @@ -39,10 +39,10 @@ #include "common/as_core_type.hpp" #include "common/code_utils.hpp" #include "common/encoding.hpp" -#include "common/instance.hpp" #include "common/num_utils.hpp" #include "common/numeric_limits.hpp" #include "common/random.hpp" +#include "instance/instance.hpp" #include "net/ip4_types.hpp" #include "net/netif.hpp" diff --git a/src/core/net/ip6_filter.cpp b/src/core/net/ip6_filter.cpp index 0104fac8142..1dae10c71d7 100644 --- a/src/core/net/ip6_filter.cpp +++ b/src/core/net/ip6_filter.cpp @@ -36,9 +36,9 @@ #include #include "common/code_utils.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" +#include "instance/instance.hpp" #include "meshcop/meshcop.hpp" #include "net/ip6.hpp" #include "net/tcp6.hpp" diff --git a/src/core/net/ip6_mpl.cpp b/src/core/net/ip6_mpl.cpp index 6fbdf385b36..78922ef6f25 100644 --- a/src/core/net/ip6_mpl.cpp +++ b/src/core/net/ip6_mpl.cpp @@ -35,11 +35,11 @@ #include "common/code_utils.hpp" #include "common/debug.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/message.hpp" #include "common/random.hpp" #include "common/serial_number.hpp" +#include "instance/instance.hpp" #include "net/ip6.hpp" namespace ot { diff --git a/src/core/net/netif.cpp b/src/core/net/netif.cpp index e6c3c2e3c97..ff39891e736 100644 --- a/src/core/net/netif.cpp +++ b/src/core/net/netif.cpp @@ -35,9 +35,9 @@ #include "common/as_core_type.hpp" #include "common/debug.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/message.hpp" +#include "instance/instance.hpp" #include "net/ip6.hpp" namespace ot { diff --git a/src/core/net/sntp_client.cpp b/src/core/net/sntp_client.cpp index bc79e3d9be1..5897a5f3bc2 100644 --- a/src/core/net/sntp_client.cpp +++ b/src/core/net/sntp_client.cpp @@ -34,9 +34,9 @@ #include "common/as_core_type.hpp" #include "common/code_utils.hpp" #include "common/debug.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" +#include "instance/instance.hpp" #include "net/udp6.hpp" #include "thread/thread_netif.hpp" diff --git a/src/core/net/srp_client.cpp b/src/core/net/srp_client.cpp index eae23025c78..9663d9299cb 100644 --- a/src/core/net/srp_client.cpp +++ b/src/core/net/srp_client.cpp @@ -33,12 +33,12 @@ #include "common/as_core_type.hpp" #include "common/code_utils.hpp" #include "common/debug.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/num_utils.hpp" #include "common/random.hpp" #include "common/settings.hpp" #include "common/string.hpp" +#include "instance/instance.hpp" /** * @file diff --git a/src/core/net/srp_server.cpp b/src/core/net/srp_server.cpp index 2a57c9217eb..aaaaaa71f85 100644 --- a/src/core/net/srp_server.cpp +++ b/src/core/net/srp_server.cpp @@ -37,13 +37,13 @@ #include "common/as_core_type.hpp" #include "common/const_cast.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" #include "common/new.hpp" #include "common/num_utils.hpp" #include "common/random.hpp" #include "common/string.hpp" +#include "instance/instance.hpp" #include "net/dns_types.hpp" #include "thread/thread_netif.hpp" diff --git a/src/core/net/tcp6.cpp b/src/core/net/tcp6.cpp index 74d598a82c3..dccb41bb2ef 100644 --- a/src/core/net/tcp6.cpp +++ b/src/core/net/tcp6.cpp @@ -40,11 +40,11 @@ #include "common/as_core_type.hpp" #include "common/code_utils.hpp" #include "common/error.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" #include "common/num_utils.hpp" #include "common/random.hpp" +#include "instance/instance.hpp" #include "net/checksum.hpp" #include "net/ip6.hpp" #include "net/netif.hpp" diff --git a/src/core/net/udp6.cpp b/src/core/net/udp6.cpp index be62da2609a..71d0ea8720d 100644 --- a/src/core/net/udp6.cpp +++ b/src/core/net/udp6.cpp @@ -39,8 +39,8 @@ #include "common/code_utils.hpp" #include "common/encoding.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" +#include "instance/instance.hpp" #include "net/checksum.hpp" #include "net/ip6.hpp" diff --git a/src/core/radio/radio_callbacks.cpp b/src/core/radio/radio_callbacks.cpp index ae85c778063..6a6131c19fd 100644 --- a/src/core/radio/radio_callbacks.cpp +++ b/src/core/radio/radio_callbacks.cpp @@ -33,8 +33,8 @@ #include "radio.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" +#include "instance/instance.hpp" namespace ot { diff --git a/src/core/radio/radio_platform.cpp b/src/core/radio/radio_platform.cpp index 7840a867cfe..d1f6866ed86 100644 --- a/src/core/radio/radio_platform.cpp +++ b/src/core/radio/radio_platform.cpp @@ -35,7 +35,7 @@ #include "common/as_core_type.hpp" #include "common/code_utils.hpp" -#include "common/instance.hpp" +#include "instance/instance.hpp" #include "radio/radio.hpp" using namespace ot; diff --git a/src/core/radio/trel_interface.cpp b/src/core/radio/trel_interface.cpp index 2f69c7d0a96..acbe3e5e7d6 100644 --- a/src/core/radio/trel_interface.cpp +++ b/src/core/radio/trel_interface.cpp @@ -40,10 +40,10 @@ #include "common/as_core_type.hpp" #include "common/code_utils.hpp" #include "common/debug.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" #include "common/string.hpp" +#include "instance/instance.hpp" #include "net/dns_types.hpp" namespace ot { diff --git a/src/core/radio/trel_link.cpp b/src/core/radio/trel_link.cpp index 203e0dfeb51..4735f379e3a 100644 --- a/src/core/radio/trel_link.cpp +++ b/src/core/radio/trel_link.cpp @@ -36,9 +36,9 @@ #include "common/code_utils.hpp" #include "common/debug.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" +#include "instance/instance.hpp" namespace ot { namespace Trel { diff --git a/src/core/radio/trel_packet.cpp b/src/core/radio/trel_packet.cpp index 2847b6001cf..f28129f72af 100644 --- a/src/core/radio/trel_packet.cpp +++ b/src/core/radio/trel_packet.cpp @@ -36,8 +36,8 @@ #include "common/code_utils.hpp" #include "common/debug.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" +#include "instance/instance.hpp" namespace ot { namespace Trel { diff --git a/src/core/thread/address_resolver.cpp b/src/core/thread/address_resolver.cpp index 2337f818590..a779a11588f 100644 --- a/src/core/thread/address_resolver.cpp +++ b/src/core/thread/address_resolver.cpp @@ -38,10 +38,10 @@ #include "common/code_utils.hpp" #include "common/debug.hpp" #include "common/encoding.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" #include "common/time.hpp" +#include "instance/instance.hpp" #include "mac/mac_types.hpp" #include "thread/mesh_forwarder.hpp" #include "thread/mle_router.hpp" diff --git a/src/core/thread/announce_begin_server.cpp b/src/core/thread/announce_begin_server.cpp index 1c904e358a9..4db912dd2b4 100644 --- a/src/core/thread/announce_begin_server.cpp +++ b/src/core/thread/announce_begin_server.cpp @@ -39,9 +39,9 @@ #include "common/as_core_type.hpp" #include "common/code_utils.hpp" #include "common/debug.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" +#include "instance/instance.hpp" #include "meshcop/meshcop_tlvs.hpp" #include "thread/thread_netif.hpp" #include "thread/uri_paths.hpp" diff --git a/src/core/thread/announce_sender.cpp b/src/core/thread/announce_sender.cpp index 810939e4cc4..4a8ece2c8ac 100644 --- a/src/core/thread/announce_sender.cpp +++ b/src/core/thread/announce_sender.cpp @@ -36,10 +36,10 @@ #include #include "common/code_utils.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" #include "common/random.hpp" +#include "instance/instance.hpp" #include "meshcop/meshcop.hpp" #include "meshcop/meshcop_tlvs.hpp" #include "radio/radio.hpp" diff --git a/src/core/thread/anycast_locator.cpp b/src/core/thread/anycast_locator.cpp index 88a02d4e188..14e0fd84368 100644 --- a/src/core/thread/anycast_locator.cpp +++ b/src/core/thread/anycast_locator.cpp @@ -37,8 +37,8 @@ #include "common/as_core_type.hpp" #include "common/code_utils.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" +#include "instance/instance.hpp" #include "thread/thread_tlvs.hpp" #include "thread/uri_paths.hpp" diff --git a/src/core/thread/child.cpp b/src/core/thread/child.cpp index 7dbec0c4016..008173b6d9b 100644 --- a/src/core/thread/child.cpp +++ b/src/core/thread/child.cpp @@ -36,9 +36,9 @@ #include "common/array.hpp" #include "common/code_utils.hpp" #include "common/debug.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/num_utils.hpp" +#include "instance/instance.hpp" namespace ot { diff --git a/src/core/thread/child_supervision.cpp b/src/core/thread/child_supervision.cpp index f4bcd580c52..80622ebb46c 100644 --- a/src/core/thread/child_supervision.cpp +++ b/src/core/thread/child_supervision.cpp @@ -35,9 +35,9 @@ #include "openthread-core-config.h" #include "common/code_utils.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" +#include "instance/instance.hpp" #include "thread/thread_netif.hpp" namespace ot { diff --git a/src/core/thread/child_table.cpp b/src/core/thread/child_table.cpp index e5ec2093665..cd9cb65492e 100644 --- a/src/core/thread/child_table.cpp +++ b/src/core/thread/child_table.cpp @@ -36,8 +36,8 @@ #if OPENTHREAD_FTD #include "common/code_utils.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" +#include "instance/instance.hpp" namespace ot { diff --git a/src/core/thread/discover_scanner.cpp b/src/core/thread/discover_scanner.cpp index 0fa311c906e..2425e1e3afe 100644 --- a/src/core/thread/discover_scanner.cpp +++ b/src/core/thread/discover_scanner.cpp @@ -35,8 +35,8 @@ #include "common/as_core_type.hpp" #include "common/code_utils.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" +#include "instance/instance.hpp" #include "thread/mesh_forwarder.hpp" #include "thread/mle.hpp" #include "thread/mle_router.hpp" diff --git a/src/core/thread/dua_manager.cpp b/src/core/thread/dua_manager.cpp index 934f3387000..20fb792e856 100644 --- a/src/core/thread/dua_manager.cpp +++ b/src/core/thread/dua_manager.cpp @@ -37,10 +37,10 @@ #include "common/as_core_type.hpp" #include "common/code_utils.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" #include "common/settings.hpp" +#include "instance/instance.hpp" #include "net/ip6_address.hpp" #include "thread/mle_types.hpp" #include "thread/thread_netif.hpp" diff --git a/src/core/thread/energy_scan_server.cpp b/src/core/thread/energy_scan_server.cpp index da5fa171a82..c3901419ce3 100644 --- a/src/core/thread/energy_scan_server.cpp +++ b/src/core/thread/energy_scan_server.cpp @@ -37,9 +37,9 @@ #include "common/as_core_type.hpp" #include "common/code_utils.hpp" #include "common/debug.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" +#include "instance/instance.hpp" #include "meshcop/meshcop.hpp" #include "meshcop/meshcop_tlvs.hpp" #include "thread/thread_netif.hpp" diff --git a/src/core/thread/indirect_sender.cpp b/src/core/thread/indirect_sender.cpp index 7549702ff1f..89e8869177b 100644 --- a/src/core/thread/indirect_sender.cpp +++ b/src/core/thread/indirect_sender.cpp @@ -36,9 +36,9 @@ #if OPENTHREAD_FTD #include "common/code_utils.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/message.hpp" +#include "instance/instance.hpp" #include "thread/child.hpp" #include "thread/mesh_forwarder.hpp" #include "thread/mle_tlvs.hpp" diff --git a/src/core/thread/key_manager.cpp b/src/core/thread/key_manager.cpp index ddcbf74ef0b..8f37d372c2f 100644 --- a/src/core/thread/key_manager.cpp +++ b/src/core/thread/key_manager.cpp @@ -35,12 +35,12 @@ #include "common/code_utils.hpp" #include "common/encoding.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" #include "common/timer.hpp" #include "crypto/hkdf_sha256.hpp" #include "crypto/storage.hpp" +#include "instance/instance.hpp" #include "thread/mle_router.hpp" #include "thread/thread_netif.hpp" diff --git a/src/core/thread/link_metrics.cpp b/src/core/thread/link_metrics.cpp index 8e76990f740..9bf6e9a18fc 100644 --- a/src/core/thread/link_metrics.cpp +++ b/src/core/thread/link_metrics.cpp @@ -37,11 +37,11 @@ #include "common/code_utils.hpp" #include "common/encoding.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" #include "common/num_utils.hpp" #include "common/numeric_limits.hpp" +#include "instance/instance.hpp" #include "mac/mac.hpp" #include "thread/link_metrics_tlvs.hpp" #include "thread/neighbor_table.hpp" diff --git a/src/core/thread/link_quality.cpp b/src/core/thread/link_quality.cpp index ed5bbb5bf7e..bf6b35b42c1 100644 --- a/src/core/thread/link_quality.cpp +++ b/src/core/thread/link_quality.cpp @@ -36,9 +36,9 @@ #include #include "common/code_utils.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/num_utils.hpp" +#include "instance/instance.hpp" namespace ot { diff --git a/src/core/thread/lowpan.cpp b/src/core/thread/lowpan.cpp index a31519b3a51..c00506c3178 100644 --- a/src/core/thread/lowpan.cpp +++ b/src/core/thread/lowpan.cpp @@ -36,8 +36,8 @@ #include "common/code_utils.hpp" #include "common/debug.hpp" #include "common/encoding.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" +#include "instance/instance.hpp" #include "net/ip6.hpp" #include "net/udp6.hpp" #include "thread/network_data_leader.hpp" diff --git a/src/core/thread/mesh_forwarder.cpp b/src/core/thread/mesh_forwarder.cpp index 6b70245c40a..6068d011b75 100644 --- a/src/core/thread/mesh_forwarder.cpp +++ b/src/core/thread/mesh_forwarder.cpp @@ -36,11 +36,11 @@ #include "common/code_utils.hpp" #include "common/debug.hpp" #include "common/encoding.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/message.hpp" #include "common/random.hpp" #include "common/time_ticker.hpp" +#include "instance/instance.hpp" #include "net/ip6.hpp" #include "net/ip6_filter.hpp" #include "net/netif.hpp" diff --git a/src/core/thread/mle.cpp b/src/core/thread/mle.cpp index e224369a484..c8f68d6ee02 100644 --- a/src/core/thread/mle.cpp +++ b/src/core/thread/mle.cpp @@ -41,12 +41,12 @@ #include "common/code_utils.hpp" #include "common/debug.hpp" #include "common/encoding.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/num_utils.hpp" #include "common/random.hpp" #include "common/serial_number.hpp" #include "common/settings.hpp" +#include "instance/instance.hpp" #include "meshcop/meshcop.hpp" #include "meshcop/meshcop_tlvs.hpp" #include "net/netif.hpp" diff --git a/src/core/thread/mle_router.cpp b/src/core/thread/mle_router.cpp index 87a4a84eb38..e6785c33a3b 100644 --- a/src/core/thread/mle_router.cpp +++ b/src/core/thread/mle_router.cpp @@ -38,12 +38,12 @@ #include "common/code_utils.hpp" #include "common/debug.hpp" #include "common/encoding.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/num_utils.hpp" #include "common/random.hpp" #include "common/serial_number.hpp" #include "common/settings.hpp" +#include "instance/instance.hpp" #include "mac/mac_types.hpp" #include "meshcop/meshcop.hpp" #include "net/icmp6.hpp" diff --git a/src/core/thread/mlr_manager.cpp b/src/core/thread/mlr_manager.cpp index 3d988a73ec1..4fd5355f495 100644 --- a/src/core/thread/mlr_manager.cpp +++ b/src/core/thread/mlr_manager.cpp @@ -37,9 +37,9 @@ #include "common/as_core_type.hpp" #include "common/code_utils.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" +#include "instance/instance.hpp" #include "net/ip6_address.hpp" #include "thread/thread_netif.hpp" #include "thread/uri_paths.hpp" diff --git a/src/core/thread/neighbor.cpp b/src/core/thread/neighbor.cpp index 868c762d5aa..d86956870d4 100644 --- a/src/core/thread/neighbor.cpp +++ b/src/core/thread/neighbor.cpp @@ -36,9 +36,9 @@ #include "common/array.hpp" #include "common/code_utils.hpp" #include "common/debug.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/num_utils.hpp" +#include "instance/instance.hpp" namespace ot { diff --git a/src/core/thread/neighbor_table.cpp b/src/core/thread/neighbor_table.cpp index 39bd0663dce..21741412125 100644 --- a/src/core/thread/neighbor_table.cpp +++ b/src/core/thread/neighbor_table.cpp @@ -34,8 +34,8 @@ #include "neighbor_table.hpp" #include "common/code_utils.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" +#include "instance/instance.hpp" #include "thread/dua_manager.hpp" namespace ot { diff --git a/src/core/thread/network_data.cpp b/src/core/thread/network_data.cpp index 009e67515ec..2599d653bab 100644 --- a/src/core/thread/network_data.cpp +++ b/src/core/thread/network_data.cpp @@ -37,9 +37,9 @@ #include "common/array.hpp" #include "common/code_utils.hpp" #include "common/debug.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" +#include "instance/instance.hpp" #include "mac/mac_types.hpp" #include "thread/thread_netif.hpp" #include "thread/thread_tlvs.hpp" diff --git a/src/core/thread/network_data_leader.cpp b/src/core/thread/network_data_leader.cpp index c82a3cafc44..11c5441dc45 100644 --- a/src/core/thread/network_data_leader.cpp +++ b/src/core/thread/network_data_leader.cpp @@ -37,12 +37,12 @@ #include "common/code_utils.hpp" #include "common/debug.hpp" #include "common/encoding.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/logging.hpp" #include "common/message.hpp" #include "common/random.hpp" #include "common/timer.hpp" +#include "instance/instance.hpp" #include "mac/mac_types.hpp" #include "thread/lowpan.hpp" #include "thread/mle_router.hpp" diff --git a/src/core/thread/network_data_leader_ftd.cpp b/src/core/thread/network_data_leader_ftd.cpp index ea5f56bc5b7..aa833f49e7b 100644 --- a/src/core/thread/network_data_leader_ftd.cpp +++ b/src/core/thread/network_data_leader_ftd.cpp @@ -40,11 +40,11 @@ #include "common/code_utils.hpp" #include "common/debug.hpp" #include "common/encoding.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" #include "common/message.hpp" #include "common/timer.hpp" +#include "instance/instance.hpp" #include "mac/mac_types.hpp" #include "meshcop/meshcop.hpp" #include "thread/lowpan.hpp" diff --git a/src/core/thread/network_data_local.cpp b/src/core/thread/network_data_local.cpp index b99900fd590..1e92266c286 100644 --- a/src/core/thread/network_data_local.cpp +++ b/src/core/thread/network_data_local.cpp @@ -37,9 +37,9 @@ #include "common/code_utils.hpp" #include "common/debug.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" +#include "instance/instance.hpp" #include "mac/mac_types.hpp" #include "thread/mle_types.hpp" #include "thread/thread_netif.hpp" diff --git a/src/core/thread/network_data_notifier.cpp b/src/core/thread/network_data_notifier.cpp index 657c0e3b548..750b3799b49 100644 --- a/src/core/thread/network_data_notifier.cpp +++ b/src/core/thread/network_data_notifier.cpp @@ -36,9 +36,9 @@ #if OPENTHREAD_FTD || OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE || OPENTHREAD_CONFIG_TMF_NETDATA_SERVICE_ENABLE #include "common/code_utils.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" +#include "instance/instance.hpp" #include "thread/network_data_leader.hpp" #include "thread/network_data_local.hpp" #include "thread/tmf.hpp" diff --git a/src/core/thread/network_data_publisher.cpp b/src/core/thread/network_data_publisher.cpp index 056765cb9c4..6094eddef34 100644 --- a/src/core/thread/network_data_publisher.cpp +++ b/src/core/thread/network_data_publisher.cpp @@ -39,10 +39,10 @@ #include "common/array.hpp" #include "common/code_utils.hpp" #include "common/const_cast.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" #include "common/random.hpp" +#include "instance/instance.hpp" #include "thread/network_data_local.hpp" #include "thread/network_data_service.hpp" diff --git a/src/core/thread/network_data_service.cpp b/src/core/thread/network_data_service.cpp index 1d2e90dbae7..ab1af15e59b 100644 --- a/src/core/thread/network_data_service.cpp +++ b/src/core/thread/network_data_service.cpp @@ -35,8 +35,8 @@ #include "network_data_service.hpp" #include "common/code_utils.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" +#include "instance/instance.hpp" #include "thread/network_data_local.hpp" namespace ot { diff --git a/src/core/thread/network_data_types.cpp b/src/core/thread/network_data_types.cpp index 1793f2b4c16..be349ab9076 100644 --- a/src/core/thread/network_data_types.cpp +++ b/src/core/thread/network_data_types.cpp @@ -33,7 +33,7 @@ #include "network_data_types.hpp" -#include "common/instance.hpp" +#include "instance/instance.hpp" #include "thread/network_data_tlvs.hpp" namespace ot { diff --git a/src/core/thread/network_diagnostic.cpp b/src/core/thread/network_diagnostic.cpp index 7f313a573b2..235f03c6fb2 100644 --- a/src/core/thread/network_diagnostic.cpp +++ b/src/core/thread/network_diagnostic.cpp @@ -39,10 +39,10 @@ #include "common/code_utils.hpp" #include "common/debug.hpp" #include "common/encoding.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" #include "common/random.hpp" +#include "instance/instance.hpp" #include "mac/mac.hpp" #include "net/netif.hpp" #include "thread/mesh_forwarder.hpp" diff --git a/src/core/thread/panid_query_server.cpp b/src/core/thread/panid_query_server.cpp index 01df10af8ae..19c40c40c28 100644 --- a/src/core/thread/panid_query_server.cpp +++ b/src/core/thread/panid_query_server.cpp @@ -37,9 +37,9 @@ #include "common/as_core_type.hpp" #include "common/code_utils.hpp" #include "common/debug.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" +#include "instance/instance.hpp" #include "meshcop/meshcop.hpp" #include "meshcop/meshcop_tlvs.hpp" #include "thread/thread_netif.hpp" diff --git a/src/core/thread/radio_selector.cpp b/src/core/thread/radio_selector.cpp index 965734a0ca1..ea7ea74de3e 100644 --- a/src/core/thread/radio_selector.cpp +++ b/src/core/thread/radio_selector.cpp @@ -36,10 +36,10 @@ #if OPENTHREAD_CONFIG_MULTI_RADIO #include "common/code_utils.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" #include "common/random.hpp" +#include "instance/instance.hpp" namespace ot { diff --git a/src/core/thread/router.cpp b/src/core/thread/router.cpp index c99fec132fd..d16d635e540 100644 --- a/src/core/thread/router.cpp +++ b/src/core/thread/router.cpp @@ -36,9 +36,9 @@ #include "common/array.hpp" #include "common/code_utils.hpp" #include "common/debug.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/num_utils.hpp" +#include "instance/instance.hpp" namespace ot { diff --git a/src/core/thread/router_table.cpp b/src/core/thread/router_table.cpp index b462c69eada..1302ce78847 100644 --- a/src/core/thread/router_table.cpp +++ b/src/core/thread/router_table.cpp @@ -31,10 +31,10 @@ #if OPENTHREAD_FTD #include "common/code_utils.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" #include "common/timer.hpp" +#include "instance/instance.hpp" #include "thread/mle.hpp" #include "thread/mle_router.hpp" #include "thread/network_data_leader.hpp" diff --git a/src/core/thread/src_match_controller.cpp b/src/core/thread/src_match_controller.cpp index 2d73ce923a9..b53db11147e 100644 --- a/src/core/thread/src_match_controller.cpp +++ b/src/core/thread/src_match_controller.cpp @@ -37,9 +37,9 @@ #include "common/code_utils.hpp" #include "common/debug.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" +#include "instance/instance.hpp" #include "mac/mac_types.hpp" #include "radio/radio.hpp" #include "thread/child.hpp" diff --git a/src/core/thread/thread_netif.cpp b/src/core/thread/thread_netif.cpp index e01d1921844..bba16dec63b 100644 --- a/src/core/thread/thread_netif.cpp +++ b/src/core/thread/thread_netif.cpp @@ -35,9 +35,9 @@ #include "common/code_utils.hpp" #include "common/encoding.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/message.hpp" +#include "instance/instance.hpp" #include "net/ip6.hpp" #include "net/netif.hpp" #include "net/udp6.hpp" diff --git a/src/core/thread/time_sync_service.cpp b/src/core/thread/time_sync_service.cpp index 138c1aa74fc..77e3dd38315 100644 --- a/src/core/thread/time_sync_service.cpp +++ b/src/core/thread/time_sync_service.cpp @@ -41,9 +41,9 @@ #include #include -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" +#include "instance/instance.hpp" #define ABS(value) (((value) >= 0) ? (value) : -(value)) diff --git a/src/core/utils/channel_manager.cpp b/src/core/utils/channel_manager.cpp index 1303509f72d..7ed7df4864b 100644 --- a/src/core/utils/channel_manager.cpp +++ b/src/core/utils/channel_manager.cpp @@ -37,11 +37,11 @@ #if OPENTHREAD_CONFIG_CHANNEL_MANAGER_ENABLE && OPENTHREAD_FTD #include "common/code_utils.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" #include "common/random.hpp" #include "common/string.hpp" +#include "instance/instance.hpp" #include "meshcop/dataset_updater.hpp" #include "radio/radio.hpp" diff --git a/src/core/utils/flash.cpp b/src/core/utils/flash.cpp index 243d7d50531..f49e5f6ee88 100644 --- a/src/core/utils/flash.cpp +++ b/src/core/utils/flash.cpp @@ -35,7 +35,7 @@ #include #include "common/code_utils.hpp" -#include "common/instance.hpp" +#include "instance/instance.hpp" namespace ot { diff --git a/src/core/utils/history_tracker.cpp b/src/core/utils/history_tracker.cpp index 2bcda12fd90..74d8cfb8553 100644 --- a/src/core/utils/history_tracker.cpp +++ b/src/core/utils/history_tracker.cpp @@ -38,11 +38,11 @@ #include "common/as_core_type.hpp" #include "common/code_utils.hpp" #include "common/debug.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/num_utils.hpp" #include "common/string.hpp" #include "common/timer.hpp" +#include "instance/instance.hpp" #include "net/ip6_headers.hpp" namespace ot { diff --git a/src/core/utils/jam_detector.cpp b/src/core/utils/jam_detector.cpp index a628fed6ceb..af55ba82437 100644 --- a/src/core/utils/jam_detector.cpp +++ b/src/core/utils/jam_detector.cpp @@ -36,10 +36,10 @@ #if OPENTHREAD_CONFIG_JAM_DETECTION_ENABLE #include "common/code_utils.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" #include "common/random.hpp" +#include "instance/instance.hpp" #include "thread/thread_netif.hpp" namespace ot { diff --git a/src/core/utils/mesh_diag.cpp b/src/core/utils/mesh_diag.cpp index 60d78f15c6c..e21cb184c5c 100644 --- a/src/core/utils/mesh_diag.cpp +++ b/src/core/utils/mesh_diag.cpp @@ -38,9 +38,9 @@ #include "common/as_core_type.hpp" #include "common/code_utils.hpp" #include "common/debug.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" +#include "instance/instance.hpp" namespace ot { namespace Utils { diff --git a/src/core/utils/slaac_address.cpp b/src/core/utils/slaac_address.cpp index ade19541c06..dacbbcd55fd 100644 --- a/src/core/utils/slaac_address.cpp +++ b/src/core/utils/slaac_address.cpp @@ -37,12 +37,12 @@ #include "common/array.hpp" #include "common/code_utils.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" #include "common/log.hpp" #include "common/random.hpp" #include "common/settings.hpp" #include "crypto/sha256.hpp" +#include "instance/instance.hpp" #include "net/ip6_address.hpp" namespace ot { diff --git a/src/core/utils/srp_client_buffers.cpp b/src/core/utils/srp_client_buffers.cpp index cfead0ac2e0..098e7ea5442 100644 --- a/src/core/utils/srp_client_buffers.cpp +++ b/src/core/utils/srp_client_buffers.cpp @@ -38,8 +38,8 @@ #include #include "common/code_utils.hpp" -#include "common/instance.hpp" #include "common/locator_getters.hpp" +#include "instance/instance.hpp" namespace ot { namespace Utils { diff --git a/src/ncp/ncp_base.hpp b/src/ncp/ncp_base.hpp index bd1110124e0..fa4c856ddbb 100644 --- a/src/ncp/ncp_base.hpp +++ b/src/ncp/ncp_base.hpp @@ -55,8 +55,8 @@ #endif #include "changed_props_set.hpp" -#include "common/instance.hpp" #include "common/tasklet.hpp" +#include "instance/instance.hpp" #include "lib/spinel/spinel.h" #include "lib/spinel/spinel_buffer.hpp" #include "lib/spinel/spinel_decoder.hpp" diff --git a/src/ncp/ncp_base_ftd.cpp b/src/ncp/ncp_base_ftd.cpp index 2ba87516596..b0d72331238 100644 --- a/src/ncp/ncp_base_ftd.cpp +++ b/src/ncp/ncp_base_ftd.cpp @@ -50,7 +50,7 @@ #include "common/code_utils.hpp" #include "common/debug.hpp" -#include "common/instance.hpp" +#include "instance/instance.hpp" #if OPENTHREAD_CONFIG_COMMISSIONER_ENABLE #include "meshcop/commissioner.hpp" #endif diff --git a/src/ncp/ncp_base_mtd.cpp b/src/ncp/ncp_base_mtd.cpp index 70d9589823f..7d699c7b435 100644 --- a/src/ncp/ncp_base_mtd.cpp +++ b/src/ncp/ncp_base_mtd.cpp @@ -70,8 +70,8 @@ #include "common/code_utils.hpp" #include "common/debug.hpp" -#include "common/instance.hpp" #include "common/string.hpp" +#include "instance/instance.hpp" #include "net/ip6.hpp" #if OPENTHREAD_MTD || OPENTHREAD_FTD diff --git a/src/ncp/ncp_base_radio.cpp b/src/ncp/ncp_base_radio.cpp index 11ec6aa0d78..428037e4bce 100644 --- a/src/ncp/ncp_base_radio.cpp +++ b/src/ncp/ncp_base_radio.cpp @@ -40,7 +40,7 @@ #include "common/code_utils.hpp" #include "common/debug.hpp" -#include "common/instance.hpp" +#include "instance/instance.hpp" #include "mac/mac_frame.hpp" #if OPENTHREAD_RADIO || OPENTHREAD_CONFIG_LINK_RAW_ENABLE diff --git a/src/ncp/ncp_hdlc.cpp b/src/ncp/ncp_hdlc.cpp index a18c345cb6b..59da4249646 100644 --- a/src/ncp/ncp_hdlc.cpp +++ b/src/ncp/ncp_hdlc.cpp @@ -41,8 +41,8 @@ #include "openthread-core-config.h" #include "common/code_utils.hpp" #include "common/debug.hpp" -#include "common/instance.hpp" #include "common/new.hpp" +#include "instance/instance.hpp" #include "net/ip6.hpp" #if OPENTHREAD_CONFIG_NCP_HDLC_ENABLE diff --git a/src/ncp/ncp_spi.cpp b/src/ncp/ncp_spi.cpp index 1cd4f9aab3e..c6d1051560f 100644 --- a/src/ncp/ncp_spi.cpp +++ b/src/ncp/ncp_spi.cpp @@ -40,8 +40,8 @@ #include "openthread-core-config.h" #include "common/code_utils.hpp" #include "common/debug.hpp" -#include "common/instance.hpp" #include "common/new.hpp" +#include "instance/instance.hpp" #include "net/ip6.hpp" #if OPENTHREAD_CONFIG_NCP_SPI_ENABLE diff --git a/tests/unit/test_array.cpp b/tests/unit/test_array.cpp index 0840f999c78..b185d4170ae 100644 --- a/tests/unit/test_array.cpp +++ b/tests/unit/test_array.cpp @@ -36,8 +36,8 @@ #include "common/array.hpp" #include "common/debug.hpp" #include "common/equatable.hpp" -#include "common/instance.hpp" #include "common/type_traits.hpp" +#include "instance/instance.hpp" #include "test_util.h" diff --git a/tests/unit/test_checksum.cpp b/tests/unit/test_checksum.cpp index 82e74fdd7e9..c37f5ba62c8 100644 --- a/tests/unit/test_checksum.cpp +++ b/tests/unit/test_checksum.cpp @@ -27,9 +27,9 @@ */ #include "common/encoding.hpp" -#include "common/instance.hpp" #include "common/message.hpp" #include "common/random.hpp" +#include "instance/instance.hpp" #include "net/checksum.hpp" #include "net/icmp6.hpp" #include "net/ip4_types.hpp" diff --git a/tests/unit/test_child.cpp b/tests/unit/test_child.cpp index 45fe65a807b..0ac2384f31c 100644 --- a/tests/unit/test_child.cpp +++ b/tests/unit/test_child.cpp @@ -32,7 +32,7 @@ #include "test_util.h" #include "common/code_utils.hpp" -#include "common/instance.hpp" +#include "instance/instance.hpp" #include "thread/child.hpp" namespace ot { diff --git a/tests/unit/test_child_table.cpp b/tests/unit/test_child_table.cpp index 2fb4583f45c..12627f12768 100644 --- a/tests/unit/test_child_table.cpp +++ b/tests/unit/test_child_table.cpp @@ -33,7 +33,7 @@ #include "test_util.h" #include "common/array.hpp" #include "common/code_utils.hpp" -#include "common/instance.hpp" +#include "instance/instance.hpp" #include "thread/child_table.hpp" namespace ot { diff --git a/tests/unit/test_cmd_line_parser.cpp b/tests/unit/test_cmd_line_parser.cpp index cc2a9359515..048a337ba2b 100644 --- a/tests/unit/test_cmd_line_parser.cpp +++ b/tests/unit/test_cmd_line_parser.cpp @@ -32,7 +32,7 @@ #include -#include "common/instance.hpp" +#include "instance/instance.hpp" #include "utils/parse_cmdline.hpp" #include "test_util.hpp" diff --git a/tests/unit/test_dns.cpp b/tests/unit/test_dns.cpp index 2a2597efb98..8e8d6a0fc95 100644 --- a/tests/unit/test_dns.cpp +++ b/tests/unit/test_dns.cpp @@ -34,7 +34,7 @@ #include "test_util.hpp" #include "common/array.hpp" -#include "common/instance.hpp" +#include "instance/instance.hpp" #include "net/dns_types.hpp" namespace ot { diff --git a/tests/unit/test_dns_client.cpp b/tests/unit/test_dns_client.cpp index e259ba9ae65..59efab72df2 100644 --- a/tests/unit/test_dns_client.cpp +++ b/tests/unit/test_dns_client.cpp @@ -39,9 +39,9 @@ #include "common/arg_macros.hpp" #include "common/array.hpp" -#include "common/instance.hpp" #include "common/string.hpp" #include "common/time.hpp" +#include "instance/instance.hpp" #if OPENTHREAD_CONFIG_DNS_CLIENT_ENABLE && OPENTHREAD_CONFIG_DNS_CLIENT_SERVICE_DISCOVERY_ENABLE && \ OPENTHREAD_CONFIG_DNS_CLIENT_DEFAULT_SERVER_ADDRESS_AUTO_SET_ENABLE && OPENTHREAD_CONFIG_DNSSD_SERVER_ENABLE && \ diff --git a/tests/unit/test_dso.cpp b/tests/unit/test_dso.cpp index 2ee18286a9e..149a690d6e8 100644 --- a/tests/unit/test_dso.cpp +++ b/tests/unit/test_dso.cpp @@ -34,8 +34,8 @@ #include "common/arg_macros.hpp" #include "common/array.hpp" #include "common/as_core_type.hpp" -#include "common/instance.hpp" #include "common/time.hpp" +#include "instance/instance.hpp" #include "net/dns_dso.hpp" #if OPENTHREAD_CONFIG_DNS_DSO_ENABLE diff --git a/tests/unit/test_hdlc.cpp b/tests/unit/test_hdlc.cpp index c4c707cb173..4e96310de8f 100644 --- a/tests/unit/test_hdlc.cpp +++ b/tests/unit/test_hdlc.cpp @@ -29,7 +29,7 @@ #include #include "common/code_utils.hpp" -#include "common/instance.hpp" +#include "instance/instance.hpp" #include "lib/hdlc/hdlc.hpp" #include "lib/spinel/multi_frame_buffer.hpp" diff --git a/tests/unit/test_link_metrics_manager.cpp b/tests/unit/test_link_metrics_manager.cpp index 4125680befe..58ef1416ada 100644 --- a/tests/unit/test_link_metrics_manager.cpp +++ b/tests/unit/test_link_metrics_manager.cpp @@ -33,7 +33,7 @@ #include "test_util.h" #include "common/array.hpp" #include "common/code_utils.hpp" -#include "common/instance.hpp" +#include "instance/instance.hpp" #include "mac/mac_types.hpp" #include "thread/child_table.hpp" diff --git a/tests/unit/test_linked_list.cpp b/tests/unit/test_linked_list.cpp index 0032ee2c1a5..8c581d76f15 100644 --- a/tests/unit/test_linked_list.cpp +++ b/tests/unit/test_linked_list.cpp @@ -34,9 +34,9 @@ #include #include "common/debug.hpp" -#include "common/instance.hpp" #include "common/linked_list.hpp" #include "common/owning_list.hpp" +#include "instance/instance.hpp" #include "test_util.h" diff --git a/tests/unit/test_lowpan.hpp b/tests/unit/test_lowpan.hpp index a9542b9e702..8a6e3976d12 100644 --- a/tests/unit/test_lowpan.hpp +++ b/tests/unit/test_lowpan.hpp @@ -32,7 +32,7 @@ #include #include "common/code_utils.hpp" -#include "common/instance.hpp" +#include "instance/instance.hpp" #include "mac/mac.hpp" #include "net/ip6_headers.hpp" #include "thread/lowpan.hpp" diff --git a/tests/unit/test_message.cpp b/tests/unit/test_message.cpp index 095536442ad..ac1320095ad 100644 --- a/tests/unit/test_message.cpp +++ b/tests/unit/test_message.cpp @@ -28,9 +28,9 @@ #include "common/appender.hpp" #include "common/debug.hpp" -#include "common/instance.hpp" #include "common/message.hpp" #include "common/random.hpp" +#include "instance/instance.hpp" #include "test_platform.h" #include "test_util.hpp" diff --git a/tests/unit/test_message_queue.cpp b/tests/unit/test_message_queue.cpp index 9eb3c77219c..33144721e36 100644 --- a/tests/unit/test_message_queue.cpp +++ b/tests/unit/test_message_queue.cpp @@ -33,8 +33,8 @@ #include #include "common/debug.hpp" -#include "common/instance.hpp" #include "common/message.hpp" +#include "instance/instance.hpp" #include "test_util.h" diff --git a/tests/unit/test_multicast_listeners_table.cpp b/tests/unit/test_multicast_listeners_table.cpp index 20c810e7f30..6fae2743ba4 100644 --- a/tests/unit/test_multicast_listeners_table.cpp +++ b/tests/unit/test_multicast_listeners_table.cpp @@ -38,7 +38,7 @@ #include "test_util.h" #include "backbone_router/multicast_listeners_table.hpp" #include "common/code_utils.hpp" -#include "common/instance.hpp" +#include "instance/instance.hpp" namespace ot { diff --git a/tests/unit/test_nat64.cpp b/tests/unit/test_nat64.cpp index d699d83f824..55bd0e00393 100644 --- a/tests/unit/test_nat64.cpp +++ b/tests/unit/test_nat64.cpp @@ -35,8 +35,8 @@ #include "common/code_utils.hpp" #include "common/debug.hpp" -#include "common/instance.hpp" #include "common/message.hpp" +#include "instance/instance.hpp" #include "net/ip6.hpp" #if OPENTHREAD_CONFIG_NAT64_TRANSLATOR_ENABLE diff --git a/tests/unit/test_ndproxy_table.cpp b/tests/unit/test_ndproxy_table.cpp index 80f5d13dda9..81ed9f0edf1 100644 --- a/tests/unit/test_ndproxy_table.cpp +++ b/tests/unit/test_ndproxy_table.cpp @@ -38,7 +38,7 @@ #include "test_util.h" #include "backbone_router/ndproxy_table.hpp" #include "common/code_utils.hpp" -#include "common/instance.hpp" +#include "instance/instance.hpp" namespace ot { diff --git a/tests/unit/test_netif.cpp b/tests/unit/test_netif.cpp index 1a5c0e12017..c8c9a5dbbaf 100644 --- a/tests/unit/test_netif.cpp +++ b/tests/unit/test_netif.cpp @@ -34,7 +34,7 @@ #include "common/code_utils.hpp" #include "common/debug.hpp" -#include "common/instance.hpp" +#include "instance/instance.hpp" #include "net/netif.hpp" #include "test_util.h" diff --git a/tests/unit/test_network_data.cpp b/tests/unit/test_network_data.cpp index 6fcdfd3ec0e..d83d840235c 100644 --- a/tests/unit/test_network_data.cpp +++ b/tests/unit/test_network_data.cpp @@ -30,7 +30,7 @@ #include "common/array.hpp" #include "common/code_utils.hpp" -#include "common/instance.hpp" +#include "instance/instance.hpp" #include "thread/network_data_leader.hpp" #include "thread/network_data_local.hpp" #include "thread/network_data_service.hpp" diff --git a/tests/unit/test_platform.h b/tests/unit/test_platform.h index ec5f8870947..76a72ba0904 100644 --- a/tests/unit/test_platform.h +++ b/tests/unit/test_platform.h @@ -41,7 +41,7 @@ #include #include "common/code_utils.hpp" -#include "common/instance.hpp" +#include "instance/instance.hpp" #include "test_util.h" diff --git a/tests/unit/test_pool.cpp b/tests/unit/test_pool.cpp index 51656cdc653..57edc315d31 100644 --- a/tests/unit/test_pool.cpp +++ b/tests/unit/test_pool.cpp @@ -30,8 +30,8 @@ #include -#include "common/instance.hpp" #include "common/pool.hpp" +#include "instance/instance.hpp" #include "test_util.h" diff --git a/tests/unit/test_priority_queue.cpp b/tests/unit/test_priority_queue.cpp index 6348f55c5cb..724a61e0145 100644 --- a/tests/unit/test_priority_queue.cpp +++ b/tests/unit/test_priority_queue.cpp @@ -29,8 +29,8 @@ #include #include "common/debug.hpp" -#include "common/instance.hpp" #include "common/message.hpp" +#include "instance/instance.hpp" #include "test_platform.h" #include "test_util.h" diff --git a/tests/unit/test_routing_manager.cpp b/tests/unit/test_routing_manager.cpp index decb1b8bb0b..8ba85af108f 100644 --- a/tests/unit/test_routing_manager.cpp +++ b/tests/unit/test_routing_manager.cpp @@ -38,8 +38,8 @@ #include "border_router/routing_manager.hpp" #include "common/arg_macros.hpp" #include "common/array.hpp" -#include "common/instance.hpp" #include "common/time.hpp" +#include "instance/instance.hpp" #include "net/icmp6.hpp" #include "net/nd6.hpp" diff --git a/tests/unit/test_spinel_buffer.cpp b/tests/unit/test_spinel_buffer.cpp index 8d4f3225722..1cb402a4f31 100644 --- a/tests/unit/test_spinel_buffer.cpp +++ b/tests/unit/test_spinel_buffer.cpp @@ -29,9 +29,9 @@ #include #include "common/code_utils.hpp" -#include "common/instance.hpp" #include "common/message.hpp" #include "common/random.hpp" +#include "instance/instance.hpp" #include "lib/spinel/spinel_buffer.hpp" #include "test_platform.h" diff --git a/tests/unit/test_spinel_decoder.cpp b/tests/unit/test_spinel_decoder.cpp index 1a2249ab71e..e8ee85822c2 100644 --- a/tests/unit/test_spinel_decoder.cpp +++ b/tests/unit/test_spinel_decoder.cpp @@ -27,7 +27,7 @@ */ #include "common/code_utils.hpp" -#include "common/instance.hpp" +#include "instance/instance.hpp" #include "lib/spinel/spinel_decoder.hpp" #include "test_util.hpp" diff --git a/tests/unit/test_spinel_encoder.cpp b/tests/unit/test_spinel_encoder.cpp index 4b76d4c6bfd..09c8de93e65 100644 --- a/tests/unit/test_spinel_encoder.cpp +++ b/tests/unit/test_spinel_encoder.cpp @@ -27,7 +27,7 @@ */ #include "common/code_utils.hpp" -#include "common/instance.hpp" +#include "instance/instance.hpp" #include "lib/spinel/spinel_encoder.hpp" #include "test_util.hpp" diff --git a/tests/unit/test_srp_server.cpp b/tests/unit/test_srp_server.cpp index 230375902d1..7b9b989c919 100644 --- a/tests/unit/test_srp_server.cpp +++ b/tests/unit/test_srp_server.cpp @@ -38,9 +38,9 @@ #include "common/arg_macros.hpp" #include "common/array.hpp" -#include "common/instance.hpp" #include "common/string.hpp" #include "common/time.hpp" +#include "instance/instance.hpp" #if OPENTHREAD_CONFIG_SRP_SERVER_ENABLE && OPENTHREAD_CONFIG_SRP_CLIENT_ENABLE && \ !OPENTHREAD_CONFIG_TIME_SYNC_ENABLE && !OPENTHREAD_PLATFORM_POSIX diff --git a/tests/unit/test_timer.cpp b/tests/unit/test_timer.cpp index b3509f833e6..5c8e6eb0a8d 100644 --- a/tests/unit/test_timer.cpp +++ b/tests/unit/test_timer.cpp @@ -31,9 +31,9 @@ #include "common/array.hpp" #include "common/code_utils.hpp" #include "common/debug.hpp" -#include "common/instance.hpp" #include "common/num_utils.hpp" #include "common/timer.hpp" +#include "instance/instance.hpp" enum { diff --git a/tests/unit/test_tlv.cpp b/tests/unit/test_tlv.cpp index 1af0121be3e..703abe3e56e 100644 --- a/tests/unit/test_tlv.cpp +++ b/tests/unit/test_tlv.cpp @@ -30,9 +30,9 @@ #include -#include "common/instance.hpp" #include "common/message.hpp" #include "common/tlvs.hpp" +#include "instance/instance.hpp" #include "test_util.h" diff --git a/tests/unit/test_trickle_timer.cpp b/tests/unit/test_trickle_timer.cpp index f5851f26163..166455c71c3 100644 --- a/tests/unit/test_trickle_timer.cpp +++ b/tests/unit/test_trickle_timer.cpp @@ -30,9 +30,9 @@ #include "common/code_utils.hpp" #include "common/debug.hpp" -#include "common/instance.hpp" #include "common/num_utils.hpp" #include "common/trickle_timer.hpp" +#include "instance/instance.hpp" static ot::Instance *sInstance;