Move include/platform to include/openthread/platform.

configure.ac

@@ -1080,7 +1080,7 @@ AC_CONFIG_FILES([
 Makefile
 include/Makefile
 include/openthread/Makefile
-include/platform/Makefile
+include/openthread/platform/Makefile
 src/Makefile
 src/cli/Makefile
 src/ncp/Makefile

etc/visual-studio/libopenthread_k.vcxproj

@@ -57,7 +57,7 @@
       <DisableSpecificWarnings>4100;4706;4748;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <TreatWarningAsError>true</TreatWarningAsError>
       <WppEnabled>true</WppEnabled>
-      <WppScanConfigurationData>..\..\include\platform\logging-windows.h</WppScanConfigurationData>
+      <WppScanConfigurationData>..\..\include\openthread\platform\logging-windows.h</WppScanConfigurationData>
       <WppAdditionalOptions>-km %(WppAdditionalOptions)</WppAdditionalOptions>
       <WppModuleName>otCore</WppModuleName>
       <WppSearchString>WPP_INIT_TRACING</WppSearchString>

etc/visual-studio/otApi.vcxproj

@@ -49,7 +49,7 @@
         ..\..\include;
       </AdditionalIncludeDirectories>
       <WppEnabled>true</WppEnabled>
-      <WppScanConfigurationData>..\..\include\platform\logging-windows.h</WppScanConfigurationData>
+      <WppScanConfigurationData>..\..\include\openthread\platform\logging-windows.h</WppScanConfigurationData>
       <WppModuleName>otApi</WppModuleName>
       <EnablePREfast>true</EnablePREfast>
       <ExceptionHandling Condition="'$(Platform)'=='ARM'">Sync</ExceptionHandling>

etc/visual-studio/otLwf.vcxproj

@@ -60,7 +60,7 @@
       <PreCompiledHeaderFile>precomp.h</PreCompiledHeaderFile>
       <PreCompiledHeader>Use</PreCompiledHeader>
       <WppEnabled>true</WppEnabled>
-      <WppScanConfigurationData>..\..\include\platform\logging-windows.h</WppScanConfigurationData>
+      <WppScanConfigurationData>..\..\include\openthread\platform\logging-windows.h</WppScanConfigurationData>
       <WppAdditionalOptions>-km %(WppAdditionalOptions)</WppAdditionalOptions>
       <WppModuleName>otLwf</WppModuleName>
       <WppSearchString>WPP_INIT_TRACING</WppSearchString>

etc/visual-studio/otNodeApi.vcxproj

@@ -48,7 +48,7 @@
       <WarningLevel>Level3</WarningLevel>
       <SDLCheck>true</SDLCheck>
       <WppEnabled>true</WppEnabled>
-      <WppScanConfigurationData>..\..\include\platform\logging-windows.h</WppScanConfigurationData>
+      <WppScanConfigurationData>..\..\include\openthread\platform\logging-windows.h</WppScanConfigurationData>
       <WppModuleName>otNodeApi</WppModuleName>
       <EnablePREfast>true</EnablePREfast>
       <ExceptionHandling Condition="'$(Platform)'=='ARM'">Sync</ExceptionHandling>

etc/visual-studio/ottmp.vcxproj

@@ -50,7 +50,7 @@
       <TreatWarningAsError>true</TreatWarningAsError>
       <DisableSpecificWarnings>%(DisableSpecificWarnings);4200;4201;4214</DisableSpecificWarnings>
       <WppEnabled>true</WppEnabled>
-      <WppScanConfigurationData>..\..\include\platform\logging-windows.h</WppScanConfigurationData>
+      <WppScanConfigurationData>..\..\include\openthread\platform\logging-windows.h</WppScanConfigurationData>
       <WppAdditionalOptions>-km %(WppAdditionalOptions)</WppAdditionalOptions>
       <WppModuleName>ottmp</WppModuleName>
       <WppSearchString>WPP_INIT_TRACING</WppSearchString>

etc/visual-studio/spinel_k.vcxproj

@@ -50,7 +50,7 @@
       <DisableSpecificWarnings>4100;4706;4748;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <TreatWarningAsError>true</TreatWarningAsError>
       <WppEnabled>true</WppEnabled>
-      <WppScanConfigurationData>..\..\include\platform\logging-windows.h</WppScanConfigurationData>
+      <WppScanConfigurationData>..\..\include\openthread\platform\logging-windows.h</WppScanConfigurationData>
       <WppAdditionalOptions>-km %(WppAdditionalOptions)</WppAdditionalOptions>
       <WppModuleName>otCore</WppModuleName>
       <WppSearchString>WPP_INIT_TRACING</WppSearchString>

examples/apps/cli/main.c

@@ -34,11 +34,10 @@
 
 #include "openthread/openthread.h"
 #include "openthread/cli.h"
+#include "openthread/platform/platform.h"
 
 #include <openthread-core-config.h>
 #include <openthread-diag.h>
-#include <openthread/tasklet.h>
-#include <platform/platform.h>
 #include <assert.h>
 
 #ifdef OPENTHREAD_MULTIPLE_INSTANCE

examples/apps/ncp/main.c

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

examples/drivers/windows/otApi/precomp.h

@@ -24,7 +24,7 @@
 #include <openthread/openthread.h>
 #include <openthread/commissioner.h>
 #include <openthread/joiner.h>
-#include <platform/logging-windows.h>
+#include <openthread/platform/logging-windows.h>
 
 #include <winioctl.h>
 #include <otLwfIoctl.h>

examples/drivers/windows/otCli/main.cpp

@@ -31,7 +31,7 @@
 
 #include <openthread/openthread.h>
 #include <openthread/cli.h>
-#include <platform/uart.h>
+#include <openthread/platform/uart.h>
 
 bool skipNextLine = false;
 

examples/drivers/windows/otLwf/precomp.h

@@ -70,12 +70,12 @@ RtlCopyBufferToMdl(
 #include <openthread/dhcp6_server.h>
 #include <openthread/dhcp6_client.h>
 #include <common/code_utils.hpp>
-#include <platform/logging.h>
-#include <platform/logging-windows.h>
-#include <platform/radio.h>
-#include <platform/misc.h>
-#include <platform/alarm.h>
-#include <platform/settings.h>
+#include <openthread/platform/logging.h>
+#include <openthread/platform/logging-windows.h>
+#include <openthread/platform/radio.h>
+#include <openthread/platform/misc.h>
+#include <openthread/platform/alarm.h>
+#include <openthread/platform/settings.h>
 #include <ncp/spinel.h>
 
 #include <otLwfIoctl.h>

examples/drivers/windows/otNodeApi/precomp.h

@@ -52,7 +52,7 @@ using namespace std;
 #include <openthread/openthread.h>
 #include <openthread/commissioner.h>
 #include <openthread/joiner.h>
-#include <platform/logging-windows.h>
+#include <openthread/platform/logging-windows.h>
 #include <otNode.h>
 
 void Unload();

examples/drivers/windows/ottmp/pch.hpp

@@ -71,4 +71,4 @@ typedef struct _OTTMP_DEVICE_CONTEXT *POTTMP_DEVICE_CONTEXT;
 #include "device.hpp"
 #include "serial.hpp"
 #include "oid.hpp"
-#include "platform/logging-windows.h"
+#include "openthread/platform/logging-windows.h"

examples/platforms/cc2538/alarm.c

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

examples/platforms/cc2538/diag.c

@@ -34,8 +34,8 @@
 #include <openthread-config.h>
 #include "openthread/openthread.h"
 
-#include <platform/alarm.h>
-#include <platform/radio.h>
+#include "openthread/platform/alarm.h"
+#include "openthread/platform/radio.h"
 #include "platform-cc2538.h"
 
 /**

examples/platforms/cc2538/flash.c

@@ -32,7 +32,7 @@
 #include <fcntl.h>
 
 #include <openthread-config.h>
-#include <platform/alarm.h>
+#include "openthread/platform/alarm.h"
 #include <utils/flash.h>
 
 #include <common/code_utils.hpp>

examples/platforms/cc2538/misc.c

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

examples/platforms/cc2538/radio.c

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

examples/platforms/cc2538/random.c

@@ -33,10 +33,10 @@
  */
 
 #include "openthread/types.h"
+#include "openthread/platform/radio.h"
+#include "openthread/platform/random.h"
 
 #include <common/code_utils.hpp>
-#include <platform/radio.h>
-#include <platform/random.h>
 #include "platform-cc2538.h"
 
 static void generateRandom(uint16_t aInputLength, uint8_t *aOutput, uint16_t *aOutputLength)

examples/platforms/cc2538/uart.c

@@ -35,9 +35,9 @@
 #include <stddef.h>
 
 #include "openthread/types.h"
+#include "openthread/platform/uart.h"
 
 #include <common/code_utils.hpp>
-#include <platform/uart.h>
 #include "platform-cc2538.h"
 
 enum

examples/platforms/cc2650/alarm.c

@@ -31,8 +31,8 @@
 #include <openthread/types.h>
 #include <driverlib/aon_rtc.h>
 
-#include <platform/alarm.h>
-#include <platform/diag.h>
+#include <openthread/platform/alarm.h>
+#include <openthread/platform/diag.h>
 
 /**
  * /NOTE: we could use systick, but that would sacrifice atleast a few ops

examples/platforms/cc2650/crypto/cc2650-mbedtls-config.h

@@ -32,7 +32,7 @@
 #include <inttypes.h>
 #include <stdlib.h>
 
-#include <platform/logging.h>
+#include <openthread/platform/logging.h>
 
 #if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE)
 #define _CRT_SECURE_NO_DEPRECATE 1

examples/platforms/cc2650/diag.c

@@ -29,7 +29,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
-#include <platform/diag.h>
+#include <openthread/platform/diag.h>
 
 
 /**

examples/platforms/cc2650/misc.c

@@ -27,7 +27,7 @@
  */
 
 #include <openthread/types.h>
-#include <platform/misc.h>
+#include <openthread/platform/misc.h>
 #include <driverlib/sys_ctrl.h>
 
 /**

examples/platforms/cc2650/radio.c

@@ -31,8 +31,8 @@
 #include <assert.h>
 #include <common/code_utils.hpp>
 #include "cc2650_radio.h"
-#include <platform/radio.h>
-#include <platform/random.h> /* to seed the CSMA-CA funciton */
+#include <openthread/platform/radio.h>
+#include <openthread/platform/random.h> /* to seed the CSMA-CA funciton */
 
 #include <driverlib/prcm.h>
 #include <inc/hw_prcm.h>

examples/platforms/cc2650/random.c

@@ -32,7 +32,7 @@
 #include <driverlib/prcm.h>
 #include <driverlib/trng.h>
 
-#include <platform/random.h>
+#include <openthread/platform/random.h>
 
 #include <mbedtls/entropy_poll.h>
 

examples/platforms/cc2650/uart.c

@@ -35,7 +35,7 @@
 
 #include <openthread/types.h>
 #include <common/code_utils.hpp>
-#include <platform/uart.h>
+#include <openthread/platform/uart.h>
 
 /**
  * \note this will configure the uart for 115200 baud 8-N-1, no HW flow control

examples/platforms/da15000/alarm.c

@@ -33,7 +33,7 @@
 
 #include <stdbool.h>
 #include <stdint.h>
-#include <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,11 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
-
 #include "openthread/types.h"
+#include "openthread/platform/alarm.h"
 
 #include "hw_qspi.h"
 #include "qspi_automode.h"
-#include "platform/alarm.h"
 #include "openthread-config.h"
 
 #define FLASH_SECTOR_SIZE             0x1000

examples/platforms/da15000/logging.c

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

examples/platforms/da15000/misc.c

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

examples/platforms/da15000/platform.c

@@ -35,7 +35,8 @@
 #include <stdint.h>
 
 #include "openthread/openthread.h"
-#include "platform/alarm.h"
+#include "openthread/platform/alarm.h"
+#include "openthread/platform/uart.h"
 #include "platform-da15000.h"
 #include "sdk_defs.h"
 #include "hw_cpm.h"

examples/platforms/da15000/radio.c

@@ -32,8 +32,9 @@
 */
 
 #include <common/code_utils.hpp>
-#include <platform/alarm.h>
-#include <platform/radio.h>
+#include "openthread/openthread.h"
+#include "openthread/platform/alarm.h"
+#include "openthread/platform/radio.h"
 #include "platform-da15000.h"
 
 #include <ad_ftdf.h>

examples/platforms/da15000/random.c

@@ -34,7 +34,7 @@
  *   This implementation is not a true random number generator and does @em satisfy the Thread requirements.
  */
 
-#include <platform/random.h>
+#include "openthread/platform/random.h"
 #include "platform-da15000.h"
 #include "sdk_defs.h"
 #include "hw_trng.h"

examples/platforms/da15000/uart.c

@@ -32,8 +32,9 @@
 #include <unistd.h>
 #include <hw_uart.h>
 
+#include "openthread/platform/uart.h"
+
 #include <common/code_utils.hpp>
-#include <platform/uart.h>
 #include "hw_gpio.h"
 #include "platform-da15000.h"
 

examples/platforms/nrf52840/alarm.c

@@ -37,9 +37,9 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <platform/alarm.h>
-#include <platform/diag.h>
-#include <platform/usec-alarm.h>
+#include <openthread/platform/alarm.h>
+#include <openthread/platform/diag.h>
+#include <openthread/platform/usec-alarm.h>
 
 #include "platform-config.h"
 #include "cmsis/cmsis_gcc.h"

examples/platforms/nrf52840/diag.c

@@ -32,9 +32,9 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include <platform/diag.h>
-#include <platform/alarm.h>
-#include <platform/radio.h>
+#include <openthread/platform/diag.h>
+#include <openthread/platform/alarm.h>
+#include <openthread/platform/radio.h>
 
 #include <common/code_utils.hpp>
 #include <common/logging.hpp>

examples/platforms/nrf52840/flash.c

@@ -32,7 +32,7 @@
 
 #include <openthread/types.h>
 #include <common/code_utils.hpp>
-#include <platform/alarm.h>
+#include <openthread/platform/alarm.h>
 #include <utils/flash.h>
 
 #include "hal/nrf_nvmc.h"

examples/platforms/nrf52840/logging.c

@@ -35,8 +35,8 @@
 #include <stdarg.h>
 #include <stdio.h>
 
-#include <platform/logging.h>
-#include <platform/alarm.h>
+#include <openthread/platform/logging.h>
+#include <openthread/platform/alarm.h>
 #include <common/code_utils.hpp>
 
 #include "platform-nrf5.h"

examples/platforms/nrf52840/misc.c

@@ -27,7 +27,7 @@
  */
 
 #include <openthread/types.h>
-#include <platform/misc.h>
+#include <openthread/platform/misc.h>
 
 #include "device/nrf.h"
 

examples/platforms/nrf52840/platform.c

@@ -32,7 +32,7 @@
  *
  */
 
-#include <platform/logging.h>
+#include <openthread/platform/logging.h>
 
 #include "drivers/nrf_drv_clock.h"
 #include "platform-nrf5.h"

examples/platforms/nrf52840/radio.c

@@ -40,9 +40,9 @@
 
 #include <common/code_utils.hpp>
 #include <platform-config.h>
-#include <platform/logging.h>
-#include <platform/radio.h>
-#include <platform/diag.h>
+#include <openthread/platform/logging.h>
+#include <openthread/platform/radio.h>
+#include <openthread/platform/diag.h>
 
 #include "device/nrf.h"
 #include "drivers/nrf_drv_radio802154.h"

examples/platforms/nrf52840/random.c

@@ -36,7 +36,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <platform/random.h>
+#include <openthread/platform/random.h>
 #include <common/code_utils.hpp>
 
 #include "hal/nrf_rng.h"

examples/platforms/nrf52840/uart.c

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

examples/platforms/posix/alarm.c

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

examples/platforms/posix/diag.c

@@ -36,8 +36,8 @@
 #include <openthread-config.h>
 #include "openthread/openthread.h"
 
-#include <platform/alarm.h>
-#include <platform/radio.h>
+#include "openthread/platform/alarm.h"
+#include "openthread/platform/radio.h"
 
 /**
  * Diagnostics mode variables.

examples/platforms/posix/logging.c

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

examples/platforms/posix/misc.c

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

examples/platforms/posix/platform.c

@@ -48,7 +48,7 @@
 
 #include "openthread/openthread.h"
 #include "openthread/tasklet.h"
-#include <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 <platform/radio.h>
-#include <platform/diag.h>
+#include "openthread/platform/diag.h"
+#include "openthread/platform/radio.h"
 
 enum
 {

examples/platforms/posix/random.c

@@ -37,9 +37,9 @@
 #include "platform-posix.h"
 
 #include "openthread/types.h"
+#include "openthread/platform/random.h"
 
 #include <common/code_utils.hpp>
-#include <platform/random.h>
 
 static uint32_t s_state = 1;
 

examples/platforms/posix/spi-stubs.c

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

examples/platforms/posix/uart-posix.c

@@ -38,8 +38,9 @@
 #include <errno.h>
 #include <signal.h>
 
+#include "openthread/platform/uart.h"
+
 #include <common/code_utils.hpp>
-#include <platform/uart.h>
 
 #ifdef OPENTHREAD_TARGET_LINUX
 #include <sys/prctl.h>

examples/platforms/posix/uart-windows.c

@@ -28,7 +28,7 @@
 
 #include "platform-posix.h"
 
-#include <platform/uart.h>
+#include "openthread/platform/uart.h"
 
 static HANDLE s_WorkerThread;
 static HANDLE s_StopWorkerEvent;

examples/platforms/utils/settings.cpp

@@ -40,9 +40,9 @@
 #include <openthread-core-config.h>
 
 #include "openthread/types.h"
+#include "openthread/platform/settings.h"
 
 #include <common/code_utils.hpp>
-#include <platform/settings.h>
 
 #include "flash.h"
 

include/Makefile.am

@@ -32,21 +32,18 @@ include $(abs_top_nlbuild_autotools_dir)/automake/pre.am
 
 DIST_SUBDIRS                            = \
     openthread                            \
-    platform                              \
     $(NULL)
 
 # Always build (e.g. for 'make all') these subdirectories.
 
 SUBDIRS                                 = \
     openthread                            \
-    platform                              \
     $(NULL)
 
 # Always pretty (e.g. for 'make pretty') these subdirectories.
 
 PRETTY_SUBDIRS                          = \
     openthread                            \
-    platform                              \
     $(NULL)
 
 include_HEADERS                         = \

include/openthread/Makefile.am

@@ -28,6 +28,24 @@
 
 include $(abs_top_nlbuild_autotools_dir)/automake/pre.am
 
+# Always package (e.g. for 'make dist') these subdirectories.
+
+DIST_SUBDIRS                            = \
+    platform                              \
+    $(NULL)
+
+# Always build (e.g. for 'make all') these subdirectories.
+
+SUBDIRS                                 = \
+    platform                              \
+    $(NULL)
+
+# Always pretty (e.g. for 'make pretty') these subdirectories.
+
+PRETTY_SUBDIRS                          = \
+    platform                              \
+    $(NULL)
+
 openthread_headers                      = \
     cli.h                                 \
     coap.h                                \

include/openthread/commissioner.h

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

include/openthread/joiner.h

@@ -36,7 +36,7 @@
 #define OPENTHREAD_JOINER_H_
 
 #include "openthread/types.h"
-#include <platform/toolchain.h>
+#include "openthread/platform/toolchain.h"
 
 #ifdef __cplusplus
 extern "C" {

include/openthread/platform/Makefile.am

@@ -45,7 +45,7 @@ ot_platform_headers                      =\
     usec-alarm.h                          \
     $(NULL)
 
-ot_platformdir = $(includedir)/platform
+ot_platformdir = $(includedir)/openthread/platform
 dist_ot_platform_HEADERS = $(ot_platform_headers)
 
 install-headers: install-includeHEADERS

include/openthread/platform/diag.h

@@ -39,7 +39,7 @@
 #include <stdint.h>
 #include <stddef.h>
 
-#include <platform/radio.h>
+#include <openthread/platform/radio.h>
 
 #include <openthread/types.h>
 

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

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

src/cli/cli.cpp

@@ -58,7 +58,7 @@
 #include <net/ip6.hpp>
 #include "openthread/dhcp6_client.h"
 #include "openthread/dhcp6_server.h"
-#include <platform/uart.h>
+#include "openthread/platform/uart.h"
 #endif
 
 #include <common/encoding.hpp>

src/cli/cli_uart.cpp

@@ -37,6 +37,8 @@
 #include <string.h>
 
 #include "openthread/cli.h"
+#include "openthread/platform/logging.h"
+#include "openthread/platform/uart.h"
 
 #include <cli/cli.hpp>
 #include <cli/cli_uart.hpp>
@@ -44,8 +46,6 @@
 #include <common/encoding.hpp>
 #include <common/new.hpp>
 #include <common/tasklet.hpp>
-#include <platform/logging.h>
-#include <platform/uart.h>
 
 namespace Thread {
 namespace Cli {

src/core/api/instance_api.cpp

@@ -34,8 +34,8 @@
 #define WPP_NAME "instance_api.tmh"
 
 #include "openthread/instance.h"
-#include "platform/misc.h"
-#include "platform/settings.h"
+#include "openthread/platform/misc.h"
+#include "openthread/platform/settings.h"
 
 #include "openthread-instance.h"
 

src/core/api/link_raw_api.cpp

@@ -33,8 +33,8 @@
 
 #include <common/debug.hpp>
 #include <common/logging.hpp>
-#include <platform/random.h>
-#include <platform/usec-alarm.h>
+#include "openthread/platform/random.h"
+#include "openthread/platform/usec-alarm.h"
 #include "openthread-instance.h"
 
 #ifdef __cplusplus

src/core/api/thread_api.cpp

@@ -38,7 +38,7 @@
 #include "openthread-instance.h"
 #include "common/logging.hpp"
 #include "common/settings.hpp"
-#include "platform/settings.h"
+#include "openthread/platform/settings.h"
 
 using namespace Thread;
 

src/core/coap/coap_client.cpp

@@ -28,12 +28,13 @@
 
 #include <string.h>
 
+#include "openthread/platform/random.h"
+
 #include <coap/coap_client.hpp>
 #include <common/debug.hpp>
 #include <common/code_utils.hpp>
 #include <net/ip6.hpp>
 #include <net/udp6.hpp>
-#include <platform/random.h>
 
 /**
  * @file

src/core/coap/coap_header.cpp

@@ -31,12 +31,13 @@
  *   This file implements the CoAP header generation and parsing.
  */
 
+#include "openthread/platform/random.h"
+
 #include <coap/coap_header.hpp>
 #include <coap/coap_client.hpp>
 #include <common/debug.hpp>
 #include <common/code_utils.hpp>
 #include <common/encoding.hpp>
-#include <platform/random.h>
 
 namespace Thread {
 namespace Coap {

src/core/common/logging.hpp

@@ -39,13 +39,13 @@
 #include <string.h>
 
 #include <openthread-core-config.h>
-#include <platform/logging.h>
+#include "openthread/platform/logging.h"
 
 #ifdef WINDOWS_LOGGING
 #ifdef _KERNEL_MODE
 #include <wdm.h>
 #endif
-#include <platform/logging-windows.h>
+#include "openthread/platform/logging-windows.h"
 #ifdef WPP_NAME
 #include WPP_NAME
 #endif

src/core/common/message.hpp

@@ -44,11 +44,11 @@
 #include <string.h>
 
 #include "openthread/message.h"
+#include "openthread/platform/messagepool.h"
 
 #include <openthread-core-config.h>
 #include <common/code_utils.hpp>
 #include <mac/mac_frame.hpp>
-#include <platform/messagepool.h>
 
 namespace Thread {
 

src/core/common/new.hpp

@@ -35,7 +35,8 @@
 #define NEW_HPP_
 
 #include <stddef.h>
-#include <platform/toolchain.h>
+
+#include "openthread/platform/toolchain.h"
 
 inline void *operator new(size_t, void *p) throw() { return p; }
 

src/core/common/timer.cpp

@@ -33,12 +33,13 @@
 
 #define WPP_NAME "timer.tmh"
 
+#include "openthread/platform/alarm.h"
+
 #include <common/code_utils.hpp>
 #include <common/timer.hpp>
 #include <common/debug.hpp>
 #include <common/logging.hpp>
 #include <net/ip6.hpp>
-#include <platform/alarm.h>
 #include <openthread-instance.h>
 
 namespace Thread {

src/core/common/timer.hpp

@@ -38,9 +38,9 @@
 #include <stdint.h>
 
 #include "openthread/types.h"
+#include "openthread/platform/alarm.h"
 
 #include <common/tasklet.hpp>
-#include <platform/alarm.h>
 
 namespace Thread {
 

src/core/common/trickle_timer.cpp

@@ -31,10 +31,11 @@
  *   This file implements the trickle timer logic.
  */
 
+#include "openthread/platform/random.h"
+
 #include <common/code_utils.hpp>
 #include <common/debug.hpp>
 #include <common/trickle_timer.hpp>
-#include <platform/random.h>
 
 namespace Thread {
 

src/core/mac/mac.cpp

@@ -41,6 +41,9 @@
 
 #include <string.h>
 
+#include "openthread/platform/random.h"
+#include "openthread/platform/usec-alarm.h"
+
 #include <common/code_utils.hpp>
 #include <common/debug.hpp>
 #include <common/encoding.hpp>
@@ -49,8 +52,6 @@
 #include <crypto/sha256.hpp>
 #include <mac/mac.hpp>
 #include <mac/mac_frame.hpp>
-#include <platform/random.h>
-#include <platform/usec-alarm.h>
 #include <thread/mle_router.hpp>
 #include <thread/thread_netif.hpp>
 #include <openthread-instance.h>

src/core/mac/mac.hpp

@@ -34,13 +34,15 @@
 #ifndef MAC_HPP_
 #define MAC_HPP_
 
+#include "openthread/platform/radio.h"
+
 #include <openthread-core-config.h>
+
 #include <common/tasklet.hpp>
 #include <common/timer.hpp>
 #include <mac/mac_frame.hpp>
 #include <mac/mac_whitelist.hpp>
 #include <mac/mac_blacklist.hpp>
-#include <platform/radio.h>
 #include <thread/key_manager.hpp>
 #include <thread/topology.hpp>
 #include <thread/network_diagnostic_tlvs.hpp>

src/core/mac/mac_frame.hpp

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

src/core/meshcop/announce_begin_client.cpp

@@ -39,11 +39,12 @@
 #include <openthread-config.h>
 #endif
 
+#include "openthread/platform/random.h"
+
 #include <coap/coap_header.hpp>
 #include <common/code_utils.hpp>
 #include <common/debug.hpp>
 #include <common/logging.hpp>
-#include <platform/random.h>
 #include <meshcop/announce_begin_client.hpp>
 #include <meshcop/tlvs.hpp>
 #include <thread/thread_netif.hpp>

src/core/meshcop/commissioner.cpp

@@ -42,6 +42,8 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "openthread/platform/random.h"
+
 #include <coap/coap_header.hpp>
 #include <common/crc16.hpp>
 #include <common/encoding.hpp>
@@ -50,7 +52,6 @@
 #include <meshcop/commissioner.hpp>
 #include <meshcop/joiner_router.hpp>
 #include <meshcop/tlvs.hpp>
-#include <platform/random.h>
 #include <thread/thread_netif.hpp>
 #include <thread/thread_tlvs.hpp>
 #include <thread/thread_uris.hpp>

src/core/meshcop/dataset.cpp

@@ -34,11 +34,12 @@
 
 #include <stdio.h>
 
+#include "openthread/platform/settings.h"
+
 #include <common/code_utils.hpp>
 #include <common/settings.hpp>
 #include <meshcop/dataset.hpp>
 #include <meshcop/tlvs.hpp>
-#include <platform/settings.h>
 #include <thread/mle_tlvs.hpp>
 
 namespace Thread {

src/core/meshcop/dataset_manager.cpp

@@ -36,6 +36,9 @@
 
 #include <stdio.h>
 
+#include "openthread/platform/random.h"
+#include "openthread/platform/radio.h"
+
 #include <common/code_utils.hpp>
 #include <common/debug.hpp>
 #include <coap/coap_header.hpp>
@@ -46,8 +49,6 @@
 #include <meshcop/dataset.hpp>
 #include <meshcop/dataset_manager.hpp>
 #include <meshcop/tlvs.hpp>
-#include <platform/random.h>
-#include <platform/radio.h>
 #include <thread/thread_netif.hpp>
 #include <thread/thread_tlvs.hpp>
 #include <thread/thread_uris.hpp>

src/core/meshcop/dataset_manager_ftd.cpp

@@ -36,6 +36,9 @@
 
 #include <stdio.h>
 
+#include "openthread/platform/random.h"
+#include "openthread/platform/radio.h"
+
 #include <common/code_utils.hpp>
 #include <common/debug.hpp>
 #include <coap/coap_header.hpp>
@@ -46,8 +49,6 @@
 #include <meshcop/dataset.hpp>
 #include <meshcop/dataset_manager.hpp>
 #include <meshcop/tlvs.hpp>
-#include <platform/random.h>
-#include <platform/radio.h>
 #include <thread/thread_netif.hpp>
 #include <thread/thread_tlvs.hpp>
 #include <thread/thread_uris.hpp>

src/core/meshcop/energy_scan_client.cpp

@@ -33,12 +33,13 @@
 
 #define WPP_NAME "energy_scan_client.tmh"
 
+#include "openthread/platform/random.h"
+
 #include <coap/coap_header.hpp>
 #include <common/code_utils.hpp>
 #include <common/debug.hpp>
 #include <common/encoding.hpp>
 #include <common/logging.hpp>
-#include <platform/random.h>
 #include <meshcop/energy_scan_client.hpp>
 #include <meshcop/tlvs.hpp>
 #include <thread/thread_netif.hpp>

src/core/meshcop/joiner.cpp

@@ -41,6 +41,9 @@
 
 #include <stdio.h>
 
+#include "openthread/platform/radio.h"
+#include "openthread/platform/random.h"
+
 #include <common/code_utils.hpp>
 #include <common/crc16.hpp>
 #include <common/debug.hpp>
@@ -48,8 +51,6 @@
 #include <common/logging.hpp>
 #include <mac/mac_frame.hpp>
 #include <meshcop/joiner.hpp>
-#include <platform/radio.h>
-#include <platform/random.h>
 #include <thread/thread_netif.hpp>
 #include <thread/thread_uris.hpp>