[script] add script to check, enforce, and update header guards (#12227)

This commit introduces a new script `update-header-guards.py` which
checks for the presence of header guards in `.h` and `.hpp` files and
automatically updates them, standardizing the header guard name format
across the codebase.

The new format for header guards is derived from the full path of the
file. For example, `src/core/common/notifier.hpp` will use
`OT_CORE_COMMON_NOTIFIER_HPP_`. The guard name includes additional
prefixes such as `OT_` or `OPENTHREAD_` to ensure uniqueness.

This new naming format handles cases where the same filename may be used
in different folders, such as the two `heap.hpp` files located in
`src/core/common` and `src/core/utils`.

It also ensures that public and platform OpenThread headers under
`include/openthread` have uniquely distinct header guard names to avoid
conflicts when these headers are included in other projects.

The new script helped identify issues with existing header files that
lacked header guards (e.g., `posix/system.hpp`) or had improper guards
(e.g., `openthread/link_metrics.h`).

This commit also introduces a new check script `check-header-guards` to
validate that all header guards are correctly formatted. This check is
added to the GitHub CI actions to ensure consistency moving forward.

All existing header files have been updated (using the new script)
to apply the new guard name format.

.github/workflows/makefile-check.yml

@@ -58,3 +58,16 @@ jobs:
     - name: Check
       run: |
         script/check-core-makefiles
+
+  header-guard-check:
+    runs-on: ubuntu-24.04
+    steps:
+    - name: Harden Runner
+      uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+      with:
+        egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
+
+    - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+    - name: Check
+      run: |
+        script/check-header-guards

include/openthread/ble_secure.h

@@ -500,4 +500,4 @@ bool otBleSecureGetInstallCodeVerifyStatus(otInstance *aInstance);
 } // extern "C"
 #endif
 
-#endif /* OPENTHREAD_BLE_SECURE_H_ */
+#endif // OPENTHREAD_BLE_SECURE_H_

include/openthread/coap.h

@@ -1124,4 +1124,4 @@ static inline otError otCoapSendResponse(otInstance *aInstance, otMessage *aMess
 } // extern "C"
 #endif
 
-#endif /* OPENTHREAD_COAP_H_ */
+#endif // OPENTHREAD_COAP_H_

include/openthread/coap_secure.h

@@ -416,4 +416,4 @@ otError otCoapSecureSendResponse(otInstance *aInstance, otMessage *aMessage, con
 } // extern "C"
 #endif
 
-#endif /* OPENTHREAD_COAP_SECURE_H_ */
+#endif // OPENTHREAD_COAP_SECURE_H_

include/openthread/instance.h

@@ -52,7 +52,7 @@ extern "C" {
  *
  * @note This number versions both OpenThread platform and user APIs.
  */
-#define OPENTHREAD_API_VERSION (563)
+#define OPENTHREAD_API_VERSION (564)
 
 /**
  * @addtogroup api-instance

include/openthread/link_metrics.h

@@ -32,8 +32,8 @@
  *   This file defines the OpenThread Link Metrics API.
  */
 
-#ifndef LINK_METRICS_H_
-#define LINK_METRICS_H_
+#ifndef OPENTHREAD_LINK_METRICS_H_
+#define OPENTHREAD_LINK_METRICS_H_
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -280,4 +280,4 @@ otError otLinkMetricsManagerGetMetricsValueByExtAddr(otInstance          *aInsta
 } // extern "C"
 #endif
 
-#endif // LINK_METRICS_H_
+#endif // OPENTHREAD_LINK_METRICS_H_

include/openthread/mdns.h

@@ -32,8 +32,8 @@
  *   This file includes the mDNS related APIs.
  */
 
-#ifndef OPENTHREAD_MULTICAST_DNS_H_
-#define OPENTHREAD_MULTICAST_DNS_H_
+#ifndef OPENTHREAD_MDNS_H_
+#define OPENTHREAD_MDNS_H_
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -1111,4 +1111,4 @@ bool otMdnsIsVerboseLoggingEnabled(otInstance *aInstance);
 } // extern "C"
 #endif
 
-#endif // OPENTHREAD_MULTICAST_DNS_H_
+#endif // OPENTHREAD_MDNS_H_

include/openthread/platform/border_routing.h

@@ -32,8 +32,8 @@
  *   This file includes the platform abstraction for border routing manager.
  */
 
-#ifndef OPENTHREAD_PLATFORM_BORDER_ROUTER_H_
-#define OPENTHREAD_PLATFORM_BORDER_ROUTER_H_
+#ifndef OPENTHREAD_PLATFORM_BORDER_ROUTING_H_
+#define OPENTHREAD_PLATFORM_BORDER_ROUTING_H_
 
 #include <stdint.h>
 
@@ -100,4 +100,4 @@ extern void otPlatBorderRoutingProcessDhcp6PdPrefix(otInstance
 }
 #endif
 
-#endif // OPENTHREAD_PLATFORM_BORDER_ROUTER_H_
+#endif // OPENTHREAD_PLATFORM_BORDER_ROUTING_H_

include/openthread/platform/dns.h

@@ -123,4 +123,4 @@ extern void otPlatDnsUpstreamQueryDone(otInstance *aInstance, otPlatDnsUpstreamQ
 }
 #endif
 
-#endif
+#endif // OPENTHREAD_PLATFORM_DNS_H_

include/openthread/platform/mdns_socket.h

@@ -32,8 +32,8 @@
  *   This file includes the platform abstraction for mDNS socket.
  */
 
-#ifndef OPENTHREAD_PLATFORM_MULTICAST_DNS_SOCKET_H_
-#define OPENTHREAD_PLATFORM_MULTICAST_DNS_SOCKET_H_
+#ifndef OPENTHREAD_PLATFORM_MDNS_SOCKET_H_
+#define OPENTHREAD_PLATFORM_MDNS_SOCKET_H_
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -226,4 +226,4 @@ extern void otPlatMdnsHandleHostAddressRemoveAll(otInstance *aInstance, uint32_t
 } // extern "C"
 #endif
 
-#endif // OPENTHREAD_PLATFORM_MULTICAST_DNS_SOCKET_H_
+#endif // OPENTHREAD_PLATFORM_MDNS_SOCKET_H_

include/openthread/random_noncrypto.h

@@ -32,8 +32,8 @@
  *  This file defines the OpenThread non cryptographic random number generator API.
  */
 
-#ifndef OPENTHREAD_RANDOM_H_
-#define OPENTHREAD_RANDOM_H_
+#ifndef OPENTHREAD_RANDOM_NONCRYPTO_H_
+#define OPENTHREAD_RANDOM_NONCRYPTO_H_
 
 #include <stdint.h>
 
@@ -131,4 +131,4 @@ uint32_t otRandomNonCryptoAddJitter(uint32_t aValue, uint16_t aJitter);
 } // extern "C"
 #endif
 
-#endif // OPENTHREAD_RANDOM_H_
+#endif // OPENTHREAD_RANDOM_NONCRYPTO_H_

include/openthread/tcat.h

@@ -223,4 +223,4 @@ typedef void (*otHandleTcatJoin)(otError aError, void *aContext);
 } // extern "C"
 #endif
 
-#endif /* OPENTHREAD_TCAT_H_ */
+#endif // OPENTHREAD_TCAT_H_

script/check-header-guards

@@ -0,0 +1,51 @@
+#!/bin/bash
+#
+#  Copyright (c) 2025, The OpenThread Authors.
+#  All rights reserved.
+#
+#  Redistribution and use in source and binary forms, with or without
+#  modification, are permitted provided that the following conditions are met:
+#  1. Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer.
+#  2. Redistributions in binary form must reproduce the above copyright
+#     notice, this list of conditions and the following disclaimer in the
+#     documentation and/or other materials provided with the distribution.
+#  3. Neither the name of the copyright holder nor the
+#     names of its contributors may be used to endorse or promote products
+#     derived from this software without specific prior written permission.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+#  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+#  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+#  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+#  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+#  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+#  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+#  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+#  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+#  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+#  POSSIBILITY OF SUCH DAMAGE.
+#
+
+set -euo pipefail
+
+die()
+{
+    echo >&2 "ERROR: $*"
+    exit 1
+}
+
+main()
+{
+    ./script/update-header-guards.py || die "Could not run ./script/update-header-guards - fix header guards"
+
+    status=$(git status --porcelain)
+
+    if [ -n "${status}" ]; then
+        die "Header guards are not properly formatted - run ./script/update-header-guards"
+    else
+        echo 'PASS: header-guard-check'
+    fi
+}
+
+main "$@"

script/update-header-guards.py

