Apply #include code style. (#1723)

examples/apps/cli/main.c

@@ -32,14 +32,13 @@
 #include <openthread-config.h>
 #endif
 
-#include "openthread/openthread.h"
-#include "openthread/cli.h"
-#include "openthread/diag.h"
-#include "openthread/platform/platform.h"
-
-#include <openthread-core-config.h>
 #include <assert.h>
 
+#include <openthread/cli.h>
+#include <openthread/diag.h>
+#include <openthread/openthread.h>
+#include <openthread/platform/platform.h>
+
 #ifdef OPENTHREAD_MULTIPLE_INSTANCE
 void *otPlatCAlloc(size_t aNum, size_t aSize)
 {

examples/apps/ncp/main.c

@@ -32,13 +32,12 @@
 #include <openthread-config.h>
 #endif
 
-#include "openthread/openthread.h"
+#include <assert.h>
-#include "openthread/diag.h"
-#include "openthread/ncp.h"
-#include "openthread/platform/platform.h"
 
-#include <openthread-core-config.h>
+#include <openthread/diag.h>
-#include <common/debug.hpp>
+#include <openthread/ncp.h>
+#include <openthread/openthread.h>
+#include <openthread/platform/platform.h>
 
 #ifdef OPENTHREAD_MULTIPLE_INSTANCE
 void *otPlatCAlloc(size_t aNum, size_t aSize)

examples/platforms/cc2538/alarm.c

@@ -36,10 +36,11 @@
 #include <stdint.h>
 
 #include <openthread-config.h>
-#include "openthread/openthread.h"
+#include <openthread/openthread.h>
-#include "openthread/platform/platform.h"
+#include <openthread/platform/alarm.h>
-#include "openthread/platform/alarm.h"
+#include <openthread/platform/diag.h>
-#include "openthread/platform/diag.h"
+#include <openthread/platform/platform.h>
+
 #include "platform-cc2538.h"
 
 enum

examples/platforms/cc2538/diag.c

@@ -32,10 +32,10 @@
 #include <sys/time.h>
 
 #include <openthread-config.h>
-#include "openthread/openthread.h"
+#include <openthread/openthread.h>
+#include <openthread/platform/alarm.h>
+#include <openthread/platform/radio.h>
 
-#include "openthread/platform/alarm.h"
-#include "openthread/platform/radio.h"
 #include "platform-cc2538.h"
 
 /**

examples/platforms/cc2538/flash.c

@@ -26,18 +26,18 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <fcntl.h>
 
 #include <openthread-config.h>
-#include "openthread/platform/alarm.h"
+#include <openthread/platform/alarm.h>
-#include <utils/flash.h>
 
-#include <utils/code_utils.h>
 #include "platform-cc2538.h"
 #include "rom-utility.h"
+#include "utils/code_utils.h"
+#include "utils/flash.h"
 
 #define FLASH_CTRL_FCTL_BUSY   0x00000080
 

examples/platforms/cc2538/misc.c

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

examples/platforms/cc2538/platform-cc2538.h

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

examples/platforms/cc2538/radio.c

@@ -33,15 +33,14 @@
  */
 
 #include <openthread-config.h>
+#include <openthread/openthread.h>
+#include <openthread/platform/diag.h>
+#include <openthread/platform/platform.h>
+#include <openthread/platform/radio.h>
 
-#include "openthread/openthread.h"
-#include "openthread/platform/platform.h"
-#include "openthread/platform/radio.h"
-#include "openthread/platform/diag.h"
-
-#include <utils/code_utils.h>
-#include <common/logging.hpp>
 #include "platform-cc2538.h"
+#include "common/logging.hpp"
+#include "utils/code_utils.h"
 
 enum
 {

examples/platforms/cc2538/random.c

@@ -32,12 +32,12 @@
  *
  */
 
-#include "openthread/types.h"
+#include <openthread/types.h>
-#include "openthread/platform/radio.h"
+#include <openthread/platform/radio.h>
-#include "openthread/platform/random.h"
+#include <openthread/platform/random.h>
 
-#include <utils/code_utils.h>
 #include "platform-cc2538.h"
+#include "utils/code_utils.h"
 
 static void generateRandom(uint8_t *aOutput, uint16_t aOutputLength)
 {

examples/platforms/cc2538/uart.c

@@ -34,11 +34,11 @@
 
 #include <stddef.h>
 
-#include "openthread/types.h"
+#include <openthread/types.h>
-#include "openthread/platform/uart.h"
+#include <openthread/platform/uart.h>
 
-#include <utils/code_utils.h>
 #include "platform-cc2538.h"
+#include "utils/code_utils.h"
 
 enum
 {

examples/platforms/da15000/alarm.c

@@ -39,7 +39,9 @@
 
 #include <stdbool.h>
 #include <stdint.h>
-#include "openthread/platform/alarm.h"
+
+#include <openthread/platform/alarm.h>
+
 #include "hw_timer0.h"
 #include "hw_gpio.h"
 #include "platform-da15000.h"

examples/platforms/da15000/flash.c

@@ -26,12 +26,12 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "openthread/types.h"
+#include <openthread-config.h>
-#include "openthread/platform/alarm.h"
+#include <openthread/types.h>
+#include <openthread/platform/alarm.h>
 
 #include "hw_qspi.h"
 #include "qspi_automode.h"
-#include "openthread-config.h"
 
 #define FLASH_SECTOR_SIZE             0x1000
 #define FLASH_BUFFER_SIZE             0x2000

examples/platforms/da15000/logging.c

@@ -31,7 +31,7 @@
 * Platform abstraction for the logging
 *
 */
-#include "openthread/platform/logging.h"
+#include <openthread/platform/logging.h>
 
 void otPlatLog(otLogLevel aLogLevel, otLogRegion aLogRegion, const char *aFormat, ...)
 {

examples/platforms/da15000/misc.c

@@ -26,9 +26,10 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "openthread/types.h"
+#include <openthread/types.h>
+
+#include <openthread/platform/misc.h>
 
-#include "openthread/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

@@ -34,15 +34,17 @@
 #include <assert.h>
 #include <stdint.h>
 
-#include "openthread/openthread.h"
+#include <openthread/openthread.h>
-#include "openthread/platform/alarm.h"
+#include <openthread/platform/alarm.h>
-#include "openthread/platform/uart.h"
+#include <openthread/platform/uart.h>
+
 #include "platform-da15000.h"
+
 #include "sdk_defs.h"
-#include "hw_cpm.h"
-#include "hw_watchdog.h"
 #include "ftdf.h"
+#include "hw_cpm.h"
 #include "hw_gpio.h"
+#include "hw_watchdog.h"
 
 static bool sBlink = false;
 static int  sMsCounterInit;

examples/platforms/da15000/radio.c

@@ -31,17 +31,19 @@
 * Platform abstraction for radio communication.
 */
 
-#include <utils/code_utils.h>
+#include <openthread/openthread.h>
-#include "openthread/openthread.h"
+#include <openthread/platform/alarm.h>
-#include "openthread/platform/alarm.h"
+#include <openthread/platform/radio.h>
-#include "openthread/platform/radio.h"
+
+#include "utils/code_utils.h"
+
 #include "platform-da15000.h"
 
-#include <ad_ftdf.h>
+#include "ad_ftdf.h"
-#include <ad_ftdf_phy_api.h>
+#include "ad_ftdf_phy_api.h"
-#include <hw_rf.h>
+#include "hw_rf.h"
-#include <internal.h>
+#include "internal.h"
-#include <regmap.h>
+#include "regmap.h"
 
 #define FACTORY_TEST_TIMESTAMP      (0x7F8EA08) // Register holds a timestamp of facotry test of a chip
 #define FACTORY_TESTER_ID           (0x7F8EA0C) // Register holds test machine ID used for factory test

examples/platforms/da15000/random.c

@@ -34,13 +34,13 @@
  *   This implementation is not a true random number generator and does @em satisfy the Thread requirements.
  */
 
-#include "openthread/platform/random.h"
-#include "platform-da15000.h"
-#include "sdk_defs.h"
-#include "hw_trng.h"
 #include <string.h>
 
+#include <openthread/platform/random.h>
 
+#include "platform-da15000.h"
+#include "hw_trng.h"
+#include "sdk_defs.h"
 
 #define HW_TRNG_RAM             (0x40040000)
 

examples/platforms/da15000/uart.c

@@ -36,12 +36,13 @@
 #include <fcntl.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <hw_uart.h>
 
-#include "openthread/platform/uart.h"
+#include <openthread/platform/uart.h>
+
+#include "common/code_utils.hpp"
 
-#include <common/code_utils.hpp>
 #include "hw_gpio.h"
+#include "hw_uart.h"
 #include "platform-da15000.h"
 
 static int sInFd;

examples/platforms/efr32/alarm.c

@@ -36,10 +36,11 @@
 #include <stdint.h>
 
 #include <openthread-config.h>
-#include <utils/code_utils.h>
-#include <openthread/platform/platform.h>
 #include <openthread/platform/alarm.h>
 #include <openthread/platform/diag.h>
+#include <openthread/platform/platform.h>
+
+#include "utils/code_utils.h"
 
 #include "rail.h"
 

examples/platforms/efr32/diag.c

@@ -40,6 +40,7 @@
 #include <openthread-config.h>
 #include <openthread/platform/alarm.h>
 #include <openthread/platform/radio.h>
+
 #include "platform-efr32.h"
 
 /**

examples/platforms/efr32/flash.c

@@ -33,8 +33,9 @@
 
 #include <openthread-config.h>
 #include <openthread/platform/alarm.h>
-#include <utils/flash.h>
+
-#include <utils/code_utils.h>
+#include "utils/code_utils.h"
+#include "utils/flash.h"
 
 #include "em_msc.h"
 

examples/platforms/efr32/logging.c

@@ -38,19 +38,10 @@
 #include <openthread-config.h>
 #endif
 
-
+#include <openthread/cli.h>
 #include <openthread/platform/logging.h>
-#if OPENTHREAD_ENABLE_CLI_LOGGING
-#include <ctype.h>
-#include <inttypes.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
 
-#include <utils/code_utils.h>
+#include "utils/code_utils.h"
-#include <cli.h>
-#endif
 
 void otPlatLog(otLogLevel aLogLevel, otLogRegion aLogRegion, const char *aFormat, ...)
 {

examples/platforms/efr32/platform.c

@@ -35,7 +35,8 @@
 #include <string.h>
 
 #include <openthread/platform/uart.h>
-#include <common/logging.hpp>
+
+#include "common/logging.hpp"
 
 #include "pa.h"
 #include "pti.h"

examples/platforms/efr32/radio.c

@@ -33,15 +33,16 @@
  */
 
 #include <assert.h>
+
 #include <openthread/types.h>
 #include <openthread-config.h>
-
-#include <common/logging.hpp>
-#include <utils/code_utils.h>
 #include <openthread/platform/platform.h>
 #include <openthread/platform/radio.h>
 #include <openthread/platform/diag.h>
 
+#include "common/logging.hpp"
+#include "utils/code_utils.h"
+
 #include "em_core.h"
 #include "em_system.h"
 #include "rail.h"

examples/platforms/efr32/random.c

@@ -32,10 +32,11 @@
  *
  */
 
-#include <utils/code_utils.h>
 #include <openthread/types.h>
 #include <openthread/platform/random.h>
 
+#include "utils/code_utils.h"
+
 #include "em_adc.h"
 #include "em_cmu.h"
 

examples/platforms/efr32/uart.c

@@ -34,10 +34,11 @@
 
 #include <stddef.h>
 
-#include <utils/code_utils.h>
 #include <openthread/types.h>
 #include <openthread/platform/uart.h>
 
+#include "utils/code_utils.h"
+
 #include "bspconfig.h"
 #include "em_cmu.h"
 #include "em_gpio.h"

examples/platforms/posix/alarm.c

@@ -32,8 +32,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "openthread/platform/alarm.h"
+#include <openthread/platform/alarm.h>
-#include "openthread/platform/diag.h"
+#include <openthread/platform/diag.h>
 
 static bool s_is_running = false;
 static uint32_t s_alarm = 0;

examples/platforms/posix/diag.c

@@ -34,10 +34,9 @@
 #include <sys/time.h>
 
 #include <openthread-config.h>
-#include "openthread/openthread.h"
+#include <openthread/openthread.h>
-
+#include <openthread/platform/alarm.h>
-#include "openthread/platform/alarm.h"
+#include <openthread/platform/radio.h>
-#include "openthread/platform/radio.h"
 
 /**
  * Diagnostics mode variables.

examples/platforms/posix/flash.c

@@ -28,16 +28,17 @@
 
 #include "platform-posix.h"
 
+#include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/stat.h>
 #include <string.h>
+#include <sys/stat.h>
+#include <unistd.h>
 
 #include <openthread-config.h>
-#include <utils/flash.h>
+
-#include <utils/code_utils.h>
+#include "utils/code_utils.h"
+#include "utils/flash.h"
 
 static int sFlashFd;
 uint32_t sEraseAddress;
@@ -82,7 +83,8 @@ ThreadError utilsFlashInit(void)
     {
         for (uint16_t index = 0; index < FLASH_PAGE_NUM; index++)
         {
-            SuccessOrExit(error = utilsFlashErasePage(index * FLASH_PAGE_SIZE));
+            error = utilsFlashErasePage(index * FLASH_PAGE_SIZE);
+            otEXPECT(error == kThreadError_None);
         }
     }
 
@@ -113,7 +115,7 @@ ThreadError utilsFlashErasePage(uint32_t aAddress)
     // Write the page
     ssize_t r;
     r =  pwrite(sFlashFd, &(dummyPage[0]), FLASH_PAGE_SIZE, address);
-    VerifyOrExit(((int)r) == ((int)(FLASH_PAGE_SIZE)), error = kThreadError_Failed);
+    otEXPECT_ACTION(((int)r) == ((int)(FLASH_PAGE_SIZE)), error = kThreadError_Failed);
 
 
 exit:

examples/platforms/posix/logging.c

@@ -39,7 +39,8 @@
 #include <syslog.h>
 #endif
 
-#include "openthread/platform/logging.h"
+#include <openthread/platform/logging.h>
+
 #include "utils/code_utils.h"
 
 // Macro to append content to end of the log string.

examples/platforms/posix/misc.c

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

examples/platforms/posix/platform-posix.h

@@ -41,6 +41,12 @@
 #include <openthread-config.h>
 #endif
 
+#include <assert.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <time.h>
+
 #if _WIN32
 #include <WinSock2.h>
 #include <WS2tcpip.h>
@@ -75,14 +81,7 @@ __forceinline void timersub(struct timeval *a, struct timeval *b, struct timeval
 #define POLL poll
 #endif
 
-#include "openthread/openthread.h"
+#include <openthread/openthread.h>
-#include <common/code_utils.hpp>
-
-#include <assert.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
 
 /**
  * Unique node ID.

examples/platforms/posix/platform.c

@@ -46,9 +46,9 @@
 #include <syslog.h>
 #endif
 
-#include "openthread/openthread.h"
+#include <openthread/openthread.h>
-#include "openthread/tasklet.h"
+#include <openthread/tasklet.h>
-#include "openthread/platform/alarm.h"
+#include <openthread/platform/alarm.h>
 
 uint32_t NODE_ID = 1;
 uint32_t WELLKNOWN_NODE_ID = 34;

examples/platforms/posix/radio.c

@@ -28,8 +28,8 @@
 
 #include "platform-posix.h"
 
-#include "openthread/platform/diag.h"
+#include <openthread/platform/diag.h>
-#include "openthread/platform/radio.h"
+#include <openthread/platform/radio.h>
 
 #include "utils/code_utils.h"
 

examples/platforms/posix/random.c

@@ -37,10 +37,10 @@
 
 #include "platform-posix.h"
 
-#include "openthread/types.h"
+#include <openthread/types.h>
-#include "openthread/platform/random.h"
+#include <openthread/platform/random.h>
 
-#include <utils/code_utils.h>
+#include "utils/code_utils.h"
 
 static uint32_t sState = 1;
 

examples/platforms/posix/spi-stubs.c

@@ -31,8 +31,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "openthread/platform/uart.h"
+#include <openthread/platform/spi-slave.h>
-#include "openthread/platform/spi-slave.h"
+#include <openthread/platform/uart.h>
 
 // Spi-slave stubs
 

examples/platforms/posix/uart-posix.c

@@ -29,18 +29,18 @@
 #include "platform-posix.h"
 
 #include <assert.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <poll.h>
+#include <signal.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <termios.h>
 #include <unistd.h>
-#include <errno.h>
-#include <signal.h>
 
-#include "openthread/platform/uart.h"
+#include <openthread/platform/uart.h>
 
-#include <utils/code_utils.h>
+#include "utils/code_utils.h"
 
 #ifdef OPENTHREAD_TARGET_LINUX
 #include <sys/prctl.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" {

include/openthread/border_agent_proxy.h

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

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,8 +43,8 @@
 
 #include <stdint.h>
 
-#include "openthread/types.h"
+#include <openthread/message.h>
-#include "openthread/message.h"
+#include <openthread/types.h>
 
 #ifdef __cplusplus
 extern "C" {

include/openthread/commissioner.h

@@ -35,8 +35,8 @@
 #ifndef OPENTHREAD_COMMISSIONER_H_
 #define OPENTHREAD_COMMISSIONER_H_
 
-#include "openthread/types.h"
+#include <openthread/types.h>
-#include "openthread/platform/toolchain.h"
+#include <openthread/platform/toolchain.h>
 
 #ifdef __cplusplus
 extern "C" {

include/openthread/crypto.h

@@ -35,8 +35,8 @@
 #ifndef OPENTHREAD_CRYPTO_H_
 #define OPENTHREAD_CRYPTO_H_
 
-#include <stdint.h>
 #include <stdbool.h>
+#include <stdint.h>
 
 #ifdef __cplusplus
 extern "C" {

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/dataset_ftd.h

@@ -35,7 +35,7 @@
 #ifndef OPENTHREAD_DATASET_FTD_H_
 #define OPENTHREAD_DATASET_FTD_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,7 +35,7 @@
 #ifndef OPENTHREAD_DHCP6_SERVER_H_
 #define OPENTHREAD_DHCP6_SERVER_H_
 
-#include "openthread/types.h"
+#include <openthread/types.h>
 
 #ifdef __cplusplus
 extern "C" {

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/dns.h

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

include/openthread/icmp6.h

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

include/openthread/instance.h

@@ -35,8 +35,8 @@
 #ifndef OPENTHREAD_INSTANCE_H_
 #define OPENTHREAD_INSTANCE_H_
 
-#include "openthread/types.h"
+#include <openthread/types.h>
-#include "openthread/platform/logging.h"
+#include <openthread/platform/logging.h>
 
 #ifdef __cplusplus
 extern "C" {

include/openthread/ip6.h

@@ -35,8 +35,8 @@
 #ifndef OPENTHREAD_IP6_H_
 #define OPENTHREAD_IP6_H_
 
-#include "openthread/message.h"
+#include <openthread/message.h>
-#include "platform/radio.h"
+#include <openthread/platform/radio.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,8 +35,8 @@
 #ifndef OPENTHREAD_JOINER_H_
 #define OPENTHREAD_JOINER_H_
 
-#include "openthread/types.h"
+#include <openthread/types.h>
-#include "openthread/platform/toolchain.h"
+#include <openthread/platform/toolchain.h>
 
 #ifdef __cplusplus
 extern "C" {

include/openthread/link.h

@@ -35,8 +35,8 @@
 #ifndef OPENTHREAD_LINK_H_
 #define OPENTHREAD_LINK_H_
 
-#include "openthread/types.h"
+#include <openthread/types.h>
-#include "platform/radio.h"
+#include <openthread/platform/radio.h>
 
 #ifdef __cplusplus
 extern "C" {

include/openthread/link_raw.h

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

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/openthread.h

@@ -35,17 +35,16 @@
 #ifndef OPENTHREAD_H_
 #define OPENTHREAD_H_
 
-#include "openthread/types.h"
+#include <openthread/crypto.h>
-
+#include <openthread/dataset.h>
-#include "openthread/crypto.h"
+#include <openthread/instance.h>
-#include "openthread/dataset.h"
+#include <openthread/ip6.h>
-#include "openthread/instance.h"
+#include <openthread/link.h>
-#include "openthread/ip6.h"
+#include <openthread/message.h>
-#include "openthread/link.h"
+#include <openthread/netdata.h>
-#include "openthread/message.h"
+#include <openthread/tasklet.h>
-#include "openthread/netdata.h"
+#include <openthread/thread.h>
-#include "openthread/tasklet.h"
+#include <openthread/types.h>
-#include "openthread/thread.h"
 
 #ifdef __cplusplus
 extern "C" {

include/openthread/platform/alarm.h

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

include/openthread/platform/diag.h

@@ -39,9 +39,8 @@
 #include <stdint.h>
 #include <stddef.h>
 
-#include <openthread/platform/radio.h>
-
 #include <openthread/types.h>
+#include <openthread/platform/radio.h>
 
 #ifdef __cplusplus
 extern "C" {

include/openthread/platform/messagepool.h

@@ -37,9 +37,8 @@
 
 #include <stdint.h>
 
-#include "openthread/types.h"
+#include <openthread/message.h>
-
+#include <openthread/types.h>
-#include "openthread/message.h"
 
 /**
  * @defgroup messagepool MessagePool

include/openthread/platform/misc.h

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

include/openthread/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/openthread/platform/radio.h

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

include/openthread/platform/random.h

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

include/openthread/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/openthread/platform/spi-slave.h

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

include/openthread/platform/uart.h

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

include/openthread/platform/usec-alarm.h

@@ -37,7 +37,7 @@
 
 #include <stdint.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,9 +35,9 @@
 #ifndef OPENTHREAD_THREAD_H_
 #define OPENTHREAD_THREAD_H_
 
-#include "openthread/types.h"
+#include <openthread/link.h>
-#include "openthread/link.h"
+#include <openthread/message.h>
-#include "openthread/message.h"
+#include <openthread/types.h>
 
 #ifdef __cplusplus
 extern "C" {

include/openthread/thread_ftd.h

@@ -35,9 +35,9 @@
 #ifndef OPENTHREAD_THREAD_FTD_H_
 #define OPENTHREAD_THREAD_FTD_H_
 
-#include "openthread/types.h"
+#include <openthread/link.h>
-#include "openthread/link.h"
+#include <openthread/message.h>
-#include "openthread/message.h"
+#include <openthread/types.h>
 
 #ifdef __cplusplus
 extern "C" {

include/openthread/types.h

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

include/openthread/udp.h

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

src/cli/cli.cpp

@@ -37,44 +37,46 @@
 #include <openthread-config.h>
 #endif
 
-#include <stdio.h>
+#include "cli.hpp"
-#include <stdlib.h>
-#include "utils/wrap_string.h"
 
 #ifdef OTDLL
 #include <assert.h>
 #endif
 
-#include "openthread/openthread.h"
+#include <stdio.h>
-#include "openthread/commissioner.h"
+#include <stdlib.h>
-#include "openthread/joiner.h"
+#include "utils/wrap_string.h"
+
+#include <openthread/openthread.h>
+#include <openthread/commissioner.h>
+#include <openthread/joiner.h>
 
 #if OPENTHREAD_FTD
-#include "openthread/dataset_ftd.h"
+#include <openthread/dataset_ftd.h>
-#include "openthread/thread_ftd.h"
+#include <openthread/thread_ftd.h>
 #endif
 
 #ifndef OTDLL
-#include <openthread-instance.h>
+#include <openthread/dhcp6_client.h>
-#include "openthread/diag.h"
+#include <openthread/dhcp6_server.h>
-#include "openthread/icmp6.h"
+#include <openthread/diag.h>
+#include <openthread/icmp6.h>
+#include <openthread/platform/uart.h>
 
-#include <common/new.hpp>
+#include "openthread-instance.h"
-#include <net/ip6.hpp>
+#include "common/new.hpp"
-#include "openthread/dhcp6_client.h"
+#include "net/ip6.hpp"
-#include "openthread/dhcp6_server.h"
-#include "openthread/platform/uart.h"
 #endif
 
-#include <common/encoding.hpp>
-
-#include "cli.hpp"
 #include "cli_dataset.hpp"
 #include "cli_uart.hpp"
+
 #if OPENTHREAD_ENABLE_APPLICATION_COAP
 #include "cli_coap.hpp"
 #endif
 
+#include "common/encoding.hpp"
+
 using ot::Encoding::BigEndian::HostSwap16;
 using ot::Encoding::BigEndian::HostSwap32;
 

src/cli/cli.hpp

@@ -42,22 +42,23 @@
 
 #include <stdarg.h>
 
-#include "openthread/openthread.h"
+#include <openthread/openthread.h>
-#include "openthread/ip6.h"
+#include <openthread/ip6.h>
-#include "openthread/udp.h"
+#include <openthread/udp.h>
 
-#include <cli/cli_server.hpp>
+#include "cli/cli_server.hpp"
-#include <common/code_utils.hpp>
 
 #if OPENTHREAD_ENABLE_APPLICATION_COAP
 #include <coap/coap_header.hpp>
 #endif
 
+#include "common/code_utils.hpp"
+
 #ifndef OTDLL
-#include <net/icmp6.hpp>
+#include <openthread/dhcp6_client.h>
-#include <common/timer.hpp>
+#include <openthread/dns.h>
-#include "openthread/dhcp6_client.h"
+#include "common/timer.hpp"
-#include "openthread/dns.h"
+#include "net/icmp6.hpp"
 #endif
 
 #ifdef OTDLL

src/cli/cli_coap.cpp

@@ -37,13 +37,14 @@
 #include <openthread-config.h>
 #endif
 
-#include <ctype.h>
-#include <cli/cli.hpp>
-
 #if OPENTHREAD_ENABLE_APPLICATION_COAP
 
-#include <cli/cli_coap.hpp>
+#include "cli_coap.hpp"
-#include <coap/coap_header.hpp>
+
+#include <ctype.h>
+
+#include "cli/cli.hpp"
+#include "coap/coap_header.hpp"
 
 namespace ot {
 namespace Cli {

src/cli/cli_coap.hpp

@@ -34,6 +34,11 @@
 #ifndef CLI_COAP_HPP_
 #define CLI_COAP_HPP_
 
+#include <openthread/types.h>
+
+#include "cli/cli.hpp"
+#include "coap/coap_header.hpp"
+
 namespace ot {
 namespace Cli {
 

src/cli/cli_console.cpp

@@ -37,14 +37,15 @@
 #include <openthread-config.h>
 #endif
 
+#include "cli_console.hpp"
+
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include "utils/wrap_string.h"
 
-#include <cli/cli.hpp>
+#include "cli/cli.hpp"
-#include <cli/cli_console.hpp>
+#include "common/new.hpp"
-#include <common/new.hpp>
 
 namespace ot {
 namespace Cli {

src/cli/cli_console.hpp

@@ -34,9 +34,10 @@
 #ifndef CLI_CONSOLE_HPP_
 #define CLI_CONSOLE_HPP_
 
-#include "openthread/cli.h"
+#include <openthread/cli.h>
 
-#include <cli/cli_server.hpp>
+#include "cli/cli.hpp"
+#include "cli/cli_server.hpp"
 
 namespace ot {
 namespace Cli {

src/cli/cli_dataset.cpp

@@ -37,18 +37,19 @@
 #include <openthread-config.h>
 #endif
 
+#include "cli_dataset.hpp"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include "utils/wrap_string.h"
 
-#include "openthread/openthread.h"
+#include <openthread/openthread.h>
 
 #if OPENTHREAD_FTD
-#include "openthread/dataset_ftd.h"
+#include <openthread/dataset_ftd.h>
 #endif
 
-#include "cli.hpp"
+#include "cli/cli.hpp"
-#include "cli_dataset.hpp"
 
 namespace ot {
 namespace Cli {

src/cli/cli_dataset.hpp

@@ -36,7 +36,7 @@
 
 #include <stdarg.h>
 
-#include <cli/cli_server.hpp>
+#include "cli/cli_server.hpp"
 
 namespace ot {
 namespace Cli {

src/cli/cli_instance.cpp

@@ -37,12 +37,13 @@
 #include <openthread-config.h>
 #endif
 
+#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include "utils/wrap_string.h"
-#include <assert.h>
 
-#include "openthread/openthread.h"
+#include <openthread/openthread.h>
+
 #include "cli.hpp"
 
 namespace ot {

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 ot {
 namespace Cli {

src/cli/cli_uart.cpp

@@ -37,21 +37,22 @@
 #include <openthread-config.h>
 #endif
 
+#include "cli_uart.hpp"
+
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include "utils/wrap_string.h"
 
-#include "openthread/cli.h"
+#include <openthread/cli.h>
-#include "openthread/platform/logging.h"
+#include <openthread/platform/logging.h>
-#include "openthread/platform/uart.h"
+#include <openthread/platform/uart.h>
 
-#include <cli/cli.hpp>
+#include "cli/cli.hpp"
-#include <cli/cli_uart.hpp>
+#include "common/code_utils.hpp"
-#include <common/code_utils.hpp>
+#include "common/encoding.hpp"
-#include <common/encoding.hpp>
+#include "common/new.hpp"
-#include <common/new.hpp>
+#include "common/tasklet.hpp"
-#include <common/tasklet.hpp>
 
 namespace ot {
 namespace Cli {

src/cli/cli_uart.hpp

@@ -34,10 +34,11 @@
 #ifndef CLI_UART_HPP_
 #define CLI_UART_HPP_
 
-#include "openthread/types.h"
+#include <openthread/types.h>
 
-#include <cli/cli_server.hpp>
+#include "cli/cli.hpp"
-#include <common/tasklet.hpp>
+#include "cli/cli_server.hpp"
+#include "common/tasklet.hpp"
 
 namespace ot {
 namespace Cli {

src/cli/cli_udp.cpp

@@ -37,13 +37,14 @@
 #include <openthread-config.h>
 #endif
 
+#include "cli_udp.hpp"
+
 #include <stdarg.h>
 #include <stdio.h>
 #include "utils/wrap_string.h"
 
-#include <cli/cli.hpp>
+#include "cli/cli.hpp"
-#include <cli/cli_udp.hpp>
+#include "common/code_utils.hpp"
-#include <common/code_utils.hpp>
 
 namespace ot {
 namespace Cli {

src/cli/cli_udp.hpp

@@ -34,9 +34,10 @@
 #ifndef CLI_UDP_HPP_
 #define CLI_UDP_HPP_
 
-#include "openthread/types.h"
+#include <openthread/types.h>
 
-#include <cli/cli_server.hpp>
+#include "cli/cli.hpp"
+#include "cli/cli_server.hpp"
 
 namespace ot {
 namespace Cli {

src/core/api/border_agent_proxy_api.cpp

@@ -31,7 +31,7 @@
  *   This file implements the OpenThread Border Agent Proxy API.
  */
 
-#include "openthread/border_agent_proxy.h"
+#include <openthread/border_agent_proxy.h>
 
 #include "openthread-instance.h"
 

src/core/api/coap_api.cpp

@@ -31,7 +31,7 @@
  *   This file implements the OpenThread CoAP API.
  */
 
-#include "openthread/coap.h"
+#include <openthread/coap.h>
 
 #include "openthread-instance.h"
 #include "coap/coap_header.hpp"

src/core/api/commissioner_api.cpp

@@ -31,7 +31,7 @@
  *   This file implements the OpenThread Commissioner API.
  */
 
-#include "openthread/commissioner.h"
+#include <openthread/commissioner.h>
 
 #include "openthread-instance.h"
 

src/core/api/crypto_api.cpp

@@ -31,12 +31,12 @@
  *   This file implements the OpenThread Crypto API.
  */
 
-#include "openthread/crypto.h"
+#include <openthread/crypto.h>
 
-#include "common/debug.hpp"
 #include "common/code_utils.hpp"
-#include "crypto/hmac_sha256.hpp"
+#include "common/debug.hpp"
 #include "crypto/aes_ccm.hpp"
+#include "crypto/hmac_sha256.hpp"
 
 using namespace ot::Crypto;
 

src/core/api/dataset_api.cpp

@@ -31,7 +31,7 @@
  *   This file implements the OpenThread Operational Dataset API (for both FTD and MTD).
  */
 
-#include "openthread/dataset.h"
+#include <openthread/dataset.h>
 
 #include "openthread-instance.h"
 

src/core/api/dataset_ftd_api.cpp

@@ -33,7 +33,7 @@
 
 #if OPENTHREAD_FTD
 
-#include "openthread/dataset_ftd.h"
+#include <openthread/dataset_ftd.h>
 
 #include "openthread-instance.h"
 

src/core/api/dhcp6_api.cpp

@@ -31,8 +31,8 @@
  *   This file implements the OpenThread DHCPv6 API.
  */
 
-#include "openthread/dhcp6_client.h"
+#include <openthread/dhcp6_client.h>
-#include "openthread/dhcp6_server.h"
+#include <openthread/dhcp6_server.h>
 
 #include "openthread-instance.h"
 

src/core/api/dns_api.cpp

@@ -31,7 +31,7 @@
  *   This file implements the OpenThread UDP API.
  */
 
-#include "openthread/dns.h"
+#include <openthread/dns.h>
 
 #include "openthread-instance.h"
 

src/core/api/icmp6_api.cpp

@@ -31,7 +31,7 @@
  *   This file implements the OpenThread ICMPv6 API.
  */
 
-#include "openthread/icmp6.h"
+#include <openthread/icmp6.h>
 
 #include "openthread-instance.h"