diff --git a/mace/core/runtime/hexagon/hexagon_controller.h b/mace/core/runtime/hexagon/hexagon_controller.h
index 1bf57f9d9fe9aaec213f6cc042b152e7e0cb8b14..07b7a45325177b2756be81f6d0cd58527d4df4cf 100644
--- a/mace/core/runtime/hexagon/hexagon_controller.h
+++ b/mace/core/runtime/hexagon/hexagon_controller.h
@@ -15,7 +15,7 @@
 #ifndef MACE_CORE_RUNTIME_HEXAGON_HEXAGON_CONTROLLER_H_
 #define MACE_CORE_RUNTIME_HEXAGON_HEXAGON_CONTROLLER_H_
 
-#include "mace/core/runtime/hexagon/hexagon_nn.h"
+#include "mace/third_party/nnlib/hexagon_nn.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/mace/core/runtime/hexagon/hexagon_nn_ops.h b/mace/core/runtime/hexagon/hexagon_nn_ops.h
index dba6c56ee248df7c4a555830a6faff28913c3c13..d7d97cb01619a713c740913ad4d6fd4d5f38f9d0 100644
--- a/mace/core/runtime/hexagon/hexagon_nn_ops.h
+++ b/mace/core/runtime/hexagon/hexagon_nn_ops.h
@@ -27,7 +27,7 @@ namespace mace {
 typedef enum op_type_enum {
 #define DEF_OP(NAME, ...) OP_##NAME,
 
-#include "mace/core/runtime/hexagon/ops.h"  // NOLINT(build/include)
+#include "mace/third_party/nnlib/ops.h"  // NOLINT(build/include)
   NN_OPS_MAX
 
 #undef DEF_OP
@@ -38,7 +38,7 @@ class OpMap {
   void Init() {
 #define DEF_OP(NAME) op_map_[#NAME] = OP_##NAME;
 
-#include "mace/core/runtime/hexagon/ops.h"  // NOLINT(build/include)
+#include "mace/third_party/nnlib/ops.h"  // NOLINT(build/include)
 
 #undef DEF_OP
   }
diff --git a/tools/mace_tools.py b/tools/mace_tools.py
index 231e158a939b9f3e22886515edafc20c848f3413..a287461010d7efe0143a901596a6ac85d5de5265 100644
--- a/tools/mace_tools.py
+++ b/tools/mace_tools.py
@@ -41,7 +41,7 @@ def get_target_socs(configs):
     else:
         available_socs = sh_commands.adb_get_all_socs()
         target_socs = available_socs
-        if hasattr(configs, "target_socs"):
+        if "target_socs" in configs:
             target_socs = set(configs["target_socs"])
             target_socs = target_socs & available_socs