@@ -0,0 +1,128 @@
+#!/usr/bin/env python3
+#
+#  Copyright (c) 2025, The OpenThread Authors.
+#  All rights reserved.
+#
+#  Redistribution and use in source and binary forms, with or without
+#  modification, are permitted provided that the following conditions are met:
+#  1. Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer.
+#  2. Redistributions in binary form must reproduce the above copyright
+#     notice, this list of conditions and the following disclaimer in the
+#     documentation and/or other materials provided with the distribution.
+#  3. Neither the name of the copyright holder nor the
+#     names of its contributors may be used to endorse or promote products
+#     derived from this software without specific prior written permission.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+#  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+#  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+#  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+#  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+#  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+#  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+#  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+#  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+#  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+#  POSSIBILITY OF SUCH DAMAGE.
+#
+
+# This script updates the header guards in .hpp and .h files within the `src`
+# `include/openthread`, and `tests` directories. It ensures that header
+# guards follow a consistent naming convention based on the file path.
+
+import os
+
+#----------------------------------------------------------------------------------------------
+# Helper functions
+
+
+def get_header_file_list(path):
+    """Get a sorted list of full file names (with path) in a given `path` folder having either `.h` or `.hpp` extension"""
+    return sorted([
+        "{}/{}".format(dir_path, file_name)[2:]
+        for dir_path, dir_names, file_names in os.walk('./' + path)
+        for file_name in file_names
+        if file_name.endswith('.hpp') or file_name.endswith('.h')
+    ])
+
+
+def read_txt_file(file_name):
+    """Read the content of a text file with name `file_name` and return content as a list of lines"""
+    with open(file_name, 'r') as file:
+        lines = file.readlines()
+    return lines
+
+
+def write_txt_file(file_name, lines):
+    """Write a text file with name `file_name` with the content given as a list of `lines`"""
+    with open(file_name, 'w') as file:
+        file.writelines(lines)
+
+
+def update_header_guard_in(file_name, replace_str, new_str):
+    """Update header guard in a given file.
+
+    Args:
+        file_name (str): The name of the file to update.
+        replace_str (str): The prefix string to replace in the file path to generate header guard name
+        new_str (str): The new string to use as a prefix for the header guard.
+    """
+    STATE_SEARCH = 1
+    STATE_MATCH_START = 2
+    STATE_DONE = 3
+
+    # Strip and replace the `replace_str` with `new_str`.
+    # Then replace '/','.', or `-` with '_', then format.
+
+    guard_name = file_name.replace(replace_str, new_str, 1)
+    guard_name = guard_name.replace('/', '_').replace('-', '_').replace('.', '_').upper() + '_'
+
+    lines = read_txt_file(file_name)
+    new_lines = []
+    state = STATE_SEARCH
+
+    for line in lines[:-1]:
+        if state == STATE_SEARCH:
+            if line.startswith('#ifndef '):
+                state = STATE_MATCH_START
+                line = '#ifndef ' + guard_name + '\n'
+            new_lines.append(line)
+        elif state == STATE_MATCH_START:
+            if not line.startswith('#define'):
+                raise RuntimeError('missing header guard #define in: {}'.format(file_name))
+            line = '#define ' + guard_name + '\n'
+            new_lines.append(line)
+            state = STATE_DONE
+        else:
+            new_lines.append(line)
+
+    if state != STATE_DONE:
+        raise RuntimeError('missing header guard #ifndef in: {}'.format(file_name))
+
+    if not lines[-1].startswith('#endif'):
+        raise RuntimeError('missing header guard #endif in: {}'.format(file_name))
+
+    new_lines.append('#endif // ' + guard_name + '\n')
+
+    if new_lines != lines:
+        write_txt_file(file_name, new_lines)
+        print("- Updated {} ({})".format(file_name, guard_name))
+
+
+#----------------------------------------------------------------------------------------------
+
+# Check and update header guards in various folders
+
+folders = [('src', 'OT'), ('include/openthread', 'OPENTHREAD'), ('tests', 'OT')]
+
+for folder in folders:
+    path = folder[0]
+    guard_prefix = folder[1]
+
+    header_file_list = get_header_file_list(path)
+
+    print('Updating header guards in ./{}/'.format(path))
+
+    for file_name in header_file_list:
+        update_header_guard_in(file_name, path, guard_prefix)

src/cli/cli.hpp

@@ -31,8 +31,8 @@
  *   This file contains definitions for the CLI interpreter.
  */
 
-#ifndef CLI_HPP_
-#define CLI_HPP_
+#ifndef OT_CLI_CLI_HPP_
+#define OT_CLI_CLI_HPP_
 
 #include "openthread-core-config.h"
 
@@ -432,4 +432,4 @@ private:
 } // namespace Cli
 } // namespace ot
 
-#endif // CLI_HPP_
+#endif // OT_CLI_CLI_HPP_

src/cli/cli_ba.hpp

@@ -31,8 +31,8 @@
  *   This file contains definitions for CLI to Border Agent.
  */
 
-#ifndef CLI_BA_HPP_
-#define CLI_BA_HPP_
+#ifndef OT_CLI_CLI_BA_HPP_
+#define OT_CLI_CLI_BA_HPP_
 
 #include "openthread-core-config.h"
 
@@ -93,4 +93,4 @@ private:
 
 #endif // OPENTHREAD_CONFIG_BORDER_AGENT_ENABLE
 
-#endif // CLI_BA_HPP_
+#endif // OT_CLI_CLI_BA_HPP_

src/cli/cli_bbr.hpp

@@ -31,8 +31,8 @@
  *   This file contains definitions for CLI to backbone router.
  */
 
-#ifndef CLI_BBR_HPP_
-#define CLI_BBR_HPP_
+#ifndef OT_CLI_CLI_BBR_HPP_
+#define OT_CLI_CLI_BBR_HPP_
 
 #include "openthread-core-config.h"
 
@@ -90,4 +90,4 @@ private:
 
 #endif //  (OPENTHREAD_CONFIG_THREAD_VERSION >= OT_THREAD_VERSION_1_2)
 
-#endif // CLI_BBR_HPP_
+#endif // OT_CLI_CLI_BBR_HPP_

src/cli/cli_br.hpp

@@ -31,8 +31,8 @@
  *   This file contains definitions for CLI to Border Router.
  */
 
-#ifndef CLI_BR_HPP_
-#define CLI_BR_HPP_
+#ifndef OT_CLI_CLI_BR_HPP_
+#define OT_CLI_CLI_BR_HPP_
 
 #include "openthread-core-config.h"
 
@@ -115,4 +115,4 @@ private:
 
 #endif // OPENTHREAD_CONFIG_BORDER_ROUTING_ENABLE
 
-#endif // CLI_BR_HPP_
+#endif // OT_CLI_CLI_BR_HPP_

src/cli/cli_coap.hpp

@@ -31,8 +31,8 @@
  *   This file contains definitions for a simple CLI CoAP server and client.
  */
 
-#ifndef CLI_COAP_HPP_
-#define CLI_COAP_HPP_
+#ifndef OT_CLI_CLI_COAP_HPP_
+#define OT_CLI_CLI_COAP_HPP_
 
 #include "openthread-core-config.h"
 
@@ -189,4 +189,4 @@ private:
 
 #endif // OPENTHREAD_CONFIG_COAP_API_ENABLE
 
-#endif // CLI_COAP_HPP_
+#endif // OT_CLI_CLI_COAP_HPP_

src/cli/cli_coap_secure.hpp

@@ -31,8 +31,8 @@
  *   This file contains definitions for a simple CLI CoAP Secure server and client.
  */
 
-#ifndef CLI_COAP_SECURE_HPP_
-#define CLI_COAP_SECURE_HPP_
+#ifndef OT_CLI_CLI_COAP_SECURE_HPP_
+#define OT_CLI_CLI_COAP_SECURE_HPP_
 
 #include "openthread-core-config.h"
 
@@ -162,4 +162,4 @@ private:
 
 #endif // OPENTHREAD_CONFIG_COAP_SECURE_API_ENABLE
 
-#endif // CLI_COAP_SECURE_HPP_
+#endif // OT_CLI_CLI_COAP_SECURE_HPP_

src/cli/cli_commissioner.hpp

@@ -31,8 +31,8 @@
  *   This file contains definitions for a simple CLI to control the Commissioner role.
  */
 
-#ifndef CLI_COMMISSIONER_HPP_
-#define CLI_COMMISSIONER_HPP_
+#ifndef OT_CLI_CLI_COMMISSIONER_HPP_
+#define OT_CLI_CLI_COMMISSIONER_HPP_
 
 #include "openthread-core-config.h"
 
@@ -110,4 +110,4 @@ private:
 
 #endif // OPENTHREAD_CONFIG_COMMISSIONER_ENABLE && OPENTHREAD_FTD
 
-#endif // CLI_COMMISSIONER_HPP_
+#endif // OT_CLI_CLI_COMMISSIONER_HPP_

src/cli/cli_config.h

@@ -31,8 +31,8 @@
  *   This file includes compile-time configurations for the CLI service.
  */
 
-#ifndef CONFIG_CLI_H_
-#define CONFIG_CLI_H_
+#ifndef OT_CLI_CLI_CONFIG_H_
+#define OT_CLI_CLI_CONFIG_H_
 
 #include "openthread-core-config.h"
 
@@ -196,4 +196,4 @@
 #define OPENTHREAD_CONFIG_CLI_BLE_SECURE_ENABLE 0
 #endif
 
-#endif // CONFIG_CLI_H_
+#endif // OT_CLI_CLI_CONFIG_H_

src/cli/cli_dataset.hpp

@@ -31,8 +31,8 @@
  *   This file contains definitions for the CLI interpreter.
  */
 
