[config-header] simplify config header file includes (#2255)

This commit simplifies the config header files includes in
OpenThread core and non-public source files. With this change the
"openthread-core-config.h" becomes the main config header file. This
header file includes all other config ones:
1) The `configure` generated `<openthread/config.h>;
2) The project specific one by `OPENTHREAD_PROJECT_CORE_CONFIG_FILE`;
3) The "openthread-core-default-config.h" defining default settings.

With the change in this commit, all header files include "openthread-
core-config.h" as the first `#include`, and in `.cpp` files, the first
`#include` continues to be the unit's corresponding header file. The
new model ensures that the configuration settings are visible and
consistent in all the source files. This commit also updates the
style guide document accordingly.

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.

src/cli/cli.cpp

@@ -31,8 +31,6 @@
  *   This file implements the CLI interpreter.
  */
 
-#include <openthread/config.h>
-
 #include "cli.hpp"
 
 #ifdef OTDLL

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>
 

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"

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_

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>

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"

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>

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"

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>

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 {

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>

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"

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>

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"

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>
 

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>
 

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
 

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"

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>
 

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>
 

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"

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>
 

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
 

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"

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>
 

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>
 

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>

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>
 

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>
 

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>
 

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>
 

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

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>
 

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>
 

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>
 

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"

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>

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
 

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"

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"

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>

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"

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>

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>

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"

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"
 

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.

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"

src/core/common/crc16.cpp

@@ -31,8 +31,6 @@
  *   This file implements CRC16 computations.
  */
 
-#include <openthread/config.h>
-
 #include "crc16.hpp"
 
 namespace ot {

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 {

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>

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"
 

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"

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 {

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>

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>

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"

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"

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>

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 {

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>

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>

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"

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"
 

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"

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>

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>

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"
 

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"

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>

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 {

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 {

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 {

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 {

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>

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>

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 {

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"

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"
 

src/core/crypto/sha256.cpp

@@ -31,8 +31,6 @@
  *   This file implements SHA-256.
  */
 
-#include <openthread/config.h>
-
 #include "sha256.hpp"
 
 namespace ot {

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>

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"

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"

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"

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>

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>

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 {

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>

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"

src/core/meshcop/commissioner.cpp

@@ -33,8 +33,6 @@
 
 #define WPP_NAME "commissioner.tmh"
 
-#include <openthread/config.h>
-
 #include "commissioner.hpp"
 
 #include <stdio.h>

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"

src/core/meshcop/dataset.cpp

@@ -32,8 +32,6 @@
  *
  */
 
-#include <openthread/config.h>
-
 #include "dataset.hpp"
 
 #include <stdio.h>

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"

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>

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"

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>

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"

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>
 

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_