diff --git a/base/HidlInternal.cpp b/base/HidlInternal.cpp
index 9c0efbb..4f88be5 100644
--- a/base/HidlInternal.cpp
+++ b/base/HidlInternal.cpp
@@ -129,6 +129,7 @@
     }
 #else
     // No-op for user builds.
+    (void) instrumentationCallbacks;
     return;
 #endif
 }
@@ -139,6 +140,8 @@
     std::cmatch cm;
     std::regex e("^" + mInstrumentationLibPackage + "(.*).profiler.so$");
     if (std::regex_match(file->d_name, cm, e)) return true;
+#else
+    (void) file;
 #endif
     return false;
 }
diff --git a/transport/include/hidl/Static.h b/transport/include/hidl/Static.h
index d62d675..04b1729 100644
--- a/transport/include/hidl/Static.h
+++ b/transport/include/hidl/Static.h
@@ -21,7 +21,8 @@
 #include <android/hidl/manager/1.0/IServiceManager.h>
 #include <hidl/ConcurrentMap.h>
 #include <hwbinder/IBinder.h>
-#include <utils/threads.h>
+#include <utils/StrongPointer.h>
+#include <utils/Mutex.h>
 
 namespace android {
 namespace hardware {