diff --git a/mace/core/operator.h b/mace/core/operator.h
index 59986cadd3f45cd6b8a6583db9c4ae3c0b58f2c2..27afdadd3a3b4c8bfbbe613c36ca558025f7c606 100644
--- a/mace/core/operator.h
+++ b/mace/core/operator.h
@@ -2,8 +2,8 @@
 // Copyright (c) 2017 XiaoMi All rights reserved.
 //
 
-#ifndef MACE_CORE_OPERATOR_H
-#define MACE_CORE_OPERATOR_H
+#ifndef MACE_CORE_OPERATOR_H_
+#define MACE_CORE_OPERATOR_H_
 
 #include <memory>
 #include <string>
@@ -176,4 +176,4 @@ MACE_DECLARE_REGISTRY(OpRegistry,
 
 }  // namespace mace
 
-#endif  // MACE_CORE_OPERATOR_H
+#endif  // MACE_CORE_OPERATOR_H_
diff --git a/mace/core/runtime/cpu/cpu_runtime.cc b/mace/core/runtime/cpu/cpu_runtime.cc
index cc8e214e7cab7ea904999b0bd48f92986cbb1750..555372ab8da152690237e12dd7f26a20c3db8468 100644
--- a/mace/core/runtime/cpu/cpu_runtime.cc
+++ b/mace/core/runtime/cpu/cpu_runtime.cc
@@ -29,6 +29,7 @@ int GetCPUMaxFreq(int cpu_id) {
 }
 
 void SortCPUIdsByMaxFreqAsc(std::vector<int> *cpu_ids) {
+  MACE_CHECK_NOTNULL(cpu_ids);
   int cpu_count = cpu_ids->size();
   std::vector<int> cpu_max_freq;
   cpu_max_freq.resize(cpu_count);
diff --git a/mace/core/runtime/hexagon/hexagon_control_wrapper.h b/mace/core/runtime/hexagon/hexagon_control_wrapper.h
index 9f17ca967d4dc680bade552630d07af70c6bf5e8..01f69749fcf050c83b953213f76122d676bde99c 100644
--- a/mace/core/runtime/hexagon/hexagon_control_wrapper.h
+++ b/mace/core/runtime/hexagon/hexagon_control_wrapper.h
@@ -2,8 +2,8 @@
 // Copyright (c) 2017 XiaoMi All rights reserved.
 //
 
-#ifndef MACE_DSP_HEXAGON_CONTROL_WRAPPER_H_
-#define MACE_DSP_HEXAGON_CONTROL_WRAPPER_H_
+#ifndef MACE_CORE_RUNTIME_HEXAGON_HEXAGON_CONTROL_WRAPPER_H_
+#define MACE_CORE_RUNTIME_HEXAGON_HEXAGON_CONTROL_WRAPPER_H_
 
 #include <vector>
 
@@ -55,4 +55,4 @@ class HexagonControlWrapper {
 };
 }  // namespace mace
 
-#endif  // MACE_DSP_HEXAGON_CONTROL_WRAPPER_H_
+#endif  // MACE_CORE_RUNTIME_HEXAGON_HEXAGON_CONTROL_WRAPPER_H_
diff --git a/mace/core/runtime/hexagon/hexagon_controller.h b/mace/core/runtime/hexagon/hexagon_controller.h
index 2b8b20be01c50213437ab8cda5c88e2aaa07a501..11f77c1d834e7a6de42574e8853fb54e6c078381 100644
--- a/mace/core/runtime/hexagon/hexagon_controller.h
+++ b/mace/core/runtime/hexagon/hexagon_controller.h
@@ -2,8 +2,8 @@
 // Copyright (c) 2017 XiaoMi All rights reserved.
 //
 
-#ifndef MACE_CORE_RUNTIME_HEXAGON_CONTROLLER_H_
-#define MACE_CORE_RUNTIME_HEXAGON_CONTROLLER_H_
+#ifndef MACE_CORE_RUNTIME_HEXAGON_HEXAGON_CONTROLLER_H_
+#define MACE_CORE_RUNTIME_HEXAGON_HEXAGON_CONTROLLER_H_
 
 #include "mace/core/runtime/hexagon/hexagon_nn.h"
 
@@ -22,5 +22,5 @@ int hexagon_controller_DeInitHexagon();
 }
 #endif  // __cplusplus
 
-#endif  // MACE_CORE_RUNTIME_HEXAGON_CONTROLLER_H_
+#endif  // MACE_CORE_RUNTIME_HEXAGON_HEXAGON_CONTROLLER_H_
 
diff --git a/mace/core/runtime/hexagon/hexagon_nn.h b/mace/core/runtime/hexagon/hexagon_nn.h
index 82cfb3de28012cfef51e5dabe16463b01ef8524d..7bb5bdefbe2fef4dfd13283969c69f4fd66eff2a 100644
--- a/mace/core/runtime/hexagon/hexagon_nn.h
+++ b/mace/core/runtime/hexagon/hexagon_nn.h
@@ -33,8 +33,8 @@
  *
  */
 
-#ifndef MACE_CORE_RUNTIME_HEXAGON_NN_H_
-#define MACE_CORE_RUNTIME_HEXAGON_NN_H_
+#ifndef MACE_CORE_RUNTIME_HEXAGON_HEXAGON_NN_H_
+#define MACE_CORE_RUNTIME_HEXAGON_HEXAGON_NN_H_
 #ifndef __QAIC_HEADER
 #define __QAIC_HEADER(ff) ff
 #endif  // __QAIC_HEADER
@@ -221,4 +221,4 @@ __QAIC_HEADER_EXPORT int __QAIC_HEADER(hexagon_nn_execute_new)(
 #ifdef __cplusplus
 }
 #endif
-#endif  // MACE_CORE_RUNTIME_HEXAGON_NN_H_
+#endif  // MACE_CORE_RUNTIME_HEXAGON_HEXAGON_NN_H_
diff --git a/mace/core/runtime/hexagon/hexagon_nn_ops.h b/mace/core/runtime/hexagon/hexagon_nn_ops.h
index 74cdb32dc244d6519628ec1bc0ab8cf33d6c6287..faad9c4d0f256084ca3b651c96feab9b7767467e 100644
--- a/mace/core/runtime/hexagon/hexagon_nn_ops.h
+++ b/mace/core/runtime/hexagon/hexagon_nn_ops.h
@@ -2,8 +2,8 @@
 // Copyright (c) 2018 XiaoMi All rights reserved.
 //
 
-#ifndef MACE_CORE_RUNTIME_HEXAGON_NN_OPS_H_
-#define MACE_CORE_RUNTIME_HEXAGON_NN_OPS_H_
+#ifndef MACE_CORE_RUNTIME_HEXAGON_HEXAGON_NN_OPS_H_
+#define MACE_CORE_RUNTIME_HEXAGON_HEXAGON_NN_OPS_H_
 
 #include <string>
 #include <unordered_map>
@@ -47,4 +47,4 @@ class OpMap {
 };
 }  // namespace mace
 
-#endif  // MACE_CORE_RUNTIME_HEXAGON_NN_OPS_H_
+#endif  // MACE_CORE_RUNTIME_HEXAGON_HEXAGON_NN_OPS_H_