-#ifndef CLI_DATASET_HPP_
-#define CLI_DATASET_HPP_
+#ifndef OT_CLI_CLI_DATASET_HPP_
+#define OT_CLI_CLI_DATASET_HPP_
 
 #include "openthread-core-config.h"
 
@@ -141,4 +141,4 @@ private:
 } // namespace Cli
 } // namespace ot
 
-#endif // CLI_DATASET_HPP_
+#endif // OT_CLI_CLI_DATASET_HPP_

src/cli/cli_dns.hpp

@@ -31,8 +31,8 @@
  *   This file contains definitions for CLI to DNS (client and resolver).
  */
 
-#ifndef CLI_DNS_HPP_
-#define CLI_DNS_HPP_
+#ifndef OT_CLI_CLI_DNS_HPP_
+#define OT_CLI_CLI_DNS_HPP_
 
 #include "openthread-core-config.h"
 
@@ -139,4 +139,4 @@ private:
 
 #endif // OPENTHREAD_CLI_DNS_ENABLE
 
-#endif // CLI_DNS_HPP_
+#endif // OT_CLI_CLI_DNS_HPP_

src/cli/cli_history.hpp

@@ -31,8 +31,8 @@
  *   This file contains definitions for CLI to control History Tracker
  */
 
-#ifndef CLI_HISTORY_HPP_
-#define CLI_HISTORY_HPP_
+#ifndef OT_CLI_CLI_HISTORY_HPP_
+#define OT_CLI_CLI_HISTORY_HPP_
 
 #include "openthread-core-config.h"
 
@@ -133,4 +133,4 @@ private:
 
 #endif // OPENTHREAD_CONFIG_HISTORY_TRACKER_ENABLE
 
-#endif // CLI_HISTORY_HPP_
+#endif // OT_CLI_CLI_HISTORY_HPP_

src/cli/cli_joiner.hpp

@@ -31,8 +31,8 @@
  *   This file contains definitions for a simple CLI to control the Joiner role.
  */
 
-#ifndef CLI_JOINER_HPP_
-#define CLI_JOINER_HPP_
+#ifndef OT_CLI_CLI_JOINER_HPP_
+#define OT_CLI_CLI_JOINER_HPP_
 
 #include "openthread-core-config.h"
 
@@ -89,4 +89,4 @@ private:
 
 #endif // OPENTHREAD_CONFIG_JOINER_ENABLE
 
-#endif // CLI_JOINER_HPP_
+#endif // OT_CLI_CLI_JOINER_HPP_

src/cli/cli_link_metrics.hpp

@@ -31,8 +31,8 @@
  *   This file contains definitions for the CLI interpreter for Link Metrics function.
  */
 
-#ifndef CLI_LINK_METRICS_HPP_
-#define CLI_LINK_METRICS_HPP_
+#ifndef OT_CLI_CLI_LINK_METRICS_HPP_
+#define OT_CLI_CLI_LINK_METRICS_HPP_
 
 #include "openthread-core-config.h"
 
@@ -127,4 +127,4 @@ private:
 
 #endif // OPENTHREAD_CONFIG_MLE_LINK_METRICS_INITIATOR_ENABLE
 
-#endif // CLI_LINK_METRICS_HPP_
+#endif // OT_CLI_CLI_LINK_METRICS_HPP_

src/cli/cli_mac_filter.hpp

@@ -31,8 +31,8 @@
  *   This file contains definitions for CLI to MAC Filter.
  */
 
-#ifndef CLI_MAC_FILTER_HPP_
-#define CLI_MAC_FILTER_HPP_
+#ifndef OT_CLI_CLI_MAC_FILTER_HPP_
+#define OT_CLI_CLI_MAC_FILTER_HPP_
 
 #include "openthread-core-config.h"
 
@@ -98,4 +98,4 @@ private:
 
 #endif // OPENTHREAD_CLI_DNS_ENABLE
 
-#endif // CLI_MAC_FILTER_HPP_
+#endif // OT_CLI_CLI_MAC_FILTER_HPP_

src/cli/cli_mdns.hpp

@@ -31,8 +31,8 @@
  *   This file contains definitions for CLI to DNS (client and resolver).
  */
 
-#ifndef CLI_MDNS_HPP_
-#define CLI_MDNS_HPP_
+#ifndef OT_CLI_CLI_MDNS_HPP_
+#define OT_CLI_CLI_MDNS_HPP_
 
 #include "openthread-core-config.h"
 
@@ -140,4 +140,4 @@ private:
 
 #endif // OPENTHREAD_CONFIG_MULTICAST_DNS_ENABLE && OPENTHREAD_CONFIG_MULTICAST_DNS_PUBLIC_API_ENABLE
 
-#endif // CLI_MDNS_HPP_
+#endif // OT_CLI_CLI_MDNS_HPP_

src/cli/cli_mesh_diag.hpp

@@ -31,8 +31,8 @@
  *   This file contains definitions for the CLI interpreter for Mesh Diagnostics function.
  */
 
-#ifndef CLI_MESH_DIAG_HPP_
-#define CLI_MESH_DIAG_HPP_
+#ifndef OT_CLI_CLI_MESH_DIAG_HPP_
+#define OT_CLI_CLI_MESH_DIAG_HPP_
 
 #include "openthread-core-config.h"
 
@@ -113,4 +113,4 @@ private:
 
 #endif // OPENTHREAD_CONFIG_MESH_DIAG_ENABLE && OPENTHREAD_FTD
 
-#endif // CLI_MESH_DIAG_HPP_
+#endif // OT_CLI_CLI_MESH_DIAG_HPP_

src/cli/cli_network_data.hpp

@@ -31,8 +31,8 @@
  *   This file contains definitions for Network Data CLI commands.
  */
 
-#ifndef CLI_NETWORK_DATA_HPP_
-#define CLI_NETWORK_DATA_HPP_
+#ifndef OT_CLI_CLI_NETWORK_DATA_HPP_
+#define OT_CLI_CLI_NETWORK_DATA_HPP_
 
 #include "openthread-core-config.h"
 
@@ -144,4 +144,4 @@ private:
 } // namespace Cli
 } // namespace ot
 
-#endif // CLI_NETWORK_DATA_HPP_
+#endif // OT_CLI_CLI_NETWORK_DATA_HPP_

src/cli/cli_ping.hpp

@@ -31,8 +31,8 @@
  *   This file contains definitions for the CLI interpreter for Ping Sneder function.
  */
 
-#ifndef CLI_PING_SENDER_HPP_
-#define CLI_PING_SENDER_HPP_
+#ifndef OT_CLI_CLI_PING_HPP_
+#define OT_CLI_CLI_PING_HPP_
 
 #include "openthread-core-config.h"
 
@@ -91,4 +91,4 @@ private:
 
 #endif // OPENTHREAD_CONFIG_PING_SENDER_ENABLE
 
-#endif // CLI_PING_SENDER_HPP_
+#endif // OT_CLI_CLI_PING_HPP_

src/cli/cli_srp_client.hpp

@@ -31,8 +31,8 @@
  *   This file contains definitions for a simple CLI to control SRP Client.
  */
 
-#ifndef CLI_SRP_CLIENT_HPP_
-#define CLI_SRP_CLIENT_HPP_
+#ifndef OT_CLI_CLI_SRP_CLIENT_HPP_
+#define OT_CLI_CLI_SRP_CLIENT_HPP_
 
 #include "openthread-core-config.h"
 
@@ -106,4 +106,4 @@ private:
 
 #endif // OPENTHREAD_CONFIG_SRP_CLIENT_ENABLE
 
-#endif // CLI_SRP_CLIENT_HPP_
+#endif // OT_CLI_CLI_SRP_CLIENT_HPP_

src/cli/cli_srp_server.hpp

@@ -31,8 +31,8 @@
  *   This file contains definitions for a simple CLI to control the SRP server.
  */
 
-#ifndef CLI_SRP_SERVER_HPP_
-#define CLI_SRP_SERVER_HPP_
+#ifndef OT_CLI_CLI_SRP_SERVER_HPP_
+#define OT_CLI_CLI_SRP_SERVER_HPP_
 
 #include "openthread-core-config.h"
 
@@ -90,4 +90,4 @@ private:
 
 #endif // OPENTHREAD_CONFIG_SRP_SERVER_ENABLE
 
-#endif // CLI_SRP_SERVER_HPP_
+#endif // OT_CLI_CLI_SRP_SERVER_HPP_

src/cli/cli_tcat.hpp

@@ -26,8 +26,8 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef CLI_TCAT_HPP_
-#define CLI_TCAT_HPP_
+#ifndef OT_CLI_CLI_TCAT_HPP_
+#define OT_CLI_CLI_TCAT_HPP_
 
 #include "openthread-core-config.h"
 
@@ -87,4 +87,4 @@ private:
 
 #endif // OPENTHREAD_CONFIG_BLE_TCAT_ENABLE && OPENTHREAD_CONFIG_CLI_BLE_SECURE_ENABLE
 
-#endif // CLI_TCAT_HPP_
+#endif // OT_CLI_CLI_TCAT_HPP_

