diff --git a/Android.bp b/Android.bp
index 01fe22a..0dc42b0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -120,6 +120,7 @@
     shared_libs: [
         "android.hardware.net.nlinterceptor-V1-ndk",
         "libbase",
+        "libbinder",
         "libutils",
         "libwifi-system-iface",
     ],
@@ -180,6 +181,7 @@
         local_include_dirs: ["aidl"],
         export_aidl_headers: true,
     },
+    export_shared_lib_headers: ["libbinder"],
     srcs: [
         "ipc_constants.cpp",
         ":libwificond_ipc_aidl",
diff --git a/net/netlink_utils.cpp b/net/netlink_utils.cpp
index ff29a13..fc705d6 100644
--- a/net/netlink_utils.cpp
+++ b/net/netlink_utils.cpp
@@ -350,7 +350,7 @@
     }
   } else {
     for (auto& packet : response) {
-      packet_per_wiphy.push_back(move(*(packet.release())));
+      packet_per_wiphy.push_back(std::move(*(packet.release())));
     }
   }
 
@@ -826,7 +826,7 @@
               attr_by_wiphy_and_id[wiphy_index].find(attr_id);
           if (attr_id_and_attr == attr_by_wiphy_and_id[wiphy_index].end()) {
             attr_by_wiphy_and_id[wiphy_index].
-                insert(make_pair(attr_id, move(attr)));
+                insert(make_pair(attr_id, std::move(attr)));
           } else {
             attr_id_and_attr->second.Merge(attr);
           }
@@ -842,7 +842,7 @@
     for (const auto& attr : wiphy_and_attributes.second) {
       new_wiphy.AddAttribute(attr.second);
     }
-    packet_per_wiphy->emplace_back(move(new_wiphy));
+    packet_per_wiphy->emplace_back(std::move(new_wiphy));
   }
   return true;
 }