[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

@@ -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

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 {
 

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",

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

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;
 

src/core/api/border_routing_api.cpp

@@ -39,7 +39,7 @@
 #include <openthread/platform/border_routing.h>
 
 #include "border_router/routing_manager.hpp"
-#include "common/instance.hpp"
+#include "instance/instance.hpp"
 
 using namespace ot;
 

src/core/api/dns_api.cpp

@@ -35,7 +35,7 @@
 
 #include <openthread/dns_client.h>
 
-#include "common/instance.hpp"
+#include "instance/instance.hpp"
 #include "net/dns_types.hpp"
 
 using namespace ot;

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"
 

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;
 

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"

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;
 

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 {

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"
 

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"

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"

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 {

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"

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"

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 {

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"
 

src/core/common/heap.cpp

@@ -33,7 +33,7 @@
 
 #include "heap.hpp"
 
-#include "common/instance.hpp"
+#include "instance/instance.hpp"
 
 namespace ot {
 namespace Heap {

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 {
 

src/core/common/log.cpp

@@ -38,10 +38,10 @@
 #include <openthread/platform/logging.h>
 
 #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.

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"
 

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"
 

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 {

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 {
 

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 {
 

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;

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"
 

src/core/instance/extension_example.cpp

@@ -37,8 +37,8 @@
 #include <stdint.h>
 
 #include "common/code_utils.hpp"
-#include "common/extension.hpp"
 #include "common/new.hpp"
+#include "instance/extension.hpp"
 
 namespace ot {
 namespace Extension {

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"

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 {
 

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"

src/core/mac/link_raw.cpp

@@ -40,10 +40,10 @@
 #include <openthread/platform/diag.h>
 
 #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 {

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"

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 {

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 {

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"

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"

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"

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"

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"

src/core/meshcop/dataset_local.cpp

@@ -37,11 +37,11 @@
 #include <stdio.h>
 
 #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"

src/core/meshcop/dataset_manager.cpp

@@ -37,10 +37,10 @@
 #include <stdio.h>
 
 #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"

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"

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 {

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

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"

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"

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"

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"

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"

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"

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"
 

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"

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

src/core/net/dns_platform.cpp

@@ -37,8 +37,8 @@
 #include <openthread/platform/dns.h>
 
 #include "common/code_utils.hpp"
-#include "common/instance.hpp"
 #include "common/message.hpp"
+#include "instance/instance.hpp"
 
 #if OPENTHREAD_CONFIG_DNS_UPSTREAM_QUERY_ENABLE
 

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 {

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"
 

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"
 

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"

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"
 

src/core/net/ip6_filter.cpp

@@ -36,9 +36,9 @@
 #include <stdio.h>
 
 #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"

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 {

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 {

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"
 

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

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"
 

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"

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"
 

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 {
 

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;

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 {

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 {

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 {

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"

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"

src/core/thread/announce_sender.cpp

@@ -36,10 +36,10 @@
 #include <openthread/platform/radio.h>
 
 #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"

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"
 

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 {
 

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 {

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 {
 

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"

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"

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"

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"

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"
 

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"

src/core/thread/link_quality.cpp

@@ -36,9 +36,9 @@
 #include <stdio.h>
 
 #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 {
 

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"

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"

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"

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"

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"

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 {
 

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 {

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"