diff --git a/proprietary/wvm/Android.mk b/proprietary/wvm/Android.mk
index 891bc9d1..dbbf63a5 100644
--- a/proprietary/wvm/Android.mk
+++ b/proprietary/wvm/Android.mk
@@ -17,6 +17,10 @@ LOCAL_SRC_FILES:=           \
     WVMMediaSource.cpp      \
     WVMInfoListener.cpp
 
+LOCAL_SHARED_LIBRARIES := \
+    libstagefright \
+    libstagefright_foundation
+
 LOCAL_MODULE := libwvmcommon
 LOCAL_MODULE_TAGS := optional
 
diff --git a/proprietary/wvm/WVMFileSource.cpp b/proprietary/wvm/WVMFileSource.cpp
index d318077f..6c4e8a7f 100644
--- a/proprietary/wvm/WVMFileSource.cpp
+++ b/proprietary/wvm/WVMFileSource.cpp
@@ -8,7 +8,6 @@
 #include "WVMFileSource.h"
 #include "media/stagefright/MediaErrors.h"
 #include "media/stagefright/MediaDefs.h"
-#include "media/stagefright/MediaDebug.h"
 
 namespace android {
 
diff --git a/proprietary/wvm/WVMMediaSource.cpp b/proprietary/wvm/WVMMediaSource.cpp
index 609ca3e6..5a066279 100644
--- a/proprietary/wvm/WVMMediaSource.cpp
+++ b/proprietary/wvm/WVMMediaSource.cpp
@@ -9,9 +9,9 @@
 #include "WVMFileSource.h"
 #include "WVMExtractorImpl.h"
 #include "WVMErrorCodes.h"
+#include "media/stagefright/foundation/ADebug.h"
 #include "media/stagefright/MediaErrors.h"
 #include "media/stagefright/MediaDefs.h"
-#include "media/stagefright/MediaDebug.h"
 #include "AndroidHooks.h"
 
 namespace android {
@@ -235,7 +235,7 @@ status_t WVMMediaSource::read(MediaBuffer **buffer, const ReadOptions *options)
     status_t err = mGroup->acquire_buffer(&mediaBuf);
 
     if (err != OK) {
-        CHECK_EQ(mediaBuf, NULL);
+        CHECK(mediaBuf == NULL);
         return err;
     }
 
diff --git a/proprietary/wvm/test/Testlibwvm.cpp b/proprietary/wvm/test/Testlibwvm.cpp
index e354efd1..2090e076 100644
--- a/proprietary/wvm/test/Testlibwvm.cpp
+++ b/proprietary/wvm/test/Testlibwvm.cpp
@@ -14,7 +14,6 @@
 #include <media/stagefright/MetaData.h>
 #include <media/stagefright/MediaErrors.h>
 #include <media/stagefright/MediaBuffer.h>
-#include <media/stagefright/MediaDebug.h>
 
 using namespace android;
 using namespace std;