src/cli/cli_tcp.hpp

@@ -31,8 +31,8 @@
  *   This file contains definitions for a TCP CLI tool.
  */
 
-#ifndef CLI_TCP_EXAMPLE_HPP_
-#define CLI_TCP_EXAMPLE_HPP_
+#ifndef OT_CLI_CLI_TCP_HPP_
+#define OT_CLI_CLI_TCP_HPP_
 
 #include "openthread-core-config.h"
 
@@ -222,4 +222,4 @@ private:
 } // namespace Cli
 } // namespace ot
 
-#endif // CLI_TCP_EXAMPLE_HPP_
+#endif // OT_CLI_CLI_TCP_HPP_

src/cli/cli_udp.hpp

@@ -31,8 +31,8 @@
  *   This file contains definitions for a simple CLI CoAP server and client.
  */
 
-#ifndef CLI_UDP_EXAMPLE_HPP_
-#define CLI_UDP_EXAMPLE_HPP_
+#ifndef OT_CLI_CLI_UDP_HPP_
+#define OT_CLI_CLI_UDP_HPP_
 
 #include "openthread-core-config.h"
 
@@ -88,4 +88,4 @@ private:
 } // namespace Cli
 } // namespace ot
 
-#endif // CLI_UDP_EXAMPLE_HPP_
+#endif // OT_CLI_CLI_UDP_HPP_

src/cli/cli_utils.hpp

@@ -31,8 +31,8 @@
  *   This file contains definitions for the CLI util functions.
  */
 
-#ifndef CLI_UTILS_HPP_
-#define CLI_UTILS_HPP_
+#ifndef OT_CLI_CLI_UTILS_HPP_
+#define OT_CLI_CLI_UTILS_HPP_
 
 #include "openthread-core-config.h"
 
@@ -792,4 +792,4 @@ exit:
 } // namespace Cli
 } // namespace ot
 
-#endif // CLI_UTILS_HPP_
+#endif // OT_CLI_CLI_UTILS_HPP_

src/cli/x509_cert_key.hpp

@@ -33,8 +33,8 @@
  *  CoAP Secure use with cipher suite ECDHE_ECDSA_WITH_AES_128_CCM8.
  */
 
