diff --git a/gst-libs/gst/dvm/Makefile.am b/gst-libs/gst/dvm/Makefile.am
index d2f4d2abad..3da6f8616c 100644
--- a/gst-libs/gst/dvm/Makefile.am
+++ b/gst-libs/gst/dvm/Makefile.am
@@ -2,10 +2,10 @@ lib_LTLIBRARIES = libgstdvm-@GST_MAJORMINOR@.la
 libgstdvmincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/dvm
 
 libgstdvminclude_HEADERS = \
-	gst-dvm.h
+	gstdvm.h
 
 libgstdvm_@GST_MAJORMINOR@_la_SOURCES = \
-	gst-dvm.c
+	gstdvm.c
 
 libgstdvm_@GST_MAJORMINOR@_la_CFLAGS = \
 	$(GST_PLUGINS_BAD_CFLAGS) \
diff --git a/gst-libs/gst/dvm/gst-dvm.c b/gst-libs/gst/dvm/gstdvm.c
similarity index 99%
rename from gst-libs/gst/dvm/gst-dvm.c
rename to gst-libs/gst/dvm/gstdvm.c
index 8f84b0caad..82dea7b750 100644
--- a/gst-libs/gst/dvm/gst-dvm.c
+++ b/gst-libs/gst/dvm/gstdvm.c
@@ -24,7 +24,7 @@
 #include "config.h"
 #endif
 
-#include "gst-dvm.h"
+#include "gstdvm.h"
 
 #include <pthread.h>
 
diff --git a/gst-libs/gst/dvm/gst-dvm.h b/gst-libs/gst/dvm/gstdvm.h
similarity index 100%
rename from gst-libs/gst/dvm/gst-dvm.h
rename to gst-libs/gst/dvm/gstdvm.h
diff --git a/sys/androidcamera/Makefile.am b/sys/androidcamera/Makefile.am
index f2a6ac5e2b..e24e94404f 100644
--- a/sys/androidcamera/Makefile.am
+++ b/sys/androidcamera/Makefile.am
@@ -18,6 +18,7 @@ noinst_HEADERS = \
 	gst-android-graphics-imageformat.h
 
 libgstandroidcamera_la_CFLAGS = \
+	$(GST_PLUGINS_BAD_CFLAGS) \
 	$(GST_PLUGINS_BASE_CFLAGS) \
 	$(GST_BASE_CFLAGS) \
 	$(GST_CFLAGS) \
@@ -25,7 +26,8 @@ libgstandroidcamera_la_CFLAGS = \
 libgstandroidcamera_la_LIBADD = \
 	$(GST_PLUGINS_BASE_LIBS) \
 	$(GST_BASE_LIBS) \
-	$(GST_LIBS)
+	$(GST_LIBS) \
+	$(top_builddir)/gst-libs/gst/dvm/libgstdvm-@GST_MAJORMINOR@.la
 libgstandroidcamera_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstandroidcamera_la_LIBTOOLFLAGS = --tag=disable-static
 
diff --git a/sys/androidcamera/gst-android-graphics-imageformat.c b/sys/androidcamera/gst-android-graphics-imageformat.c
index 3140af048e..577131f27b 100644
--- a/sys/androidcamera/gst-android-graphics-imageformat.c
+++ b/sys/androidcamera/gst-android-graphics-imageformat.c
@@ -23,7 +23,7 @@
 #include "config.h"
 #endif
 
-#include <gst/dvm/gst-dvm.h>
+#include <gst/dvm/gstdvm.h>
 
 #include "gst-android-graphics-imageformat.h"
 
diff --git a/sys/androidcamera/gst-android-graphics-surfacetexture.c b/sys/androidcamera/gst-android-graphics-surfacetexture.c
index bb78f0273c..06a29453fa 100644
--- a/sys/androidcamera/gst-android-graphics-surfacetexture.c
+++ b/sys/androidcamera/gst-android-graphics-surfacetexture.c
@@ -23,7 +23,7 @@
 #include "config.h"
 #endif
 
-#include <gst/dvm/gst-dvm.h>
+#include <gst/dvm/gstdvm.h>
 
 #include "gst-android-graphics-surfacetexture.h"
 
