diff --git a/STYLE_GUIDE.md b/STYLE_GUIDE.md
index e18168f3c..123c5f3a9 100644
--- a/STYLE_GUIDE.md
+++ b/STYLE_GUIDE.md
@@ -43,13 +43,14 @@
   - Preprocessor `#include` directives shall use brace (“<”) and (“>”) style for all public headers, including C and C++ standard library, or other first- and third-party public library headers.
   - Preprocessor `#include` directives should use double quote (‘“‘) and (‘“‘) style for all private or relative headers.
   - Preprocessor `#include` directives should be grouped, ordered, or sorted as follows:
-    - The `<openthread/config.h>` public header
-    - This compilation unit's corresponding header, if any
+    - If the unit is a core/private header file, `"openthread-core-config.h"` should be the first header file included.
+    - If the unit is a core/private `.c` or `.cpp` file:
+      - If the unit has a corresponding header file, the unit's corresponding header file should be included before any other header file.
+      - If the unit has no corresponding header file, then it should directly include `"openthread-core-config.h"` before any other header file.
     - C++ Standard Library headers
     - C Standard Library headers
     - Third-party library headers
     - First-party library headers
-    - The `"openthread-core-config.h"` private header
     - Private or local headers
     - Alphanumeric order within each subgroup
   - The preprocessor shall not be used to redefine reserved language keywords.
diff --git a/src/cli/cli.cpp b/src/cli/cli.cpp
index 8ce09a370..8e5b17171 100644
--- a/src/cli/cli.cpp
+++ b/src/cli/cli.cpp
@@ -31,8 +31,6 @@
  *   This file implements the CLI interpreter.
  */
 
-#include <openthread/config.h>
-
 #include "cli.hpp"
 
 #ifdef OTDLL
diff --git a/src/cli/cli.hpp b/src/cli/cli.hpp
index 5a11cdfb0..0968e41d3 100644
--- a/src/cli/cli.hpp
+++ b/src/cli/cli.hpp
@@ -34,7 +34,7 @@
 #ifndef CLI_HPP_
 #define CLI_HPP_
 
-#include <openthread/config.h>
+#include "openthread-core-config.h"
 
 #include <stdarg.h>
 
diff --git a/src/cli/cli_coap.cpp b/src/cli/cli_coap.cpp
index 5af664956..58e1cfe52 100644
--- a/src/cli/cli_coap.cpp
+++ b/src/cli/cli_coap.cpp
@@ -31,12 +31,10 @@
  *   This file implements a simple CLI for the CoAP service.
  */
 
-#include <openthread/config.h>
+#include "cli_coap.hpp"
 
 #if OPENTHREAD_ENABLE_APPLICATION_COAP
 
-#include "cli_coap.hpp"
-
 #include <ctype.h>
 
 #include "cli/cli.hpp"
diff --git a/src/cli/cli_coap.hpp b/src/cli/cli_coap.hpp
index fa7ff70b2..82a1dc37d 100644
--- a/src/cli/cli_coap.hpp
+++ b/src/cli/cli_coap.hpp
@@ -34,6 +34,10 @@
 #ifndef CLI_COAP_HPP_
 #define CLI_COAP_HPP_
 
+#include "openthread-core-config.h"
+
+#if OPENTHREAD_ENABLE_APPLICATION_COAP
+
 #include <openthread/types.h>
 
 #include "coap/coap_header.hpp"
@@ -96,4 +100,6 @@ private:
 }  // namespace Cli
 }  // namespace ot
 
+#endif  // OPENTHREAD_ENABLE_APPLICATION_COAP
+
 #endif  // CLI_COAP_HPP_
diff --git a/src/cli/cli_console.cpp b/src/cli/cli_console.cpp
index 59174a19d..c2f208b74 100644
--- a/src/cli/cli_console.cpp
+++ b/src/cli/cli_console.cpp
@@ -31,8 +31,6 @@
  *   This file implements the CLI server on the CONSOLE service.
  */
 
-#include <openthread/config.h>
-
 #include "cli_console.hpp"
 
 #include <stdarg.h>
diff --git a/src/cli/cli_console.hpp b/src/cli/cli_console.hpp
index 0f151efb2..afdacca3e 100644
--- a/src/cli/cli_console.hpp
+++ b/src/cli/cli_console.hpp
@@ -34,6 +34,8 @@
 #ifndef CLI_CONSOLE_HPP_
 #define CLI_CONSOLE_HPP_
 
+#include "openthread-core-config.h"
+
 #include <openthread/cli.h>
 
 #include "cli/cli.hpp"
diff --git a/src/cli/cli_dataset.cpp b/src/cli/cli_dataset.cpp
index 86b396978..d16fbdb9e 100644
--- a/src/cli/cli_dataset.cpp
+++ b/src/cli/cli_dataset.cpp
@@ -31,8 +31,6 @@
  *   This file implements the CLI interpreter.
  */
 
-#include <openthread/config.h>
-
 #include "cli_dataset.hpp"
 
 #include <stdio.h>
diff --git a/src/cli/cli_dataset.hpp b/src/cli/cli_dataset.hpp
index f34645580..6b96db668 100644
--- a/src/cli/cli_dataset.hpp
+++ b/src/cli/cli_dataset.hpp
@@ -34,6 +34,8 @@
 #ifndef CLI_DATASET_HPP_
 #define CLI_DATASET_HPP_
 
+#include "openthread-core-config.h"
+
 #include <stdarg.h>
 
 #include "cli/cli_server.hpp"
diff --git a/src/cli/cli_instance.cpp b/src/cli/cli_instance.cpp
index d6cf97fef..81162389f 100644
--- a/src/cli/cli_instance.cpp
+++ b/src/cli/cli_instance.cpp
@@ -31,7 +31,7 @@
  *   This file implements the CLI interpreter Instance related functions.
  */
 
-#include <openthread/config.h>
+#include "openthread-core-config.h"
 
 #include <assert.h>
 #include <stdio.h>
diff --git a/src/cli/cli_server.hpp b/src/cli/cli_server.hpp
index efe4b9c40..f9ce50c79 100644
--- a/src/cli/cli_server.hpp
+++ b/src/cli/cli_server.hpp
@@ -34,6 +34,8 @@
 #ifndef CLI_SERVER_HPP_
 #define CLI_SERVER_HPP_
 