-#ifndef SRC_CLI_X509_CERT_KEY_HPP_
-#define SRC_CLI_X509_CERT_KEY_HPP_
+#ifndef OT_CLI_X509_CERT_KEY_HPP_
+#define OT_CLI_X509_CERT_KEY_HPP_
 
 #ifdef __cplusplus
 extern "C" {
@@ -113,4 +113,4 @@ extern "C" {
 } // extern "C"
 #endif
 
-#endif /* SRC_CLI_X509_CERT_KEY_HPP_ */
+#endif // OT_CLI_X509_CERT_KEY_HPP_

src/core/backbone_router/backbone_tmf.hpp

@@ -31,8 +31,8 @@
  *   This file includes definitions for Backbone TMF functionality.
  */
 
-#ifndef OT_CORE_THREAD_BACKBONE_TMF_HPP_
-#define OT_CORE_THREAD_BACKBONE_TMF_HPP_
+#ifndef OT_CORE_BACKBONE_ROUTER_BACKBONE_TMF_HPP_
+#define OT_CORE_BACKBONE_ROUTER_BACKBONE_TMF_HPP_
 
 #include "openthread-core-config.h"
 
@@ -104,4 +104,4 @@ private:
 
 #endif //  OPENTHREAD_FTD && OPENTHREAD_CONFIG_BACKBONE_ROUTER_ENABLE
 
-#endif //  OT_CORE_THREAD_BACKBONE_TMF_HPP_
+#endif // OT_CORE_BACKBONE_ROUTER_BACKBONE_TMF_HPP_

src/core/backbone_router/bbr_leader.hpp

@@ -31,8 +31,8 @@
  *   This file includes definitions for Primary Backbone Router service management in the Thread Network.
  */
 
-#ifndef BACKBONE_ROUTER_LEADER_HPP_
-#define BACKBONE_ROUTER_LEADER_HPP_
+#ifndef OT_CORE_BACKBONE_ROUTER_BBR_LEADER_HPP_
+#define OT_CORE_BACKBONE_ROUTER_BBR_LEADER_HPP_
 
 #include "openthread-core-config.h"
 
@@ -200,4 +200,4 @@ private:
 
 #endif // (OPENTHREAD_CONFIG_THREAD_VERSION >= OT_THREAD_VERSION_1_2)
 
-#endif // BACKBONE_ROUTER_LEADER_HPP_
+#endif // OT_CORE_BACKBONE_ROUTER_BBR_LEADER_HPP_

src/core/backbone_router/bbr_local.hpp

@@ -31,8 +31,8 @@
  *   This file includes definitions for local Backbone Router service.
  */
 
-#ifndef BACKBONE_ROUTER_LOCAL_HPP_
-#define BACKBONE_ROUTER_LOCAL_HPP_
+#ifndef OT_CORE_BACKBONE_ROUTER_BBR_LOCAL_HPP_
+#define OT_CORE_BACKBONE_ROUTER_BBR_LOCAL_HPP_
 
 #include "openthread-core-config.h"
 
@@ -309,4 +309,4 @@ DefineMapEnum(otBackboneRouterState, BackboneRouter::Local::State);
 
 #endif // OPENTHREAD_FTD && OPENTHREAD_CONFIG_BACKBONE_ROUTER_ENABLE
 
-#endif // BACKBONE_ROUTER_LOCAL_HPP_
+#endif // OT_CORE_BACKBONE_ROUTER_BBR_LOCAL_HPP_

src/core/backbone_router/bbr_manager.hpp

@@ -31,8 +31,8 @@
  *   This file includes definitions for Backbone Router management.
  */
 
-#ifndef BACKBONE_ROUTER_MANAGER_HPP_
-#define BACKBONE_ROUTER_MANAGER_HPP_
+#ifndef OT_CORE_BACKBONE_ROUTER_BBR_MANAGER_HPP_
+#define OT_CORE_BACKBONE_ROUTER_BBR_MANAGER_HPP_
 
 #include "openthread-core-config.h"
 
@@ -260,4 +260,4 @@ DeclareTmfHandler(Manager, kUriBackboneAnswer);
 
 #endif // OPENTHREAD_FTD && OPENTHREAD_CONFIG_BACKBONE_ROUTER_ENABLE
 
-#endif // BACKBONE_ROUTER_MANAGER_HPP_
+#endif // OT_CORE_BACKBONE_ROUTER_BBR_MANAGER_HPP_

src/core/backbone_router/multicast_listeners_table.hpp

@@ -31,8 +31,8 @@
  *   This file includes definitions for Multicast Listeners Table.
  */
 
-#ifndef MULTICAST_LISTENERS_TABLE_HPP
-#define MULTICAST_LISTENERS_TABLE_HPP
+#ifndef OT_CORE_BACKBONE_ROUTER_MULTICAST_LISTENERS_TABLE_HPP_
+#define OT_CORE_BACKBONE_ROUTER_MULTICAST_LISTENERS_TABLE_HPP_
 
 #include "openthread-core-config.h"
 
@@ -231,4 +231,4 @@ DefineMapEnum(otBackboneRouterMulticastListenerEvent, BackboneRouter::MulticastL
 
 #endif // OPENTHREAD_FTD && OPENTHREAD_CONFIG_BACKBONE_ROUTER_MULTICAST_ROUTING_ENABLE
 
-#endif // MULTICAST_LISTENERS_TABLE_HPP
+#endif // OT_CORE_BACKBONE_ROUTER_MULTICAST_LISTENERS_TABLE_HPP_

src/core/backbone_router/ndproxy_table.hpp

@@ -30,8 +30,8 @@
  *   This file includes definitions for NdProxy Table on Thread Backbone Border Router.
  */
 
-#ifndef NDPROXY_TABLE_HPP_
-#define NDPROXY_TABLE_HPP_
+#ifndef OT_CORE_BACKBONE_ROUTER_NDPROXY_TABLE_HPP_
+#define OT_CORE_BACKBONE_ROUTER_NDPROXY_TABLE_HPP_
 
 #include "openthread-core-config.h"
 
@@ -305,4 +305,4 @@ DefineMapEnum(otBackboneRouterNdProxyEvent, BackboneRouter::NdProxyTable::NdProx
 
 #endif // OPENTHREAD_FTD && OPENTHREAD_CONFIG_BACKBONE_ROUTER_DUA_NDPROXYING_ENABLE
 
-#endif // NDPROXY_TABLE_HPP_
+#endif // OT_CORE_BACKBONE_ROUTER_NDPROXY_TABLE_HPP_

src/core/border_router/br_log.hpp

@@ -31,8 +31,8 @@
  *   This file includes common Border Router logging helper functions.
  */
 
-#ifndef BR_LOG_HPP_
-#define BR_LOG_HPP_
+#ifndef OT_CORE_BORDER_ROUTER_BR_LOG_HPP_
+#define OT_CORE_BORDER_ROUTER_BR_LOG_HPP_
 
 #include "openthread-core-config.h"
 
@@ -111,4 +111,4 @@ inline void LogRecursiveDnsServerOption(const Ip6::Address &, uint32_t) {}
 
 #endif // OPENTHREAD_CONFIG_BORDER_ROUTING_ENABLE
 
-#endif // BR_LOG_HPP_
+#endif // OT_CORE_BORDER_ROUTER_BR_LOG_HPP_

src/core/border_router/br_tracker.hpp

@@ -26,8 +26,8 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef BR_TRACKER_HPP_
-#define BR_TRACKER_HPP_
+#ifndef OT_CORE_BORDER_ROUTER_BR_TRACKER_HPP_
+#define OT_CORE_BORDER_ROUTER_BR_TRACKER_HPP_
 
 #include "openthread-core-config.h"
 
@@ -142,4 +142,4 @@ private:
 
 #endif // OPENTHREAD_CONFIG_BORDER_ROUTING_ENABLE
 
-#endif // BR_TRACKER_HPP_
+#endif // OT_CORE_BORDER_ROUTER_BR_TRACKER_HPP_

src/core/border_router/br_types.hpp

@@ -31,8 +31,8 @@
  *   This file includes common type definitions for Border Router modules.
  */
 
-#ifndef BR_TYPES_HPP_
-#define BR_TYPES_HPP_
+#ifndef OT_CORE_BORDER_ROUTER_BR_TYPES_HPP_
+#define OT_CORE_BORDER_ROUTER_BR_TYPES_HPP_
 
 #include "openthread-core-config.h"
 
@@ -671,4 +671,4 @@ TimeMilli CalculateClampedExpirationTime(TimeMilli aUpdateTime, uint32_t aLifeti
 
 #endif // OPENTHREAD_CONFIG_BORDER_ROUTING_ENABLE
 
-#endif // BR_TYPES_HPP_
+#endif // OT_CORE_BORDER_ROUTER_BR_TYPES_HPP_

src/core/border_router/dhcp6_pd_client.hpp

@@ -31,8 +31,8 @@
  *   This file includes definitions for DHCPv6 Prefix Delegation (PD) Client.
  */
 
-#ifndef DHCP6_PD_CLIENT_HPP_
-#define DHCP6_PD_CLIENT_HPP_
+#ifndef OT_CORE_BORDER_ROUTER_DHCP6_PD_CLIENT_HPP_
+#define OT_CORE_BORDER_ROUTER_DHCP6_PD_CLIENT_HPP_
 
 #include "openthread-core-config.h"
 
@@ -274,4 +274,4 @@ private:
 
 #endif // OT_CONFIG_DHCP6_PD_CLIENT_ENABLE
 
-#endif // DHCP6_PD_CLIENT_HPP_
+#endif // OT_CORE_BORDER_ROUTER_DHCP6_PD_CLIENT_HPP_

src/core/border_router/infra_if.hpp

@@ -31,8 +31,8 @@
  *   This file includes definitions for infrastructure network interface.
  */
 
-#ifndef INFRA_IF_HPP_
-#define INFRA_IF_HPP_
+#ifndef OT_CORE_BORDER_ROUTER_INFRA_IF_HPP_
+#define OT_CORE_BORDER_ROUTER_INFRA_IF_HPP_
 
 #include "openthread-core-config.h"
 
@@ -242,4 +242,4 @@ private:
 
 #endif // OPENTHREAD_CONFIG_BORDER_ROUTING_ENABLE
 
-#endif // INFRA_IF_HPP_
+#endif // OT_CORE_BORDER_ROUTER_INFRA_IF_HPP_

src/core/border_router/multi_ail_detector.hpp

@@ -31,8 +31,8 @@
  *   This file includes definitions for the multi AIL detector.
  */
 
-#ifndef MULTI_AIL_DETECTOR_HPP_
-#define MULTI_AIL_DETECTOR_HPP_
+#ifndef OT_CORE_BORDER_ROUTER_MULTI_AIL_DETECTOR_HPP_
+#define OT_CORE_BORDER_ROUTER_MULTI_AIL_DETECTOR_HPP_
 
 #include "openthread-core-config.h"
 
@@ -189,4 +189,4 @@ private:
 
 #endif // OPENTHREAD_CONFIG_BORDER_ROUTING_ENABLE && OPENTHREAD_CONFIG_BORDER_ROUTING_MULTI_AIL_DETECTION_ENABLE
 
-#endif // MULTI_AIL_DETECTOR_HPP_
+#endif // OT_CORE_BORDER_ROUTER_MULTI_AIL_DETECTOR_HPP_

src/core/border_router/routing_manager.hpp

@@ -31,8 +31,8 @@
  *   This file includes definitions for the RA-based routing management.
  */
 
-#ifndef ROUTING_MANAGER_HPP_
-#define ROUTING_MANAGER_HPP_
+#ifndef OT_CORE_BORDER_ROUTER_ROUTING_MANAGER_HPP_
+#define OT_CORE_BORDER_ROUTER_ROUTING_MANAGER_HPP_
 
 #include "openthread-core-config.h"
 
@@ -1087,4 +1087,4 @@ DefineMapEnum(otBorderRoutingDhcp6PdState, BorderRouter::RoutingManager::Dhcp6Pd
 
 #endif // OPENTHREAD_CONFIG_BORDER_ROUTING_ENABLE
 
-#endif // ROUTING_MANAGER_HPP_
+#endif // OT_CORE_BORDER_ROUTER_ROUTING_MANAGER_HPP_

src/core/border_router/rx_ra_tracker.hpp

@@ -31,8 +31,8 @@
  *   This file includes definitions for the Received RA Tracker.
  */
 
-#ifndef RX_RA_TRACKER_HPP_
-#define RX_RA_TRACKER_HPP_
+#ifndef OT_CORE_BORDER_ROUTER_RX_RA_TRACKER_HPP_
+#define OT_CORE_BORDER_ROUTER_RX_RA_TRACKER_HPP_
 
 #include "openthread-core-config.h"
 
@@ -696,4 +696,4 @@ template <> void RxRaTracker::Entry<RxRaTracker::Router>::Free(void);
 
 #endif // OPENTHREAD_CONFIG_BORDER_ROUTING_ENABLE
 
-#endif // RX_RA_TRACKER_HPP_
+#endif // OT_CORE_BORDER_ROUTER_RX_RA_TRACKER_HPP_

src/core/coap/coap.hpp

@@ -26,8 +26,8 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef COAP_HPP_
-#define COAP_HPP_
+#ifndef OT_CORE_COAP_COAP_HPP_
+#define OT_CORE_COAP_COAP_HPP_
 
 #include "openthread-core-config.h"
 
@@ -969,4 +969,4 @@ DefineCoreType(otCoapBlockwiseResource, Coap::ResourceBlockWise);
 
 } // namespace ot
 
-#endif // COAP_HPP_
+#endif // OT_CORE_COAP_COAP_HPP_

src/core/coap/coap_message.hpp

@@ -31,8 +31,8 @@
  *   This file includes definitions for generating and processing CoAP messages.
  */
 
-#ifndef COAP_HEADER_HPP_
-#define COAP_HEADER_HPP_
+#ifndef OT_CORE_COAP_COAP_MESSAGE_HPP_
+#define OT_CORE_COAP_COAP_MESSAGE_HPP_
 
 #include "openthread-core-config.h"
 
@@ -1232,4 +1232,4 @@ inline const Coap::Message *AsCoapMessagePtr(const otMessage *aMessage)
 
 } // namespace ot
 
-#endif // COAP_HEADER_HPP_
+#endif // OT_CORE_COAP_COAP_MESSAGE_HPP_

src/core/coap/coap_secure.hpp

@@ -26,8 +26,8 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef COAP_SECURE_HPP_
-#define COAP_SECURE_HPP_
+#ifndef OT_CORE_COAP_COAP_SECURE_HPP_
+#define OT_CORE_COAP_COAP_SECURE_HPP_
 
 #include "openthread-core-config.h"
 
@@ -169,4 +169,4 @@ private:
 
 #endif // OPENTHREAD_CONFIG_SECURE_TRANSPORT_ENABLE
 
-#endif // COAP_SECURE_HPP_
+#endif // OT_CORE_COAP_COAP_SECURE_HPP_

src/core/common/appender.hpp

@@ -31,8 +31,8 @@
  *  This file defines OpenThread `Appender` class.
  */
 
-#ifndef APPENDER_HPP_
-#define APPENDER_HPP_
+#ifndef OT_CORE_COMMON_APPENDER_HPP_
+#define OT_CORE_COMMON_APPENDER_HPP_
 
 #include "openthread-core-config.h"
 
@@ -169,4 +169,4 @@ private:
 
 } // namespace ot
 
-#endif // APPENDER_HPP_
+#endif // OT_CORE_COMMON_APPENDER_HPP_

src/core/common/array.hpp

@@ -31,8 +31,8 @@
  *   This file includes definitions for a generic array.
  */
 
-#ifndef ARRAY_HPP_
-#define ARRAY_HPP_
+#ifndef OT_CORE_COMMON_ARRAY_HPP_
+#define OT_CORE_COMMON_ARRAY_HPP_
 
 #include "openthread-core-config.h"
 
@@ -571,4 +571,4 @@ private:
 
 } // namespace ot
 
-#endif // ARRAY_HPP_
+#endif // OT_CORE_COMMON_ARRAY_HPP_

src/core/common/as_core_type.hpp

@@ -31,8 +31,8 @@
  *   This file includes helper functions to convert between public OT C structs and corresponding core C++ classes.
  */
 
-#ifndef AS_CORE_TYPE_HPP_
-#define AS_CORE_TYPE_HPP_
+#ifndef OT_CORE_COMMON_AS_CORE_TYPE_HPP_
+#define OT_CORE_COMMON_AS_CORE_TYPE_HPP_
 
 #include "openthread-core-config.h"
 
@@ -157,4 +157,4 @@ template <typename EnumType> const typename MappedEnum<EnumType>::Type MapEnum(E
 
 } // namespace ot
 
-#endif // AS_CORE_TYPE_HPP_
+#endif // OT_CORE_COMMON_AS_CORE_TYPE_HPP_

src/core/common/binary_search.hpp

@@ -31,8 +31,8 @@
  *  This file provides a generic binary search and related helper functions.
  */
 
-#ifndef BINARY_SEARCH_HPP_
-#define BINARY_SEARCH_HPP_
+#ifndef OT_CORE_COMMON_BINARY_SEARCH_HPP_
+#define OT_CORE_COMMON_BINARY_SEARCH_HPP_
 
 #include "openthread-core-config.h"
 
@@ -122,4 +122,4 @@ private:
 
 } // namespace ot
 
