From 075bff327c42375a631ae9c28b943702d461ce94 Mon Sep 17 00:00:00 2001 From: Jonathan Hui Date: Wed, 18 Jan 2017 13:48:10 -0800 Subject: [PATCH] Move `openthread-types.h` to `openthread/types.h`. --- etc/visual-studio/libopenthread_k.vcxproj | 2 +- etc/visual-studio/libopenthread_k.vcxproj.filters | 2 +- examples/drivers/windows/include/otLwfIoctl.h | 2 +- examples/platforms/cc2538/misc.c | 2 +- examples/platforms/cc2538/platform-cc2538.h | 3 ++- examples/platforms/cc2538/radio.c | 1 - examples/platforms/cc2538/random.c | 2 +- examples/platforms/cc2538/uart.c | 3 ++- examples/platforms/cc2650/alarm.c | 2 +- examples/platforms/cc2650/misc.c | 2 +- examples/platforms/cc2650/platform-cc2650.h | 2 +- examples/platforms/cc2650/platform.c | 2 +- examples/platforms/cc2650/radio.c | 2 +- examples/platforms/cc2650/random.c | 2 +- examples/platforms/cc2650/uart.c | 2 +- examples/platforms/da15000/flash.c | 3 ++- examples/platforms/da15000/misc.c | 5 +++-- examples/platforms/da15000/platform-da15000.h | 2 +- examples/platforms/da15000/platform.c | 1 - examples/platforms/nrf52840/alarm.c | 2 +- examples/platforms/nrf52840/flash.c | 2 +- examples/platforms/nrf52840/logging.c | 2 +- examples/platforms/nrf52840/misc.c | 2 +- examples/platforms/nrf52840/platform-nrf5.h | 2 +- examples/platforms/nrf52840/radio.c | 2 +- examples/platforms/nrf52840/uart.c | 2 +- examples/platforms/posix/misc.c | 3 ++- examples/platforms/posix/random.c | 2 +- examples/platforms/utils/flash.h | 2 +- examples/platforms/utils/settings.cpp | 3 ++- include/Makefile.am | 1 - include/openthread-diag.h | 2 +- include/openthread-icmp6.h | 2 +- include/openthread.h | 2 +- include/openthread/Makefile.am | 1 + include/openthread/cli.h | 2 +- include/openthread/coap.h | 2 +- include/openthread/commissioner.h | 2 +- include/openthread/dataset.h | 2 +- include/openthread/dhcp6_client.h | 2 +- include/openthread/dhcp6_server.h | 2 ++ include/openthread/instance.h | 2 +- include/openthread/jam_detection.h | 2 +- include/openthread/joiner.h | 2 +- include/openthread/link.h | 2 +- include/openthread/link_raw.h | 3 +-- include/openthread/message.h | 2 +- include/openthread/ncp.h | 2 +- include/openthread/netdata.h | 2 +- include/openthread/tasklet.h | 2 +- include/openthread/thread.h | 2 +- include/{openthread-types.h => openthread/types.h} | 0 include/openthread/udp.h | 2 +- include/platform/alarm.h | 2 +- include/platform/diag.h | 2 +- include/platform/messagepool.h | 3 ++- include/platform/misc.h | 2 +- include/platform/platform.h | 2 +- include/platform/radio.h | 2 +- include/platform/random.h | 2 +- include/platform/settings.h | 2 +- include/platform/spi-slave.h | 2 +- include/platform/uart.h | 2 +- src/cli/cli_console.hpp | 1 - src/cli/cli_server.hpp | 2 +- src/cli/cli_uart.hpp | 3 ++- src/cli/cli_udp.hpp | 3 ++- src/core/coap/coap_base.hpp | 3 ++- src/core/coap/coap_client.hpp | 1 - src/core/coap/coap_header.hpp | 1 - src/core/common/message.hpp | 1 - src/core/common/timer.hpp | 3 ++- src/core/common/tlvs.hpp | 3 ++- src/core/crypto/aes_ccm.hpp | 3 ++- src/core/mac/mac_blacklist_impl.hpp | 3 ++- src/core/mac/mac_blacklist_stub.hpp | 3 ++- src/core/mac/mac_frame.hpp | 3 ++- src/core/mac/mac_whitelist_impl.hpp | 3 ++- src/core/mac/mac_whitelist_stub.hpp | 3 ++- src/core/meshcop/announce_begin_client.hpp | 2 +- src/core/meshcop/dataset_manager.cpp | 1 - src/core/meshcop/dataset_manager.hpp | 2 +- src/core/meshcop/dataset_manager_ftd.cpp | 1 - src/core/meshcop/dataset_manager_ftd.hpp | 2 +- src/core/meshcop/dataset_manager_mtd.hpp | 2 +- src/core/meshcop/dtls.hpp | 3 ++- src/core/meshcop/energy_scan_client.hpp | 2 +- src/core/meshcop/joiner.hpp | 1 - src/core/meshcop/joiner_router_ftd.hpp | 2 +- src/core/meshcop/panid_query_client.hpp | 2 +- src/core/meshcop/timestamp.cpp | 3 ++- src/core/meshcop/tlvs.hpp | 3 ++- src/core/net/dhcp6_client.cpp | 3 ++- src/core/net/dhcp6_server.cpp | 3 ++- src/core/net/dhcp6_server.hpp | 3 ++- src/core/net/icmp6.hpp | 2 +- src/core/net/ip6_address.hpp | 2 +- src/core/net/ip6_headers.hpp | 3 ++- src/core/net/ip6_mpl.hpp | 3 ++- src/core/net/ip6_routes.hpp | 3 ++- src/core/openthread-instance.h | 4 +++- src/core/thread/address_resolver_ftd.hpp | 4 +++- src/core/thread/address_resolver_mtd.hpp | 2 +- src/core/thread/announce_begin_server.hpp | 4 +++- src/core/thread/energy_scan_server.hpp | 4 +++- src/core/thread/key_manager.hpp | 3 ++- src/core/thread/link_quality.cpp | 3 ++- src/core/thread/link_quality.hpp | 2 +- src/core/thread/mesh_forwarder.hpp | 4 +++- src/core/thread/mle_tlvs.hpp | 3 ++- src/core/thread/network_data.hpp | 3 ++- src/core/thread/network_diagnostic.hpp | 4 +++- src/core/thread/network_diagnostic_tlvs.hpp | 3 ++- src/core/thread/panid_query_server.hpp | 4 +++- src/core/thread/thread_netif.hpp | 2 +- src/core/thread/thread_tlvs.hpp | 3 ++- src/core/utils/jam_detector.cpp | 2 +- src/core/utils/slaac_address.cpp | 2 +- src/core/utils/slaac_address.hpp | 3 ++- src/diag/diag_process.hpp | 4 +++- src/ncp/hdlc.hpp | 2 +- src/ncp/ncp_base.hpp | 7 +++---- src/ncp/ncp_buffer.hpp | 2 +- tests/unit/test_util.h | 2 +- third_party/mbedtls/hardware_entropy.c | 3 ++- 125 files changed, 169 insertions(+), 127 deletions(-) rename include/{openthread-types.h => openthread/types.h} (100%) diff --git a/etc/visual-studio/libopenthread_k.vcxproj b/etc/visual-studio/libopenthread_k.vcxproj index 9528623cc..ba259acd6 100644 --- a/etc/visual-studio/libopenthread_k.vcxproj +++ b/etc/visual-studio/libopenthread_k.vcxproj @@ -141,7 +141,7 @@ - + diff --git a/etc/visual-studio/libopenthread_k.vcxproj.filters b/etc/visual-studio/libopenthread_k.vcxproj.filters index 3004870f5..262fa01e9 100644 --- a/etc/visual-studio/libopenthread_k.vcxproj.filters +++ b/etc/visual-studio/libopenthread_k.vcxproj.filters @@ -530,7 +530,7 @@ Header Files - + Header Files diff --git a/examples/drivers/windows/include/otLwfIoctl.h b/examples/drivers/windows/include/otLwfIoctl.h index 08fdc3827..2e7a74926 100644 --- a/examples/drivers/windows/include/otLwfIoctl.h +++ b/examples/drivers/windows/include/otLwfIoctl.h @@ -35,7 +35,7 @@ #ifndef __OTLWFIOCTL_H__ #define __OTLWFIOCTL_H__ -#include +#include __inline LONG ThreadErrorToNtstatus(ThreadError error) { return (LONG)-((int)error); } diff --git a/examples/platforms/cc2538/misc.c b/examples/platforms/cc2538/misc.c index 511499cd5..3d8a5d5eb 100644 --- a/examples/platforms/cc2538/misc.c +++ b/examples/platforms/cc2538/misc.c @@ -26,7 +26,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include +#include "openthread/types.h" #include #include "platform-cc2538.h" diff --git a/examples/platforms/cc2538/platform-cc2538.h b/examples/platforms/cc2538/platform-cc2538.h index 3436bb67f..9f6db2daa 100644 --- a/examples/platforms/cc2538/platform-cc2538.h +++ b/examples/platforms/cc2538/platform-cc2538.h @@ -36,7 +36,8 @@ #define PLATFORM_CC2538_H_ #include -#include + +#include "openthread/types.h" #include "cc2538-reg.h" diff --git a/examples/platforms/cc2538/radio.c b/examples/platforms/cc2538/radio.c index c37f98d6c..26cb93e05 100644 --- a/examples/platforms/cc2538/radio.c +++ b/examples/platforms/cc2538/radio.c @@ -32,7 +32,6 @@ * */ -#include #include #include diff --git a/examples/platforms/cc2538/random.c b/examples/platforms/cc2538/random.c index a904c5c8d..7651fb888 100644 --- a/examples/platforms/cc2538/random.c +++ b/examples/platforms/cc2538/random.c @@ -32,7 +32,7 @@ * */ -#include +#include "openthread/types.h" #include #include diff --git a/examples/platforms/cc2538/uart.c b/examples/platforms/cc2538/uart.c index d0bb20168..8d205ddb7 100644 --- a/examples/platforms/cc2538/uart.c +++ b/examples/platforms/cc2538/uart.c @@ -34,7 +34,8 @@ #include -#include +#include "openthread/types.h" + #include #include #include "platform-cc2538.h" diff --git a/examples/platforms/cc2650/alarm.c b/examples/platforms/cc2650/alarm.c index 20629ab9a..ba43dd6ae 100644 --- a/examples/platforms/cc2650/alarm.c +++ b/examples/platforms/cc2650/alarm.c @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include diff --git a/examples/platforms/cc2650/misc.c b/examples/platforms/cc2650/misc.c index e73d5df6a..06fa4a3ff 100644 --- a/examples/platforms/cc2650/misc.c +++ b/examples/platforms/cc2650/misc.c @@ -26,7 +26,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include diff --git a/examples/platforms/cc2650/platform-cc2650.h b/examples/platforms/cc2650/platform-cc2650.h index 80f4c94f9..68266ed7e 100644 --- a/examples/platforms/cc2650/platform-cc2650.h +++ b/examples/platforms/cc2650/platform-cc2650.h @@ -30,7 +30,7 @@ #define PLATFORM_H_ #include -#include "openthread-types.h" +#include "openthread/types.h" #ifdef __cplusplus extern "C" { diff --git a/examples/platforms/cc2650/platform.c b/examples/platforms/cc2650/platform.c index d77334702..b036f704e 100644 --- a/examples/platforms/cc2650/platform.c +++ b/examples/platforms/cc2650/platform.c @@ -26,7 +26,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include "platform-cc2650.h" otInstance *sInstance; diff --git a/examples/platforms/cc2650/radio.c b/examples/platforms/cc2650/radio.c index 5cfa99004..ad71fa140 100644 --- a/examples/platforms/cc2650/radio.c +++ b/examples/platforms/cc2650/radio.c @@ -26,7 +26,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include diff --git a/examples/platforms/cc2650/random.c b/examples/platforms/cc2650/random.c index 1ac38edef..43ab4a269 100644 --- a/examples/platforms/cc2650/random.c +++ b/examples/platforms/cc2650/random.c @@ -26,7 +26,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include diff --git a/examples/platforms/cc2650/uart.c b/examples/platforms/cc2650/uart.c index bd3fea1cc..ab4f38d2d 100644 --- a/examples/platforms/cc2650/uart.c +++ b/examples/platforms/cc2650/uart.c @@ -33,7 +33,7 @@ #include #include -#include +#include #include #include diff --git a/examples/platforms/da15000/flash.c b/examples/platforms/da15000/flash.c index 111fc0290..4ba690829 100644 --- a/examples/platforms/da15000/flash.c +++ b/examples/platforms/da15000/flash.c @@ -27,7 +27,8 @@ */ -#include +#include "openthread/types.h" + #include "hw_qspi.h" #include "qspi_automode.h" #include "platform/alarm.h" diff --git a/examples/platforms/da15000/misc.c b/examples/platforms/da15000/misc.c index 0d9907f60..f10b9eee7 100755 --- a/examples/platforms/da15000/misc.c +++ b/examples/platforms/da15000/misc.c @@ -26,8 +26,9 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include -#include +#include "openthread/types.h" + +#include "platform/misc.h" #include "sdk_defs.h" void otPlatReset(otInstance *aInstance) diff --git a/examples/platforms/da15000/platform-da15000.h b/examples/platforms/da15000/platform-da15000.h index 2b5efa3a1..2d9bf5eaf 100755 --- a/examples/platforms/da15000/platform-da15000.h +++ b/examples/platforms/da15000/platform-da15000.h @@ -29,7 +29,7 @@ #ifndef PLATFORM_DA15000_H_ #define PLATFORM_DA15000_H_ -#include +#include "openthread/types.h" /** * This function initializes the radio service used by OpenThread. diff --git a/examples/platforms/da15000/platform.c b/examples/platforms/da15000/platform.c index 404db27e7..2a32d222f 100644 --- a/examples/platforms/da15000/platform.c +++ b/examples/platforms/da15000/platform.c @@ -36,7 +36,6 @@ #include #include "platform/alarm.h" -#include #include "platform-da15000.h" #include "sdk_defs.h" #include "hw_cpm.h" diff --git a/examples/platforms/nrf52840/alarm.c b/examples/platforms/nrf52840/alarm.c index 4484f783a..8a7a03a1f 100644 --- a/examples/platforms/nrf52840/alarm.c +++ b/examples/platforms/nrf52840/alarm.c @@ -47,7 +47,7 @@ #include "hal/nrf_rtc.h" #include -#include +#include #define RTC_FREQUENCY 32768ULL diff --git a/examples/platforms/nrf52840/flash.c b/examples/platforms/nrf52840/flash.c index f67cff372..b9a1d2765 100644 --- a/examples/platforms/nrf52840/flash.c +++ b/examples/platforms/nrf52840/flash.c @@ -30,7 +30,7 @@ #include #include -#include +#include #include #include #include diff --git a/examples/platforms/nrf52840/logging.c b/examples/platforms/nrf52840/logging.c index 7a8c8029d..1897139ed 100644 --- a/examples/platforms/nrf52840/logging.c +++ b/examples/platforms/nrf52840/logging.c @@ -43,7 +43,7 @@ #include #include -#include +#include #if (OPENTHREAD_ENABLE_DEFAULT_LOGGING == 0) #include diff --git a/examples/platforms/nrf52840/misc.c b/examples/platforms/nrf52840/misc.c index 94b30d003..1d14c0970 100644 --- a/examples/platforms/nrf52840/misc.c +++ b/examples/platforms/nrf52840/misc.c @@ -26,7 +26,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include "device/nrf.h" diff --git a/examples/platforms/nrf52840/platform-nrf5.h b/examples/platforms/nrf52840/platform-nrf5.h index e57a37340..e1cdcd7f0 100644 --- a/examples/platforms/nrf52840/platform-nrf5.h +++ b/examples/platforms/nrf52840/platform-nrf5.h @@ -37,7 +37,7 @@ #include -#include +#include #include "platform-config.h" diff --git a/examples/platforms/nrf52840/radio.c b/examples/platforms/nrf52840/radio.c index e84b4829c..28968ce78 100644 --- a/examples/platforms/nrf52840/radio.c +++ b/examples/platforms/nrf52840/radio.c @@ -49,7 +49,7 @@ #include #include -#include +#include #define SHORT_ADDRESS_SIZE 2 #define EXTENDED_ADDRESS_SIZE 8 diff --git a/examples/platforms/nrf52840/uart.c b/examples/platforms/nrf52840/uart.c index 7dc9834e9..038b0940a 100644 --- a/examples/platforms/nrf52840/uart.c +++ b/examples/platforms/nrf52840/uart.c @@ -35,8 +35,8 @@ #include #include +#include #include -#include #include #include "drivers/nrf_drv_clock.h" diff --git a/examples/platforms/posix/misc.c b/examples/platforms/posix/misc.c index 2cca2dae9..955bade0d 100644 --- a/examples/platforms/posix/misc.c +++ b/examples/platforms/posix/misc.c @@ -28,7 +28,8 @@ #include "platform-posix.h" -#include +#include "openthread/types.h" + #include void otPlatReset(otInstance *aInstance) diff --git a/examples/platforms/posix/random.c b/examples/platforms/posix/random.c index 6f76b4bb6..cbf28b396 100644 --- a/examples/platforms/posix/random.c +++ b/examples/platforms/posix/random.c @@ -36,7 +36,7 @@ #include "platform-posix.h" -#include +#include "openthread/types.h" #include #include diff --git a/examples/platforms/utils/flash.h b/examples/platforms/utils/flash.h index 290f7b1a6..6fcafeca1 100644 --- a/examples/platforms/utils/flash.h +++ b/examples/platforms/utils/flash.h @@ -37,7 +37,7 @@ #include -#include +#include "openthread/types.h" #ifdef __cplusplus extern "C" { diff --git a/examples/platforms/utils/settings.cpp b/examples/platforms/utils/settings.cpp index 500f12544..73e45fd76 100644 --- a/examples/platforms/utils/settings.cpp +++ b/examples/platforms/utils/settings.cpp @@ -37,9 +37,10 @@ #include #include -#include #include +#include "openthread/types.h" + #include #include diff --git a/include/Makefile.am b/include/Makefile.am index 3a51c095d..aa560d938 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -54,7 +54,6 @@ include_HEADERS = \ openthread.h \ openthread-diag.h \ openthread-icmp6.h \ - openthread-types.h \ $(NULL) install-headers: install-includeHEADERS diff --git a/include/openthread-diag.h b/include/openthread-diag.h index 7ffdb329a..7aefceb5a 100644 --- a/include/openthread-diag.h +++ b/include/openthread-diag.h @@ -35,7 +35,7 @@ #ifndef OPENTHREAD_DIAG_H_ #define OPENTHREAD_DIAG_H_ -#include +#include "openthread/types.h" #ifdef __cplusplus extern "C" { diff --git a/include/openthread-icmp6.h b/include/openthread-icmp6.h index 9e1fe569b..f6edab143 100644 --- a/include/openthread-icmp6.h +++ b/include/openthread-icmp6.h @@ -35,7 +35,7 @@ #ifndef OPENTHREAD_ICMP6_H_ #define OPENTHREAD_ICMP6_H_ -#include +#include #include #ifdef __cplusplus diff --git a/include/openthread.h b/include/openthread.h index 9d54a3e44..6bb98cbf3 100644 --- a/include/openthread.h +++ b/include/openthread.h @@ -35,7 +35,7 @@ #ifndef OPENTHREAD_H_ #define OPENTHREAD_H_ -#include +#include "openthread/types.h" #include "openthread/crypto.h" #include "openthread/dataset.h" diff --git a/include/openthread/Makefile.am b/include/openthread/Makefile.am index d4ef63147..6a81d0cef 100644 --- a/include/openthread/Makefile.am +++ b/include/openthread/Makefile.am @@ -46,6 +46,7 @@ openthread_headers = \ netdata.h \ tasklet.h \ thread.h \ + types.h \ udp.h \ $(NULL) diff --git a/include/openthread/cli.h b/include/openthread/cli.h index ee0694698..6915b6868 100644 --- a/include/openthread/cli.h +++ b/include/openthread/cli.h @@ -37,7 +37,7 @@ #include -#include +#include "openthread/types.h" #ifdef __cplusplus extern "C" { diff --git a/include/openthread/coap.h b/include/openthread/coap.h index 7e787b98e..57bf9c606 100644 --- a/include/openthread/coap.h +++ b/include/openthread/coap.h @@ -43,7 +43,7 @@ #include -#include "openthread-types.h" +#include "openthread/types.h" #include "openthread/message.h" #ifdef __cplusplus diff --git a/include/openthread/commissioner.h b/include/openthread/commissioner.h index d203294dd..0b6bcfe93 100644 --- a/include/openthread/commissioner.h +++ b/include/openthread/commissioner.h @@ -35,7 +35,7 @@ #ifndef OPENTHREAD_COMMISSIONER_H_ #define OPENTHREAD_COMMISSIONER_H_ -#include "openthread-types.h" +#include "openthread/types.h" #include #ifdef __cplusplus diff --git a/include/openthread/dataset.h b/include/openthread/dataset.h index b27ce9cff..0b47b01db 100644 --- a/include/openthread/dataset.h +++ b/include/openthread/dataset.h @@ -35,7 +35,7 @@ #ifndef OPENTHREAD_DATASET_H_ #define OPENTHREAD_DATASET_H_ -#include "openthread-types.h" +#include "openthread/types.h" #ifdef __cplusplus extern "C" { diff --git a/include/openthread/dhcp6_client.h b/include/openthread/dhcp6_client.h index b5bb8cd13..7b7c4ab53 100644 --- a/include/openthread/dhcp6_client.h +++ b/include/openthread/dhcp6_client.h @@ -35,7 +35,7 @@ #ifndef OPENTHREAD_DHCP6_CLIENT_H_ #define OPENTHREAD_DHCP6_CLIENT_H_ -#include +#include "openthread/types.h" #ifdef __cplusplus extern "C" { diff --git a/include/openthread/dhcp6_server.h b/include/openthread/dhcp6_server.h index c820cb520..cdf34935e 100644 --- a/include/openthread/dhcp6_server.h +++ b/include/openthread/dhcp6_server.h @@ -35,6 +35,8 @@ #ifndef OPENTHREAD_DHCP6_SERVER_H_ #define OPENTHREAD_DHCP6_SERVER_H_ +#include "openthread/types.h" + #ifdef __cplusplus extern "C" { #endif diff --git a/include/openthread/instance.h b/include/openthread/instance.h index f7a1cac70..941dc1d2b 100644 --- a/include/openthread/instance.h +++ b/include/openthread/instance.h @@ -35,7 +35,7 @@ #ifndef OPENTHREAD_INSTANCE_H_ #define OPENTHREAD_INSTANCE_H_ -#include "openthread-types.h" +#include "openthread/types.h" #ifdef __cplusplus extern "C" { diff --git a/include/openthread/jam_detection.h b/include/openthread/jam_detection.h index bbfa39450..348b077b1 100644 --- a/include/openthread/jam_detection.h +++ b/include/openthread/jam_detection.h @@ -41,7 +41,7 @@ #include #endif -#include "openthread-types.h" +#include "openthread/types.h" #ifdef __cplusplus extern "C" { diff --git a/include/openthread/joiner.h b/include/openthread/joiner.h index 08aac30d1..c765e267f 100644 --- a/include/openthread/joiner.h +++ b/include/openthread/joiner.h @@ -35,7 +35,7 @@ #ifndef OPENTHREAD_JOINER_H_ #define OPENTHREAD_JOINER_H_ -#include "openthread-types.h" +#include "openthread/types.h" #include #ifdef __cplusplus diff --git a/include/openthread/link.h b/include/openthread/link.h index db2940779..de0f3b6ca 100644 --- a/include/openthread/link.h +++ b/include/openthread/link.h @@ -35,7 +35,7 @@ #ifndef OPENTHREAD_LINK_H_ #define OPENTHREAD_LINK_H_ -#include "openthread-types.h" +#include "openthread/types.h" #include "platform/radio.h" #ifdef __cplusplus diff --git a/include/openthread/link_raw.h b/include/openthread/link_raw.h index f9d99b1d3..ff398a070 100644 --- a/include/openthread/link_raw.h +++ b/include/openthread/link_raw.h @@ -35,8 +35,7 @@ #ifndef LINK_RAW_H_ #define LINK_RAW_H_ -#include -//#include "openthread/types.h" +#include "openthread/types.h" #include "platform/radio.h" #ifdef __cplusplus diff --git a/include/openthread/message.h b/include/openthread/message.h index c04710bc0..c09d67b8d 100644 --- a/include/openthread/message.h +++ b/include/openthread/message.h @@ -35,7 +35,7 @@ #ifndef OPENTHREAD_MESSAGE_H_ #define OPENTHREAD_MESSAGE_H_ -#include "openthread-types.h" +#include "openthread/types.h" #ifdef __cplusplus extern "C" { diff --git a/include/openthread/ncp.h b/include/openthread/ncp.h index 1e1e094b7..599047c82 100644 --- a/include/openthread/ncp.h +++ b/include/openthread/ncp.h @@ -35,7 +35,7 @@ #ifndef NCP_H_ #define NCP_H_ -#include +#include "openthread/types.h" #ifdef __cplusplus extern "C" { diff --git a/include/openthread/netdata.h b/include/openthread/netdata.h index 597b919af..866122dd2 100644 --- a/include/openthread/netdata.h +++ b/include/openthread/netdata.h @@ -35,7 +35,7 @@ #ifndef OPENTHREAD_NETDATA_H_ #define OPENTHREAD_NETDATA_H_ -#include "openthread-types.h" +#include "openthread/types.h" #ifdef __cplusplus extern "C" { diff --git a/include/openthread/tasklet.h b/include/openthread/tasklet.h index 51fd783aa..8cb2452be 100644 --- a/include/openthread/tasklet.h +++ b/include/openthread/tasklet.h @@ -35,7 +35,7 @@ #ifndef OPENTHREAD_TASKLET_H_ #define OPENTHREAD_TASKLET_H_ -#include "openthread-types.h" +#include "openthread/types.h" #ifdef __cplusplus extern "C" { diff --git a/include/openthread/thread.h b/include/openthread/thread.h index aadb7070a..3800af6bd 100644 --- a/include/openthread/thread.h +++ b/include/openthread/thread.h @@ -35,7 +35,7 @@ #ifndef OPENTHREAD_THREAD_H_ #define OPENTHREAD_THREAD_H_ -#include "openthread-types.h" +#include "openthread/types.h" #include "openthread/link.h" #include "openthread/message.h" diff --git a/include/openthread-types.h b/include/openthread/types.h similarity index 100% rename from include/openthread-types.h rename to include/openthread/types.h diff --git a/include/openthread/udp.h b/include/openthread/udp.h index fea12e193..afd96ca77 100644 --- a/include/openthread/udp.h +++ b/include/openthread/udp.h @@ -35,7 +35,7 @@ #ifndef OPENTHREAD_UDP_H_ #define OPENTHREAD_UDP_H_ -#include "openthread-types.h" +#include "openthread/types.h" #include "openthread/message.h" #ifdef __cplusplus diff --git a/include/platform/alarm.h b/include/platform/alarm.h index f6f62b79a..14ab16e7d 100644 --- a/include/platform/alarm.h +++ b/include/platform/alarm.h @@ -37,7 +37,7 @@ #include -#include +#include "openthread/types.h" #ifdef __cplusplus extern "C" { diff --git a/include/platform/diag.h b/include/platform/diag.h index f2cafa636..e00d21521 100644 --- a/include/platform/diag.h +++ b/include/platform/diag.h @@ -41,7 +41,7 @@ #include -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/platform/messagepool.h b/include/platform/messagepool.h index 317a2336a..158990cec 100644 --- a/include/platform/messagepool.h +++ b/include/platform/messagepool.h @@ -36,7 +36,8 @@ #define MESSAGEPOOL_H_ #include -#include + +#include "openthread/types.h" /** * @defgroup messagepool MessagePool diff --git a/include/platform/misc.h b/include/platform/misc.h index 1df571cbe..4c77662fb 100644 --- a/include/platform/misc.h +++ b/include/platform/misc.h @@ -37,7 +37,7 @@ #include -#include +#include "openthread/types.h" #ifdef __cplusplus extern "C" { diff --git a/include/platform/platform.h b/include/platform/platform.h index e8acb55d3..744c1831c 100644 --- a/include/platform/platform.h +++ b/include/platform/platform.h @@ -35,7 +35,7 @@ #ifndef PLATFORM_H_ #define PLATFORM_H_ -#include +#include "openthread/types.h" #ifdef __cplusplus extern "C" { diff --git a/include/platform/radio.h b/include/platform/radio.h index 3b00df5c4..c5dab5ade 100644 --- a/include/platform/radio.h +++ b/include/platform/radio.h @@ -38,7 +38,7 @@ #include -#include +#include "openthread/types.h" #ifdef __cplusplus extern "C" { diff --git a/include/platform/random.h b/include/platform/random.h index 6064a0622..62d261fd4 100644 --- a/include/platform/random.h +++ b/include/platform/random.h @@ -37,7 +37,7 @@ #include -#include +#include "openthread/types.h" #ifdef __cplusplus extern "C" { diff --git a/include/platform/settings.h b/include/platform/settings.h index 8657e9220..1eb27f9dd 100644 --- a/include/platform/settings.h +++ b/include/platform/settings.h @@ -35,7 +35,7 @@ #ifndef OT_PLATFORM_SETTINGS_H #define OT_PLATFORM_SETTINGS_H 1 -#include +#include "openthread/types.h" #ifdef __cplusplus extern "C" { diff --git a/include/platform/spi-slave.h b/include/platform/spi-slave.h index 2485131ce..66da82572 100644 --- a/include/platform/spi-slave.h +++ b/include/platform/spi-slave.h @@ -37,7 +37,7 @@ #include -#include +#include "openthread/types.h" #ifdef __cplusplus extern "C" { diff --git a/include/platform/uart.h b/include/platform/uart.h index 40b8a1c59..ec549ef02 100644 --- a/include/platform/uart.h +++ b/include/platform/uart.h @@ -37,7 +37,7 @@ #include -#include +#include "openthread/types.h" #ifdef __cplusplus extern "C" { diff --git a/src/cli/cli_console.hpp b/src/cli/cli_console.hpp index e1daf4a98..af435a4bb 100644 --- a/src/cli/cli_console.hpp +++ b/src/cli/cli_console.hpp @@ -34,7 +34,6 @@ #ifndef CLI_CONSOLE_HPP_ #define CLI_CONSOLE_HPP_ -#include #include "openthread/cli.h" #include diff --git a/src/cli/cli_server.hpp b/src/cli/cli_server.hpp index 84d22b536..e1ab3c2a6 100644 --- a/src/cli/cli_server.hpp +++ b/src/cli/cli_server.hpp @@ -34,7 +34,7 @@ #ifndef CLI_SERVER_HPP_ #define CLI_SERVER_HPP_ -#include +#include "openthread/types.h" namespace Thread { namespace Cli { diff --git a/src/cli/cli_uart.hpp b/src/cli/cli_uart.hpp index b42703d3c..ddcdb4f65 100644 --- a/src/cli/cli_uart.hpp +++ b/src/cli/cli_uart.hpp @@ -34,7 +34,8 @@ #ifndef CLI_UART_HPP_ #define CLI_UART_HPP_ -#include +#include "openthread/types.h" + #include #include diff --git a/src/cli/cli_udp.hpp b/src/cli/cli_udp.hpp index e01e0cda3..4bcbf46fc 100644 --- a/src/cli/cli_udp.hpp +++ b/src/cli/cli_udp.hpp @@ -34,7 +34,8 @@ #ifndef CLI_UDP_HPP_ #define CLI_UDP_HPP_ -#include +#include "openthread/types.h" + #include namespace Thread { diff --git a/src/core/coap/coap_base.hpp b/src/core/coap/coap_base.hpp index e3a448103..a9a33d651 100644 --- a/src/core/coap/coap_base.hpp +++ b/src/core/coap/coap_base.hpp @@ -29,7 +29,8 @@ #ifndef COAP_BASE_HPP_ #define COAP_BASE_HPP_ -#include +#include "openthread/coap.h" + #include #include #include diff --git a/src/core/coap/coap_client.hpp b/src/core/coap/coap_client.hpp index eb4d408e9..6c720159f 100644 --- a/src/core/coap/coap_client.hpp +++ b/src/core/coap/coap_client.hpp @@ -29,7 +29,6 @@ #ifndef COAP_CLIENT_HPP_ #define COAP_CLIENT_HPP_ -#include #include "openthread/coap.h" #include diff --git a/src/core/coap/coap_header.hpp b/src/core/coap/coap_header.hpp index 5017650b8..d9bd94f6c 100644 --- a/src/core/coap/coap_header.hpp +++ b/src/core/coap/coap_header.hpp @@ -36,7 +36,6 @@ #include -#include #include "openthread/coap.h" #include diff --git a/src/core/common/message.hpp b/src/core/common/message.hpp index 371f289b3..7bf411d1d 100644 --- a/src/core/common/message.hpp +++ b/src/core/common/message.hpp @@ -46,7 +46,6 @@ #include "openthread/message.h" #include -#include #include #include #include diff --git a/src/core/common/timer.hpp b/src/core/common/timer.hpp index f088a73eb..92772cfc2 100644 --- a/src/core/common/timer.hpp +++ b/src/core/common/timer.hpp @@ -37,7 +37,8 @@ #include #include -#include +#include "openthread/types.h" + #include #include diff --git a/src/core/common/tlvs.hpp b/src/core/common/tlvs.hpp index 6d6c021d2..30581f260 100644 --- a/src/core/common/tlvs.hpp +++ b/src/core/common/tlvs.hpp @@ -36,7 +36,8 @@ #include -#include +#include "openthread/types.h" + #include #include diff --git a/src/core/crypto/aes_ccm.hpp b/src/core/crypto/aes_ccm.hpp index 6347aea75..de4792afd 100644 --- a/src/core/crypto/aes_ccm.hpp +++ b/src/core/crypto/aes_ccm.hpp @@ -36,7 +36,8 @@ #include -#include +#include "openthread/types.h" + #include namespace Thread { diff --git a/src/core/mac/mac_blacklist_impl.hpp b/src/core/mac/mac_blacklist_impl.hpp index 25a8db251..44a280f37 100644 --- a/src/core/mac/mac_blacklist_impl.hpp +++ b/src/core/mac/mac_blacklist_impl.hpp @@ -36,7 +36,8 @@ #include -#include +#include "openthread/types.h" + #include namespace Thread { diff --git a/src/core/mac/mac_blacklist_stub.hpp b/src/core/mac/mac_blacklist_stub.hpp index 58c180500..deb729dd2 100644 --- a/src/core/mac/mac_blacklist_stub.hpp +++ b/src/core/mac/mac_blacklist_stub.hpp @@ -36,7 +36,8 @@ #include -#include +#include "openthread/types.h" + #include namespace Thread { diff --git a/src/core/mac/mac_frame.hpp b/src/core/mac/mac_frame.hpp index b70240853..09b2b4b14 100644 --- a/src/core/mac/mac_frame.hpp +++ b/src/core/mac/mac_frame.hpp @@ -40,8 +40,9 @@ #include #include +#include "openthread/types.h" + #include -#include #include namespace Thread { diff --git a/src/core/mac/mac_whitelist_impl.hpp b/src/core/mac/mac_whitelist_impl.hpp index 60a32b580..8a5f9056f 100644 --- a/src/core/mac/mac_whitelist_impl.hpp +++ b/src/core/mac/mac_whitelist_impl.hpp @@ -36,7 +36,8 @@ #include -#include +#include "openthread/types.h" + #include namespace Thread { diff --git a/src/core/mac/mac_whitelist_stub.hpp b/src/core/mac/mac_whitelist_stub.hpp index e68dd703c..1dfc84e88 100644 --- a/src/core/mac/mac_whitelist_stub.hpp +++ b/src/core/mac/mac_whitelist_stub.hpp @@ -36,7 +36,8 @@ #include -#include +#include "openthread/types.h" + #include namespace Thread { diff --git a/src/core/meshcop/announce_begin_client.hpp b/src/core/meshcop/announce_begin_client.hpp index 17d17d1c8..0ad0c33e9 100644 --- a/src/core/meshcop/announce_begin_client.hpp +++ b/src/core/meshcop/announce_begin_client.hpp @@ -35,7 +35,7 @@ #define ANNOUNCE_BEGIN_CLIENT_HPP_ #include -#include + #include "openthread/commissioner.h" #include diff --git a/src/core/meshcop/dataset_manager.cpp b/src/core/meshcop/dataset_manager.cpp index 8db78e6f1..4b17a1561 100644 --- a/src/core/meshcop/dataset_manager.cpp +++ b/src/core/meshcop/dataset_manager.cpp @@ -36,7 +36,6 @@ #include -#include #include #include #include diff --git a/src/core/meshcop/dataset_manager.hpp b/src/core/meshcop/dataset_manager.hpp index 7e2445e83..e6cd6e8b7 100644 --- a/src/core/meshcop/dataset_manager.hpp +++ b/src/core/meshcop/dataset_manager.hpp @@ -35,7 +35,7 @@ #ifndef MESHCOP_DATASET_MANAGER_HPP_ #define MESHCOP_DATASET_MANAGER_HPP_ -#include +#include "openthread/types.h" #include #include diff --git a/src/core/meshcop/dataset_manager_ftd.cpp b/src/core/meshcop/dataset_manager_ftd.cpp index bcae45e56..02afaeb91 100644 --- a/src/core/meshcop/dataset_manager_ftd.cpp +++ b/src/core/meshcop/dataset_manager_ftd.cpp @@ -36,7 +36,6 @@ #include -#include #include #include #include diff --git a/src/core/meshcop/dataset_manager_ftd.hpp b/src/core/meshcop/dataset_manager_ftd.hpp index b7fe3833f..d198a9fc0 100644 --- a/src/core/meshcop/dataset_manager_ftd.hpp +++ b/src/core/meshcop/dataset_manager_ftd.hpp @@ -35,7 +35,7 @@ #ifndef MESHCOP_DATASET_MANAGER_FTD_HPP_ #define MESHCOP_DATASET_MANAGER_FTD_HPP_ -#include +#include "openthread/types.h" #include diff --git a/src/core/meshcop/dataset_manager_mtd.hpp b/src/core/meshcop/dataset_manager_mtd.hpp index d17c2db5a..9edb816e9 100644 --- a/src/core/meshcop/dataset_manager_mtd.hpp +++ b/src/core/meshcop/dataset_manager_mtd.hpp @@ -35,7 +35,7 @@ #ifndef MESHCOP_DATASET_MANAGER_MTD_HPP_ #define MESHCOP_DATASET_MANAGER_MTD_HPP_ -#include +#include "openthread/types.h" namespace Thread { diff --git a/src/core/meshcop/dtls.hpp b/src/core/meshcop/dtls.hpp index c86923cc5..4973dad80 100644 --- a/src/core/meshcop/dtls.hpp +++ b/src/core/meshcop/dtls.hpp @@ -34,7 +34,8 @@ #ifndef DTLS_HPP_ #define DTLS_HPP_ -#include +#include "openthread/types.h" + #include #include #include diff --git a/src/core/meshcop/energy_scan_client.hpp b/src/core/meshcop/energy_scan_client.hpp index 51b57b8d5..ffefeb6c1 100644 --- a/src/core/meshcop/energy_scan_client.hpp +++ b/src/core/meshcop/energy_scan_client.hpp @@ -35,7 +35,7 @@ #define ENERGY_SCAN_CLIENT_HPP_ #include -#include + #include "openthread/commissioner.h" #include diff --git a/src/core/meshcop/joiner.hpp b/src/core/meshcop/joiner.hpp index 04b6cf6fc..ff191a1e8 100644 --- a/src/core/meshcop/joiner.hpp +++ b/src/core/meshcop/joiner.hpp @@ -34,7 +34,6 @@ #ifndef JOINER_HPP_ #define JOINER_HPP_ -#include #include "openthread/joiner.h" #include diff --git a/src/core/meshcop/joiner_router_ftd.hpp b/src/core/meshcop/joiner_router_ftd.hpp index 340f4e399..5e542b396 100644 --- a/src/core/meshcop/joiner_router_ftd.hpp +++ b/src/core/meshcop/joiner_router_ftd.hpp @@ -34,7 +34,7 @@ #ifndef JOINER_ROUTER_HPP_ #define JOINER_ROUTER_HPP_ -#include +#include "openthread/types.h" #include #include diff --git a/src/core/meshcop/panid_query_client.hpp b/src/core/meshcop/panid_query_client.hpp index 14b7cbdcc..9690a9626 100644 --- a/src/core/meshcop/panid_query_client.hpp +++ b/src/core/meshcop/panid_query_client.hpp @@ -35,7 +35,7 @@ #define PANID_QUERY_CLIENT_HPP_ #include -#include + #include "openthread/commissioner.h" #include diff --git a/src/core/meshcop/timestamp.cpp b/src/core/meshcop/timestamp.cpp index ce897824d..5ea2af21c 100644 --- a/src/core/meshcop/timestamp.cpp +++ b/src/core/meshcop/timestamp.cpp @@ -33,7 +33,8 @@ #include -#include +#include "openthread/types.h" + #include namespace Thread { diff --git a/src/core/meshcop/tlvs.hpp b/src/core/meshcop/tlvs.hpp index 5bc5b239f..bc0fb9d64 100644 --- a/src/core/meshcop/tlvs.hpp +++ b/src/core/meshcop/tlvs.hpp @@ -37,7 +37,8 @@ #include -#include +#include "openthread/types.h" + #include #include #include diff --git a/src/core/net/dhcp6_client.cpp b/src/core/net/dhcp6_client.cpp index 898cb8710..c808f4198 100644 --- a/src/core/net/dhcp6_client.cpp +++ b/src/core/net/dhcp6_client.cpp @@ -33,7 +33,8 @@ #define WPP_NAME "dhcp6_client.tmh" -#include +#include "openthread/types.h" + #include #include #include diff --git a/src/core/net/dhcp6_server.cpp b/src/core/net/dhcp6_server.cpp index 32e610439..e9c30f015 100644 --- a/src/core/net/dhcp6_server.cpp +++ b/src/core/net/dhcp6_server.cpp @@ -33,7 +33,8 @@ #define WPP_NAME "dhcp6_server.tmh" -#include +#include "openthread/types.h" + #include #include #include diff --git a/src/core/net/dhcp6_server.hpp b/src/core/net/dhcp6_server.hpp index a61c3a3e3..e053e2f95 100644 --- a/src/core/net/dhcp6_server.hpp +++ b/src/core/net/dhcp6_server.hpp @@ -34,7 +34,8 @@ #ifndef DHCP6_SERVER_HPP_ #define DHCP6_SERVER_HPP_ -#include +#include "openthread/types.h" + #include #include #include diff --git a/src/core/net/icmp6.hpp b/src/core/net/icmp6.hpp index 44c92a5ab..59c1caea8 100644 --- a/src/core/net/icmp6.hpp +++ b/src/core/net/icmp6.hpp @@ -34,7 +34,7 @@ #ifndef ICMP6_HPP_ #define ICMP6_HPP_ -#include +#include #include #include diff --git a/src/core/net/ip6_address.hpp b/src/core/net/ip6_address.hpp index 0a29603cc..66e154c37 100644 --- a/src/core/net/ip6_address.hpp +++ b/src/core/net/ip6_address.hpp @@ -36,7 +36,7 @@ #include -#include +#include "openthread/types.h" namespace Thread { namespace Ip6 { diff --git a/src/core/net/ip6_headers.hpp b/src/core/net/ip6_headers.hpp index 692b08d64..db4ef4aec 100644 --- a/src/core/net/ip6_headers.hpp +++ b/src/core/net/ip6_headers.hpp @@ -36,7 +36,8 @@ #include -#include +#include "openthread/types.h" + #include #include #include diff --git a/src/core/net/ip6_mpl.hpp b/src/core/net/ip6_mpl.hpp index e5b527b97..2569a1fe3 100644 --- a/src/core/net/ip6_mpl.hpp +++ b/src/core/net/ip6_mpl.hpp @@ -34,7 +34,8 @@ * This file includes definitions for MPL. */ -#include +#include "openthread/types.h" + #include #include #include diff --git a/src/core/net/ip6_routes.hpp b/src/core/net/ip6_routes.hpp index 08e97596e..78bc2e5ab 100644 --- a/src/core/net/ip6_routes.hpp +++ b/src/core/net/ip6_routes.hpp @@ -34,7 +34,8 @@ * This file includes definitions for manipulating IPv6 routing tables. */ -#include +#include "openthread/types.h" + #include #include diff --git a/src/core/openthread-instance.h b/src/core/openthread-instance.h index 9f083181d..595b39747 100644 --- a/src/core/openthread-instance.h +++ b/src/core/openthread-instance.h @@ -39,7 +39,9 @@ #include #include -#include + +#include "openthread/types.h" + #include #include #include diff --git a/src/core/thread/address_resolver_ftd.hpp b/src/core/thread/address_resolver_ftd.hpp index 79a0e605a..d38b9480b 100644 --- a/src/core/thread/address_resolver_ftd.hpp +++ b/src/core/thread/address_resolver_ftd.hpp @@ -35,7 +35,9 @@ #define ADDRESS_RESOLVER_HPP_ #include -#include + +#include "openthread/types.h" + #include #include #include diff --git a/src/core/thread/address_resolver_mtd.hpp b/src/core/thread/address_resolver_mtd.hpp index a514017eb..7f138f122 100644 --- a/src/core/thread/address_resolver_mtd.hpp +++ b/src/core/thread/address_resolver_mtd.hpp @@ -34,7 +34,7 @@ #ifndef ADDRESS_RESOLVER_HPP_ #define ADDRESS_RESOLVER_HPP_ -#include +#include "openthread/types.h" namespace Thread { diff --git a/src/core/thread/announce_begin_server.hpp b/src/core/thread/announce_begin_server.hpp index 51fbea241..d689bdf75 100644 --- a/src/core/thread/announce_begin_server.hpp +++ b/src/core/thread/announce_begin_server.hpp @@ -35,7 +35,9 @@ #define ANNOUNCE_BEGIN_SERVER_HPP_ #include -#include + +#include "openthread/types.h" + #include #include #include diff --git a/src/core/thread/energy_scan_server.hpp b/src/core/thread/energy_scan_server.hpp index d9dfb97cd..3bc7d96c3 100644 --- a/src/core/thread/energy_scan_server.hpp +++ b/src/core/thread/energy_scan_server.hpp @@ -35,7 +35,9 @@ #define ENERGY_SCAN_SERVER_HPP_ #include -#include + +#include "openthread/types.h" + #include #include #include diff --git a/src/core/thread/key_manager.hpp b/src/core/thread/key_manager.hpp index 20712964e..503256cf3 100644 --- a/src/core/thread/key_manager.hpp +++ b/src/core/thread/key_manager.hpp @@ -36,7 +36,8 @@ #include -#include +#include "openthread/types.h" + #include #include diff --git a/src/core/thread/link_quality.cpp b/src/core/thread/link_quality.cpp index b85964bc4..db4eda7cc 100644 --- a/src/core/thread/link_quality.cpp +++ b/src/core/thread/link_quality.cpp @@ -40,7 +40,8 @@ #include #include -#include +#include "openthread/types.h" + #include #include diff --git a/src/core/thread/link_quality.hpp b/src/core/thread/link_quality.hpp index b004dcf79..81e923476 100644 --- a/src/core/thread/link_quality.hpp +++ b/src/core/thread/link_quality.hpp @@ -34,7 +34,7 @@ #ifndef LINK_QUALITY_HPP_ #define LINK_QUALITY_HPP_ -#include +#include "openthread/types.h" namespace Thread { diff --git a/src/core/thread/mesh_forwarder.hpp b/src/core/thread/mesh_forwarder.hpp index 8f54f5b40..9fcf9d317 100644 --- a/src/core/thread/mesh_forwarder.hpp +++ b/src/core/thread/mesh_forwarder.hpp @@ -35,7 +35,9 @@ #define MESH_FORWARDER_HPP_ #include -#include + +#include "openthread/types.h" + #include #include #include diff --git a/src/core/thread/mle_tlvs.hpp b/src/core/thread/mle_tlvs.hpp index ca6220d6d..02b587941 100644 --- a/src/core/thread/mle_tlvs.hpp +++ b/src/core/thread/mle_tlvs.hpp @@ -36,7 +36,8 @@ #include -#include +#include "openthread/types.h" + #include #include #include diff --git a/src/core/thread/network_data.hpp b/src/core/thread/network_data.hpp index d0066c007..5a7f25523 100644 --- a/src/core/thread/network_data.hpp +++ b/src/core/thread/network_data.hpp @@ -34,7 +34,8 @@ #ifndef NETWORK_DATA_HPP_ #define NETWORK_DATA_HPP_ -#include +#include "openthread/types.h" + #include #include #include diff --git a/src/core/thread/network_diagnostic.hpp b/src/core/thread/network_diagnostic.hpp index 4a0710f43..d383ccc81 100644 --- a/src/core/thread/network_diagnostic.hpp +++ b/src/core/thread/network_diagnostic.hpp @@ -35,7 +35,9 @@ #define NETWORK_DIAGNOSTIC_HPP_ #include -#include + +#include "openthread/types.h" + #include #include #include diff --git a/src/core/thread/network_diagnostic_tlvs.hpp b/src/core/thread/network_diagnostic_tlvs.hpp index 36986d414..ce71bf820 100644 --- a/src/core/thread/network_diagnostic_tlvs.hpp +++ b/src/core/thread/network_diagnostic_tlvs.hpp @@ -36,7 +36,8 @@ #include -#include +#include "openthread/types.h" + #include #include #include diff --git a/src/core/thread/panid_query_server.hpp b/src/core/thread/panid_query_server.hpp index 8dcdc93de..e798fdf55 100644 --- a/src/core/thread/panid_query_server.hpp +++ b/src/core/thread/panid_query_server.hpp @@ -35,7 +35,9 @@ #define PANID_QUERY_SERVER_HPP_ #include -#include + +#include "openthread/types.h" + #include #include #include diff --git a/src/core/thread/thread_netif.hpp b/src/core/thread/thread_netif.hpp index 0058f0d78..710a434b2 100644 --- a/src/core/thread/thread_netif.hpp +++ b/src/core/thread/thread_netif.hpp @@ -40,7 +40,7 @@ #include #endif -#include +#include "openthread/types.h" #include #include diff --git a/src/core/thread/thread_tlvs.hpp b/src/core/thread/thread_tlvs.hpp index ba9656e11..d6e84fd08 100644 --- a/src/core/thread/thread_tlvs.hpp +++ b/src/core/thread/thread_tlvs.hpp @@ -34,7 +34,8 @@ #ifndef THREAD_TLVS_HPP_ #define THREAD_TLVS_HPP_ -#include +#include "openthread/types.h" + #include #include #include diff --git a/src/core/utils/jam_detector.cpp b/src/core/utils/jam_detector.cpp index d41be5e28..c6fe986b5 100644 --- a/src/core/utils/jam_detector.cpp +++ b/src/core/utils/jam_detector.cpp @@ -38,7 +38,7 @@ #endif #include -#include + #include #include #include diff --git a/src/core/utils/slaac_address.cpp b/src/core/utils/slaac_address.cpp index 8b7fa970c..62a7cd8c3 100644 --- a/src/core/utils/slaac_address.cpp +++ b/src/core/utils/slaac_address.cpp @@ -38,7 +38,7 @@ #endif #include -#include + #include #include #include diff --git a/src/core/utils/slaac_address.hpp b/src/core/utils/slaac_address.hpp index 84dbfe74b..92dc45b9a 100644 --- a/src/core/utils/slaac_address.hpp +++ b/src/core/utils/slaac_address.hpp @@ -34,7 +34,8 @@ #ifndef SLAAC_ADDRESS_HPP_ #define SLAAC_ADDRESS_HPP_ -#include +#include "openthread/types.h" + #include namespace Thread { diff --git a/src/diag/diag_process.hpp b/src/diag/diag_process.hpp index 460d228eb..81a0de9e4 100644 --- a/src/diag/diag_process.hpp +++ b/src/diag/diag_process.hpp @@ -35,7 +35,9 @@ #define DIAG_PROCESS_HPP_ #include -#include + +#include "openthread/types.h" + #include #include #include diff --git a/src/ncp/hdlc.hpp b/src/ncp/hdlc.hpp index bbe5d7915..2172b9fdf 100644 --- a/src/ncp/hdlc.hpp +++ b/src/ncp/hdlc.hpp @@ -33,7 +33,7 @@ #ifndef HDLC_HPP_ #define HDLC_HPP_ -#include +#include "openthread/types.h" namespace Thread { diff --git a/src/ncp/ncp_base.hpp b/src/ncp/ncp_base.hpp index 1f2949d82..a92895cab 100644 --- a/src/ncp/ncp_base.hpp +++ b/src/ncp/ncp_base.hpp @@ -39,12 +39,11 @@ #include #endif +#include "openthread/types.h" +#include "openthread/message.h" +#include "openthread/ip6.h" #include "openthread/ncp.h" -#include -#include "openthread/ip6.h" -#include "openthread/message.h" -#include "openthread/ncp.h" #include #include diff --git a/src/ncp/ncp_buffer.hpp b/src/ncp/ncp_buffer.hpp index 1957fdf73..909ca553a 100644 --- a/src/ncp/ncp_buffer.hpp +++ b/src/ncp/ncp_buffer.hpp @@ -33,7 +33,7 @@ #ifndef NCP_FRAME_BUFFER_HPP_ #define NCP_FRAME_BUFFER_HPP_ -#include +#include "openthread/types.h" #include "openthread/message.h" namespace Thread { diff --git a/tests/unit/test_util.h b/tests/unit/test_util.h index 0142dc482..f16c1f4ee 100644 --- a/tests/unit/test_util.h +++ b/tests/unit/test_util.h @@ -32,7 +32,7 @@ #include #include -#include +#include "openthread/types.h" #ifndef _WIN32 diff --git a/third_party/mbedtls/hardware_entropy.c b/third_party/mbedtls/hardware_entropy.c index 6cc17d539..2ac633921 100644 --- a/third_party/mbedtls/hardware_entropy.c +++ b/third_party/mbedtls/hardware_entropy.c @@ -22,7 +22,8 @@ #include -#include +#include "openthread/types.h" + #include #include "mbedtls/entropy.h"