diff --git a/modules/Makefile.am b/modules/Makefile.am
index 0276e271a9..c96d766f42 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -31,6 +31,7 @@ include codec/Makefile.am
 include control/Makefile.am
 include demux/Makefile.am
 include gui/Makefile.am
+include hw/d3d11/Makefile.am
 include hw/vaapi/Makefile.am
 include hw/vdpau/Makefile.am
 include keystore/Makefile.am
diff --git a/modules/hw/d3d11/Makefile.am b/modules/hw/d3d11/Makefile.am
new file mode 100644
index 0000000000..8b777d2386
--- /dev/null
+++ b/modules/hw/d3d11/Makefile.am
@@ -0,0 +1,32 @@
+d3d11dir = $(pluginsdir)/d3d11
+d3d11_LTLIBRARIES =
+
+libdirect3d11_deinterlace_plugin_la_SOURCES = video_output/win32/d3d11_deinterlace.c
+libdirect3d11_deinterlace_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
+libdirect3d11_deinterlace_plugin_la_LIBADD = libdeinterlace_common.la libd3d11_common.la
+if HAVE_WINSTORE
+libdirect3d11_deinterlace_plugin_la_LIBADD += -ld3d11
+endif
+libdirect3d11_adjust_plugin_la_SOURCES = video_output/win32/d3d11_adjust.c
+libdirect3d11_adjust_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
+libdirect3d11_adjust_plugin_la_LIBADD = libd3d11_common.la
+if HAVE_WINSTORE
+libdirect3d11_adjust_plugin_la_LIBADD += -ld3d11
+endif
+
+if HAVE_AVCODEC_D3D11VA
+#video_filter_LTLIBRARIES += $(LTLIBdirect3d11_deinterlace) $(LTLIBdirect3d11_adjust)
+d3d11_LTLIBRARIES += libdirect3d11_deinterlace_plugin.la libdirect3d11_adjust_plugin.la
+endif
+
+# GPU/CPU converter
+libd3d11_surface_plugin_la_SOURCES = video_chroma/d3d11_surface.c
+libd3d11_surface_plugin_la_LIBADD = libchroma_copy.la libd3d11_common.la
+if HAVE_WINSTORE
+libd3d11_surface_plugin_la_LIBADD += -ld3d11
+endif
+
+if HAVE_AVCODEC_D3D11VA
+d3d11_LTLIBRARIES += libd3d11_surface_plugin.la
+endif
+
diff --git a/modules/video_chroma/Makefile.am b/modules/video_chroma/Makefile.am
index 53e7337765..73090ab2f2 100644
--- a/modules/video_chroma/Makefile.am
+++ b/modules/video_chroma/Makefile.am
@@ -126,18 +126,6 @@ chroma_LTLIBRARIES += \
 	libdxa9_plugin.la
 endif
 
-# D3D11VA
-libd3d11_surface_plugin_la_SOURCES = video_chroma/d3d11_surface.c
-libd3d11_surface_plugin_la_LIBADD = libchroma_copy.la libd3d11_common.la
-if HAVE_WINSTORE
-libd3d11_surface_plugin_la_LIBADD += -ld3d11
-endif
-
-if HAVE_AVCODEC_D3D11VA
-chroma_LTLIBRARIES += \
-	libd3d11_surface_plugin.la
-endif
-
 libcvpx_plugin_la_SOURCES = codec/vt_utils.c codec/vt_utils.h video_chroma/cvpx.c
 if HAVE_OSX
 libcvpx_plugin_la_CFLAGS = $(AM_CFLAGS) -mmacosx-version-min=10.8
diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am
index 29075e9f88..30af579a96 100644
--- a/modules/video_output/Makefile.am
+++ b/modules/video_output/Makefile.am
@@ -288,21 +288,6 @@ libdirect3d11_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
 vout_LTLIBRARIES += $(LTLIBdirect3d11)
 EXTRA_LTLIBRARIES += libdirect3d11_plugin.la
 
-libdirect3d11_deinterlace_plugin_la_SOURCES = video_output/win32/d3d11_deinterlace.c
-libdirect3d11_deinterlace_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
-libdirect3d11_deinterlace_plugin_la_LIBADD = libdeinterlace_common.la libd3d11_common.la
-if HAVE_WINSTORE
-libdirect3d11_deinterlace_plugin_la_LIBADD += -ld3d11
-endif
-libdirect3d11_adjust_plugin_la_SOURCES = video_output/win32/d3d11_adjust.c
-libdirect3d11_adjust_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
-libdirect3d11_adjust_plugin_la_LIBADD = libd3d11_common.la
-if HAVE_WINSTORE
-libdirect3d11_adjust_plugin_la_LIBADD += -ld3d11
-endif
-video_filter_LTLIBRARIES += $(LTLIBdirect3d11_deinterlace) $(LTLIBdirect3d11_adjust)
-EXTRA_LTLIBRARIES += libdirect3d11_deinterlace_plugin.la libdirect3d11_adjust_plugin.la
-
 libdirectdraw_plugin_la_SOURCES = video_output/win32/directdraw.c \
 	video_output/win32/common.c video_output/win32/common.h \
 	video_output/win32/events.c video_output/win32/events.h \