-#endif // BINARY_SEARCH_HPP_
+#endif // OT_CORE_COMMON_BINARY_SEARCH_HPP_

src/core/common/bit_set.hpp

@@ -31,8 +31,8 @@
  *   This file includes definitions for a bit-set.
  */
 
-#ifndef BIT_SET_HPP_
-#define BIT_SET_HPP_
+#ifndef OT_CORE_COMMON_BIT_SET_HPP_
+#define OT_CORE_COMMON_BIT_SET_HPP_
 
 #include "openthread-core-config.h"
 
@@ -137,4 +137,4 @@ private:
 
 } // namespace ot
 
-#endif // BIT_SET_HPP_
+#endif // OT_CORE_COMMON_BIT_SET_HPP_

src/core/common/bit_utils.hpp

@@ -31,8 +31,8 @@
  *   This file includes definition for bit manipulation utility functions.
  */
 
-#ifndef BIT_UTILS_HPP_
-#define BIT_UTILS_HPP_
+#ifndef OT_CORE_COMMON_BIT_UTILS_HPP_
+#define OT_CORE_COMMON_BIT_UTILS_HPP_
 
 #include "common/encoding.hpp"
 #include "common/numeric_limits.hpp"
@@ -329,4 +329,4 @@ UintType ReadBitsBigEndian(UintType aBits)
 
 } // namespace ot
 
-#endif // BIT_UTILS_HPP_
+#endif // OT_CORE_COMMON_BIT_UTILS_HPP_

src/core/common/callback.hpp

@@ -31,8 +31,8 @@
  *  This file defines OpenThread `Callback` class.
  */
 
-#ifndef CALLBACK_HPP_
-#define CALLBACK_HPP_
+#ifndef OT_CORE_COMMON_CALLBACK_HPP_
+#define OT_CORE_COMMON_CALLBACK_HPP_
 
 #include "openthread-core-config.h"
 
@@ -277,4 +277,4 @@ public:
 
 } // namespace ot
 
-#endif // CALLBACK_HPP_
+#endif // OT_CORE_COMMON_CALLBACK_HPP_

src/core/common/clearable.hpp

@@ -31,8 +31,8 @@
  *   This file includes definitions for Clearable class for OpenThread objects.
  */
 
-#ifndef CLEARABLE_HPP_
-#define CLEARABLE_HPP_
+#ifndef OT_CORE_COMMON_CLEARABLE_HPP_
+#define OT_CORE_COMMON_CLEARABLE_HPP_
 
 #include "openthread-core-config.h"
 
@@ -77,4 +77,4 @@ private:
 
 } // namespace ot
 
-#endif // CLEARABLE_HPP_
+#endif // OT_CORE_COMMON_CLEARABLE_HPP_

src/core/common/const_cast.hpp

@@ -31,8 +31,8 @@
  *   This file includes helper methods to cast between const and non-const objects and/or pointers.
  */
 
-#ifndef CONST_CAST_HPP_
-#define CONST_CAST_HPP_
+#ifndef OT_CORE_COMMON_CONST_CAST_HPP_
+#define OT_CORE_COMMON_CONST_CAST_HPP_
 
 #include "openthread-core-config.h"
 
@@ -84,4 +84,4 @@ template <typename Type> Type *AsNonConst(const Type *aPointer) { return const_c
 
 } // namespace ot
 
-#endif // CONST_CAST_HPP_
+#endif // OT_CORE_COMMON_CONST_CAST_HPP_

src/core/common/crc.hpp

@@ -31,8 +31,8 @@
  *   This file includes definitions for CRC computations.
  */
 
-#ifndef CRC_HPP_
-#define CRC_HPP_
+#ifndef OT_CORE_COMMON_CRC_HPP_
+#define OT_CORE_COMMON_CRC_HPP_
 
 #include "openthread-core-config.h"
 
@@ -133,4 +133,4 @@ private:
 
 } // namespace ot
 
-#endif // CRC_HPP_
+#endif // OT_CORE_COMMON_CRC_HPP_

src/core/common/data.hpp

@@ -31,8 +31,8 @@
  *   This file includes definitions for a `Data` and `MutableData`.
  */
 
-#ifndef DATA_HPP_
-#define DATA_HPP_
+#ifndef OT_CORE_COMMON_DATA_HPP_
+#define OT_CORE_COMMON_DATA_HPP_
 
 #include "openthread-core-config.h"
 
@@ -364,4 +364,4 @@ public:
 
 } // namespace ot
 
-#endif // DATA_HPP_
+#endif // OT_CORE_COMMON_DATA_HPP_

src/core/common/debug.hpp

@@ -31,8 +31,8 @@
  *   This file includes functions for debugging.
  */
 
-#ifndef DEBUG_HPP_
-#define DEBUG_HPP_
+#ifndef OT_CORE_COMMON_DEBUG_HPP_
+#define OT_CORE_COMMON_DEBUG_HPP_
 
 #include "openthread-core-config.h"
 
@@ -131,4 +131,4 @@
 #define AssertPointerIsNotNull(aPointer)
 #endif
 
-#endif // DEBUG_HPP_
+#endif // OT_CORE_COMMON_DEBUG_HPP_

src/core/common/encoding.hpp

@@ -31,8 +31,8 @@
  *   This file includes definitions for byte-ordering encoding.
  */
 
-#ifndef ENCODING_HPP_
-#define ENCODING_HPP_
+#ifndef OT_CORE_COMMON_ENCODING_HPP_
+#define OT_CORE_COMMON_ENCODING_HPP_
 
 #include "openthread-core-config.h"
 
@@ -429,4 +429,4 @@ template <> inline void Write(uint64_t aValue, uint8_t *aBuffer) { WriteUint64(a
 
 } // namespace ot
 
-#endif // ENCODING_HPP_
+#endif // OT_CORE_COMMON_ENCODING_HPP_

src/core/common/equatable.hpp

@@ -31,8 +31,8 @@
  *   This file includes definitions for Equatable class for OpenThread objects.
  */
 
-#ifndef EQUATABLE_HPP_
-#define EQUATABLE_HPP_
+#ifndef OT_CORE_COMMON_EQUATABLE_HPP_
+#define OT_CORE_COMMON_EQUATABLE_HPP_
 
 #include "openthread-core-config.h"
 
@@ -111,4 +111,4 @@ private:
 
 } // namespace ot
 
-#endif // EQUATABLE_HPP_
+#endif // OT_CORE_COMMON_EQUATABLE_HPP_

src/core/common/error.hpp

@@ -31,8 +31,8 @@
  *   This file defines the errors used by OpenThread core.
  */
 
-#ifndef ERROR_HPP_
-#define ERROR_HPP_
+#ifndef OT_CORE_COMMON_ERROR_HPP_
+#define OT_CORE_COMMON_ERROR_HPP_
 
 #include "openthread-core-config.h"
 
@@ -102,4 +102,4 @@ const char *ErrorToString(Error aError);
 
 } // namespace ot
 
-#endif // ERROR_HPP_
+#endif // OT_CORE_COMMON_ERROR_HPP_

src/core/common/frame_builder.hpp

@@ -31,8 +31,8 @@
  *  This file defines OpenThread `FrameBuilder` class.
  */
 
-#ifndef FRAME_BUILDER_HPP_
-#define FRAME_BUILDER_HPP_
+#ifndef OT_CORE_COMMON_FRAME_BUILDER_HPP_
+#define OT_CORE_COMMON_FRAME_BUILDER_HPP_
 
 #include "openthread-core-config.h"
 
@@ -329,4 +329,4 @@ private:
 
 } // namespace ot
 
