diff --git a/configure.ac b/configure.ac
index 5ac478a73..7fac27a8d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -68,7 +68,7 @@ AC_SUBST(LIBOPENTHREAD_VERSION_INFO,     [${LIBOPENTHREAD_VERSION_CURRENT}:${LIB
 # Check the sanity of the source directory by checking for the
 # presence of a key watch file
 #
-AC_CONFIG_SRCDIR([include/openthread.h])
+AC_CONFIG_SRCDIR([include/openthread/openthread.h])
 
 #
 # Tell autoconf where to find auxilliary build tools (e.g. config.guess,
diff --git a/examples/apps/cli/main.c b/examples/apps/cli/main.c
index 3247eec41..25f7683ed 100644
--- a/examples/apps/cli/main.c
+++ b/examples/apps/cli/main.c
@@ -32,10 +32,10 @@
 #include <openthread-config.h>
 #endif
 
+#include "openthread/openthread.h"
 #include "openthread/cli.h"
 
 #include <openthread-core-config.h>
-#include <openthread.h>
 #include <openthread-diag.h>
 #include <openthread/tasklet.h>
 #include <platform/platform.h>
diff --git a/examples/apps/ncp/main.c b/examples/apps/ncp/main.c
index f466d82df..e17b23686 100644
--- a/examples/apps/ncp/main.c
+++ b/examples/apps/ncp/main.c
@@ -32,10 +32,10 @@
 #include <openthread-config.h>
 #endif
 
-#include <openthread-core-config.h>
-#include <openthread.h>
+#include "openthread/openthread.h"
 #include "openthread/ncp.h"
 
+#include <openthread-core-config.h>
 #include <openthread-diag.h>
 #include <openthread/tasklet.h>
 #include <common/debug.hpp>
diff --git a/examples/apps/windows/pch.h b/examples/apps/windows/pch.h
index b3cdddcc7..a90a2c493 100644
--- a/examples/apps/windows/pch.h
+++ b/examples/apps/windows/pch.h
@@ -39,7 +39,7 @@
 #include <ws2ipdef.h>
 #include <mstcpip.h>
 #define OTDLL 1
-#include <openthread.h>
+#include <openthread/openthread.h>
 #include <openthread/commissioner.h>
 #include <openthread/joiner.h>
 
diff --git a/examples/drivers/windows/include/otNode.h b/examples/drivers/windows/include/otNode.h
index b321c3298..b08a4eaca 100644
--- a/examples/drivers/windows/include/otNode.h
+++ b/examples/drivers/windows/include/otNode.h
@@ -35,7 +35,7 @@
 #ifndef OTNODE_H_
 #define OTNODE_H_
 
-#include <openthread.h>
+#include <openthread/openthread.h>
 
 #ifndef OTNODEAPI
 #define OTNODEAPI __declspec(dllimport)
diff --git a/examples/drivers/windows/otApi/precomp.h b/examples/drivers/windows/otApi/precomp.h
index 873c1def7..f82c0d8b7 100644
--- a/examples/drivers/windows/otApi/precomp.h
+++ b/examples/drivers/windows/otApi/precomp.h
@@ -21,7 +21,7 @@
 #define OTDLL
 #define OTAPI EXTERN_C __declspec(dllexport)
 
-#include <openthread.h>
+#include <openthread/openthread.h>
 #include <openthread/commissioner.h>
 #include <openthread/joiner.h>
 #include <platform/logging-windows.h>
diff --git a/examples/drivers/windows/otCli/main.cpp b/examples/drivers/windows/otCli/main.cpp
index 0fc61f565..dfe2566dc 100644
--- a/examples/drivers/windows/otCli/main.cpp
+++ b/examples/drivers/windows/otCli/main.cpp
@@ -29,7 +29,7 @@
 #include <windows.h>
 #include <stdio.h>
 
-#include <openthread.h>
+#include <openthread/openthread.h>
 #include <openthread/cli.h>
 #include <platform/uart.h>
 
diff --git a/examples/drivers/windows/otLwf/precomp.h b/examples/drivers/windows/otLwf/precomp.h
index f787d4150..abc996e64 100644
--- a/examples/drivers/windows/otLwf/precomp.h
+++ b/examples/drivers/windows/otLwf/precomp.h
@@ -61,7 +61,7 @@ RtlCopyBufferToMdl(
 
 #include <openthread-windows-config.h>
 #include <openthread-core-config.h>
-#include <openthread.h>
+#include <openthread/openthread.h>
 #include <openthread-icmp6.h>
 #include <openthread/ip6.h>
 #include <openthread/tasklet.h>
diff --git a/examples/drivers/windows/otNodeApi/precomp.h b/examples/drivers/windows/otNodeApi/precomp.h
index 18bc012ef..3866643ff 100644
--- a/examples/drivers/windows/otNodeApi/precomp.h
+++ b/examples/drivers/windows/otNodeApi/precomp.h
@@ -49,7 +49,7 @@ using namespace std;
 #define OTDLL
 #define OTNODEAPI EXTERN_C __declspec(dllexport)
 
-#include <openthread.h>
+#include <openthread/openthread.h>
 #include <openthread/commissioner.h>
 #include <openthread/joiner.h>
 #include <platform/logging-windows.h>
diff --git a/examples/platforms/cc2538/alarm.c b/examples/platforms/cc2538/alarm.c
index ecff3c7b0..0c5db1ffd 100644
--- a/examples/platforms/cc2538/alarm.c
+++ b/examples/platforms/cc2538/alarm.c
@@ -36,7 +36,7 @@
 #include <stdint.h>
 
 #include <openthread-config.h>
-#include <openthread.h>
+#include "openthread/openthread.h"
 
 #include <platform/platform.h>
 #include <platform/alarm.h>
diff --git a/examples/platforms/cc2538/diag.c b/examples/platforms/cc2538/diag.c
index ab93e3dde..ef467e525 100644
--- a/examples/platforms/cc2538/diag.c
+++ b/examples/platforms/cc2538/diag.c
@@ -32,7 +32,7 @@
 #include <sys/time.h>
 
 #include <openthread-config.h>
-#include <openthread.h>
+#include "openthread/openthread.h"
 
 #include <platform/alarm.h>
 #include <platform/radio.h>
diff --git a/examples/platforms/cc2538/radio.c b/examples/platforms/cc2538/radio.c
index 26cb93e05..57ebe7b5b 100644
--- a/examples/platforms/cc2538/radio.c
+++ b/examples/platforms/cc2538/radio.c
@@ -32,7 +32,7 @@
  *
  */
 
-#include <openthread.h>
+#include "openthread/openthread.h"
 #include <openthread-config.h>
 
 #include <common/code_utils.hpp>
diff --git a/examples/platforms/da15000/platform.c b/examples/platforms/da15000/platform.c
index 2a32d222f..af5f75a98 100644
--- a/examples/platforms/da15000/platform.c
+++ b/examples/platforms/da15000/platform.c
@@ -34,7 +34,7 @@
 #include <assert.h>
 #include <stdint.h>
 
-#include <openthread.h>
+#include "openthread/openthread.h"
 #include "platform/alarm.h"
 #include "platform-da15000.h"
 #include "sdk_defs.h"
diff --git a/examples/platforms/posix/diag.c b/examples/platforms/posix/diag.c
index ad7bd908b..9832390b5 100644
--- a/examples/platforms/posix/diag.c
+++ b/examples/platforms/posix/diag.c
@@ -34,7 +34,7 @@
 #include <sys/time.h>
 
 #include <openthread-config.h>
-#include <openthread.h>
+#include "openthread/openthread.h"
 
 #include <platform/alarm.h>
 #include <platform/radio.h>
diff --git a/examples/platforms/posix/platform-posix.h b/examples/platforms/posix/platform-posix.h
index 8f12421c7..a13098d65 100644
--- a/examples/platforms/posix/platform-posix.h
+++ b/examples/platforms/posix/platform-posix.h
@@ -76,7 +76,7 @@ __forceinline void timersub(struct timeval *a, struct timeval *b, struct timeval
 #define POLL poll
 #endif
 
-#include <openthread.h>
+#include "openthread/openthread.h"
 #include <common/code_utils.hpp>
 
 #include <assert.h>
diff --git a/examples/platforms/posix/platform.c b/examples/platforms/posix/platform.c
index 308e9ab59..9fe8697bd 100644
--- a/examples/platforms/posix/platform.c
+++ b/examples/platforms/posix/platform.c
@@ -46,8 +46,8 @@
 #include <syslog.h>
 #endif
 
-#include <openthread.h>
-#include <openthread/tasklet.h>
+#include "openthread/openthread.h"
+#include "openthread/tasklet.h"
 #include <platform/alarm.h>
 
 uint32_t NODE_ID = 1;
diff --git a/include/Makefile.am b/include/Makefile.am
index aa560d938..8f520893a 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -50,8 +50,6 @@ PRETTY_SUBDIRS                          = \
     $(NULL)
 
 include_HEADERS                         = \
-    openthread/link_raw.h                 \
-    openthread.h                          \
     openthread-diag.h                     \
     openthread-icmp6.h                    \
     $(NULL)
diff --git a/include/openthread/Makefile.am b/include/openthread/Makefile.am
index 6a81d0cef..10b7e20e1 100644
--- a/include/openthread/Makefile.am
+++ b/include/openthread/Makefile.am
@@ -41,9 +41,11 @@ openthread_headers                      = \
     jam_detection.h                       \
     joiner.h                              \
     link.h                                \
+    link_raw.h                            \
     message.h                             \
     ncp.h                                 \
     netdata.h                             \
+    openthread.h                          \
     tasklet.h                             \
     thread.h                              \
     types.h                               \
diff --git a/include/openthread.h b/include/openthread/openthread.h
similarity index 100%
rename from include/openthread.h
rename to include/openthread/openthread.h
diff --git a/src/cli/cli.cpp b/src/cli/cli.cpp
index 32ad55474..1a5510d65 100644
--- a/src/cli/cli.cpp
+++ b/src/cli/cli.cpp
@@ -45,7 +45,7 @@
 #include <assert.h>
 #endif
 
-#include <openthread.h>
+#include "openthread/openthread.h"
 #include "openthread/commissioner.h"
 #include "openthread/joiner.h"
 
diff --git a/src/cli/cli.hpp b/src/cli/cli.hpp
index 8f31c4762..60f9d5e2f 100644
--- a/src/cli/cli.hpp
+++ b/src/cli/cli.hpp
@@ -39,9 +39,10 @@
 #else
 #include <openthread-config.h>
 #endif
-#include <openthread.h>
 
 #include <stdarg.h>
+
+#include "openthread/openthread.h"
 #include "openthread/ip6.h"
 #include "openthread/udp.h"
 
diff --git a/src/cli/cli_dataset.cpp b/src/cli/cli_dataset.cpp
index 1d9787296..16c45bbf9 100644
--- a/src/cli/cli_dataset.cpp
+++ b/src/cli/cli_dataset.cpp
@@ -41,7 +41,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <openthread.h>
+#include "openthread/openthread.h"
 
 #include "cli.hpp"
 #include "cli_dataset.hpp"
diff --git a/src/cli/cli_instance.cpp b/src/cli/cli_instance.cpp
index 1b9eaf946..9419d89d8 100644
--- a/src/cli/cli_instance.cpp
+++ b/src/cli/cli_instance.cpp
@@ -42,7 +42,7 @@
 #include <string.h>
 #include <assert.h>
 
-#include <openthread.h>
+#include "openthread/openthread.h"
 #include "cli.hpp"
 
 namespace Thread {
diff --git a/src/core/common/logging.cpp b/src/core/common/logging.cpp
index 06dd47a62..e86a3f362 100644
--- a/src/core/common/logging.cpp
+++ b/src/core/common/logging.cpp
@@ -39,7 +39,8 @@
 #include <openthread-config.h>
 #endif
 
-#include <openthread.h>
+#include "openthread/openthread.h"
+
 #include <common/logging.hpp>
 
 #ifndef WINDOWS_LOGGING
diff --git a/src/core/common/tasklet.cpp b/src/core/common/tasklet.cpp
index 456659554..e03393af4 100644
--- a/src/core/common/tasklet.cpp
+++ b/src/core/common/tasklet.cpp
@@ -31,7 +31,8 @@
  *   This file implements the tasklet scheduler.
  */
 
-#include <openthread.h>
+#include "openthread/openthread.h"
+
 #include <common/code_utils.hpp>
 #include <common/debug.hpp>
 #include <common/tasklet.hpp>
diff --git a/src/core/net/ip6_filter.hpp b/src/core/net/ip6_filter.hpp
index fb260b733..5a0ed6a96 100644
--- a/src/core/net/ip6_filter.hpp
+++ b/src/core/net/ip6_filter.hpp
@@ -34,7 +34,7 @@
 #ifndef IP6_FILTER_HPP_
 #define IP6_FILTER_HPP_
 
-#include <openthread.h>
+#include "openthread/openthread.h"
 
 namespace Thread {
 namespace Ip6 {
diff --git a/src/core/net/socket.hpp b/src/core/net/socket.hpp
index 6933e0be9..d69dccdb5 100644
--- a/src/core/net/socket.hpp
+++ b/src/core/net/socket.hpp
@@ -34,7 +34,8 @@
 #ifndef NET_SOCKET_HPP_
 #define NET_SOCKET_HPP_
 
-#include <openthread.h>
+#include "openthread/openthread.h"
+
 #include <net/ip6_address.hpp>
 
 namespace Thread {
diff --git a/src/core/net/tcp.hpp b/src/core/net/tcp.hpp
index df0b23f86..eb3fd0e14 100644
--- a/src/core/net/tcp.hpp
+++ b/src/core/net/tcp.hpp
@@ -34,7 +34,8 @@
 #ifndef TCP_HPP_
 #define TCP_HPP_
 
-#include <openthread.h>
+#include "openthread/openthread.h"
+
 #include <net/ip6_headers.hpp>
 
 namespace Thread {
diff --git a/src/core/net/udp6.hpp b/src/core/net/udp6.hpp
index 7c5fd05d0..c66af1da1 100644
--- a/src/core/net/udp6.hpp
+++ b/src/core/net/udp6.hpp
@@ -34,7 +34,6 @@
 #ifndef UDP6_HPP_
 #define UDP6_HPP_
 
-#include <openthread.h>
 #include "openthread/udp.h"
 
 #include <net/ip6_headers.hpp>
diff --git a/src/core/openthread.cpp b/src/core/openthread.cpp
index a9d780997..6239398f3 100644
--- a/src/core/openthread.cpp
+++ b/src/core/openthread.cpp
@@ -39,7 +39,7 @@
 #include <openthread-config.h>
 #endif
 
-#include <openthread.h>
+#include "openthread/openthread.h"
 
 #include <common/code_utils.hpp>
 #include <common/debug.hpp>
diff --git a/src/core/thread/mle.hpp b/src/core/thread/mle.hpp
index 54d1f868f..07ad6dc5c 100644
--- a/src/core/thread/mle.hpp
+++ b/src/core/thread/mle.hpp
@@ -34,7 +34,8 @@
 #ifndef MLE_HPP_
 #define MLE_HPP_
 
-#include <openthread.h>
+#include "openthread/openthread.h"
+
 #include <common/encoding.hpp>
 #include <common/timer.hpp>
 #include <mac/mac.hpp>
diff --git a/src/core/utils/jam_detector.cpp b/src/core/utils/jam_detector.cpp
index c6fe986b5..80d26d849 100644
--- a/src/core/utils/jam_detector.cpp
+++ b/src/core/utils/jam_detector.cpp
@@ -37,7 +37,7 @@
 #include <openthread-config.h>
 #endif
 
-#include <openthread.h>
+#include "openthread/openthread.h"
 
 #include <thread/thread_netif.hpp>
 #include <common/code_utils.hpp>
diff --git a/src/core/utils/slaac_address.cpp b/src/core/utils/slaac_address.cpp
index 62a7cd8c3..e8ff8e467 100644
--- a/src/core/utils/slaac_address.cpp
+++ b/src/core/utils/slaac_address.cpp
@@ -37,7 +37,7 @@
 #include <openthread-config.h>
 #endif
 
-#include <openthread.h>
+#include "openthread/openthread.h"
 
 #include <common/debug.hpp>
 #include <common/code_utils.hpp>
diff --git a/src/ncp/ncp_base.cpp b/src/ncp/ncp_base.cpp
index 7644a8f72..c756cd7d3 100644
--- a/src/ncp/ncp_base.cpp
+++ b/src/ncp/ncp_base.cpp
@@ -38,7 +38,7 @@
 
 #include <stdlib.h>
 
-#include "openthread/message.h"
+#include "openthread/openthread.h"
 #include "openthread/ncp.h"
 
 #if OPENTHREAD_ENABLE_JAM_DETECTION
@@ -49,7 +49,6 @@
 #include <common/debug.hpp>
 #include <ncp/ncp_base.hpp>
 #include <net/ip6.hpp>
-#include <openthread.h>
 #include <openthread-diag.h>
 #include <openthread-icmp6.h>
 #include <openthread-instance.h>
diff --git a/tests/unit/test_aes.cpp b/tests/unit/test_aes.cpp
index 1a32fa3c9..d56002047 100644
--- a/tests/unit/test_aes.cpp
+++ b/tests/unit/test_aes.cpp
@@ -27,7 +27,7 @@
  */
 
 #include "test_util.h"
-#include <openthread.h>
+#include "openthread/openthread.h"
 #include <common/debug.hpp>
 #include <crypto/aes_ccm.hpp>
 #include <crypto/mbedtls.hpp>
diff --git a/tests/unit/test_hmac_sha256.cpp b/tests/unit/test_hmac_sha256.cpp
index 41dd289de..24fa5e06c 100644
--- a/tests/unit/test_hmac_sha256.cpp
+++ b/tests/unit/test_hmac_sha256.cpp
@@ -27,7 +27,7 @@
  */
 
 #include "test_util.h"
-#include <openthread.h>
+#include "openthread/openthread.h"
 #include <common/debug.hpp>
 #include <string.h>
 
diff --git a/tests/unit/test_link_quality.cpp b/tests/unit/test_link_quality.cpp
index e322618cc..656dc3f2e 100644
--- a/tests/unit/test_link_quality.cpp
+++ b/tests/unit/test_link_quality.cpp
@@ -27,7 +27,7 @@
  */
 
 #include "test_util.h"
-#include <openthread.h>
+#include "openthread/openthread.h"
 #include <thread/link_quality.hpp>
 
 #include <string.h>
diff --git a/tests/unit/test_lowpan.hpp b/tests/unit/test_lowpan.hpp
index c68a3444c..61008ae34 100644
--- a/tests/unit/test_lowpan.hpp
+++ b/tests/unit/test_lowpan.hpp
@@ -31,7 +31,8 @@
 
 #include <stdint.h>
 
-#include <openthread.h>
+#include "openthread/openthread.h"
+
 #include <mac/mac.hpp>
 #include <net/ip6_headers.hpp>
 #include <thread/thread_netif.hpp>
diff --git a/tests/unit/test_mac_frame.cpp b/tests/unit/test_mac_frame.cpp
index 45a384517..07a450c2d 100644
--- a/tests/unit/test_mac_frame.cpp
+++ b/tests/unit/test_mac_frame.cpp
@@ -27,7 +27,7 @@
  */
 
 #include "test_util.h"
-#include <openthread.h>
+#include "openthread/openthread.h"
 #include <common/debug.hpp>
 #include <mac/mac_frame.hpp>
 #include <string.h>
diff --git a/tests/unit/test_message.cpp b/tests/unit/test_message.cpp
index 3a9cb0d0c..ac4777890 100644
--- a/tests/unit/test_message.cpp
+++ b/tests/unit/test_message.cpp
@@ -27,7 +27,7 @@
  */
 
 #include "test_util.h"
-#include <openthread.h>
+#include "openthread/openthread.h"
 #include <common/debug.hpp>
 #include <common/message.hpp>
 #include <string.h>
diff --git a/tests/unit/test_message_queue.cpp b/tests/unit/test_message_queue.cpp
index 83fa49e10..93007ff5b 100644
--- a/tests/unit/test_message_queue.cpp
+++ b/tests/unit/test_message_queue.cpp
@@ -28,9 +28,7 @@
 
 #include "test_util.h"
 
-#include <openthread.h>
-#include "openthread/ip6.h"
-#include "openthread/message.h"
+#include "openthread/openthread.h"
 
 #include <common/debug.hpp>
 #include <common/message.hpp>
diff --git a/tests/unit/test_ncp_buffer.cpp b/tests/unit/test_ncp_buffer.cpp
index 982e8661c..82307fe5b 100644
--- a/tests/unit/test_ncp_buffer.cpp
+++ b/tests/unit/test_ncp_buffer.cpp
@@ -28,7 +28,7 @@
 
 #include <ctype.h>
 #include "test_util.h"
-#include <openthread.h>
+#include "openthread/openthread.h"
 #include <common/code_utils.hpp>
 #include <common/message.hpp>
 #include <ncp/ncp_buffer.hpp>
diff --git a/tests/unit/test_priority_queue.cpp b/tests/unit/test_priority_queue.cpp
index 5e45304bd..2ed4c9ec1 100644
--- a/tests/unit/test_priority_queue.cpp
+++ b/tests/unit/test_priority_queue.cpp
@@ -27,7 +27,7 @@
  */
 
 #include "test_util.h"
-#include <openthread.h>
+#include "openthread/openthread.h"
 #include <common/debug.hpp>
 #include <common/message.hpp>
 #include <string.h>