+#include "openthread-core-config.h"
+
 #include <openthread/types.h>
 
 namespace ot {
diff --git a/src/cli/cli_uart.cpp b/src/cli/cli_uart.cpp
index 8023373a5..a5af59515 100644
--- a/src/cli/cli_uart.cpp
+++ b/src/cli/cli_uart.cpp
@@ -31,8 +31,6 @@
  *   This file implements the CLI server on the UART service.
  */
 
-#include <openthread/config.h>
-
 #include "cli_uart.hpp"
 
 #include <stdarg.h>
diff --git a/src/cli/cli_uart.hpp b/src/cli/cli_uart.hpp
index a061dbdde..3ba1988cd 100644
--- a/src/cli/cli_uart.hpp
+++ b/src/cli/cli_uart.hpp
@@ -34,6 +34,8 @@
 #ifndef CLI_UART_HPP_
 #define CLI_UART_HPP_
 
+#include "openthread-core-config.h"
+
 #include <openthread/types.h>
 
 #include "cli/cli.hpp"
diff --git a/src/cli/cli_udp.cpp b/src/cli/cli_udp.cpp
index 2b8a94350..57c1a675a 100644
--- a/src/cli/cli_udp.cpp
+++ b/src/cli/cli_udp.cpp
@@ -31,8 +31,6 @@
  *   This file implements the CLI server on a UDP socket.
  */
 
-#include <openthread/config.h>
-
 #include "cli_udp.hpp"
 
 #include <stdarg.h>
diff --git a/src/cli/cli_udp.hpp b/src/cli/cli_udp.hpp
index fb5d79673..1c7742593 100644
--- a/src/cli/cli_udp.hpp
+++ b/src/cli/cli_udp.hpp
@@ -34,6 +34,8 @@
 #ifndef CLI_UDP_HPP_
 #define CLI_UDP_HPP_
 
+#include "openthread-core-config.h"
+
 #include <openthread/types.h>
 
 #include "cli/cli.hpp"
diff --git a/src/cli/cli_udp_example.cpp b/src/cli/cli_udp_example.cpp
index 17993ee07..371647d6e 100644
--- a/src/cli/cli_udp_example.cpp
+++ b/src/cli/cli_udp_example.cpp
@@ -33,7 +33,6 @@
 
 #include "cli_udp_example.hpp"
 
-#include <openthread/config.h>
 #include <openthread/message.h>
 #include <openthread/udp.h>
 
diff --git a/src/cli/cli_udp_example.hpp b/src/cli/cli_udp_example.hpp
index a983df39c..fff0e91d7 100644
--- a/src/cli/cli_udp_example.hpp
+++ b/src/cli/cli_udp_example.hpp
@@ -34,6 +34,8 @@
 #ifndef CLI_UDP_EXAMPLE_HPP_
 #define CLI_UDP_EXAMPLE_HPP_
 
+#include "openthread-core-config.h"
+
 #include <openthread/udp.h>
 #include <openthread/types.h>
 
diff --git a/src/core/api/border_router_api.cpp b/src/core/api/border_router_api.cpp
index 3bc0feddc..5a3022734 100644
--- a/src/core/api/border_router_api.cpp
+++ b/src/core/api/border_router_api.cpp
@@ -31,7 +31,7 @@
  *   This file implements the OpenThread Border Router API.
  */
 
-#include <openthread/config.h>
+#include "openthread-core-config.h"
 
 #if OPENTHREAD_ENABLE_BORDER_ROUTER
 
diff --git a/src/core/api/child_supervision_api.cpp b/src/core/api/child_supervision_api.cpp
index b31130ea6..c7733be12 100644
--- a/src/core/api/child_supervision_api.cpp
+++ b/src/core/api/child_supervision_api.cpp
@@ -31,6 +31,7 @@
  *   This file implements the OpenThread child supervision API.
  */
 
+#include "openthread-core-config.h"
 #include "openthread/child_supervision.h"
 
 #include "openthread-instance.h"
diff --git a/src/core/api/coap_api.cpp b/src/core/api/coap_api.cpp
index 60c67e60b..ed0585bea 100644
--- a/src/core/api/coap_api.cpp
+++ b/src/core/api/coap_api.cpp
@@ -31,7 +31,7 @@
  *   This file implements the OpenThread CoAP API.
  */
 
-#include <openthread/config.h>
+#include "openthread-core-config.h"
 
 #include <openthread/coap.h>
 
diff --git a/src/core/api/commissioner_api.cpp b/src/core/api/commissioner_api.cpp
index 6b996f601..1e10f677d 100644
--- a/src/core/api/commissioner_api.cpp
+++ b/src/core/api/commissioner_api.cpp
@@ -31,7 +31,7 @@
  *   This file implements the OpenThread Commissioner API.
  */
 
-#include <openthread/config.h>
+#include "openthread-core-config.h"
 
 #include <openthread/commissioner.h>
 
diff --git a/src/core/api/crypto_api.cpp b/src/core/api/crypto_api.cpp
index 9582b8aa3..83d5bce6c 100644
--- a/src/core/api/crypto_api.cpp
+++ b/src/core/api/crypto_api.cpp
@@ -31,7 +31,7 @@
  *   This file implements the OpenThread Crypto API.
  */
 
-#include <openthread/config.h>
+#include "openthread-core-config.h"
 #include <openthread/crypto.h>
 
 #include "common/code_utils.hpp"
diff --git a/src/core/api/dataset_api.cpp b/src/core/api/dataset_api.cpp
index bf0a1c719..a84e3a2d3 100644
--- a/src/core/api/dataset_api.cpp
+++ b/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/config.h>
+#include "openthread-core-config.h"
 
 #include <openthread/dataset.h>
 
diff --git a/src/core/api/dataset_ftd_api.cpp b/src/core/api/dataset_ftd_api.cpp
index 7a60c7a8e..c231966c5 100644
--- a/src/core/api/dataset_ftd_api.cpp
+++ b/src/core/api/dataset_ftd_api.cpp
@@ -31,7 +31,7 @@
  *   This file implements the OpenThread Operational Dataset API (FTD only).
  */
 
-#include <openthread/config.h>
+#include "openthread-core-config.h"
 
 #if OPENTHREAD_FTD
 
diff --git a/src/core/api/dhcp6_api.cpp b/src/core/api/dhcp6_api.cpp
index 451a1728f..ef307e481 100644
--- a/src/core/api/dhcp6_api.cpp
+++ b/src/core/api/dhcp6_api.cpp
@@ -31,9 +31,9 @@
  *   This file implements the OpenThread DHCPv6 API.
  */
 
-#include <openthread/config.h>
-#include <openthread/dhcp6_client.h>
+#include "openthread-core-config.h"
 
+#include <openthread/dhcp6_client.h>
 #include <openthread/dhcp6_server.h>
 
 #include "openthread-instance.h"
diff --git a/src/core/api/dns_api.cpp b/src/core/api/dns_api.cpp
index 71e696b5d..14294f99a 100644
--- a/src/core/api/dns_api.cpp
+++ b/src/core/api/dns_api.cpp
@@ -31,7 +31,7 @@
  *   This file implements the OpenThread UDP API.
  */
 
-#include <openthread/config.h>
+#include "openthread-core-config.h"
 
 #include <openthread/dns.h>
 
diff --git a/src/core/api/icmp6_api.cpp b/src/core/api/icmp6_api.cpp
index 3f83eb0d7..dfc77f9d0 100644
--- a/src/core/api/icmp6_api.cpp
+++ b/src/core/api/icmp6_api.cpp
@@ -31,7 +31,7 @@
  *   This file implements the OpenThread ICMPv6 API.
  */
 
-#include <openthread/config.h>
+#include "openthread-core-config.h"
 
 #include <openthread/icmp6.h>
 
diff --git a/src/core/api/instance_api.cpp b/src/core/api/instance_api.cpp
index ac993029a..70171adfa 100644
--- a/src/core/api/instance_api.cpp
+++ b/src/core/api/instance_api.cpp
@@ -33,7 +33,7 @@
 
 #define WPP_NAME "instance_api.tmh"
 
-#include <openthread/config.h>
+#include "openthread-core-config.h"
 
 #include <openthread/instance.h>
 #include <openthread/platform/misc.h>
diff --git a/src/core/api/ip6_api.cpp b/src/core/api/ip6_api.cpp
index c7c91f7c9..a811db494 100644
--- a/src/core/api/ip6_api.cpp
+++ b/src/core/api/ip6_api.cpp
@@ -33,7 +33,7 @@
 
 #define WPP_NAME "ip6_api.tmh"
 
-#include <openthread/config.h>
+#include "openthread-core-config.h"
 
 #include <openthread/ip6.h>
 
diff --git a/src/core/api/jam_detection_api.cpp b/src/core/api/jam_detection_api.cpp
index 16ad85c26..a77b7cc36 100644
--- a/src/core/api/jam_detection_api.cpp
+++ b/src/core/api/jam_detection_api.cpp
@@ -31,7 +31,7 @@
  *   This file implements the OpenThread Jam Detection API.
  */
 
-#include <openthread/config.h>
+#include "openthread-core-config.h"
 
 #include <openthread/jam_detection.h>
 
diff --git a/src/core/api/joiner_api.cpp b/src/core/api/joiner_api.cpp
index 737a9f4f5..055f7e984 100644
--- a/src/core/api/joiner_api.cpp
+++ b/src/core/api/joiner_api.cpp
@@ -31,7 +31,7 @@
  *   This file implements the OpenThread Joiner API.
  */
 
-#include <openthread/config.h>
+#include "openthread-core-config.h"
 
 #include <openthread/joiner.h>
 
diff --git a/src/core/api/link_api.cpp b/src/core/api/link_api.cpp
index 2c2fb4bd0..ab249879d 100644
--- a/src/core/api/link_api.cpp
+++ b/src/core/api/link_api.cpp
@@ -31,7 +31,7 @@
  *   This file implements the OpenThread Link API.
  */
 
-#include <openthread/config.h>
+#include "openthread-core-config.h"
 
 #include <openthread/link.h>
 
diff --git a/src/core/api/link_raw.hpp b/src/core/api/link_raw.hpp
index 239592092..dbc116b15 100644
--- a/src/core/api/link_raw.hpp
+++ b/src/core/api/link_raw.hpp
@@ -34,9 +34,10 @@
 #ifndef LINK_RAW_HPP_
 #define LINK_RAW_HPP_
 
+#include "openthread-core-config.h"
+
 #include <openthread/link_raw.h>
 
-#include "openthread-core-config.h"
 #include "common/timer.hpp"
 
 #if OPENTHREAD_CONFIG_ENABLE_SOFTWARE_ACK_TIMEOUT || OPENTHREAD_CONFIG_ENABLE_SOFTWARE_RETRANSMIT || OPENTHREAD_CONFIG_ENABLE_SOFTWARE_ENERGY_SCAN
diff --git a/src/core/api/link_raw_api.cpp b/src/core/api/link_raw_api.cpp
index f244f7ff2..3b5134fda 100644
--- a/src/core/api/link_raw_api.cpp
+++ b/src/core/api/link_raw_api.cpp
@@ -31,7 +31,7 @@
  *   This file implements the OpenThread Link Raw API.
  */
 
-#include <openthread/config.h>
+#include "openthread-core-config.h"
 
 #include <openthread/platform/random.h>
 
diff --git a/src/core/api/message_api.cpp b/src/core/api/message_api.cpp
index c11da5268..afe269750 100644
--- a/src/core/api/message_api.cpp
+++ b/src/core/api/message_api.cpp
@@ -30,7 +30,8 @@
  * @file
  *   This file implements the OpenThread Message API.
  */
-#include <openthread/config.h>
+
+#include "openthread-core-config.h"
 
 #include <openthread/message.h>
 
diff --git a/src/core/api/netdata_api.cpp b/src/core/api/netdata_api.cpp
index 6378f1986..e84abc5d9 100644
--- a/src/core/api/netdata_api.cpp
+++ b/src/core/api/netdata_api.cpp
@@ -30,7 +30,8 @@
  * @file
  *   This file implements the OpenThread Network Data API.
  */
-#include <openthread/config.h>
+
+#include "openthread-core-config.h"
 
 #include <openthread/netdata.h>
 
diff --git a/src/core/api/tasklet_api.cpp b/src/core/api/tasklet_api.cpp
index bc8beba66..0d8821084 100644
--- a/src/core/api/tasklet_api.cpp
+++ b/src/core/api/tasklet_api.cpp
@@ -33,7 +33,8 @@
 
 #define WPP_NAME "tasklet_api.tmh"
 
-#include <openthread/config.h>
+#include "openthread-core-config.h"
+
 #include <openthread/tasklet.h>
 
 #include "openthread-instance.h"
diff --git a/src/core/api/thread_api.cpp b/src/core/api/thread_api.cpp
index 4aeaa2733..b199eef5e 100644
--- a/src/core/api/thread_api.cpp
+++ b/src/core/api/thread_api.cpp
@@ -33,7 +33,7 @@
 
 #define WPP_NAME "thread_api.tmh"
 
-#include <openthread/config.h>
+#include "openthread-core-config.h"
 
 #include <openthread/thread.h>
 #include <openthread/platform/settings.h>
diff --git a/src/core/api/thread_ftd_api.cpp b/src/core/api/thread_ftd_api.cpp
index 7e75026b3..c05e292bc 100644
--- a/src/core/api/thread_ftd_api.cpp
+++ b/src/core/api/thread_ftd_api.cpp
@@ -33,7 +33,7 @@
 
 #define WPP_NAME "thread_ftd_api.tmh"
 
-#include <openthread/config.h>
+#include "openthread-core-config.h"
 
 #if OPENTHREAD_FTD
 
diff --git a/src/core/api/tmf_proxy_api.cpp b/src/core/api/tmf_proxy_api.cpp
index cc4d9218d..7f2a0ab13 100644
--- a/src/core/api/tmf_proxy_api.cpp
+++ b/src/core/api/tmf_proxy_api.cpp
@@ -31,7 +31,8 @@
  *   This file implements the OpenThread TMF proxy API.
  */
 
-#include <openthread/config.h>
+#include "openthread-core-config.h"
+
 #include <openthread/tmf_proxy.h>
 
 #include "openthread-instance.h"
diff --git a/src/core/api/udp_api.cpp b/src/core/api/udp_api.cpp
index 9a4570dee..6431db854 100644
--- a/src/core/api/udp_api.cpp
+++ b/src/core/api/udp_api.cpp
@@ -31,7 +31,8 @@
  *   This file implements the OpenThread UDP API.
  */
 
-#include <openthread/config.h>
+#include "openthread-core-config.h"
+
 #include <openthread/udp.h>
 
 #include "openthread-instance.h"
diff --git a/src/core/coap/coap.cpp b/src/core/coap/coap.cpp
index c02d63b3b..44cf127cd 100644
--- a/src/core/coap/coap.cpp
+++ b/src/core/coap/coap.cpp
@@ -28,8 +28,6 @@
 
 #define WPP_NAME "coap.tmh"
 
-#include <openthread/config.h>
-
 #include "coap.hpp"
 
 #include <openthread/platform/random.h>
diff --git a/src/core/coap/coap.hpp b/src/core/coap/coap.hpp
index 442aac11c..e1fc2b09c 100644
--- a/src/core/coap/coap.hpp
+++ b/src/core/coap/coap.hpp
@@ -29,6 +29,8 @@
 #ifndef COAP_HPP_
 #define COAP_HPP_
 
+#include "openthread-core-config.h"
+
 #include <openthread/coap.h>
 
 #include "coap/coap_header.hpp"
diff --git a/src/core/coap/coap_header.cpp b/src/core/coap/coap_header.cpp
index 24d2f187c..8acb585a3 100644
--- a/src/core/coap/coap_header.cpp
+++ b/src/core/coap/coap_header.cpp
@@ -31,8 +31,6 @@
  *   This file implements the CoAP header generation and parsing.
  */
 
-#include <openthread/config.h>
-
 #include "coap_header.hpp"
 
 #include <openthread/platform/random.h>
diff --git a/src/core/coap/coap_header.hpp b/src/core/coap/coap_header.hpp
index ceaa4e2de..762bfc3c0 100644
--- a/src/core/coap/coap_header.hpp
+++ b/src/core/coap/coap_header.hpp
@@ -34,6 +34,8 @@
 #ifndef COAP_HEADER_HPP_
 #define COAP_HEADER_HPP_
 
+#include "openthread-core-config.h"
+
 #include "utils/wrap_string.h"
 
 #include <openthread/coap.h>
diff --git a/src/core/coap/coap_secure.cpp b/src/core/coap/coap_secure.cpp
index 1c97af0ee..03377cd85 100644
--- a/src/core/coap/coap_secure.cpp
+++ b/src/core/coap/coap_secure.cpp
@@ -28,8 +28,6 @@
 
 #define WPP_NAME "coap_secure.tmh"
 
-#include <openthread/config.h>
-
 #include "coap_secure.hpp"
 
 #include "common/logging.hpp"
diff --git a/src/core/coap/coap_secure.hpp b/src/core/coap/coap_secure.hpp
index 6a98ac36e..8aca0eb16 100644
--- a/src/core/coap/coap_secure.hpp
+++ b/src/core/coap/coap_secure.hpp
@@ -29,6 +29,8 @@
 #ifndef COAP_SECURE_HPP_
 #define COAP_SECURE_HPP_
 
+#include "openthread-core-config.h"
+
 #include "coap/coap.hpp"
 #include "meshcop/dtls.hpp"
 
diff --git a/src/core/common/code_utils.hpp b/src/core/common/code_utils.hpp
index 1fde41f4f..481ddc5ae 100644
--- a/src/core/common/code_utils.hpp
+++ b/src/core/common/code_utils.hpp
@@ -34,6 +34,8 @@
 #ifndef CODE_UTILS_HPP_
 #define CODE_UTILS_HPP_
 
+#include "openthread-core-config.h"
+
 #include "utils/wrap_stdbool.h"
 
 // Calculates the aligned variable size.
diff --git a/src/core/common/context.hpp b/src/core/common/context.hpp
index 276b6e0c1..17bd76e31 100644
--- a/src/core/common/context.hpp
+++ b/src/core/common/context.hpp
@@ -34,7 +34,8 @@
 #ifndef CONTEXT_HPP_
 #define CONTEXT_HPP_
 
-#include <openthread/config.h>
+#include "openthread-core-config.h"
+
 #include <openthread/platform/toolchain.h>
 
 #include "openthread-core-config.h"
diff --git a/src/core/common/crc16.cpp b/src/core/common/crc16.cpp
index befa6c567..1a707032a 100644
--- a/src/core/common/crc16.cpp
+++ b/src/core/common/crc16.cpp
@@ -31,8 +31,6 @@
  *   This file implements CRC16 computations.
  */
 
-#include <openthread/config.h>
-
 #include "crc16.hpp"
 
 namespace ot {
diff --git a/src/core/common/crc16.hpp b/src/core/common/crc16.hpp
index 6333b6025..cf84f89c3 100644
--- a/src/core/common/crc16.hpp
+++ b/src/core/common/crc16.hpp
@@ -34,6 +34,8 @@
 #ifndef CRC16_HPP_
 #define CRC16_HPP_
 
+#include "openthread-core-config.h"
+
 #include "utils/wrap_stdint.h"
 
 namespace ot {
diff --git a/src/core/common/debug.hpp b/src/core/common/debug.hpp
index b6dfbbe07..0a4019005 100644
--- a/src/core/common/debug.hpp
+++ b/src/core/common/debug.hpp
@@ -34,12 +34,12 @@
 #ifndef DEBUG_HPP_
 #define DEBUG_HPP_
 
+#include "openthread-core-config.h"
+
 #include <ctype.h>
 #include <stdio.h>
 #include "utils/wrap_string.h"
 
-#include "openthread-core-config.h"
-
 #if defined(OPENTHREAD_TARGET_DARWIN) || defined(OPENTHREAD_TARGET_LINUX)
 
 #include <assert.h>
diff --git a/src/core/common/encoding.hpp b/src/core/common/encoding.hpp
index c89a5f56d..21603e4cb 100644
--- a/src/core/common/encoding.hpp
+++ b/src/core/common/encoding.hpp
@@ -34,6 +34,8 @@
 #ifndef ENCODING_HPP_
 #define ENCODING_HPP_
 
+#include "openthread-core-config.h"
+
 #include <limits.h>
 #include "utils/wrap_stdint.h"
 
diff --git a/src/core/common/locator.cpp b/src/core/common/locator.cpp
index b9b5f0066..c96b23e0d 100644
--- a/src/core/common/locator.cpp
+++ b/src/core/common/locator.cpp
@@ -33,8 +33,6 @@
 
 #define WPP_NAME "locator.tmh"
 
-#include <openthread/config.h>
-
 #include "locator.hpp"
 
 #include "openthread-instance.h"
diff --git a/src/core/common/locator.hpp b/src/core/common/locator.hpp
index 680e30e4c..641835edf 100644
--- a/src/core/common/locator.hpp
+++ b/src/core/common/locator.hpp
@@ -34,11 +34,10 @@
 #ifndef LOCATOR_HPP_
 #define LOCATOR_HPP_
 
-#include <openthread/config.h>
+#include "openthread-core-config.h"
 
 #include <openthread/types.h>
 
-#include "openthread-core-config.h"
 #include "openthread-single-instance.h"
 
 namespace ot {
diff --git a/src/core/common/logging.cpp b/src/core/common/logging.cpp
index c2f0a4107..59fb0b736 100644
--- a/src/core/common/logging.cpp
+++ b/src/core/common/logging.cpp
@@ -33,8 +33,6 @@
 
 #define WPP_NAME "logging.tmh"
 
-#include <openthread/config.h>
-
 #include "logging.hpp"
 
 #include <openthread/openthread.h>
diff --git a/src/core/common/logging.hpp b/src/core/common/logging.hpp
index 8af62d85a..78d86e6fc 100644
--- a/src/core/common/logging.hpp
+++ b/src/core/common/logging.hpp
@@ -34,7 +34,7 @@
 #ifndef LOGGING_HPP_
 #define LOGGING_HPP_
 
-#include <openthread/config.h>
+#include "openthread-core-config.h"
 
 #include <ctype.h>
 #include <stdio.h>
@@ -44,8 +44,6 @@
 #include <openthread/types.h>
 #include <openthread/platform/logging.h>
 
-#include "openthread-core-config.h"
-
 #ifdef WINDOWS_LOGGING
 #ifdef _KERNEL_MODE
 #include <wdm.h>
diff --git a/src/core/common/message.cpp b/src/core/common/message.cpp
index 49a2c518c..f753413ad 100644
--- a/src/core/common/message.cpp
+++ b/src/core/common/message.cpp
@@ -33,8 +33,6 @@
 
 #define WPP_NAME "message.tmh"
 
-#include <openthread/config.h>
-
 #include "message.hpp"
 
 #include "openthread-instance.h"
diff --git a/src/core/common/message.hpp b/src/core/common/message.hpp
index d6b56265d..5ee8295f2 100644
--- a/src/core/common/message.hpp
+++ b/src/core/common/message.hpp
@@ -34,7 +34,7 @@
 #ifndef MESSAGE_HPP_
 #define MESSAGE_HPP_
 
-#include <openthread/config.h>
+#include "openthread-core-config.h"
 
 #include "utils/wrap_stdint.h"
 #include "utils/wrap_string.h"
@@ -42,7 +42,6 @@
 #include <openthread/message.h>
 #include <openthread/platform/messagepool.h>
 
-#include "openthread-core-config.h"
 #include "common/code_utils.hpp"
 #include "common/locator.hpp"
 #include "mac/mac_frame.hpp"
diff --git a/src/core/common/new.hpp b/src/core/common/new.hpp
index a59538393..ee2e3a47d 100644
--- a/src/core/common/new.hpp
+++ b/src/core/common/new.hpp
@@ -34,6 +34,8 @@
 #ifndef NEW_HPP_
 #define NEW_HPP_
 
+#include "openthread-core-config.h"
+
 #include <stddef.h>
 
 #include <openthread/platform/toolchain.h>
diff --git a/src/core/common/settings.hpp b/src/core/common/settings.hpp
index df2431f30..db42760fd 100644
--- a/src/core/common/settings.hpp
+++ b/src/core/common/settings.hpp
@@ -34,6 +34,8 @@
 #ifndef SETTINGS_HPP_
 #define SETTINGS_HPP_
 
+#include "openthread-core-config.h"
+
 #include "thread/mle.hpp"
 
 namespace ot {
diff --git a/src/core/common/tasklet.cpp b/src/core/common/tasklet.cpp
index e031b8bb9..26c55168e 100644
--- a/src/core/common/tasklet.cpp
+++ b/src/core/common/tasklet.cpp
@@ -31,8 +31,6 @@
  *   This file implements the tasklet scheduler.
  */
 
-#include <openthread/config.h>
-
 #include "tasklet.hpp"
 
 #include <openthread/openthread.h>
diff --git a/src/core/common/tasklet.hpp b/src/core/common/tasklet.hpp
index e17865f5f..8d4b1b9bf 100644
--- a/src/core/common/tasklet.hpp
+++ b/src/core/common/tasklet.hpp
@@ -34,6 +34,8 @@
 #ifndef TASKLET_HPP_
 #define TASKLET_HPP_
 
+#include "openthread-core-config.h"
+
 #include <stdio.h>
 
 #include <openthread/tasklet.h>
diff --git a/src/core/common/timer.cpp b/src/core/common/timer.cpp
index a6954f79a..7787bbcb9 100644
--- a/src/core/common/timer.cpp
+++ b/src/core/common/timer.cpp
@@ -33,8 +33,6 @@
 
 #define WPP_NAME "timer.tmh"
 
-#include <openthread/config.h>
-
 #include "timer.hpp"
 
 #include "openthread-instance.h"
diff --git a/src/core/common/timer.hpp b/src/core/common/timer.hpp
index 3d3431f19..013365ae8 100644
--- a/src/core/common/timer.hpp
+++ b/src/core/common/timer.hpp
@@ -34,6 +34,8 @@
 #ifndef TIMER_HPP_
 #define TIMER_HPP_
 
+#include "openthread-core-config.h"
+
 #include <stddef.h>
 #include "utils/wrap_stdint.h"
 
diff --git a/src/core/common/tlvs.cpp b/src/core/common/tlvs.cpp
index d91d2aa96..fb38ca927 100644
--- a/src/core/common/tlvs.cpp
+++ b/src/core/common/tlvs.cpp
@@ -31,8 +31,6 @@
  *   This file implements common methods for manipulating MLE TLVs.
  */
 
-#include <openthread/config.h>
-
 #include "tlvs.hpp"
 
 #include "common/code_utils.hpp"
diff --git a/src/core/common/tlvs.hpp b/src/core/common/tlvs.hpp
index ac4351e5f..32351c380 100644
--- a/src/core/common/tlvs.hpp
+++ b/src/core/common/tlvs.hpp
@@ -34,6 +34,8 @@
 #ifndef TLVS_HPP_
 #define TLVS_HPP_
 
+#include "openthread-core-config.h"
+
 #include "utils/wrap_string.h"
 
 #include <openthread/types.h>
diff --git a/src/core/common/trickle_timer.cpp b/src/core/common/trickle_timer.cpp
index 9c614daf5..38f2ad9df 100644
--- a/src/core/common/trickle_timer.cpp
+++ b/src/core/common/trickle_timer.cpp
@@ -31,8 +31,6 @@
  *   This file implements the trickle timer logic.
  */
 
-#include <openthread/config.h>
-
 #include "trickle_timer.hpp"
 
 #include <openthread/platform/random.h>
diff --git a/src/core/common/trickle_timer.hpp b/src/core/common/trickle_timer.hpp
index 68dc34226..6437cc548 100644
--- a/src/core/common/trickle_timer.hpp
+++ b/src/core/common/trickle_timer.hpp
@@ -34,6 +34,8 @@
 #ifndef TRICKLE_TIMER_HPP_
 #define TRICKLE_TIMER_HPP_
 
+#include "openthread-core-config.h"
+
 #include "common/context.hpp"
 #include "common/timer.hpp"
 
diff --git a/src/core/crypto/aes_ccm.cpp b/src/core/crypto/aes_ccm.cpp
index f85cc9a71..4bb58c316 100644
--- a/src/core/crypto/aes_ccm.cpp
+++ b/src/core/crypto/aes_ccm.cpp
@@ -31,8 +31,6 @@
  *   This file implements AES-CCM.
  */
 
-#include <openthread/config.h>
-
 #include "aes_ccm.hpp"
 
 #include "common/code_utils.hpp"
diff --git a/src/core/crypto/aes_ccm.hpp b/src/core/crypto/aes_ccm.hpp
index 6c31fac59..1fb093235 100644
--- a/src/core/crypto/aes_ccm.hpp
+++ b/src/core/crypto/aes_ccm.hpp
@@ -34,6 +34,8 @@
 #ifndef AES_CCM_HPP_
 #define AES_CCM_HPP_
 
+#include "openthread-core-config.h"
+
 #include "utils/wrap_stdint.h"
 
 #include <openthread/types.h>
diff --git a/src/core/crypto/aes_ecb.cpp b/src/core/crypto/aes_ecb.cpp
index 8db84769c..7f3c4b487 100644
--- a/src/core/crypto/aes_ecb.cpp
+++ b/src/core/crypto/aes_ecb.cpp
@@ -31,8 +31,6 @@
  *   This file implements AES-ECB.
  */
 
-#include <openthread/config.h>
-
 #include "aes_ecb.hpp"
 
 namespace ot {
diff --git a/src/core/crypto/aes_ecb.hpp b/src/core/crypto/aes_ecb.hpp
index 6323cd055..058d08438 100644
--- a/src/core/crypto/aes_ecb.hpp
+++ b/src/core/crypto/aes_ecb.hpp
@@ -34,6 +34,8 @@
 #ifndef AES_ECB_HPP_
 #define AES_ECB_HPP_
 
+#include "openthread-core-config.h"
+
 #include <mbedtls/aes.h>
 
 namespace ot {
diff --git a/src/core/crypto/heap.hpp b/src/core/crypto/heap.hpp
index ec05da5e7..2279c40dd 100644
--- a/src/core/crypto/heap.hpp
+++ b/src/core/crypto/heap.hpp
@@ -35,11 +35,10 @@
 #ifndef OT_HEAP_HPP_
 #define OT_HEAP_HPP_
 
-#include <openthread/config.h>
+#include "openthread-core-config.h"
 
 #include <stddef.h>
 
-#include "openthread-core-config.h"
 #include "utils/wrap_stdint.h"
 
 namespace ot {
diff --git a/src/core/crypto/hmac_sha256.cpp b/src/core/crypto/hmac_sha256.cpp
index 3857fb17f..f2c81bdd8 100644
--- a/src/core/crypto/hmac_sha256.cpp
+++ b/src/core/crypto/hmac_sha256.cpp
@@ -31,8 +31,6 @@
  *   This file implements HMAC SHA-256.
  */
 
-#include <openthread/config.h>
-
 #include "hmac_sha256.hpp"
 
 namespace ot {
diff --git a/src/core/crypto/hmac_sha256.hpp b/src/core/crypto/hmac_sha256.hpp
index aaa2eb4ab..7d8ed8646 100644
--- a/src/core/crypto/hmac_sha256.hpp
+++ b/src/core/crypto/hmac_sha256.hpp
@@ -34,6 +34,8 @@
 #ifndef HMAC_SHA256_HPP_
 #define HMAC_SHA256_HPP_
 
+#include "openthread-core-config.h"
+
 #include "utils/wrap_stdint.h"
 
 #include <mbedtls/md.h>
diff --git a/src/core/crypto/mbedtls.cpp b/src/core/crypto/mbedtls.cpp
index ffec6185b..934ed6eff 100644
--- a/src/core/crypto/mbedtls.cpp
+++ b/src/core/crypto/mbedtls.cpp
@@ -31,8 +31,6 @@
  *   This file implements the use of mbedTLS.
  */
 
-#include <openthread/config.h>
-
 #include "mbedtls.hpp"
 
 #include <mbedtls/platform.h>
diff --git a/src/core/crypto/mbedtls.hpp b/src/core/crypto/mbedtls.hpp
index d6e1c3cb7..8535aa235 100644
--- a/src/core/crypto/mbedtls.hpp
+++ b/src/core/crypto/mbedtls.hpp
@@ -34,6 +34,8 @@
 #ifndef OT_MBEDTLS_HPP_
 #define OT_MBEDTLS_HPP_
 
+#include "openthread-core-config.h"
+
 #if !OPENTHREAD_ENABLE_MULTIPLE_INSTANCES
 
 namespace ot {
diff --git a/src/core/crypto/pbkdf2_cmac.cpp b/src/core/crypto/pbkdf2_cmac.cpp
index df5643c92..8ad97510c 100644
--- a/src/core/crypto/pbkdf2_cmac.cpp
+++ b/src/core/crypto/pbkdf2_cmac.cpp
@@ -31,8 +31,6 @@
  *   This file implements PBKDF2 using AES-CMAC-PRF-128
  */
 
-#include <openthread/config.h>
-
 #include "pbkdf2_cmac.h"
 
 #include "common/debug.hpp"
diff --git a/src/core/crypto/pbkdf2_cmac.h b/src/core/crypto/pbkdf2_cmac.h
index 5791b0430..0d59ac133 100644
--- a/src/core/crypto/pbkdf2_cmac.h
+++ b/src/core/crypto/pbkdf2_cmac.h
@@ -35,6 +35,8 @@
 #ifndef PBKDF2_CMAC_H_
 #define PBKDF2_CMAC_H_
 
+#include "openthread-core-config.h"
+
 #include "utils/wrap_stdbool.h"
 #include "utils/wrap_stdint.h"
 
diff --git a/src/core/crypto/sha256.cpp b/src/core/crypto/sha256.cpp
index e178f43fa..a61f780a9 100644
--- a/src/core/crypto/sha256.cpp
+++ b/src/core/crypto/sha256.cpp
@@ -31,8 +31,6 @@
  *   This file implements SHA-256.
  */
 
-#include <openthread/config.h>
-
 #include "sha256.hpp"
 
 namespace ot {
diff --git a/src/core/crypto/sha256.hpp b/src/core/crypto/sha256.hpp
index c4292a93b..6431dd74a 100644
--- a/src/core/crypto/sha256.hpp
+++ b/src/core/crypto/sha256.hpp
@@ -34,6 +34,8 @@
 #ifndef SHA256_HPP_
 #define SHA256_HPP_
 
+#include "openthread-core-config.h"
+
 #include "utils/wrap_stdint.h"
 
 #include <mbedtls/sha256.h>
diff --git a/src/core/mac/mac.cpp b/src/core/mac/mac.cpp
index 2714c45c5..b97469db7 100644
--- a/src/core/mac/mac.cpp
+++ b/src/core/mac/mac.cpp
@@ -33,8 +33,6 @@
 
 #define WPP_NAME "mac.tmh"
 
-#include <openthread/config.h>
-
 #include "mac.hpp"
 
 #include "utils/wrap_string.h"
diff --git a/src/core/mac/mac.hpp b/src/core/mac/mac.hpp
index fc58d9d51..7eb9f638e 100644
--- a/src/core/mac/mac.hpp
+++ b/src/core/mac/mac.hpp
@@ -34,9 +34,10 @@
 #ifndef MAC_HPP_
 #define MAC_HPP_
 
+#include "openthread-core-config.h"
+
 #include <openthread/platform/radio.h>
 
-#include "openthread-core-config.h"
 #include "common/context.hpp"
 #include "common/locator.hpp"
 #include "common/tasklet.hpp"
diff --git a/src/core/mac/mac_filter.cpp b/src/core/mac/mac_filter.cpp
index 38efa8d97..d5c8a47fa 100644
--- a/src/core/mac/mac_filter.cpp
+++ b/src/core/mac/mac_filter.cpp
@@ -31,8 +31,6 @@
  *   This file implements Filter IEEE 802.15.4 frame filtering based on MAC address.
  */
 
-#include <openthread/config.h>
-
 #include "mac_filter.hpp"
 
 #include "openthread/types.h"
diff --git a/src/core/mac/mac_filter.hpp b/src/core/mac/mac_filter.hpp
index ec7753036..53f9d0b6d 100644
--- a/src/core/mac/mac_filter.hpp
+++ b/src/core/mac/mac_filter.hpp
@@ -34,6 +34,8 @@
 #ifndef MAC_FILTER_HPP_
 #define MAC_FILTER_HPP_
 
+#include "openthread-core-config.h"
+
 #include "utils/wrap_stdint.h"
 
 #include <openthread/types.h>
diff --git a/src/core/mac/mac_frame.cpp b/src/core/mac/mac_frame.cpp
index de41af414..6557bf672 100644
--- a/src/core/mac/mac_frame.cpp
+++ b/src/core/mac/mac_frame.cpp
@@ -31,8 +31,6 @@
  *   This file implements IEEE 802.15.4 header generation and processing.
  */
 
-#include <openthread/config.h>
-
 #include "mac_frame.hpp"
 
 #include <stdio.h>
diff --git a/src/core/mac/mac_frame.hpp b/src/core/mac/mac_frame.hpp
index 75d70df1f..2b4ae5b4d 100644
--- a/src/core/mac/mac_frame.hpp
+++ b/src/core/mac/mac_frame.hpp
@@ -34,6 +34,8 @@
 #ifndef MAC_FRAME_HPP_
 #define MAC_FRAME_HPP_
 
+#include "openthread-core-config.h"
+
 #include <limits.h>
 #include "utils/wrap_stdint.h"
 #include "utils/wrap_string.h"
@@ -41,7 +43,6 @@
 #include <openthread/types.h>
 #include <openthread/platform/radio.h>
 
-#include "openthread-core-config.h"
 #include "common/encoding.hpp"
 
 namespace ot {
diff --git a/src/core/meshcop/announce_begin_client.cpp b/src/core/meshcop/announce_begin_client.cpp
index f4902c7be..864d1027d 100644
--- a/src/core/meshcop/announce_begin_client.cpp
+++ b/src/core/meshcop/announce_begin_client.cpp
@@ -33,8 +33,6 @@
 
 #define WPP_NAME "announce_begin_client.tmh"
 
-#include <openthread/config.h>
-
 #include "announce_begin_client.hpp"
 
 #include <openthread/platform/random.h>
diff --git a/src/core/meshcop/announce_begin_client.hpp b/src/core/meshcop/announce_begin_client.hpp
index 6459ad415..b9bb3a391 100644
--- a/src/core/meshcop/announce_begin_client.hpp
+++ b/src/core/meshcop/announce_begin_client.hpp
@@ -35,6 +35,7 @@
 #define ANNOUNCE_BEGIN_CLIENT_HPP_
 
 #include "openthread-core-config.h"
+
 #include "common/locator.hpp"
 #include "coap/coap.hpp"
 #include "net/ip6_address.hpp"
diff --git a/src/core/meshcop/commissioner.cpp b/src/core/meshcop/commissioner.cpp
index b70058aca..a65da06b8 100644
--- a/src/core/meshcop/commissioner.cpp
+++ b/src/core/meshcop/commissioner.cpp
@@ -33,8 +33,6 @@
 
 #define WPP_NAME "commissioner.tmh"
 
-#include <openthread/config.h>
-
 #include "commissioner.hpp"
 
 #include <stdio.h>
diff --git a/src/core/meshcop/commissioner.hpp b/src/core/meshcop/commissioner.hpp
index bfc76c2e0..ca56f0d2f 100644
--- a/src/core/meshcop/commissioner.hpp
+++ b/src/core/meshcop/commissioner.hpp
@@ -34,9 +34,10 @@
 #ifndef COMMISSIONER_HPP_
 #define COMMISSIONER_HPP_
 
+#include "openthread-core-config.h"
+
 #include <openthread/commissioner.h>
 
-#include "openthread-core-config.h"
 #include "coap/coap.hpp"
 #include "coap/coap_secure.hpp"
 #include "common/locator.hpp"
diff --git a/src/core/meshcop/dataset.cpp b/src/core/meshcop/dataset.cpp
index a123f2d22..fe93bfb13 100644
--- a/src/core/meshcop/dataset.cpp
+++ b/src/core/meshcop/dataset.cpp
@@ -32,8 +32,6 @@
  *
  */
 
-#include <openthread/config.h>
-
 #include "dataset.hpp"
 
 #include <stdio.h>
diff --git a/src/core/meshcop/dataset.hpp b/src/core/meshcop/dataset.hpp
index c850371d0..394db0c60 100644
--- a/src/core/meshcop/dataset.hpp
+++ b/src/core/meshcop/dataset.hpp
@@ -35,6 +35,8 @@
 #ifndef MESHCOP_DATASET_HPP_
 #define MESHCOP_DATASET_HPP_
 
+#include "openthread-core-config.h"
+
 #include "common/locator.hpp"
 #include "common/message.hpp"
 #include "meshcop/meshcop_tlvs.hpp"
diff --git a/src/core/meshcop/dataset_local.cpp b/src/core/meshcop/dataset_local.cpp
index 0ac9cdb46..cf56b6a18 100644
--- a/src/core/meshcop/dataset_local.cpp
+++ b/src/core/meshcop/dataset_local.cpp
@@ -34,8 +34,6 @@
 
 #define WPP_NAME "dataset_local.tmh"
 
-#include <openthread/config.h>
-
 #include "dataset_local.hpp"
 
 #include <stdio.h>
diff --git a/src/core/meshcop/dataset_local.hpp b/src/core/meshcop/dataset_local.hpp
index 9684d9ab0..092daf932 100644
--- a/src/core/meshcop/dataset_local.hpp
+++ b/src/core/meshcop/dataset_local.hpp
@@ -35,6 +35,8 @@
 #ifndef MESHCOP_DATASET_LOCAL_HPP_
 #define MESHCOP_DATASET_LOCAL_HPP_
 
+#include "openthread-core-config.h"
+
 #include "common/locator.hpp"
 #include "meshcop/dataset.hpp"
 #include "meshcop/meshcop_tlvs.hpp"
diff --git a/src/core/meshcop/dataset_manager.cpp b/src/core/meshcop/dataset_manager.cpp
index 84ebeef6b..ab6ccd78f 100644
--- a/src/core/meshcop/dataset_manager.cpp
+++ b/src/core/meshcop/dataset_manager.cpp
@@ -34,8 +34,6 @@
 
 #define WPP_NAME "dataset_manager.tmh"
 
-#include <openthread/config.h>
-
 #include "dataset_manager.hpp"
 
 #include <stdio.h>
diff --git a/src/core/meshcop/dataset_manager.hpp b/src/core/meshcop/dataset_manager.hpp
index 5dd4dd62a..ad4d6e841 100644
--- a/src/core/meshcop/dataset_manager.hpp
+++ b/src/core/meshcop/dataset_manager.hpp
@@ -35,6 +35,8 @@
 #ifndef MESHCOP_DATASET_MANAGER_HPP_
 #define MESHCOP_DATASET_MANAGER_HPP_
 
+#include "openthread-core-config.h"
+
 #include <openthread/types.h>
 
 #include "coap/coap.hpp"
diff --git a/src/core/meshcop/dataset_manager_ftd.cpp b/src/core/meshcop/dataset_manager_ftd.cpp
index a54ca0bcb..6699aed8d 100644
--- a/src/core/meshcop/dataset_manager_ftd.cpp
+++ b/src/core/meshcop/dataset_manager_ftd.cpp
@@ -31,12 +31,11 @@
  *   This file implements MeshCoP Datasets manager to process commands.
  *
  */
-
-#if OPENTHREAD_FTD
-
 #define WPP_NAME "dataset_manager_ftd.tmh"
 
-#include <openthread/config.h>
+#include "dataset_manager_ftd.hpp"
+
+#if OPENTHREAD_FTD
 
 #include <stdio.h>
 
diff --git a/src/core/meshcop/dataset_manager_ftd.hpp b/src/core/meshcop/dataset_manager_ftd.hpp
index f80262336..858fc1780 100644
--- a/src/core/meshcop/dataset_manager_ftd.hpp
+++ b/src/core/meshcop/dataset_manager_ftd.hpp
@@ -35,9 +35,14 @@
 #ifndef MESHCOP_DATASET_MANAGER_FTD_HPP_
 #define MESHCOP_DATASET_MANAGER_FTD_HPP_
 
+#include "openthread-core-config.h"
+
+#if OPENTHREAD_FTD
+
 #include <openthread/types.h>
 
 #include "coap/coap.hpp"
+#include "meshcop/dataset_manager.hpp"
 
 namespace ot {
 
@@ -88,4 +93,6 @@ private:
 }  // namespace MeshCoP
 }  // namespace ot
 
+#endif  // OPENTHREAD_FTD
+
 #endif  // MESHCOP_DATASET_MANAGER_HPP_
diff --git a/src/core/meshcop/dataset_manager_mtd.hpp b/src/core/meshcop/dataset_manager_mtd.hpp
index 3b0e22e69..95fce9ad7 100644
--- a/src/core/meshcop/dataset_manager_mtd.hpp
+++ b/src/core/meshcop/dataset_manager_mtd.hpp
@@ -35,6 +35,8 @@
 #ifndef MESHCOP_DATASET_MANAGER_MTD_HPP_
 #define MESHCOP_DATASET_MANAGER_MTD_HPP_
 
+#include "openthread-core-config.h"
+
 #include <openthread/types.h>
 
 namespace ot {
diff --git a/src/core/meshcop/dtls.cpp b/src/core/meshcop/dtls.cpp
index aee213281..6f51e45e1 100644
--- a/src/core/meshcop/dtls.cpp
+++ b/src/core/meshcop/dtls.cpp
@@ -32,7 +32,6 @@
  */
 
 #define WPP_NAME "dtls.tmh"
-#include <openthread/config.h>
 
 #include "dtls.hpp"
 
diff --git a/src/core/meshcop/dtls.hpp b/src/core/meshcop/dtls.hpp
index 06992d425..1f8959f34 100644
--- a/src/core/meshcop/dtls.hpp
+++ b/src/core/meshcop/dtls.hpp
@@ -34,6 +34,8 @@
 #ifndef DTLS_HPP_
 #define DTLS_HPP_
 
+#include "openthread-core-config.h"
+
 #include <openthread/types.h>
 
 #include <mbedtls/ssl.h>
diff --git a/src/core/meshcop/energy_scan_client.cpp b/src/core/meshcop/energy_scan_client.cpp
index 7c6bcadec..e61cd031c 100644
--- a/src/core/meshcop/energy_scan_client.cpp
+++ b/src/core/meshcop/energy_scan_client.cpp
@@ -32,7 +32,6 @@
  */
 
 #define WPP_NAME "energy_scan_client.tmh"
-#include <openthread/config.h>
 
 #include "energy_scan_client.hpp"
 
diff --git a/src/core/meshcop/energy_scan_client.hpp b/src/core/meshcop/energy_scan_client.hpp
index 6ac24206b..4dbb2b07c 100644
--- a/src/core/meshcop/energy_scan_client.hpp
+++ b/src/core/meshcop/energy_scan_client.hpp
@@ -34,9 +34,10 @@
 #ifndef ENERGY_SCAN_CLIENT_HPP_
 #define ENERGY_SCAN_CLIENT_HPP_
 
+#include "openthread-core-config.h"
+
 #include <openthread/commissioner.h>
 
-#include "openthread-core-config.h"
 #include "coap/coap.hpp"
 #include "common/locator.hpp"
 #include "net/ip6_address.hpp"
diff --git a/src/core/meshcop/joiner.cpp b/src/core/meshcop/joiner.cpp
index 354f87947..f2e8ad302 100644
--- a/src/core/meshcop/joiner.cpp
+++ b/src/core/meshcop/joiner.cpp
@@ -33,8 +33,6 @@
 
 #define WPP_NAME "joiner.tmh"
 
-#include <openthread/config.h>
-
 #include "joiner.hpp"
 
 #include <stdio.h>
diff --git a/src/core/meshcop/joiner.hpp b/src/core/meshcop/joiner.hpp
index 44f7474fb..9b9cf7685 100644
--- a/src/core/meshcop/joiner.hpp
+++ b/src/core/meshcop/joiner.hpp
@@ -34,6 +34,8 @@
 #ifndef JOINER_HPP_
 #define JOINER_HPP_
 
+#include "openthread-core-config.h"
+
 #include <openthread/joiner.h>
 
 #include "coap/coap.hpp"
diff --git a/src/core/meshcop/joiner_router.cpp b/src/core/meshcop/joiner_router.cpp
index bf218954e..3be39a7a1 100644
--- a/src/core/meshcop/joiner_router.cpp
+++ b/src/core/meshcop/joiner_router.cpp
@@ -35,8 +35,6 @@
 
 #define WPP_NAME "joiner_router.tmh"
 
-#include <openthread/config.h>
-
 #include "joiner_router.hpp"
 
 #include <stdio.h>
diff --git a/src/core/meshcop/joiner_router.hpp b/src/core/meshcop/joiner_router.hpp
index 6a3f3f578..9e1dfc5c8 100644
--- a/src/core/meshcop/joiner_router.hpp
+++ b/src/core/meshcop/joiner_router.hpp
@@ -34,6 +34,8 @@
 #ifndef JOINER_ROUTER_HPP_
 #define JOINER_ROUTER_HPP_
 
+#include "openthread-core-config.h"
+
 #include <openthread/types.h>
 
 #include "coap/coap.hpp"
diff --git a/src/core/meshcop/leader.cpp b/src/core/meshcop/leader.cpp
index 4e164bb51..a13cdd448 100644
--- a/src/core/meshcop/leader.cpp
+++ b/src/core/meshcop/leader.cpp
@@ -35,8 +35,6 @@
 
 #define WPP_NAME "leader.tmh"
 
-#include <openthread/config.h>
-
 #include "leader.hpp"
 
 #include <stdio.h>
diff --git a/src/core/meshcop/leader.hpp b/src/core/meshcop/leader.hpp
index a691aee8c..b62165c24 100644
--- a/src/core/meshcop/leader.hpp
+++ b/src/core/meshcop/leader.hpp
@@ -34,6 +34,8 @@
 #ifndef MESHCOP_LEADER_HPP_
 #define MESHCOP_LEADER_HPP_
 
+#include "openthread-core-config.h"
+
 #include "coap/coap.hpp"
 #include "common/locator.hpp"
 #include "common/timer.hpp"
diff --git a/src/core/meshcop/meshcop.hpp b/src/core/meshcop/meshcop.hpp
index cbd5e2ca6..dc9d20001 100644
--- a/src/core/meshcop/meshcop.hpp
+++ b/src/core/meshcop/meshcop.hpp
@@ -35,6 +35,8 @@
 #ifndef MESHCOP_HPP_
 #define MESHCOP_HPP_
 
+#include "openthread-core-config.h"
+
 #include "coap/coap.hpp"
 #include "common/message.hpp"
 
diff --git a/src/core/meshcop/meshcop_tlvs.hpp b/src/core/meshcop/meshcop_tlvs.hpp
index 79f042148..dc1f1f0b0 100644
--- a/src/core/meshcop/meshcop_tlvs.hpp
+++ b/src/core/meshcop/meshcop_tlvs.hpp
@@ -35,6 +35,8 @@
 #ifndef MESHCOP_TLVS_HPP_
 #define MESHCOP_TLVS_HPP_
 
+#include "openthread-core-config.h"
+
 #include "utils/wrap_string.h"
 
 #include <openthread/types.h>
diff --git a/src/core/meshcop/panid_query_client.cpp b/src/core/meshcop/panid_query_client.cpp
index b3f5aec9a..2828535fa 100644
--- a/src/core/meshcop/panid_query_client.cpp
+++ b/src/core/meshcop/panid_query_client.cpp
@@ -33,8 +33,6 @@
 
 #define WPP_NAME "panid_query_client.tmh"
 
-#include <openthread/config.h>
-
 #include "panid_query_client.hpp"
 
 #include <openthread/platform/random.h>
diff --git a/src/core/meshcop/panid_query_client.hpp b/src/core/meshcop/panid_query_client.hpp
index dba6806c4..b6b09abd7 100644
--- a/src/core/meshcop/panid_query_client.hpp
+++ b/src/core/meshcop/panid_query_client.hpp
@@ -34,9 +34,10 @@
 #ifndef PANID_QUERY_CLIENT_HPP_
 #define PANID_QUERY_CLIENT_HPP_
 
+#include "openthread-core-config.h"
+
 #include <openthread/commissioner.h>
 
-#include "openthread-core-config.h"
 #include "coap/coap.hpp"
 #include "common/locator.hpp"
 #include "net/ip6_address.hpp"
diff --git a/src/core/meshcop/timestamp.cpp b/src/core/meshcop/timestamp.cpp
index 54a334601..65de2d59c 100644
--- a/src/core/meshcop/timestamp.cpp
+++ b/src/core/meshcop/timestamp.cpp
@@ -31,8 +31,6 @@
  *   This file implements common MeshCoP timestamp processing.
  */
 
-#include <openthread/config.h>
-
 #include "timestamp.hpp"
 
 #include "utils/wrap_string.h"
diff --git a/src/core/meshcop/timestamp.hpp b/src/core/meshcop/timestamp.hpp
index d65a7baf5..a76c2ea1e 100644
--- a/src/core/meshcop/timestamp.hpp
+++ b/src/core/meshcop/timestamp.hpp
@@ -35,6 +35,8 @@
 #ifndef MESHCOP_TIMESTAMP_HPP_
 #define MESHCOP_TIMESTAMP_HPP_
 
+#include "openthread-core-config.h"
+
 #include <string.h>
 
 #include <openthread/platform/toolchain.h>
diff --git a/src/core/net/dhcp6.hpp b/src/core/net/dhcp6.hpp
index a32a0ccc5..89fcee98f 100644
--- a/src/core/net/dhcp6.hpp
+++ b/src/core/net/dhcp6.hpp
@@ -34,6 +34,8 @@
 #ifndef DHCP6_HPP_
 #define DHCP6_HPP_
 
+#include "openthread-core-config.h"
+
 #include "common/message.hpp"
 #include "net/udp6.hpp"
 
diff --git a/src/core/net/dhcp6_client.cpp b/src/core/net/dhcp6_client.cpp
index b9d16fddc..9090c5c71 100644
--- a/src/core/net/dhcp6_client.cpp
+++ b/src/core/net/dhcp6_client.cpp
@@ -33,8 +33,6 @@
 
 #define WPP_NAME "dhcp6_client.tmh"
 
-#include <openthread/config.h>
-
 #include "dhcp6_client.hpp"
 
 #include <openthread/types.h>
diff --git a/src/core/net/dhcp6_client.hpp b/src/core/net/dhcp6_client.hpp
index c63590c9f..14abf540e 100644
--- a/src/core/net/dhcp6_client.hpp
+++ b/src/core/net/dhcp6_client.hpp
@@ -34,6 +34,8 @@
 #ifndef DHCP6_CLIENT_HPP_
 #define DHCP6_CLIENT_HPP_
 
+#include "openthread-core-config.h"
+
 #include <openthread/dhcp6_client.h>
 
 #include "common/locator.hpp"
diff --git a/src/core/net/dhcp6_server.cpp b/src/core/net/dhcp6_server.cpp
index 15c47707f..b0a12e22d 100644
--- a/src/core/net/dhcp6_server.cpp
+++ b/src/core/net/dhcp6_server.cpp
@@ -33,8 +33,6 @@
 
 #define WPP_NAME "dhcp6_server.tmh"
 
-#include <openthread/config.h>
-
 #include "dhcp6_server.hpp"
 
 #include <openthread/types.h>
diff --git a/src/core/net/dhcp6_server.hpp b/src/core/net/dhcp6_server.hpp
index a89c4a632..1d1c47631 100644
--- a/src/core/net/dhcp6_server.hpp
+++ b/src/core/net/dhcp6_server.hpp
@@ -34,6 +34,8 @@
 #ifndef DHCP6_SERVER_HPP_
 #define DHCP6_SERVER_HPP_
 
+#include "openthread-core-config.h"
+
 #include <openthread/types.h>
 
 #include "common/locator.hpp"
diff --git a/src/core/net/dns_client.cpp b/src/core/net/dns_client.cpp
index b068fde3c..52da3245f 100644
--- a/src/core/net/dns_client.cpp
+++ b/src/core/net/dns_client.cpp
@@ -26,8 +26,6 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <openthread/config.h>
-
 #include "dns_client.hpp"
 
 #include "utils/wrap_string.h"
diff --git a/src/core/net/dns_client.hpp b/src/core/net/dns_client.hpp
index b5dba6c40..43034a9c4 100644
--- a/src/core/net/dns_client.hpp
+++ b/src/core/net/dns_client.hpp
@@ -29,6 +29,8 @@
 #ifndef DNS_CLIENT_HPP_
 #define DNS_CLIENT_HPP_
 
+#include "openthread-core-config.h"
+
 #include <openthread/dns.h>
 #include <openthread/types.h>
 
diff --git a/src/core/net/dns_headers.hpp b/src/core/net/dns_headers.hpp
index 1ad0bd618..5937d91a5 100644
--- a/src/core/net/dns_headers.hpp
+++ b/src/core/net/dns_headers.hpp
@@ -34,6 +34,8 @@
 #ifndef DNS_HEADER_HPP_
 #define DNS_HEADER_HPP_
 
+#include "openthread-core-config.h"
+
 #include "utils/wrap_string.h"
 
 #include <openthread/types.h>
diff --git a/src/core/net/icmp6.cpp b/src/core/net/icmp6.cpp
index 13eda2373..64a6f3e42 100644
--- a/src/core/net/icmp6.cpp
+++ b/src/core/net/icmp6.cpp
@@ -33,8 +33,6 @@
 
 #define WPP_NAME "icmp6.tmh"
 
-#include <openthread/config.h>
-
 #include "icmp6.hpp"
 
 #include "utils/wrap_string.h"
diff --git a/src/core/net/icmp6.hpp b/src/core/net/icmp6.hpp
index 2c87ad0e1..77a1e35dc 100644
--- a/src/core/net/icmp6.hpp
+++ b/src/core/net/icmp6.hpp
@@ -34,6 +34,8 @@
 #ifndef ICMP6_HPP_
 #define ICMP6_HPP_
 
+#include "openthread-core-config.h"
+
 #include <openthread/icmp6.h>
 
 #include "common/encoding.hpp"
diff --git a/src/core/net/ip6.cpp b/src/core/net/ip6.cpp
index 32342b47e..da4d0157d 100644
--- a/src/core/net/ip6.cpp
+++ b/src/core/net/ip6.cpp
@@ -33,8 +33,6 @@
 
 #define WPP_NAME "ip6.tmh"
 
-#include <openthread/config.h>
-
 #include "ip6.hpp"
 
 #include "openthread-instance.h"
diff --git a/src/core/net/ip6.hpp b/src/core/net/ip6.hpp
index 931363717..c993437b8 100644
--- a/src/core/net/ip6.hpp
+++ b/src/core/net/ip6.hpp
@@ -34,6 +34,8 @@
 #ifndef IP6_HPP_
 #define IP6_HPP_
 
+#include "openthread-core-config.h"
+
 #include <stddef.h>
 
 #include <openthread/ip6.h>
diff --git a/src/core/net/ip6_address.cpp b/src/core/net/ip6_address.cpp
index 325f30542..f3b744c3f 100644
--- a/src/core/net/ip6_address.cpp
+++ b/src/core/net/ip6_address.cpp
@@ -31,8 +31,6 @@
  *   This file implements IPv6 addresses.
  */
 
-#include <openthread/config.h>
-
 #include "ip6_address.hpp"
 
 #include <stdio.h>
diff --git a/src/core/net/ip6_address.hpp b/src/core/net/ip6_address.hpp
index 19ffe90d9..e7325f120 100644
--- a/src/core/net/ip6_address.hpp
+++ b/src/core/net/ip6_address.hpp
@@ -34,6 +34,8 @@
 #ifndef IP6_ADDRESS_HPP_
 #define IP6_ADDRESS_HPP_
 
+#include "openthread-core-config.h"
+
 #include "utils/wrap_stdint.h"
 
 #include <openthread/types.h>
diff --git a/src/core/net/ip6_filter.cpp b/src/core/net/ip6_filter.cpp
index 77702c5e1..7bd43a509 100644
--- a/src/core/net/ip6_filter.cpp
+++ b/src/core/net/ip6_filter.cpp
@@ -31,8 +31,6 @@
  *   This file implements IPv6 datagram filtering.
  */
 
-#include <openthread/config.h>
-
 #include "ip6_filter.hpp"
 
 #include <stdio.h>
diff --git a/src/core/net/ip6_filter.hpp b/src/core/net/ip6_filter.hpp
index a9c35739d..64a0fe9fb 100644
--- a/src/core/net/ip6_filter.hpp
+++ b/src/core/net/ip6_filter.hpp
@@ -34,6 +34,8 @@
 #ifndef IP6_FILTER_HPP_
 #define IP6_FILTER_HPP_
 
+#include "openthread-core-config.h"
+
 #include <openthread/openthread.h>
 
 #include "common/message.hpp"
diff --git a/src/core/net/ip6_headers.cpp b/src/core/net/ip6_headers.cpp
index 5b087a271..e8027f95a 100644
--- a/src/core/net/ip6_headers.cpp
+++ b/src/core/net/ip6_headers.cpp
@@ -31,8 +31,6 @@
  *   This file implements IP6 header processing.
  */
 
-#include <openthread/config.h>
-
 #include "ip6_headers.hpp"
 
 #include "net/ip6.hpp"
diff --git a/src/core/net/ip6_headers.hpp b/src/core/net/ip6_headers.hpp
index b38ccae7e..7e7038a32 100644
--- a/src/core/net/ip6_headers.hpp
+++ b/src/core/net/ip6_headers.hpp
@@ -34,6 +34,8 @@
 #ifndef IP6_HEADERS_HPP_
 #define IP6_HEADERS_HPP_
 
+#include "openthread-core-config.h"
+
 #include <stddef.h>
 
 #include <openthread/types.h>
diff --git a/src/core/net/ip6_mpl.cpp b/src/core/net/ip6_mpl.cpp
index 37d11f441..531b89e23 100644
--- a/src/core/net/ip6_mpl.cpp
+++ b/src/core/net/ip6_mpl.cpp
@@ -31,8 +31,6 @@
  *   This file implements MPL.
  */
 
-#include <openthread/config.h>
-
 #include "ip6_mpl.hpp"
 
 #include <openthread/platform/random.h>
diff --git a/src/core/net/ip6_mpl.hpp b/src/core/net/ip6_mpl.hpp
index 68a19de33..a22444323 100644
--- a/src/core/net/ip6_mpl.hpp
+++ b/src/core/net/ip6_mpl.hpp
@@ -34,6 +34,8 @@
  *   This file includes definitions for MPL.
  */
 
+#include "openthread-core-config.h"
+
 #include <openthread/types.h>
 
 #include "common/locator.hpp"
diff --git a/src/core/net/ip6_routes.cpp b/src/core/net/ip6_routes.cpp
index 3305b518c..32b0eaab8 100644
--- a/src/core/net/ip6_routes.cpp
+++ b/src/core/net/ip6_routes.cpp
@@ -31,8 +31,6 @@
  *   This file implements IPv6 route tables.
  */
 
-#include <openthread/config.h>
-
 #include "ip6_routes.hpp"
 
 #include "common/code_utils.hpp"
diff --git a/src/core/net/ip6_routes.hpp b/src/core/net/ip6_routes.hpp
index a22a1585b..cecdd1cbf 100644
--- a/src/core/net/ip6_routes.hpp
+++ b/src/core/net/ip6_routes.hpp
@@ -34,6 +34,8 @@
  *   This file includes definitions for manipulating IPv6 routing tables.
  */
 
+#include "openthread-core-config.h"
+
 #include <openthread/types.h>
 
 #include "common/locator.hpp"
diff --git a/src/core/net/netif.cpp b/src/core/net/netif.cpp
index 57b628ec5..dfde80089 100644
--- a/src/core/net/netif.cpp
+++ b/src/core/net/netif.cpp
@@ -30,7 +30,6 @@
  * @file
  *   This file implements IPv6 network interfaces.
  */
-#include <openthread/config.h>
 
 #include "netif.hpp"
 
diff --git a/src/core/net/netif.hpp b/src/core/net/netif.hpp
index 8d46bf402..a82de1dda 100644
--- a/src/core/net/netif.hpp
+++ b/src/core/net/netif.hpp
@@ -34,6 +34,8 @@
 #ifndef NET_NETIF_HPP_
 #define NET_NETIF_HPP_
 
+#include "openthread-core-config.h"
+
 #include "common/locator.hpp"
 #include "common/message.hpp"
 #include "common/tasklet.hpp"
diff --git a/src/core/net/socket.hpp b/src/core/net/socket.hpp
index eaa8cac7e..c768cc36b 100644
--- a/src/core/net/socket.hpp
+++ b/src/core/net/socket.hpp
@@ -34,6 +34,8 @@
 #ifndef NET_SOCKET_HPP_
 #define NET_SOCKET_HPP_
 
+#include "openthread-core-config.h"
+
 #include <openthread/openthread.h>
 
 #include "net/ip6_address.hpp"
diff --git a/src/core/net/tcp.hpp b/src/core/net/tcp.hpp
index a2bbd92e6..ec51739b6 100644
--- a/src/core/net/tcp.hpp
+++ b/src/core/net/tcp.hpp
@@ -34,6 +34,8 @@
 #ifndef TCP_HPP_
 #define TCP_HPP_
 
+#include "openthread-core-config.h"
+
 #include <openthread/openthread.h>
 
 #include "net/ip6_headers.hpp"
diff --git a/src/core/net/udp6.cpp b/src/core/net/udp6.cpp
index 706ad35a9..b08bf0950 100644
--- a/src/core/net/udp6.cpp
+++ b/src/core/net/udp6.cpp
@@ -31,8 +31,6 @@
  *   This file implements UDP/IPv6 sockets.
  */
 
-#include <openthread/config.h>
-
 #include "udp6.hpp"
 
 #include <stdio.h>
diff --git a/src/core/net/udp6.hpp b/src/core/net/udp6.hpp
index 6b06037b8..fc965340c 100644
--- a/src/core/net/udp6.hpp
+++ b/src/core/net/udp6.hpp
@@ -34,6 +34,8 @@
 #ifndef UDP6_HPP_
 #define UDP6_HPP_
 
+#include "openthread-core-config.h"
+
 #include <openthread/udp.h>
 
 #include "common/locator.hpp"
diff --git a/src/core/openthread-core-config.h b/src/core/openthread-core-config.h
index 228108852..89668914c 100644
--- a/src/core/openthread-core-config.h
+++ b/src/core/openthread-core-config.h
@@ -34,6 +34,8 @@
 #ifndef OPENTHREAD_CORE_CONFIG_H_
 #define OPENTHREAD_CORE_CONFIG_H_
 
+#include <openthread/config.h>
+
 #define OPENTHREAD_CORE_CONFIG_H_IN
 
 #ifdef OPENTHREAD_PROJECT_CORE_CONFIG_FILE
diff --git a/src/core/openthread-instance.h b/src/core/openthread-instance.h
index 3a7b23112..fe41cce8f 100644
--- a/src/core/openthread-instance.h
+++ b/src/core/openthread-instance.h
@@ -35,7 +35,7 @@
 #ifndef OPENTHREADINSTANCE_H_
 #define OPENTHREADINSTANCE_H_
 
-#include <openthread/config.h>
+#include "openthread-core-config.h"
 
 #include "utils/wrap_stdint.h"
 #include "utils/wrap_stdbool.h"
@@ -43,7 +43,6 @@
 #include <openthread/types.h>
 #include <openthread/platform/logging.h>
 
-#include "openthread-core-config.h"
 #include "openthread-single-instance.h"
 #if OPENTHREAD_ENABLE_RAW_LINK_API
 #include "api/link_raw.hpp"
diff --git a/src/core/openthread-single-instance.h b/src/core/openthread-single-instance.h
index 99fc8c6ba..42f455b79 100644
--- a/src/core/openthread-single-instance.h
+++ b/src/core/openthread-single-instance.h
@@ -35,12 +35,10 @@
 #ifndef SINGLE_OPENTHREAD_INSTANCE_H_
 #define SINGLE_OPENTHREAD_INSTANCE_H_
 
-#include <openthread/config.h>
+#include "openthread-core-config.h"
 
 #include <openthread/types.h>
 
-#include "openthread-core-config.h"
-
 
 #if !OPENTHREAD_ENABLE_MULTIPLE_INSTANCES
 
diff --git a/src/core/thread/address_resolver.cpp b/src/core/thread/address_resolver.cpp
index a7593caec..47ac83fbf 100644
--- a/src/core/thread/address_resolver.cpp
+++ b/src/core/thread/address_resolver.cpp
@@ -35,8 +35,6 @@
 
 #define WPP_NAME "address_resolver.tmh"
 
-#include <openthread/config.h>
-
 #include "address_resolver.hpp"
 
 #include <openthread/platform/random.h>
diff --git a/src/core/thread/address_resolver.hpp b/src/core/thread/address_resolver.hpp
index 47f14bf8f..efee31eea 100644
--- a/src/core/thread/address_resolver.hpp
+++ b/src/core/thread/address_resolver.hpp
@@ -34,9 +34,10 @@
 #ifndef ADDRESS_RESOLVER_HPP_
 #define ADDRESS_RESOLVER_HPP_
 
+#include "openthread-core-config.h"
+
 #include <openthread/types.h>
 
-#include "openthread-core-config.h"
 #include "coap/coap.hpp"
 #include "common/locator.hpp"
 #include "common/timer.hpp"
diff --git a/src/core/thread/announce_begin_server.cpp b/src/core/thread/announce_begin_server.cpp
index 688ef1a95..065eafe09 100644
--- a/src/core/thread/announce_begin_server.cpp
+++ b/src/core/thread/announce_begin_server.cpp
@@ -33,8 +33,6 @@
 
 #define WPP_NAME "announce_begin_server.tmh"
 
-#include <openthread/config.h>
-
 #include "announce_begin_server.hpp"
 
 #include <openthread/platform/radio.h>
diff --git a/src/core/thread/announce_begin_server.hpp b/src/core/thread/announce_begin_server.hpp
index 8bad1fe12..32358380a 100644
--- a/src/core/thread/announce_begin_server.hpp
+++ b/src/core/thread/announce_begin_server.hpp
@@ -34,9 +34,10 @@
 #ifndef ANNOUNCE_BEGIN_SERVER_HPP_
 #define ANNOUNCE_BEGIN_SERVER_HPP_
 
+#include "openthread-core-config.h"
+
 #include <openthread/types.h>
 
-#include "openthread-core-config.h"
 #include "coap/coap.hpp"
 #include "common/locator.hpp"
 #include "common/timer.hpp"
diff --git a/src/core/thread/data_poll_manager.cpp b/src/core/thread/data_poll_manager.cpp
index 18299d7b9..c8ace6cd3 100644
--- a/src/core/thread/data_poll_manager.cpp
+++ b/src/core/thread/data_poll_manager.cpp
@@ -32,9 +32,9 @@
  */
 
 #define WPP_NAME "data_poll_manager.tmh"
-#include <openthread/config.h>
 
 #include "data_poll_manager.hpp"
+
 #include <openthread/platform/random.h>
 
 #include "openthread-instance.h"
diff --git a/src/core/thread/data_poll_manager.hpp b/src/core/thread/data_poll_manager.hpp
index 9fe5395f8..57a88a925 100644
--- a/src/core/thread/data_poll_manager.hpp
+++ b/src/core/thread/data_poll_manager.hpp
@@ -34,9 +34,10 @@
 #ifndef DATA_POLL_MANAGER_HPP_
 #define DATA_POLL_MANAGER_HPP_
 
+#include "openthread-core-config.h"
+
 #include <openthread/types.h>
 
-#include "openthread-core-config.h"
 #include "common/code_utils.hpp"
 #include "common/locator.hpp"
 #include "common/timer.hpp"
diff --git a/src/core/thread/energy_scan_server.cpp b/src/core/thread/energy_scan_server.cpp
index 5a58d28d6..5b7066488 100644
--- a/src/core/thread/energy_scan_server.cpp
+++ b/src/core/thread/energy_scan_server.cpp
@@ -32,7 +32,6 @@
  */
 
 #define WPP_NAME "energy_scan_server.tmh"
-#include <openthread/config.h>
 
 #include "energy_scan_server.hpp"
 
diff --git a/src/core/thread/energy_scan_server.hpp b/src/core/thread/energy_scan_server.hpp
index 3f75becb4..4419f1655 100644
--- a/src/core/thread/energy_scan_server.hpp
+++ b/src/core/thread/energy_scan_server.hpp
@@ -34,9 +34,10 @@
 #ifndef ENERGY_SCAN_SERVER_HPP_
 #define ENERGY_SCAN_SERVER_HPP_
 
+#include "openthread-core-config.h"
+
 #include <openthread/types.h>
 
-#include "openthread-core-config.h"
 #include "coap/coap.hpp"
 #include "common/locator.hpp"
 #include "common/timer.hpp"
diff --git a/src/core/thread/key_manager.cpp b/src/core/thread/key_manager.cpp
index 9c2f9bd37..814e9c8b3 100644
--- a/src/core/thread/key_manager.cpp
+++ b/src/core/thread/key_manager.cpp
@@ -31,9 +31,6 @@
  *   This file implements Thread security material generation.
  */
 
-
-#include <openthread/config.h>
-
 #include "key_manager.hpp"
 
 #include "openthread-instance.h"
diff --git a/src/core/thread/key_manager.hpp b/src/core/thread/key_manager.hpp
index e5fe3fd0c..c3bec5280 100644
--- a/src/core/thread/key_manager.hpp
+++ b/src/core/thread/key_manager.hpp
@@ -34,6 +34,8 @@
 #ifndef KEY_MANAGER_HPP_
 #define KEY_MANAGER_HPP_
 
+#include "openthread-core-config.h"
+
 #include "utils/wrap_stdint.h"
 
 #include <openthread/types.h>
diff --git a/src/core/thread/link_quality.cpp b/src/core/thread/link_quality.cpp
index 36cf00a13..4d20e02f5 100644
--- a/src/core/thread/link_quality.cpp
+++ b/src/core/thread/link_quality.cpp
@@ -31,8 +31,6 @@
  *   This file implements link quality information processing and storage.
  */
 
-#include <openthread/config.h>
-
 #include "link_quality.hpp"
 
 #include <stdio.h>
diff --git a/src/core/thread/link_quality.hpp b/src/core/thread/link_quality.hpp
index 2ca0593d5..9bfcc02bc 100644
--- a/src/core/thread/link_quality.hpp
+++ b/src/core/thread/link_quality.hpp
@@ -34,6 +34,8 @@
 #ifndef LINK_QUALITY_HPP_
 #define LINK_QUALITY_HPP_
 
+#include "openthread-core-config.h"
+
 #include <openthread/platform/radio.h>
 #include <openthread/types.h>
 
diff --git a/src/core/thread/lowpan.cpp b/src/core/thread/lowpan.cpp
index 435a8a17c..09aab63cd 100644
--- a/src/core/thread/lowpan.cpp
+++ b/src/core/thread/lowpan.cpp
@@ -31,8 +31,6 @@
  *   This file implements 6LoWPAN header compression.
  */
 
-#include <openthread/config.h>
-
 #include "lowpan.hpp"
 
 #include "common/code_utils.hpp"
diff --git a/src/core/thread/lowpan.hpp b/src/core/thread/lowpan.hpp
index c33ac729b..a8428c387 100644
--- a/src/core/thread/lowpan.hpp
+++ b/src/core/thread/lowpan.hpp
@@ -34,6 +34,8 @@
 #ifndef LOWPAN_HPP_
 #define LOWPAN_HPP_
 
+#include "openthread-core-config.h"
+
 #include "common/locator.hpp"
 #include "common/message.hpp"
 #include "mac/mac_frame.hpp"
diff --git a/src/core/thread/mesh_forwarder.cpp b/src/core/thread/mesh_forwarder.cpp
index dd805404c..8f0244070 100644
--- a/src/core/thread/mesh_forwarder.cpp
+++ b/src/core/thread/mesh_forwarder.cpp
@@ -33,8 +33,6 @@
 
 #define WPP_NAME "mesh_forwarder.tmh"
 
-#include <openthread/config.h>
-
 #include "mesh_forwarder.hpp"
 
 #include <openthread/platform/random.h>
diff --git a/src/core/thread/mesh_forwarder.hpp b/src/core/thread/mesh_forwarder.hpp
index e1432392d..a79e3810b 100644
--- a/src/core/thread/mesh_forwarder.hpp
+++ b/src/core/thread/mesh_forwarder.hpp
@@ -34,9 +34,10 @@
 #ifndef MESH_FORWARDER_HPP_
 #define MESH_FORWARDER_HPP_
 
+#include "openthread-core-config.h"
+
 #include <openthread/types.h>
 
-#include "openthread-core-config.h"
 #include "common/locator.hpp"
 #include "common/tasklet.hpp"
 #include "mac/mac.hpp"
diff --git a/src/core/thread/mle.cpp b/src/core/thread/mle.cpp
index 259e1c845..3fef3eef5 100644
--- a/src/core/thread/mle.cpp
+++ b/src/core/thread/mle.cpp
@@ -33,9 +33,8 @@
 
 #define WPP_NAME "mle.tmh"
 
-
-#include <openthread/config.h>
 #include "mle.hpp"
+
 #include <openthread/platform/radio.h>
 #include <openthread/platform/random.h>
 #include <openthread/platform/settings.h>
diff --git a/src/core/thread/mle.hpp b/src/core/thread/mle.hpp
index 130573878..34057a573 100644
--- a/src/core/thread/mle.hpp
+++ b/src/core/thread/mle.hpp
@@ -34,6 +34,8 @@
 #ifndef MLE_HPP_
 #define MLE_HPP_
 
+#include "openthread-core-config.h"
+
 #include <openthread/openthread.h>
 
 #include "common/encoding.hpp"
diff --git a/src/core/thread/mle_constants.hpp b/src/core/thread/mle_constants.hpp
index 07ae29e34..d6e7a3e11 100644
--- a/src/core/thread/mle_constants.hpp
+++ b/src/core/thread/mle_constants.hpp
@@ -34,6 +34,8 @@
 #ifndef MLE_CONSTANTS_HPP_
 #define MLE_CONSTANTS_HPP_
 
+#include "openthread-core-config.h"
+
 namespace ot {
 namespace Mle {
 
diff --git a/src/core/thread/mle_router.cpp b/src/core/thread/mle_router.cpp
index e3ff118b7..91b54f5d9 100644
--- a/src/core/thread/mle_router.cpp
+++ b/src/core/thread/mle_router.cpp
@@ -34,8 +34,6 @@
 
 #define WPP_NAME "mle_router.tmh"
 
-#include <openthread/config.h>
-
 #include "mle_router.hpp"
 
 #include <openthread/platform/random.h>
diff --git a/src/core/thread/mle_router.hpp b/src/core/thread/mle_router.hpp
index 18b8bef46..a70638ecb 100644
--- a/src/core/thread/mle_router.hpp
+++ b/src/core/thread/mle_router.hpp
@@ -26,6 +26,9 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifndef MLE_ROUTER_HPP_
+#define MLE_ROUTER_HPP_
+
 #if OPENTHREAD_MTD
 #include "mle_router_mtd.hpp"
 #elif OPENTHREAD_FTD
@@ -34,3 +37,4 @@
 #error "Please define OPENTHREAD_MTD=1 or OPENTHREAD_FTD=1"
 #endif
 
+#endif // MLE_ROUTER_HPP_
diff --git a/src/core/thread/mle_router_ftd.hpp b/src/core/thread/mle_router_ftd.hpp
index c58bd937b..b0d5c5e0d 100644
--- a/src/core/thread/mle_router_ftd.hpp
+++ b/src/core/thread/mle_router_ftd.hpp
@@ -31,8 +31,10 @@
  *   This file includes definitions for MLE functionality required by the Thread Router and Leader roles.
  */
 
-#ifndef MLE_ROUTER_HPP_
-#define MLE_ROUTER_HPP_
+#ifndef MLE_ROUTER_FTD_HPP_
+#define MLE_ROUTER_FTD_HPP_
+
+#include "openthread-core-config.h"
 
 #include "utils/wrap_string.h"
 
@@ -848,4 +850,4 @@ private:
 
 }  // namespace ot
 
-#endif  // MLE_ROUTER_HPP_
+#endif  // MLE_ROUTER_FTD_HPP_
diff --git a/src/core/thread/mle_router_mtd.hpp b/src/core/thread/mle_router_mtd.hpp
index 7952717e3..cffc08bed 100644
--- a/src/core/thread/mle_router_mtd.hpp
+++ b/src/core/thread/mle_router_mtd.hpp
@@ -31,8 +31,10 @@
  *   This file includes definitions for MLE functionality required by the Thread Router and Leader roles.
  */
 
-#ifndef MLE_ROUTER_HPP_
-#define MLE_ROUTER_HPP_
+#ifndef MLE_ROUTER_MTD_HPP_
+#define MLE_ROUTER_MTD_HPP_
+
+#include "openthread-core-config.h"
 
 #include "utils/wrap_string.h"
 
@@ -155,4 +157,4 @@ private:
 }  // namespace Mle
 }  // namespace ot
 
-#endif  // MLE_ROUTER_HPP_
+#endif  // MLE_ROUTER_MTD_HPP_
diff --git a/src/core/thread/mle_tlvs.hpp b/src/core/thread/mle_tlvs.hpp
index efc2d5093..2ee070bcc 100644
--- a/src/core/thread/mle_tlvs.hpp
+++ b/src/core/thread/mle_tlvs.hpp
@@ -34,6 +34,8 @@
 #ifndef MLE_TLVS_HPP_
 #define MLE_TLVS_HPP_
 
+#include "openthread-core-config.h"
+
 #include "utils/wrap_string.h"
 
 #include <openthread/types.h>
diff --git a/src/core/thread/network_data.cpp b/src/core/thread/network_data.cpp
index dc890deb2..964ae9595 100644
--- a/src/core/thread/network_data.cpp
+++ b/src/core/thread/network_data.cpp
@@ -33,8 +33,6 @@
 
 #define WPP_NAME "network_data.tmh"
 
-#include <openthread/config.h>
-
 #include "network_data.hpp"
 
 #include <openthread/platform/random.h>
diff --git a/src/core/thread/network_data.hpp b/src/core/thread/network_data.hpp
index 0e1427266..c9033ebf5 100644
--- a/src/core/thread/network_data.hpp
+++ b/src/core/thread/network_data.hpp
@@ -34,6 +34,8 @@
 #ifndef NETWORK_DATA_HPP_
 #define NETWORK_DATA_HPP_
 
+#include "openthread-core-config.h"
+
 #include <openthread/types.h>
 
 #include "coap/coap.hpp"
diff --git a/src/core/thread/network_data_leader.cpp b/src/core/thread/network_data_leader.cpp
index e7232916f..5567fa644 100644
--- a/src/core/thread/network_data_leader.cpp
+++ b/src/core/thread/network_data_leader.cpp
@@ -33,8 +33,6 @@
 
 #define WPP_NAME "network_data_leader.tmh"
 
-#include <openthread/config.h>
-
 #include "network_data_leader.hpp"
 
 #include <openthread/platform/random.h>
diff --git a/src/core/thread/network_data_leader.hpp b/src/core/thread/network_data_leader.hpp
index d0ed13ce9..1065dcfe7 100644
--- a/src/core/thread/network_data_leader.hpp
+++ b/src/core/thread/network_data_leader.hpp
@@ -34,7 +34,7 @@
 #ifndef NETWORK_DATA_LEADER_HPP_
 #define NETWORK_DATA_LEADER_HPP_
 
-#include <openthread/config.h>
+#include "openthread-core-config.h"
 
 #include "utils/wrap_stdint.h"
 
diff --git a/src/core/thread/network_data_leader_ftd.cpp b/src/core/thread/network_data_leader_ftd.cpp
index 179e677fa..cdf0dc725 100644
--- a/src/core/thread/network_data_leader_ftd.cpp
+++ b/src/core/thread/network_data_leader_ftd.cpp
@@ -35,9 +35,9 @@
 
 
 #define WPP_NAME "network_data_leader_ftd.tmh"
-#include <openthread/config.h>
 
 #include "network_data_leader.hpp"
+
 #include <openthread/platform/random.h>
 
 #include "openthread-instance.h"
diff --git a/src/core/thread/network_data_leader_ftd.hpp b/src/core/thread/network_data_leader_ftd.hpp
index e90249735..2928e586d 100644
--- a/src/core/thread/network_data_leader_ftd.hpp
+++ b/src/core/thread/network_data_leader_ftd.hpp
@@ -34,6 +34,8 @@
 #ifndef NETWORK_DATA_LEADER_FTD_HPP_
 #define NETWORK_DATA_LEADER_FTD_HPP_
 
+#include "openthread-core-config.h"
+
 #include "utils/wrap_stdint.h"
 
 #include "coap/coap.hpp"
diff --git a/src/core/thread/network_data_leader_mtd.hpp b/src/core/thread/network_data_leader_mtd.hpp
index e83697842..5ed3dfd1c 100644
--- a/src/core/thread/network_data_leader_mtd.hpp
+++ b/src/core/thread/network_data_leader_mtd.hpp
@@ -34,6 +34,8 @@
 #ifndef NETWORK_DATA_LEADER_MTD_HPP_
 #define NETWORK_DATA_LEADER_MTD_HPP_
 
+#include "openthread-core-config.h"
+
 #include "utils/wrap_stdint.h"
 
 namespace ot {
diff --git a/src/core/thread/network_data_local.cpp b/src/core/thread/network_data_local.cpp
index cac640f32..54ba8d44d 100644
--- a/src/core/thread/network_data_local.cpp
+++ b/src/core/thread/network_data_local.cpp
@@ -31,8 +31,6 @@
  *   This file implements the local Thread Network Data.
  */
 
-#include <openthread/config.h>
-
 #include "network_data_local.hpp"
 
 #include "common/debug.hpp"
diff --git a/src/core/thread/network_data_local.hpp b/src/core/thread/network_data_local.hpp
index 9dbb4e631..873c46ce6 100644
--- a/src/core/thread/network_data_local.hpp
+++ b/src/core/thread/network_data_local.hpp
@@ -34,6 +34,8 @@
 #ifndef NETWORK_DATA_LOCAL_HPP_
 #define NETWORK_DATA_LOCAL_HPP_
 
+#include "openthread-core-config.h"
+
 #include "thread/network_data.hpp"
 
 namespace ot {
diff --git a/src/core/thread/network_data_tlvs.hpp b/src/core/thread/network_data_tlvs.hpp
index 8a3d51c59..61af7a389 100644
--- a/src/core/thread/network_data_tlvs.hpp
+++ b/src/core/thread/network_data_tlvs.hpp
@@ -34,6 +34,8 @@
 #ifndef NETWORK_DATA_TLVS_HPP_
 #define NETWORK_DATA_TLVS_HPP_
 
+#include "openthread-core-config.h"
+
 #include "utils/wrap_string.h"
 
 #include "common/encoding.hpp"
diff --git a/src/core/thread/network_diagnostic.cpp b/src/core/thread/network_diagnostic.cpp
index 7c16557cd..afda895c9 100644
--- a/src/core/thread/network_diagnostic.cpp
+++ b/src/core/thread/network_diagnostic.cpp
@@ -33,8 +33,6 @@
 
 #define WPP_NAME "network_diagnostic.tmh"
 
-#include <openthread/config.h>
-
 #include "network_diagnostic.hpp"
 
 #include <openthread/platform/random.h>
diff --git a/src/core/thread/network_diagnostic.hpp b/src/core/thread/network_diagnostic.hpp
index ed5a64d0a..c0bef15aa 100644
--- a/src/core/thread/network_diagnostic.hpp
+++ b/src/core/thread/network_diagnostic.hpp
@@ -34,9 +34,10 @@
 #ifndef NETWORK_DIAGNOSTIC_HPP_
 #define NETWORK_DIAGNOSTIC_HPP_
 
+#include "openthread-core-config.h"
+
 #include <openthread/types.h>
 
-#include "openthread-core-config.h"
 #include "coap/coap.hpp"
 #include "common/locator.hpp"
 #include "net/udp6.hpp"
diff --git a/src/core/thread/network_diagnostic_tlvs.hpp b/src/core/thread/network_diagnostic_tlvs.hpp
index 8da079d69..23dba5f02 100644
--- a/src/core/thread/network_diagnostic_tlvs.hpp
+++ b/src/core/thread/network_diagnostic_tlvs.hpp
@@ -34,6 +34,8 @@
 #ifndef NETWORK_DIAGNOSTIC_TLVS_HPP_
 #define NETWORK_DIAGNOSTIC_TLVS_HPP_
 
+#include "openthread-core-config.h"
+
 #include "utils/wrap_string.h"
 
 #include <openthread/types.h>
diff --git a/src/core/thread/panid_query_server.cpp b/src/core/thread/panid_query_server.cpp
index 8dc74391b..4ef9a1fd4 100644
--- a/src/core/thread/panid_query_server.cpp
+++ b/src/core/thread/panid_query_server.cpp
@@ -31,9 +31,7 @@
  *   This file implements the PAN ID Query Server.
  */
 
-
 #define WPP_NAME "panid_query_server.tmh"
-#include <openthread/config.h>
 
 #include "panid_query_server.hpp"
 
diff --git a/src/core/thread/panid_query_server.hpp b/src/core/thread/panid_query_server.hpp
index 65544ef7b..8bccb9686 100644
--- a/src/core/thread/panid_query_server.hpp
+++ b/src/core/thread/panid_query_server.hpp
@@ -34,9 +34,10 @@
 #ifndef PANID_QUERY_SERVER_HPP_
 #define PANID_QUERY_SERVER_HPP_
 
+#include "openthread-core-config.h"
+
 #include <openthread/types.h>
 
-#include "openthread-core-config.h"
 #include "coap/coap.hpp"
 #include "common/locator.hpp"
 #include "common/timer.hpp"
diff --git a/src/core/thread/src_match_controller.cpp b/src/core/thread/src_match_controller.cpp
index be409223c..a9cedb3e4 100644
--- a/src/core/thread/src_match_controller.cpp
+++ b/src/core/thread/src_match_controller.cpp
@@ -33,8 +33,6 @@
 
 #define WPP_NAME "src_match_controller.tmh"
 
-#include <openthread/config.h>
-
 #include "src_match_controller.hpp"
 
 #include "common/code_utils.hpp"
diff --git a/src/core/thread/src_match_controller.hpp b/src/core/thread/src_match_controller.hpp
index d122d809c..254f99bf3 100644
--- a/src/core/thread/src_match_controller.hpp
+++ b/src/core/thread/src_match_controller.hpp
@@ -34,9 +34,10 @@
 #ifndef SOURCE_MATCH_CONTROLLER_HPP_
 #define SOURCE_MATCH_CONTROLLER_HPP_
 
+#include "openthread-core-config.h"
+
 #include <openthread/types.h>
 
-#include "openthread-core-config.h"
 #include "common/locator.hpp"
 #include "thread/topology.hpp"
 
diff --git a/src/core/thread/thread_netif.cpp b/src/core/thread/thread_netif.cpp
index 7ef926555..94791156d 100644
--- a/src/core/thread/thread_netif.cpp
+++ b/src/core/thread/thread_netif.cpp
@@ -32,8 +32,6 @@
  *   This file implements the Thread network interface.
  */
 
-#include <openthread/config.h>
-
 #include "thread_netif.hpp"
 
 #include "openthread-instance.h"
diff --git a/src/core/thread/thread_netif.hpp b/src/core/thread/thread_netif.hpp
index c27f3f2d9..d16c7141f 100644
--- a/src/core/thread/thread_netif.hpp
+++ b/src/core/thread/thread_netif.hpp
@@ -34,7 +34,7 @@
 #ifndef THREAD_NETIF_HPP_
 #define THREAD_NETIF_HPP_
 
-#include <openthread/config.h>
+#include "openthread-core-config.h"
 
 #include <openthread/types.h>
 
diff --git a/src/core/thread/thread_tlvs.hpp b/src/core/thread/thread_tlvs.hpp
index 0124babd4..cd73c9c33 100644
--- a/src/core/thread/thread_tlvs.hpp
+++ b/src/core/thread/thread_tlvs.hpp
@@ -34,6 +34,8 @@
 #ifndef THREAD_TLVS_HPP_
 #define THREAD_TLVS_HPP_
 
+#include "openthread-core-config.h"
+
 #include <openthread/types.h>
 
 #include "common/encoding.hpp"
diff --git a/src/core/thread/thread_uri_paths.hpp b/src/core/thread/thread_uri_paths.hpp
index a50f43a02..ac5687f9e 100644
--- a/src/core/thread/thread_uri_paths.hpp
+++ b/src/core/thread/thread_uri_paths.hpp
@@ -34,6 +34,8 @@
 #ifndef THREAD_URIS_HPP_
 #define THREAD_URIS_HPP_
 
+#include "openthread-core-config.h"
+
 namespace ot {
 
 /**
diff --git a/src/core/thread/tmf_proxy.cpp b/src/core/thread/tmf_proxy.cpp
index 1293b52b1..31053ee6a 100644
--- a/src/core/thread/tmf_proxy.cpp
+++ b/src/core/thread/tmf_proxy.cpp
@@ -33,8 +33,6 @@
 
 #define WPP_NAME "tmf_proxy.tmh"
 
-#include <openthread/config.h>
-
 #include "tmf_proxy.hpp"
 
 #include <openthread/types.h>
diff --git a/src/core/thread/tmf_proxy.hpp b/src/core/thread/tmf_proxy.hpp
index aadf25762..67d0fbe87 100644
--- a/src/core/thread/tmf_proxy.hpp
+++ b/src/core/thread/tmf_proxy.hpp
@@ -34,9 +34,10 @@
 #ifndef TMF_PROXY_HPP_
 #define TMF_PROXY_HPP_
 
+#include "openthread-core-config.h"
+
 #include <openthread/tmf_proxy.h>
 
-#include "openthread-core-config.h"
 #include "coap/coap.hpp"
 
 namespace ot {
diff --git a/src/core/thread/topology.cpp b/src/core/thread/topology.cpp
index 658b3b53b..697de812e 100644
--- a/src/core/thread/topology.cpp
+++ b/src/core/thread/topology.cpp
@@ -33,8 +33,6 @@
 
 #define WPP_NAME "topology.tmh"
 
-#include <openthread/config.h>
-
 #include "topology.hpp"
 
 #include "common/code_utils.hpp"
diff --git a/src/core/thread/topology.hpp b/src/core/thread/topology.hpp
index 207d7d2be..2ed4744ee 100644
--- a/src/core/thread/topology.hpp
+++ b/src/core/thread/topology.hpp
@@ -34,9 +34,10 @@
 #ifndef TOPOLOGY_HPP_
 #define TOPOLOGY_HPP_
 
+#include "openthread-core-config.h"
+
 #include <openthread/platform/random.h>
 
-#include "openthread-core-config.h"
 #include "common/message.hpp"
 #include "mac/mac_frame.hpp"
 #include "net/ip6.hpp"
diff --git a/src/core/utils/child_supervision.cpp b/src/core/utils/child_supervision.cpp
index 7d98dd7c7..6081cd151 100644
--- a/src/core/utils/child_supervision.cpp
+++ b/src/core/utils/child_supervision.cpp
@@ -31,8 +31,6 @@
  *   This file implements the child supervision feature.
  */
 
-#include <openthread/config.h>
-
 #include "child_supervision.hpp"
 
 #include <openthread/openthread.h>
diff --git a/src/core/utils/child_supervision.hpp b/src/core/utils/child_supervision.hpp
index 143c267ec..e3f2962cc 100644
--- a/src/core/utils/child_supervision.hpp
+++ b/src/core/utils/child_supervision.hpp
@@ -35,9 +35,8 @@
 #ifndef CHILD_SUPERVISION_HPP_
 #define CHILD_SUPERVISION_HPP_
 
-#include <openthread/config.h>
-
 #include "openthread-core-config.h"
+
 #include "common/locator.hpp"
 #include "common/message.hpp"
 #include "common/timer.hpp"
diff --git a/src/core/utils/jam_detector.cpp b/src/core/utils/jam_detector.cpp
index 20fe80c99..3593ce16b 100644
--- a/src/core/utils/jam_detector.cpp
+++ b/src/core/utils/jam_detector.cpp
@@ -31,8 +31,6 @@
  *   This file implements the jam detector feature.
  */
 
-#include <openthread/config.h>
-
 #include "jam_detector.hpp"
 
 #include <openthread/openthread.h>
diff --git a/src/core/utils/jam_detector.hpp b/src/core/utils/jam_detector.hpp
index 402999a76..93bef3ac6 100644
--- a/src/core/utils/jam_detector.hpp
+++ b/src/core/utils/jam_detector.hpp
@@ -34,7 +34,7 @@
 #ifndef JAM_DETECTOR_HPP_
 #define JAM_DETECTOR_HPP_
 
-#include <openthread/config.h>
+#include "openthread-core-config.h"
 
 #include "common/locator.hpp"
 #include "common/timer.hpp"
diff --git a/src/core/utils/missing_strlcat.c b/src/core/utils/missing_strlcat.c
index 575267a4e..5729fb46c 100644
--- a/src/core/utils/missing_strlcat.c
+++ b/src/core/utils/missing_strlcat.c
@@ -25,7 +25,7 @@
  *    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <openthread/config.h>
+#include "openthread-core-config.h"
 
 #include "utils/wrap_string.h"
 
diff --git a/src/core/utils/missing_strlcpy.c b/src/core/utils/missing_strlcpy.c
index fa2b49706..a0a2373e8 100644
--- a/src/core/utils/missing_strlcpy.c
+++ b/src/core/utils/missing_strlcpy.c
@@ -25,8 +25,6 @@
  *    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <openthread/config.h>
-
 #include "utils/wrap_string.h"
 
 size_t missing_strlcpy(char *dest, const char *src, size_t size)
diff --git a/src/core/utils/missing_strnlen.c b/src/core/utils/missing_strnlen.c
index 0a1ce1a0d..7245e14c5 100644
--- a/src/core/utils/missing_strnlen.c
+++ b/src/core/utils/missing_strnlen.c
@@ -25,8 +25,6 @@
  *    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <openthread/config.h>
-
 #include "utils/wrap_string.h"
 
 size_t missing_strnlen(const char *s, size_t maxlen)
diff --git a/src/core/utils/slaac_address.cpp b/src/core/utils/slaac_address.cpp
index 2f6e313f4..aede1501c 100644
--- a/src/core/utils/slaac_address.cpp
+++ b/src/core/utils/slaac_address.cpp
@@ -31,8 +31,6 @@
  *   This file implements the Thread IPv6 global addresses configuration utilities.
  */
 
-#include <openthread/config.h>
-
 #include "slaac_address.hpp"
 
 #include "utils/wrap_string.h"
diff --git a/src/core/utils/slaac_address.hpp b/src/core/utils/slaac_address.hpp
index 771410f1c..22f2f140a 100644
--- a/src/core/utils/slaac_address.hpp
+++ b/src/core/utils/slaac_address.hpp
@@ -34,6 +34,8 @@
 #ifndef SLAAC_ADDRESS_HPP_
 #define SLAAC_ADDRESS_HPP_
 
+#include "openthread-core-config.h"
+
 #include <openthread/types.h>
 #include <openthread/platform/random.h>
 
diff --git a/src/diag/diag_process.cpp b/src/diag/diag_process.cpp
index d16e276e1..57a05c0b0 100644
--- a/src/diag/diag_process.cpp
+++ b/src/diag/diag_process.cpp
@@ -31,14 +31,13 @@
  *   This file implements the diagnostics module.
  */
 
-#include <openthread/config.h>
+#include "diag_process.hpp"
 
 #include <stdio.h>
 #include <stdlib.h>
 
 #include <openthread/instance.h>
 
-#include "diag_process.hpp"
 #include "common/code_utils.hpp"
 #include "utils/wrap_string.h"
 
diff --git a/src/diag/diag_process.hpp b/src/diag/diag_process.hpp
index 44afadfb3..dcd6013e5 100644
--- a/src/diag/diag_process.hpp
+++ b/src/diag/diag_process.hpp
@@ -34,7 +34,7 @@
 #ifndef DIAG_PROCESS_HPP_
 #define DIAG_PROCESS_HPP_
 
-#include <openthread/config.h>
+#include "openthread-core-config.h"
 
 #include <stdarg.h>
 
diff --git a/src/diag/openthread-diag.cpp b/src/diag/openthread-diag.cpp
index 23e2a0144..2d8d9efbe 100644
--- a/src/diag/openthread-diag.cpp
+++ b/src/diag/openthread-diag.cpp
@@ -31,7 +31,7 @@
  *   This file implements the top-level interface to diagnostics module.
  */
 
-#include <openthread/config.h>
+#include "openthread-core-config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/ncp/changed_props_set.hpp b/src/ncp/changed_props_set.hpp
index 820b3f8ae..0747ef218 100644
--- a/src/ncp/changed_props_set.hpp
+++ b/src/ncp/changed_props_set.hpp
@@ -33,6 +33,8 @@
 #ifndef CHANGED_PROPS_SET_HPP_
 #define CHANGED_PROPS_SET_HPP_
 
+#include "openthread-core-config.h"
+
 #include <stddef.h>
 
 #include <openthread/types.h>
diff --git a/src/ncp/hdlc.cpp b/src/ncp/hdlc.cpp
index 8b0fae184..8e6b3f7f7 100644
--- a/src/ncp/hdlc.cpp
+++ b/src/ncp/hdlc.cpp
@@ -30,8 +30,6 @@
  *   This file implements an HDLC-lite encoder and decoder.
  */
 
-#include <openthread/config.h>
-
 #include "hdlc.hpp"
 
 #include <stdlib.h>
diff --git a/src/ncp/hdlc.hpp b/src/ncp/hdlc.hpp
index bb09cf65b..4624ce5d4 100644
--- a/src/ncp/hdlc.hpp
+++ b/src/ncp/hdlc.hpp
@@ -32,7 +32,9 @@
 
 #ifndef HDLC_HPP_
 #define HDLC_HPP_
-#include <openthread/config.h>
+
+#include "openthread-core-config.h"
+
 #include <openthread/types.h>
 
 namespace ot {
diff --git a/src/ncp/ncp_base.cpp b/src/ncp/ncp_base.cpp
index 482dff3bf..b219e82db 100644
--- a/src/ncp/ncp_base.cpp
+++ b/src/ncp/ncp_base.cpp
@@ -30,8 +30,6 @@
  *   This file implements general thread device required Spinel interface to the OpenThread stack.
  */
 
-#include <openthread/config.h>
-
 #include "ncp_base.hpp"
 
 #include <stdarg.h>
diff --git a/src/ncp/ncp_base.hpp b/src/ncp/ncp_base.hpp
index cd8a9cfda..77e85a6d1 100644
--- a/src/ncp/ncp_base.hpp
+++ b/src/ncp/ncp_base.hpp
@@ -33,7 +33,7 @@
 #ifndef NCP_BASE_HPP_
 #define NCP_BASE_HPP_
 
-#include <openthread/config.h>
+#include "openthread-core-config.h"
 
 #if OPENTHREAD_MTD || OPENTHREAD_FTD
 #include <openthread/ip6.h>
diff --git a/src/ncp/ncp_base_ftd.cpp b/src/ncp/ncp_base_ftd.cpp
index eb0a6f748..8d8a5a82b 100644
--- a/src/ncp/ncp_base_ftd.cpp
+++ b/src/ncp/ncp_base_ftd.cpp
@@ -30,7 +30,6 @@
  *   This file implements full thread device specified Spinel interface to the OpenThread stack.
  */
 
-#include <openthread/config.h>
 #include "ncp_base.hpp"
 
 #include <openthread/diag.h>
diff --git a/src/ncp/ncp_base_mtd.cpp b/src/ncp/ncp_base_mtd.cpp
index 0930f3750..d62771aeb 100644
--- a/src/ncp/ncp_base_mtd.cpp
+++ b/src/ncp/ncp_base_mtd.cpp
@@ -30,7 +30,6 @@
  *   This file implements minimal thread device required Spinel interface to the OpenThread stack.
  */
 
-#include <openthread/config.h>
 #include "ncp_base.hpp"
 
 #if OPENTHREAD_ENABLE_BORDER_ROUTER
diff --git a/src/ncp/ncp_base_radio.cpp b/src/ncp/ncp_base_radio.cpp
index 4ada00ecb..6c5f67e71 100644
--- a/src/ncp/ncp_base_radio.cpp
+++ b/src/ncp/ncp_base_radio.cpp
@@ -30,8 +30,6 @@
  *   This file implements raw link required Spinel interface to the OpenThread stack.
  */
 
-#include <openthread/config.h>
-
 #include "ncp_base.hpp"
 
 #include <stdlib.h>
diff --git a/src/ncp/ncp_buffer.cpp b/src/ncp/ncp_buffer.cpp
index 69d6d2340..3f3413fa3 100644
--- a/src/ncp/ncp_buffer.cpp
+++ b/src/ncp/ncp_buffer.cpp
@@ -30,9 +30,8 @@
  *   This file implements NCP frame buffer class.
  */
 
-#include <openthread/config.h>
-
 #include "ncp_buffer.hpp"
+
 #include "utils/wrap_string.h"
 #include "common/code_utils.hpp"
 #include "common/debug.hpp"
diff --git a/src/ncp/ncp_buffer.hpp b/src/ncp/ncp_buffer.hpp
index 78a42e1a6..2fe982635 100644
--- a/src/ncp/ncp_buffer.hpp
+++ b/src/ncp/ncp_buffer.hpp
@@ -33,7 +33,8 @@
 #ifndef NCP_FRAME_BUFFER_HPP_
 #define NCP_FRAME_BUFFER_HPP_
 
-#include <openthread/config.h>
+#include "openthread-core-config.h"
+
 #include <openthread/message.h>
 #include <openthread/types.h>
 
diff --git a/src/ncp/ncp_spi.cpp b/src/ncp/ncp_spi.cpp
index 14c186ce2..06466df55 100644
--- a/src/ncp/ncp_spi.cpp
+++ b/src/ncp/ncp_spi.cpp
@@ -30,8 +30,6 @@
  *   This file implements a SPI interface to the OpenThread stack.
  */
 
-#include <openthread/config.h>
-
 #include "ncp_spi.hpp"
 
 #include <openthread/ncp.h>
diff --git a/src/ncp/ncp_spi.hpp b/src/ncp/ncp_spi.hpp
index b565e3fca..c0e20abd1 100644
--- a/src/ncp/ncp_spi.hpp
+++ b/src/ncp/ncp_spi.hpp
@@ -33,7 +33,7 @@
 #ifndef NCP_SPI_HPP_
 #define NCP_SPI_HPP_
 
-#include <openthread/config.h>
+#include "openthread-core-config.h"
 
 #include "ncp/ncp_base.hpp"
 
diff --git a/src/ncp/ncp_uart.cpp b/src/ncp/ncp_uart.cpp
index bdcd4bf8b..2ad094ace 100644
--- a/src/ncp/ncp_uart.cpp
+++ b/src/ncp/ncp_uart.cpp
@@ -30,8 +30,6 @@
  *   This file contains definitions for a UART based NCP interface to the OpenThread stack.
  */
 
-#include <openthread/config.h>
-
 #include "ncp_uart.hpp"
 
 #include <stdio.h>
@@ -166,7 +164,7 @@ void NcpUart::EncodeAndSendToUart(void)
                 SuccessOrExit(mFrameEncoder.Encode(mByte, mUartBuffer));
             }
 
-            // track the change of mHostPowerStateInProgress by the 
+            // track the change of mHostPowerStateInProgress by the
             // call to OutFrameRemove.
             prevHostPowerState = mHostPowerStateInProgress;
 
diff --git a/src/ncp/ncp_uart.hpp b/src/ncp/ncp_uart.hpp
index ff061bb59..37ba27cac 100644
--- a/src/ncp/ncp_uart.hpp
+++ b/src/ncp/ncp_uart.hpp
@@ -33,7 +33,7 @@
 #ifndef NCP_UART_HPP_
 #define NCP_UART_HPP_
 
-#include <openthread/config.h>
+#include "openthread-core-config.h"
 
 #include "ncp/hdlc.hpp"
 #include "ncp/ncp_base.hpp"
diff --git a/src/ncp/spinel_encoder.cpp b/src/ncp/spinel_encoder.cpp
index 6ab6ce593..0223cb4c5 100644
--- a/src/ncp/spinel_encoder.cpp
+++ b/src/ncp/spinel_encoder.cpp
@@ -30,8 +30,6 @@
  *   This file implements a spinel encoder.
  */
 
-#include <openthread/config.h>
-
 #include "spinel_encoder.hpp"
 
 #include "common/code_utils.hpp"
diff --git a/src/ncp/spinel_encoder.hpp b/src/ncp/spinel_encoder.hpp
index cf1def941..90bf1c465 100644
--- a/src/ncp/spinel_encoder.hpp
+++ b/src/ncp/spinel_encoder.hpp
@@ -33,7 +33,7 @@
 #ifndef SPINEL_ENCODER_HPP_
 #define SPINEL_ENCODER_HPP_
 
-#include <openthread/config.h>
+#include "openthread-core-config.h"
 
 #include <openthread/message.h>
 #include <openthread/ncp.h>
diff --git a/src/ncp/spinel_platform.h b/src/ncp/spinel_platform.h
index 9f57cd8f7..404f287e0 100644
--- a/src/ncp/spinel_platform.h
+++ b/src/ncp/spinel_platform.h
@@ -49,7 +49,7 @@
  *
  */
 
-#include <openthread/config.h>
+#include "openthread-core-config.h"
 
 #include <stdarg.h>
 #include "utils/wrap_stdbool.h"