-#endif // FRAME_BUILDER_HPP_
+#endif // OT_CORE_COMMON_FRAME_BUILDER_HPP_

src/core/common/frame_data.hpp

@@ -31,8 +31,8 @@
  *   This file includes definitions for `FrameData`.
  */
 
-#ifndef FRAME_DATA_HPP_
-#define FRAME_DATA_HPP_
+#ifndef OT_CORE_COMMON_FRAME_DATA_HPP_
+#define OT_CORE_COMMON_FRAME_DATA_HPP_
 
 #include "openthread-core-config.h"
 
@@ -164,4 +164,4 @@ public:
 
 } // namespace ot
 
-#endif // FRAME_DATA_HPP_
+#endif // OT_CORE_COMMON_FRAME_DATA_HPP_

src/core/common/heap.hpp

@@ -31,8 +31,8 @@
  *   This file includes definitions for `Heap`.
  */
 
-#ifndef HEAP_HPP_
-#define HEAP_HPP_
+#ifndef OT_CORE_COMMON_HEAP_HPP_
+#define OT_CORE_COMMON_HEAP_HPP_
 
 #include "openthread-core-config.h"
 
@@ -64,4 +64,4 @@ void Free(void *aPointer);
 } // namespace Heap
 } // namespace ot
 
-#endif // HEAP_HPP_
+#endif // OT_CORE_COMMON_HEAP_HPP_

src/core/common/heap_allocatable.hpp

@@ -31,8 +31,8 @@
  *   This file includes definitions for `Heap::Allocatable`.
  */
 
-#ifndef HEAP_ALLOCATABLE_HPP_
-#define HEAP_ALLOCATABLE_HPP_
+#ifndef OT_CORE_COMMON_HEAP_ALLOCATABLE_HPP_
+#define OT_CORE_COMMON_HEAP_ALLOCATABLE_HPP_
 
 #include "openthread-core-config.h"
 
@@ -127,4 +127,4 @@ protected:
 } // namespace Heap
 } // namespace ot
 
-#endif // HEAP_ALLOCATABLE_HPP_
+#endif // OT_CORE_COMMON_HEAP_ALLOCATABLE_HPP_

src/core/common/heap_array.hpp

@@ -31,8 +31,8 @@
  *   This file includes definitions for `Heap::Array` (a heap allocated array of flexible length).
  */
 
-#ifndef HEAP_ARRAY_HPP_
-#define HEAP_ARRAY_HPP_
+#ifndef OT_CORE_COMMON_HEAP_ARRAY_HPP_
+#define OT_CORE_COMMON_HEAP_ARRAY_HPP_
 
 #include "openthread-core-config.h"
 
@@ -533,4 +533,4 @@ private:
 } // namespace Heap
 } // namespace ot
 
-#endif // HEAP_ARRAY_HPP_
+#endif // OT_CORE_COMMON_HEAP_ARRAY_HPP_

src/core/common/heap_data.hpp

@@ -31,8 +31,8 @@
  *   This file includes definitions for `Heap::Data` (heap allocated data).
  */
 
-#ifndef HEAP_DATA_HPP_
-#define HEAP_DATA_HPP_
+#ifndef OT_CORE_COMMON_HEAP_DATA_HPP_
+#define OT_CORE_COMMON_HEAP_DATA_HPP_
 
 #include "openthread-core-config.h"
 
@@ -211,4 +211,4 @@ private:
 } // namespace Heap
 } // namespace ot
 
-#endif // HEAP_DATA_HPP_
+#endif // OT_CORE_COMMON_HEAP_DATA_HPP_

src/core/common/heap_string.hpp

@@ -31,8 +31,8 @@
  *   This file includes definitions for `Heap::String` (a heap allocated string).
  */
 
-#ifndef HEAP_STRING_HPP_
-#define HEAP_STRING_HPP_
+#ifndef OT_CORE_COMMON_HEAP_STRING_HPP_
+#define OT_CORE_COMMON_HEAP_STRING_HPP_
 
 #include "openthread-core-config.h"
 
@@ -192,4 +192,4 @@ private:
 } // namespace Heap
 } // namespace ot
 
-#endif // HEAP_STRING_HPP_
+#endif // OT_CORE_COMMON_HEAP_STRING_HPP_

src/core/common/iterator_utils.hpp

@@ -31,8 +31,8 @@
  *   This file includes definitions for a generic item-pointer iterator class.
  */
 
-#ifndef ITERATOR_UTILS_HPP_
-#define ITERATOR_UTILS_HPP_
+#ifndef OT_CORE_COMMON_ITERATOR_UTILS_HPP_
+#define OT_CORE_COMMON_ITERATOR_UTILS_HPP_
 
 namespace ot {
 
@@ -154,4 +154,4 @@ protected:
 
 } // namespace ot
 
-#endif // ITERATOR_UTILS_HPP_
+#endif // OT_CORE_COMMON_ITERATOR_UTILS_HPP_

src/core/common/linked_list.hpp

@@ -31,8 +31,8 @@
  *   This file includes definitions for a generic singly linked list.
  */
 
-#ifndef LINKED_LIST_HPP_
-#define LINKED_LIST_HPP_
+#ifndef OT_CORE_COMMON_LINKED_LIST_HPP_
+#define OT_CORE_COMMON_LINKED_LIST_HPP_
 
 #include "openthread-core-config.h"
 
@@ -613,4 +613,4 @@ private:
 
 } // namespace ot
 
-#endif // LINKED_LIST_HPP_
+#endif // OT_CORE_COMMON_LINKED_LIST_HPP_

src/core/common/locator.hpp

@@ -31,8 +31,8 @@
  *   This file includes definitions for locator class for OpenThread objects.
  */
 
-#ifndef LOCATOR_HPP_
-#define LOCATOR_HPP_
+#ifndef OT_CORE_COMMON_LOCATOR_HPP_
+#define OT_CORE_COMMON_LOCATOR_HPP_
 
 #include "openthread-core-config.h"
 
@@ -187,4 +187,4 @@ protected:
 
 } // namespace ot
 
-#endif // LOCATOR_HPP_
+#endif // OT_CORE_COMMON_LOCATOR_HPP_

src/core/common/log.hpp

@@ -31,8 +31,8 @@
  *   This file includes logging related  definitions.
  */
 
-#ifndef LOG_HPP_
-#define LOG_HPP_
+#ifndef OT_CORE_COMMON_LOG_HPP_
+#define OT_CORE_COMMON_LOG_HPP_
 
 #include "openthread-core-config.h"
 
@@ -401,4 +401,4 @@ Error GenerateNextHexDumpLine(HexDumpInfo &aInfo);
 
 } // namespace ot
 
-#endif // LOG_HPP_
+#endif // OT_CORE_COMMON_LOG_HPP_

src/core/common/logging.hpp

@@ -31,12 +31,12 @@
  *   This file includes logging related macro/function definitions.
  */
 
-#ifndef LOGGING_HPP_
-#define LOGGING_HPP_
+#ifndef OT_CORE_COMMON_LOGGING_HPP_
+#define OT_CORE_COMMON_LOGGING_HPP_
 
 #include "openthread-core-config.h"
 
 #include <openthread/logging.h>
 #include <openthread/platform/logging.h>
 
-#endif // LOGGING_HPP_
+#endif // OT_CORE_COMMON_LOGGING_HPP_

src/core/common/message.hpp

@@ -31,8 +31,8 @@
  *   This file includes definitions for the message buffer pool and message buffers.
  */
 
-#ifndef MESSAGE_HPP_
-#define MESSAGE_HPP_
+#ifndef OT_CORE_COMMON_MESSAGE_HPP_
+#define OT_CORE_COMMON_MESSAGE_HPP_
 
 #include "openthread-core-config.h"
 
@@ -1949,4 +1949,4 @@ DefineMapEnum(otMessageOrigin, Message::Origin);
 
 } // namespace ot
 
-#endif // MESSAGE_HPP_
+#endif // OT_CORE_COMMON_MESSAGE_HPP_

src/core/common/non_copyable.hpp

@@ -31,8 +31,8 @@
  *   This file includes a common base class for disabling copying.
  */
 
-#ifndef NON_COPYABLE_HPP_
-#define NON_COPYABLE_HPP_
+#ifndef OT_CORE_COMMON_NON_COPYABLE_HPP_
+#define OT_CORE_COMMON_NON_COPYABLE_HPP_
 
 namespace ot {
 
@@ -51,4 +51,4 @@ protected:
 
 } // namespace ot
 
-#endif // NON_COPYABLE_HPP_
+#endif // OT_CORE_COMMON_NON_COPYABLE_HPP_

src/core/common/notifier.hpp

@@ -31,8 +31,8 @@
  *  This file defines OpenThread Notifier class.
  */
 
-#ifndef NOTIFIER_HPP_
-#define NOTIFIER_HPP_
+#ifndef OT_CORE_COMMON_NOTIFIER_HPP_
+#define OT_CORE_COMMON_NOTIFIER_HPP_
 
 #include "openthread-core-config.h"
 
@@ -316,4 +316,4 @@ private:
 
 } // namespace ot
 
-#endif // NOTIFIER_HPP_
+#endif // OT_CORE_COMMON_NOTIFIER_HPP_

