Move openthread-types.h to openthread/types.h.

etc/visual-studio/libopenthread_k.vcxproj

@@ -141,7 +141,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\include\openthread.h" />
-    <ClInclude Include="..\..\include\openthread-types.h" />
+    <ClInclude Include="..\..\include\openthread\types.h" />
     <ClInclude Include="..\..\include\openthread-windows-config.h" />
     <ClInclude Include="..\..\include\openthread\link_raw.h" />
     <ClInclude Include="..\..\src\core\coap\coap_base.hpp" />

etc/visual-studio/libopenthread_k.vcxproj.filters

@@ -530,7 +530,7 @@
     <ClInclude Include="..\..\include\openthread.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\openthread-types.h">
+    <ClInclude Include="..\..\include\openthread\types.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\include\openthread-windows-config.h">

examples/drivers/windows/include/otLwfIoctl.h

@@ -35,7 +35,7 @@
 #ifndef __OTLWFIOCTL_H__
 #define __OTLWFIOCTL_H__
 
-#include <openthread-types.h>
+#include <openthread/types.h>
 
 __inline LONG ThreadErrorToNtstatus(ThreadError error) { return (LONG)-((int)error); }
 

examples/platforms/cc2538/misc.c

@@ -26,7 +26,7 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <openthread-types.h>
+#include "openthread/types.h"
 #include <platform/misc.h>
 #include "platform-cc2538.h"
 

examples/platforms/cc2538/platform-cc2538.h

@@ -36,7 +36,8 @@
 #define PLATFORM_CC2538_H_
 
 #include <stdint.h>
-#include <openthread-types.h>
+
+#include "openthread/types.h"
 
 #include "cc2538-reg.h"
 

examples/platforms/cc2538/radio.c

@@ -32,7 +32,6 @@
  *
  */
 
-#include <openthread-types.h>
 #include <openthread.h>
 #include <openthread-config.h>
 

examples/platforms/cc2538/random.c

@@ -32,7 +32,7 @@
  *
  */
 
-#include <openthread-types.h>
+#include "openthread/types.h"
 
 #include <common/code_utils.hpp>
 #include <platform/radio.h>

examples/platforms/cc2538/uart.c

@@ -34,7 +34,8 @@
 
 #include <stddef.h>
 
-#include <openthread-types.h>
+#include "openthread/types.h"
+
 #include <common/code_utils.hpp>
 #include <platform/uart.h>
 #include "platform-cc2538.h"

examples/platforms/cc2650/alarm.c

@@ -28,7 +28,7 @@
 
 #include <stdbool.h>
 #include <stdint.h>
-#include <openthread-types.h>
+#include <openthread/types.h>
 #include <driverlib/aon_rtc.h>
 
 #include <platform/alarm.h>

examples/platforms/cc2650/misc.c

@@ -26,7 +26,7 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <openthread-types.h>
+#include <openthread/types.h>
 #include <platform/misc.h>
 #include <driverlib/sys_ctrl.h>
 

examples/platforms/cc2650/platform-cc2650.h

@@ -30,7 +30,7 @@
 #define PLATFORM_H_
 
 #include <stdint.h>
