diff --git a/audio/2.0/default/Android.mk b/audio/2.0/default/Android.mk
index 7f42abe..ccf3c1c 100644
--- a/audio/2.0/default/Android.mk
+++ b/audio/2.0/default/Android.mk
@@ -44,6 +44,7 @@
     android.hardware.audio@2.0 \
     android.hardware.audio.common@2.0 \
     android.hardware.audio.common@2.0-util \
+    android.hardware.audio.common-util \
 
 LOCAL_HEADER_LIBRARIES := \
     libaudioclient_headers \
diff --git a/audio/2.0/default/Device.cpp b/audio/2.0/default/Device.cpp
index 3727966..c392f65 100644
--- a/audio/2.0/default/Device.cpp
+++ b/audio/2.0/default/Device.cpp
@@ -30,6 +30,8 @@
 #include "StreamOut.h"
 #include "Util.h"
 
+using ::android::hardware::audio::common::V2_0::HidlUtils;
+
 namespace android {
 namespace hardware {
 namespace audio {
diff --git a/audio/2.0/default/Stream.cpp b/audio/2.0/default/Stream.cpp
index effdd28..2fb47ef 100644
--- a/audio/2.0/default/Stream.cpp
+++ b/audio/2.0/default/Stream.cpp
@@ -26,8 +26,8 @@
 #include <utils/Vector.h>
 
 #include "Conversions.h"
-#include "EffectMap.h"
 #include "Stream.h"
+#include "common/all-versions/default/EffectMap.h"
 
 namespace android {
 namespace hardware {