src/core/common/num_utils.hpp

@@ -31,8 +31,8 @@
  *   This file includes definitions for generic number utility functions (min, max, clamp).
  */
 
-#ifndef NUM_UTILS_HPP_
-#define NUM_UTILS_HPP_
+#ifndef OT_CORE_COMMON_NUM_UTILS_HPP_
+#define OT_CORE_COMMON_NUM_UTILS_HPP_
 
 #include "common/code_utils.hpp"
 #include "common/error.hpp"
@@ -303,4 +303,4 @@ inline unsigned long ToUlong(uint32_t aUint32) { return static_cast<unsigned lon
 
 } // namespace ot
 
-#endif // NUM_UTILS_HPP_
+#endif // OT_CORE_COMMON_NUM_UTILS_HPP_

src/core/common/numeric_limits.hpp

@@ -31,8 +31,8 @@
  *   This file includes definitions for numeric limits.
  */
 
-#ifndef NUMERIC_LIMITS_HPP_
-#define NUMERIC_LIMITS_HPP_
+#ifndef OT_CORE_COMMON_NUMERIC_LIMITS_HPP_
+#define OT_CORE_COMMON_NUMERIC_LIMITS_HPP_
 
 #include <stdint.h>
 
@@ -99,4 +99,4 @@ template <> struct NumericLimits<uint64_t>
 
 } // namespace ot
 
-#endif // NUMERIC_LIMITS_HPP_
+#endif // OT_CORE_COMMON_NUMERIC_LIMITS_HPP_

src/core/common/offset_range.hpp

@@ -31,8 +31,8 @@
  *   This file includes definitions for an offset range.
  */
 
-#ifndef OFFSET_RANGE_HPP_
-#define OFFSET_RANGE_HPP_
+#ifndef OT_CORE_COMMON_OFFSET_RANGE_HPP_
+#define OT_CORE_COMMON_OFFSET_RANGE_HPP_
 
 #include "openthread-core-config.h"
 
@@ -157,4 +157,4 @@ private:
 
 } // namespace ot
 
-#endif // OFFSET_RANGE_HPP_
+#endif // OT_CORE_COMMON_OFFSET_RANGE_HPP_

src/core/common/owned_ptr.hpp

@@ -31,8 +31,8 @@
  *   This file includes definitions for an owned smart pointer.
  */
 
-#ifndef OWNED_PTR_HPP_
-#define OWNED_PTR_HPP_
+#ifndef OT_CORE_COMMON_OWNED_PTR_HPP_
+#define OT_CORE_COMMON_OWNED_PTR_HPP_
 
 #include "openthread-core-config.h"
 
@@ -177,4 +177,4 @@ private:
 
 } // namespace ot
 
-#endif // OWNED_PTR_HPP_
+#endif // OT_CORE_COMMON_OWNED_PTR_HPP_

src/core/common/owning_list.hpp

@@ -32,8 +32,8 @@
  *   the list.
  */
 
-#ifndef OWNING_LIST_HPP_
-#define OWNING_LIST_HPP_
+#ifndef OT_CORE_COMMON_OWNING_LIST_HPP_
+#define OT_CORE_COMMON_OWNING_LIST_HPP_
 
 #include "openthread-core-config.h"
 
@@ -162,4 +162,4 @@ public:
 
 } // namespace ot
 
-#endif // OWNING_LIST_HPP_
+#endif // OT_CORE_COMMON_OWNING_LIST_HPP_

src/core/common/pool.hpp

@@ -31,8 +31,8 @@
  *   This file includes definitions for a generic object pool.
  */
 
-#ifndef POOL_HPP_
-#define POOL_HPP_
+#ifndef OT_CORE_COMMON_POOL_HPP_
+#define OT_CORE_COMMON_POOL_HPP_
 
 #include "openthread-core-config.h"
 
@@ -185,4 +185,4 @@ private:
 
 } // namespace ot
 
-#endif // POOL_HPP_
+#endif // OT_CORE_COMMON_POOL_HPP_

src/core/common/preference.hpp

@@ -32,8 +32,8 @@
  *   Route Preference in RFC-4191.
  */
 
-#ifndef PREFERENCE_HPP_
-#define PREFERENCE_HPP_
+#ifndef OT_CORE_COMMON_PREFERENCE_HPP_
+#define OT_CORE_COMMON_PREFERENCE_HPP_
 
 #include "openthread-core-config.h"
 
@@ -126,4 +126,4 @@ private:
 
 } // namespace ot
 
-#endif // PREFERENCE_HPP_
+#endif // OT_CORE_COMMON_PREFERENCE_HPP_

src/core/common/ptr_wrapper.hpp

@@ -31,8 +31,8 @@
  *   This file includes definitions for a pointer wrapper.
  */
 
-#ifndef PTR_WRAPPER_HPP_
-#define PTR_WRAPPER_HPP_
+#ifndef OT_CORE_COMMON_PTR_WRAPPER_HPP_
+#define OT_CORE_COMMON_PTR_WRAPPER_HPP_
 
 #include "openthread-core-config.h"
 
@@ -169,4 +169,4 @@ protected:
 
 } // namespace ot
 
-#endif // PTR_WRAPPER_HPP_
+#endif // OT_CORE_COMMON_PTR_WRAPPER_HPP_

src/core/common/random.hpp

@@ -31,8 +31,8 @@
  *  This file includes definitions for OpenThread random number generation.
  */
 
-#ifndef RANDOM_HPP_
-#define RANDOM_HPP_
+#ifndef OT_CORE_COMMON_RANDOM_HPP_
+#define OT_CORE_COMMON_RANDOM_HPP_
 
 #include "openthread-core-config.h"
 
@@ -227,4 +227,4 @@ template <typename ObjectType> Error Fill(ObjectType &aObject)
 } // namespace Random
 } // namespace ot
 
-#endif // RANDOM_HPP_
+#endif // OT_CORE_COMMON_RANDOM_HPP_

src/core/common/retain_ptr.hpp

@@ -31,8 +31,8 @@
  *   This file includes definitions for a retain (reference counted) smart pointer.
  */
 
-#ifndef RETAIN_PTR_HPP_
-#define RETAIN_PTR_HPP_
+#ifndef OT_CORE_COMMON_RETAIN_PTR_HPP_
+#define OT_CORE_COMMON_RETAIN_PTR_HPP_
 
 #include "openthread-core-config.h"
 
@@ -205,4 +205,4 @@ private:
 
 } // namespace ot
 
-#endif // RETAIN_PTR_HPP_
+#endif // OT_CORE_COMMON_RETAIN_PTR_HPP_

src/core/common/serial_number.hpp

@@ -31,8 +31,8 @@
  *   This file includes definitions for serial number comparison similar to RFC-1982.
  */
 
-#ifndef SERIAL_NUMBER_HPP_
-#define SERIAL_NUMBER_HPP_
+#ifndef OT_CORE_COMMON_SERIAL_NUMBER_HPP_
+#define OT_CORE_COMMON_SERIAL_NUMBER_HPP_
 
 #include "openthread-core-config.h"
 
@@ -93,4 +93,4 @@ public:
 
 } // namespace ot
 
-#endif // SERIAL_NUMBER_HPP_
+#endif // OT_CORE_COMMON_SERIAL_NUMBER_HPP_

src/core/common/settings.hpp

@@ -31,8 +31,8 @@
  *   This file includes definitions for non-volatile storage of settings.
  */
 
-#ifndef SETTINGS_HPP_
-#define SETTINGS_HPP_
+#ifndef OT_CORE_COMMON_SETTINGS_HPP_
+#define OT_CORE_COMMON_SETTINGS_HPP_
 
 #include "openthread-core-config.h"
 
@@ -1132,4 +1132,4 @@ private:
 
 } // namespace ot
 
-#endif // SETTINGS_HPP_
+#endif // OT_CORE_COMMON_SETTINGS_HPP_

src/core/common/settings_driver.hpp

@@ -31,8 +31,8 @@
  *   This file includes definitions for settings driver.
  */
 
-#ifndef SETTINGS_DRIVER_HPP_
-#define SETTINGS_DRIVER_HPP_
+#ifndef OT_CORE_COMMON_SETTINGS_DRIVER_HPP_
+#define OT_CORE_COMMON_SETTINGS_DRIVER_HPP_
 
 #include "openthread-core-config.h"
 
@@ -240,4 +240,4 @@ private:
 
 } // namespace ot
 
-#endif // SETTINGS_DRIVER_HPP_
+#endif // OT_CORE_COMMON_SETTINGS_DRIVER_HPP_

src/core/common/string.hpp

@@ -31,8 +31,8 @@
  *  This file defines OpenThread String class.
  */
 
-#ifndef STRING_HPP_
-#define STRING_HPP_
+#ifndef OT_CORE_COMMON_STRING_HPP_
+#define OT_CORE_COMMON_STRING_HPP_
 
 #include "openthread-core-config.h"
 
@@ -582,4 +582,4 @@ public:
 
 } // namespace ot
 
-#endif // STRING_HPP_
+#endif // OT_CORE_COMMON_STRING_HPP_