-#include "openthread-types.h"
+#include "openthread/types.h"
 
 #ifdef __cplusplus
 extern "C" {

examples/platforms/cc2650/platform.c

@@ -26,7 +26,7 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <openthread-types.h>
+#include <openthread/types.h>
 #include "platform-cc2650.h"
 
 otInstance *sInstance;

examples/platforms/cc2650/radio.c

@@ -26,7 +26,7 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <openthread-types.h>
+#include <openthread/types.h>
 
 #include <assert.h>
 #include <common/code_utils.hpp>

examples/platforms/cc2650/random.c

@@ -26,7 +26,7 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <openthread-types.h>
+#include <openthread/types.h>
 #include <common/code_utils.hpp>
 
 #include <driverlib/prcm.h>

examples/platforms/cc2650/uart.c

@@ -33,7 +33,7 @@
 #include <driverlib/ioc.h>
 #include <driverlib/sys_ctrl.h>
 
-#include <openthread-types.h>
+#include <openthread/types.h>
 #include <common/code_utils.hpp>
 #include <platform/uart.h>
 

examples/platforms/da15000/flash.c

@@ -27,7 +27,8 @@
  */
 
 
-#include <openthread-types.h>
+#include "openthread/types.h"
+
 #include "hw_qspi.h"
 #include "qspi_automode.h"
 #include "platform/alarm.h"

examples/platforms/da15000/misc.c

@@ -26,8 +26,9 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <platform/misc.h>
-#include <openthread-types.h>
+#include "openthread/types.h"
+
+#include "platform/misc.h"
 #include "sdk_defs.h"
 
 void otPlatReset(otInstance *aInstance)

examples/platforms/da15000/platform-da15000.h

@@ -29,7 +29,7 @@
 #ifndef PLATFORM_DA15000_H_
 #define PLATFORM_DA15000_H_
 
-#include <openthread-types.h>
+#include "openthread/types.h"
 
 /**
  * This function initializes the radio service used by OpenThread.

examples/platforms/da15000/platform.c

@@ -36,7 +36,6 @@
 
 #include <openthread.h>
 #include "platform/alarm.h"
-#include <openthread-types.h>
 #include "platform-da15000.h"
 #include "sdk_defs.h"
 #include "hw_cpm.h"

examples/platforms/nrf52840/alarm.c

@@ -47,7 +47,7 @@
 #include "hal/nrf_rtc.h"
 
 #include <openthread-config.h>
-#include <openthread-types.h>
+#include <openthread/types.h>
 
 #define RTC_FREQUENCY       32768ULL
 

examples/platforms/nrf52840/flash.c

@@ -30,7 +30,7 @@
 #include <string.h>
 #include <assert.h>
 
-#include <openthread-types.h>
+#include <openthread/types.h>
 #include <common/code_utils.hpp>
 #include <platform/alarm.h>
 #include <utils/flash.h>

examples/platforms/nrf52840/logging.c

@@ -43,7 +43,7 @@
 
 #include <openthread-core-config.h>
 #include <openthread-config.h>
-#include <openthread-types.h>
+#include <openthread/types.h>
 
 #if (OPENTHREAD_ENABLE_DEFAULT_LOGGING == 0)
 #include <segger_rtt/SEGGER_RTT.h>

examples/platforms/nrf52840/misc.c

@@ -26,7 +26,7 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <openthread-types.h>
+#include <openthread/types.h>
 #include <platform/misc.h>
 
 #include "device/nrf.h"

examples/platforms/nrf52840/platform-nrf5.h

@@ -37,7 +37,7 @@
 
 #include <stdint.h>
 
-#include <openthread-types.h>
+#include <openthread/types.h>
 
 #include "platform-config.h"
 

examples/platforms/nrf52840/radio.c

@@ -49,7 +49,7 @@
 
 #include <openthread-core-config.h>
 #include <openthread-config.h>
-#include <openthread-types.h>
+#include <openthread/types.h>
 
 #define SHORT_ADDRESS_SIZE    2
 #define EXTENDED_ADDRESS_SIZE 8

examples/platforms/nrf52840/uart.c

@@ -35,8 +35,8 @@
 #include <stddef.h>
 #include <stdint.h>
 
+#include <openthread/types.h>
 #include <platform/uart.h>
-#include <openthread-types.h>
 #include <common/code_utils.hpp>
 
 #include "drivers/nrf_drv_clock.h"

examples/platforms/posix/misc.c

@@ -28,7 +28,8 @@
 
 #include "platform-posix.h"
 
-#include <openthread-types.h>
+#include "openthread/types.h"
+
 #include <platform/misc.h>
 
 void otPlatReset(otInstance *aInstance)

examples/platforms/posix/random.c

@@ -36,7 +36,7 @@
 
 #include "platform-posix.h"
 
-#include <openthread-types.h>
+#include "openthread/types.h"
 
 #include <common/code_utils.hpp>
 #include <platform/random.h>

examples/platforms/utils/flash.h

@@ -37,7 +37,7 @@
 
 #include <stdint.h>
 
-#include <openthread-types.h>
+#include "openthread/types.h"
 
 #ifdef __cplusplus
 extern "C" {

examples/platforms/utils/settings.cpp

@@ -37,9 +37,10 @@
 #include <string.h>
 #include <assert.h>
 
-#include <openthread-types.h>
 #include <openthread-core-config.h>
 
+#include "openthread/types.h"
+
 #include <common/code_utils.hpp>
 #include <platform/settings.h>
 

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

include/openthread-diag.h

@@ -35,7 +35,7 @@
 #ifndef OPENTHREAD_DIAG_H_
 #define OPENTHREAD_DIAG_H_
 
-#include <openthread-types.h>
+#include "openthread/types.h"
 
 #ifdef __cplusplus
 extern "C" {

include/openthread-icmp6.h

@@ -35,7 +35,7 @@
 #ifndef OPENTHREAD_ICMP6_H_
 #define OPENTHREAD_ICMP6_H_
 
-#include <openthread-types.h>
+#include <openthread/types.h>
 #include <openthread/message.h>
 
 #ifdef __cplusplus

include/openthread.h

@@ -35,7 +35,7 @@
 #ifndef OPENTHREAD_H_
 #define OPENTHREAD_H_
 
-#include <openthread-types.h>
+#include "openthread/types.h"
 
 #include "openthread/crypto.h"
 #include "openthread/dataset.h"

include/openthread/Makefile.am

@@ -46,6 +46,7 @@ openthread_headers                      = \
     netdata.h                             \
     tasklet.h                             \
     thread.h                              \
+    types.h                               \
     udp.h                                 \
     $(NULL)
 

include/openthread/cli.h

@@ -37,7 +37,7 @@
 
 #include <stdint.h>
 
-#include <openthread-types.h>
+#include "openthread/types.h"
 
 #ifdef __cplusplus
 extern "C" {

include/openthread/coap.h

@@ -43,7 +43,7 @@
 
 #include <stdint.h>
 
-#include "openthread-types.h"
+#include "openthread/types.h"
 #include "openthread/message.h"
 
 #ifdef __cplusplus

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 <platform/toolchain.h>
 
 #ifdef __cplusplus

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

include/openthread/dhcp6_client.h

@@ -35,7 +35,7 @@
 #ifndef OPENTHREAD_DHCP6_CLIENT_H_
 #define OPENTHREAD_DHCP6_CLIENT_H_
 
-#include <openthread-types.h>
+#include "openthread/types.h"
 
 #ifdef __cplusplus
 extern "C" {

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

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

include/openthread/jam_detection.h

@@ -41,7 +41,7 @@
 #include <openthread-config.h>
 #endif
 
-#include "openthread-types.h"
+#include "openthread/types.h"
 
 #ifdef __cplusplus
 extern "C" {

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 <platform/toolchain.h>
 
 #ifdef __cplusplus

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

include/openthread/link_raw.h

@@ -35,8 +35,7 @@
 #ifndef LINK_RAW_H_
 #define LINK_RAW_H_
 
-#include <openthread-types.h>
-//#include "openthread/types.h"
+#include "openthread/types.h"
 #include "platform/radio.h"
 
 #ifdef __cplusplus

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

include/openthread/ncp.h

@@ -35,7 +35,7 @@
 #ifndef NCP_H_
 #define NCP_H_
 
-#include <openthread-types.h>
+#include "openthread/types.h"
 
 #ifdef __cplusplus
 extern "C" {

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

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

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"
 

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

include/platform/alarm.h

@@ -37,7 +37,7 @@
 
 #include <stdint.h>
 
-#include <openthread-types.h>
+#include "openthread/types.h"
 
 #ifdef __cplusplus
 extern "C" {

include/platform/diag.h

@@ -41,7 +41,7 @@
 
 #include <platform/radio.h>
 
-#include <openthread-types.h>
+#include <openthread/types.h>
 
 #ifdef __cplusplus
 extern "C" {

include/platform/messagepool.h

@@ -36,7 +36,8 @@
 #define MESSAGEPOOL_H_
 
 #include <stdint.h>
-#include <openthread-types.h>
+
+#include "openthread/types.h"
 
 /**
  * @defgroup messagepool MessagePool

include/platform/misc.h

@@ -37,7 +37,7 @@
 
 #include <stdint.h>
 
-#include <openthread-types.h>
+#include "openthread/types.h"
 
 #ifdef __cplusplus
 extern "C" {

include/platform/platform.h

@@ -35,7 +35,7 @@
 #ifndef PLATFORM_H_
 #define PLATFORM_H_
 
-#include <openthread-types.h>
+#include "openthread/types.h"
 
 #ifdef __cplusplus
 extern "C" {

include/platform/radio.h

@@ -38,7 +38,7 @@
 
 #include <stdint.h>
 
-#include <openthread-types.h>
+#include "openthread/types.h"
 
 #ifdef __cplusplus
 extern "C" {

include/platform/random.h

@@ -37,7 +37,7 @@
 
 #include <stdint.h>
 
-#include <openthread-types.h>
+#include "openthread/types.h"
 
 #ifdef __cplusplus
 extern "C" {

include/platform/settings.h

@@ -35,7 +35,7 @@
 #ifndef OT_PLATFORM_SETTINGS_H
 #define OT_PLATFORM_SETTINGS_H 1
 
-#include <openthread-types.h>
+#include "openthread/types.h"
 
 #ifdef __cplusplus
 extern "C" {

include/platform/spi-slave.h

@@ -37,7 +37,7 @@
 
 #include <stdint.h>
 
-#include <openthread-types.h>
+#include "openthread/types.h"
 
 #ifdef __cplusplus
 extern "C" {

include/platform/uart.h

@@ -37,7 +37,7 @@
 
 #include <stdint.h>
 
-#include <openthread-types.h>
+#include "openthread/types.h"
 
 #ifdef __cplusplus
 extern "C" {

src/cli/cli_console.hpp

@@ -34,7 +34,6 @@
 #ifndef CLI_CONSOLE_HPP_
 #define CLI_CONSOLE_HPP_
 
-#include <openthread-types.h>
 #include "openthread/cli.h"
 
 #include <cli/cli_server.hpp>

src/cli/cli_server.hpp

@@ -34,7 +34,7 @@
 #ifndef CLI_SERVER_HPP_
 #define CLI_SERVER_HPP_
 
-#include <openthread-types.h>
+#include "openthread/types.h"
 
 namespace Thread {
 namespace Cli {

src/cli/cli_uart.hpp

@@ -34,7 +34,8 @@
 #ifndef CLI_UART_HPP_
 #define CLI_UART_HPP_
 
-#include <openthread-types.h>
+#include "openthread/types.h"
+
 #include <cli/cli_server.hpp>
 #include <common/tasklet.hpp>
 

src/cli/cli_udp.hpp

@@ -34,7 +34,8 @@
 #ifndef CLI_UDP_HPP_
 #define CLI_UDP_HPP_
 
-#include <openthread-types.h>
+#include "openthread/types.h"
+
 #include <cli/cli_server.hpp>
 
 namespace Thread {

src/core/coap/coap_base.hpp

@@ -29,7 +29,8 @@
 #ifndef COAP_BASE_HPP_
 #define COAP_BASE_HPP_
 
-#include <openthread-types.h>
+#include "openthread/coap.h"
+
 #include <coap/coap_header.hpp>
 #include <common/message.hpp>
 #include <net/netif.hpp>

src/core/coap/coap_client.hpp

@@ -29,7 +29,6 @@
 #ifndef COAP_CLIENT_HPP_
 #define COAP_CLIENT_HPP_
 
-#include <openthread-types.h>
 #include "openthread/coap.h"
 
 #include <coap/coap_base.hpp>

src/core/coap/coap_header.hpp

@@ -36,7 +36,6 @@
 
 #include <string.h>
 
-#include <openthread-types.h>
 #include "openthread/coap.h"
 
 #include <common/encoding.hpp>

src/core/common/message.hpp

@@ -46,7 +46,6 @@
 #include "openthread/message.h"
 
 #include <openthread-core-config.h>
-#include <openthread-types.h>
 #include <common/code_utils.hpp>
 #include <mac/mac_frame.hpp>
 #include <platform/messagepool.h>

src/core/common/timer.hpp

@@ -37,7 +37,8 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include <openthread-types.h>
+#include "openthread/types.h"
+
 #include <common/tasklet.hpp>
 #include <platform/alarm.h>
 

src/core/common/tlvs.hpp

@@ -36,7 +36,8 @@
 
 #include <string.h>
 
-#include <openthread-types.h>
+#include "openthread/types.h"
+
 #include <common/encoding.hpp>
 #include <common/message.hpp>
 

src/core/crypto/aes_ccm.hpp

@@ -36,7 +36,8 @@
 
 #include <stdint.h>
 
-#include <openthread-types.h>
+#include "openthread/types.h"
+
 #include <crypto/aes_ecb.hpp>
 
 namespace Thread {

src/core/mac/mac_blacklist_impl.hpp

@@ -36,7 +36,8 @@
 
 #include <stdint.h>
 
-#include <openthread-types.h>
+#include "openthread/types.h"
+
 #include <mac/mac_frame.hpp>
 
 namespace Thread {

src/core/mac/mac_blacklist_stub.hpp

@@ -36,7 +36,8 @@
 
 #include <stdint.h>
 
-#include <openthread-types.h>
+#include "openthread/types.h"
+
 #include <mac/mac_frame.hpp>
 
 namespace Thread {

src/core/mac/mac_frame.hpp

@@ -40,8 +40,9 @@
 #include <stdint.h>
 #include <string.h>
 
+#include "openthread/types.h"
+
 #include <common/encoding.hpp>
-#include <openthread-types.h>
 #include <platform/radio.h>
 
 namespace Thread {

src/core/mac/mac_whitelist_impl.hpp

@@ -36,7 +36,8 @@
 
 #include <stdint.h>
 
-#include <openthread-types.h>
+#include "openthread/types.h"
+
 #include <mac/mac_frame.hpp>
 
 namespace Thread {

src/core/mac/mac_whitelist_stub.hpp

@@ -36,7 +36,8 @@
 
 #include <stdint.h>
 
-#include <openthread-types.h>
+#include "openthread/types.h"
+
 #include <mac/mac_frame.hpp>
 
 namespace Thread {

src/core/meshcop/announce_begin_client.hpp

@@ -35,7 +35,7 @@
 #define ANNOUNCE_BEGIN_CLIENT_HPP_
 
 #include <openthread-core-config.h>
-#include <openthread-types.h>
+
 #include "openthread/commissioner.h"
 
 #include <coap/coap_client.hpp>

src/core/meshcop/dataset_manager.cpp

@@ -36,7 +36,6 @@
 
 #include <stdio.h>
 
-#include <openthread-types.h>
 #include <common/code_utils.hpp>
 #include <common/debug.hpp>
 #include <coap/coap_header.hpp>

src/core/meshcop/dataset_manager.hpp

@@ -35,7 +35,7 @@
 #ifndef MESHCOP_DATASET_MANAGER_HPP_
 #define MESHCOP_DATASET_MANAGER_HPP_
 
-#include <openthread-types.h>
+#include "openthread/types.h"
 
 #include <coap/coap_server.hpp>
 #include <common/timer.hpp>

src/core/meshcop/dataset_manager_ftd.cpp

@@ -36,7 +36,6 @@
 
 #include <stdio.h>
 
-#include <openthread-types.h>
 #include <common/code_utils.hpp>
 #include <common/debug.hpp>
 #include <coap/coap_header.hpp>

src/core/meshcop/dataset_manager_ftd.hpp

@@ -35,7 +35,7 @@
 #ifndef MESHCOP_DATASET_MANAGER_FTD_HPP_
 #define MESHCOP_DATASET_MANAGER_FTD_HPP_
 
-#include <openthread-types.h>
+#include "openthread/types.h"
 
 #include <coap/coap_server.hpp>
 

src/core/meshcop/dataset_manager_mtd.hpp

@@ -35,7 +35,7 @@
 #ifndef MESHCOP_DATASET_MANAGER_MTD_HPP_
 #define MESHCOP_DATASET_MANAGER_MTD_HPP_
 
-#include <openthread-types.h>
+#include "openthread/types.h"
 
 namespace Thread {
 

src/core/meshcop/dtls.hpp

@@ -34,7 +34,8 @@
 #ifndef DTLS_HPP_
 #define DTLS_HPP_
 
-#include <openthread-types.h>
+#include "openthread/types.h"
+
 #include <common/message.hpp>
 #include <common/timer.hpp>
 #include <crypto/sha256.hpp>

src/core/meshcop/energy_scan_client.hpp

@@ -35,7 +35,7 @@
 #define ENERGY_SCAN_CLIENT_HPP_
 
 #include <openthread-core-config.h>
-#include <openthread-types.h>
+
 #include "openthread/commissioner.h"
 
 #include <coap/coap_client.hpp>

src/core/meshcop/joiner.hpp

@@ -34,7 +34,6 @@
 #ifndef JOINER_HPP_
 #define JOINER_HPP_
 
-#include <openthread-types.h>
 #include "openthread/joiner.h"
 
 #include <coap/coap_header.hpp>

src/core/meshcop/joiner_router_ftd.hpp

@@ -34,7 +34,7 @@
 #ifndef JOINER_ROUTER_HPP_
 #define JOINER_ROUTER_HPP_
 
-#include <openthread-types.h>
+#include "openthread/types.h"
 
 #include <coap/coap_header.hpp>
 #include <coap/coap_client.hpp>

src/core/meshcop/panid_query_client.hpp

@@ -35,7 +35,7 @@
 #define PANID_QUERY_CLIENT_HPP_
 
 #include <openthread-core-config.h>
-#include <openthread-types.h>
+
 #include "openthread/commissioner.h"
 
 #include <coap/coap_client.hpp>

src/core/meshcop/timestamp.cpp

@@ -33,7 +33,8 @@
 
 #include <string.h>
 
-#include <openthread-types.h>
+#include "openthread/types.h"
+
 #include <meshcop/timestamp.hpp>
 
 namespace Thread {

src/core/meshcop/tlvs.hpp

@@ -37,7 +37,8 @@
 
 #include <string.h>
 
-#include <openthread-types.h>
+#include "openthread/types.h"
+
 #include <common/encoding.hpp>
 #include <common/message.hpp>
 #include <common/tlvs.hpp>

src/core/net/dhcp6_client.cpp

@@ -33,7 +33,8 @@
 
 #define WPP_NAME "dhcp6_client.tmh"
 
-#include <openthread-types.h>
+#include "openthread/types.h"
+
 #include <common/code_utils.hpp>
 #include <common/encoding.hpp>
 #include <common/logging.hpp>

src/core/net/dhcp6_server.cpp

@@ -33,7 +33,8 @@
 
 #define WPP_NAME "dhcp6_server.tmh"
 
-#include <openthread-types.h>
+#include "openthread/types.h"
+
 #include <common/code_utils.hpp>
 #include <common/encoding.hpp>
 #include <common/logging.hpp>

src/core/net/dhcp6_server.hpp

@@ -34,7 +34,8 @@
 #ifndef DHCP6_SERVER_HPP_
 #define DHCP6_SERVER_HPP_
 
-#include <openthread-types.h>
+#include "openthread/types.h"
+
 #include <mac/mac_frame.hpp>
 #include <mac/mac.hpp>
 #include <net/dhcp6.hpp>

src/core/net/icmp6.hpp

@@ -34,7 +34,7 @@
 #ifndef ICMP6_HPP_
 #define ICMP6_HPP_
 
-#include <openthread-types.h>
+#include <openthread/types.h>
 #include <common/encoding.hpp>
 #include <net/ip6_headers.hpp>
 

src/core/net/ip6_address.hpp

@@ -36,7 +36,7 @@
 
 #include <stdint.h>
 
-#include <openthread-types.h>
+#include "openthread/types.h"
 
 namespace Thread {
 namespace Ip6 {

src/core/net/ip6_headers.hpp

@@ -36,7 +36,8 @@
 
 #include <stddef.h>
 
-#include <openthread-types.h>
+#include "openthread/types.h"
+
 #include <common/encoding.hpp>
 #include <common/message.hpp>
 #include <net/ip6_address.hpp>

src/core/net/ip6_mpl.hpp

@@ -34,7 +34,8 @@
  *   This file includes definitions for MPL.
  */
 
-#include <openthread-types.h>
+#include "openthread/types.h"
+
 #include <common/message.hpp>
 #include <common/timer.hpp>
 #include <net/ip6_headers.hpp>

src/core/net/ip6_routes.hpp

@@ -34,7 +34,8 @@
  *   This file includes definitions for manipulating IPv6 routing tables.
  */
 
-#include <openthread-types.h>
+#include "openthread/types.h"
+
 #include <common/message.hpp>
 #include <net/ip6_address.hpp>