diff --git a/sys/androidcamera/gst-android-hardware-camera.c b/sys/androidcamera/gst-android-hardware-camera.c
index 945c6e6cf4..09940b662d 100644
--- a/sys/androidcamera/gst-android-hardware-camera.c
+++ b/sys/androidcamera/gst-android-hardware-camera.c
@@ -23,7 +23,7 @@
 #include "config.h"
 #endif
 
-#include <gst/dvm/gst-dvm.h>
+#include <gst/dvm/gstdvm.h>
 
 #include "gstahccallback.h"
 #include "gst-android-hardware-camera.h"
diff --git a/sys/androidcamera/gst-androidcamera.c b/sys/androidcamera/gst-androidcamera.c
index 6aa2d412c0..d836add3ed 100644
--- a/sys/androidcamera/gst-androidcamera.c
+++ b/sys/androidcamera/gst-androidcamera.c
@@ -23,7 +23,7 @@
 #endif
 
 #include <gst/gst.h>
-#include <gst/dvm/gst-dvm.h>
+#include <gst/dvm/gstdvm.h>
 
 #include "gst-android-hardware-camera.h"
 #include "gstahcsrc.h"
diff --git a/sys/androidcamera/gstahcsrc.c b/sys/androidcamera/gstahcsrc.c
index 6f8f056e92..7ed1f22973 100644
--- a/sys/androidcamera/gstahcsrc.c
+++ b/sys/androidcamera/gstahcsrc.c
@@ -73,7 +73,7 @@
 #include <gst/video/video.h>
 #include <gst/interfaces/propertyprobe.h>
 #include <gst/interfaces/photography.h>
-#include <gst/dvm/gst-dvm.h>
+#include <gst/dvm/gstdvm.h>
 
 #include "gstahcsrc.h"
 
diff --git a/sys/androidmedia/gst-android-media-mediacodec.c b/sys/androidmedia/gst-android-media-mediacodec.c
index 5cdbbd3a61..f87669c30d 100644
--- a/sys/androidmedia/gst-android-media-mediacodec.c
+++ b/sys/androidmedia/gst-android-media-mediacodec.c
@@ -23,7 +23,7 @@
 #include "config.h"
 #endif
 
-#include <gst/dvm/gst-dvm.h>
+#include <gst/dvm/gstdvm.h>
 
 #include "gst-android-media-mediacodec.h"
 
diff --git a/sys/androidmedia/gst-android-media-mediacodecinfo.c b/sys/androidmedia/gst-android-media-mediacodecinfo.c
index bd897a7373..86df3e0f98 100644
--- a/sys/androidmedia/gst-android-media-mediacodecinfo.c
+++ b/sys/androidmedia/gst-android-media-mediacodecinfo.c
@@ -23,7 +23,7 @@
 #include "config.h"
 #endif
 
-#include <gst/dvm/gst-dvm.h>
+#include <gst/dvm/gstdvm.h>
 
 #include "gst-android-media-mediacodecinfo.h"
 
diff --git a/sys/androidmedia/gst-android-media-mediacodeclist.c b/sys/androidmedia/gst-android-media-mediacodeclist.c
index faa5a8f89a..dddcf13dd1 100644
--- a/sys/androidmedia/gst-android-media-mediacodeclist.c
+++ b/sys/androidmedia/gst-android-media-mediacodeclist.c
@@ -23,7 +23,7 @@
 #include "config.h"
 #endif
 
-#include <gst/dvm/gst-dvm.h>
+#include <gst/dvm/gstdvm.h>
 
 #include "gst-android-media-mediacodeclist.h"
 
diff --git a/sys/androidmedia/gst-android-media-mediaformat.c b/sys/androidmedia/gst-android-media-mediaformat.c
index e0ed338399..ee1529b6cb 100644
--- a/sys/androidmedia/gst-android-media-mediaformat.c
+++ b/sys/androidmedia/gst-android-media-mediaformat.c
@@ -23,7 +23,7 @@
 #include "config.h"
 #endif
 
-#include <gst/dvm/gst-dvm.h>
+#include <gst/dvm/gstdvm.h>
 #include <string.h>
 
 #include "gst-android-media-mediaformat.h"