diff --git a/dlls/qedit/Makefile.in b/dlls/qedit/Makefile.in
index 35ec0e35bed..b47ee260ab7 100644
--- a/dlls/qedit/Makefile.in
+++ b/dlls/qedit/Makefile.in
@@ -4,6 +4,7 @@ IMPORTS   = strmiids strmbase uuid oleaut32 ole32 advapi32
 C_SRCS = \
 	main.c \
 	mediadet.c \
+	nullrenderer.c \
 	samplegrabber.c \
 	timeline.c
 
diff --git a/dlls/qedit/main.c b/dlls/qedit/main.c
index 578e9df2e72..a271f9adb79 100644
--- a/dlls/qedit/main.c
+++ b/dlls/qedit/main.c
@@ -60,6 +60,7 @@ static const struct object_creation_info object_creation[] =
 {
     { &CLSID_AMTimeline, AMTimeline_create },
     { &CLSID_MediaDet, MediaDet_create },
+    { &CLSID_NullRenderer, NullRenderer_create },
     { &CLSID_SampleGrabber, SampleGrabber_create },
 };
 
diff --git a/dlls/quartz/nullrenderer.c b/dlls/qedit/nullrenderer.c
similarity index 93%
rename from dlls/quartz/nullrenderer.c
rename to dlls/qedit/nullrenderer.c
index e17d19e3ca6..c19a90df710 100644
--- a/dlls/quartz/nullrenderer.c
+++ b/dlls/qedit/nullrenderer.c
@@ -1,5 +1,5 @@
 /*
- * Null Renderer (Promiscuous, not rendering anything at all!)
+ * Null renderer filter
  *
  * Copyright 2004 Christian Costa
  * Copyright 2008 Maarten Lankhorst
@@ -19,25 +19,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-
-#include "quartz_private.h"
-#include "pin.h"
-
-#include "uuids.h"
-#include "vfwmsgs.h"
-#include "amvideo.h"
-#include "windef.h"
-#include "winbase.h"
+#define COBJMACROS
 #include "dshow.h"
-#include "evcode.h"
-#include "strmif.h"
-#include "ddraw.h"
-
-#include "wine/unicode.h"
 #include "wine/debug.h"
+#include "wine/strmbase.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(quartz);
+WINE_DEFAULT_DEBUG_CHANNEL(qedit);
 
 typedef struct NullRendererImpl
 {
@@ -89,7 +76,7 @@ static HRESULT WINAPI NullRendererInner_QueryInterface(IUnknown *iface, REFIID r
 {
     NullRendererImpl *This = impl_from_IUnknown(iface);
 
-    TRACE("(%p/%p)->(%s, %p)\n", This, iface, qzdebugstr_guid(riid), ppv);
+    TRACE("filter %p, iid %s, out %p.\n", This, debugstr_guid(riid), ppv);
 
     *ppv = NULL;
 
@@ -112,7 +99,7 @@ static HRESULT WINAPI NullRendererInner_QueryInterface(IUnknown *iface, REFIID r
     }
 
     if (!IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IVideoWindow))
-        FIXME("No interface for %s!\n", qzdebugstr_guid(riid));
+        FIXME("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid));
 
     return E_NOINTERFACE;
 }
diff --git a/dlls/qedit/qedit_classes.idl b/dlls/qedit/qedit_classes.idl
index 7dca0f125b4..35a5abd3f5d 100644
--- a/dlls/qedit/qedit_classes.idl
+++ b/dlls/qedit/qedit_classes.idl
@@ -32,6 +32,13 @@ coclass AMTimeline { interface IAMTimeline; interface IPersistStream; interface
 ]
 coclass MediaDet { interface IMediaDet; }
 
+[
+    helpstring("Null Renderer"),
+    threading(both),
+    uuid(c1f400a4-3f08-11d3-9f0b-006008039e37)
+]
+coclass NullRenderer { interface IBaseFilter; }
+
 [
     helpstring("Sample Grabber"),
     threading(both),
diff --git a/dlls/qedit/qedit_private.h b/dlls/qedit/qedit_private.h
index 708c53d7de9..344656d7d87 100644
--- a/dlls/qedit/qedit_private.h
+++ b/dlls/qedit/qedit_private.h
@@ -34,6 +34,7 @@
 
 HRESULT AMTimeline_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN;
 HRESULT MediaDet_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN;
+HRESULT NullRenderer_create(IUnknown *outer, void **out) DECLSPEC_HIDDEN;
 HRESULT SampleGrabber_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN;
 
 #endif /* __QEDIT_PRIVATE_INCLUDED__ */
diff --git a/dlls/quartz/Makefile.in b/dlls/quartz/Makefile.in
index 147d395ab9f..efd96dbb1c9 100644
--- a/dlls/quartz/Makefile.in
+++ b/dlls/quartz/Makefile.in
@@ -16,7 +16,6 @@ C_SRCS = \
 	main.c \
 	memallocator.c \
 	mpegsplit.c \
-	nullrenderer.c \
 	parser.c \
 	pin.c \
 	regsvr.c \
diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c
index 4575c6ee549..08287a75ebc 100644
--- a/dlls/quartz/main.c
+++ b/dlls/quartz/main.c
@@ -74,7 +74,6 @@ static const struct object_creation_info object_creation[] =
     { &CLSID_AviSplitter, AVISplitter_create },
     { &CLSID_MPEG1Splitter, MPEGSplitter_create },
     { &CLSID_VideoRenderer, VideoRenderer_create },
-    { &CLSID_NullRenderer, NullRenderer_create },
     { &CLSID_VideoMixingRenderer, VMR7Impl_create },
     { &CLSID_VideoMixingRenderer9, VMR9Impl_create },
     { &CLSID_VideoRendererDefault, VideoRendererDefault_create },
diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h
index 2104f806f72..8d4b6a3c870 100644
--- a/dlls/quartz/quartz_private.h
+++ b/dlls/quartz/quartz_private.h
@@ -59,7 +59,6 @@ HRESULT MPEGSplitter_create(IUnknown * pUnkOuter, LPVOID * ppv) DECLSPEC_HIDDEN;
 HRESULT AVIDec_create(IUnknown * pUnkOuter, LPVOID * ppv) DECLSPEC_HIDDEN;
 HRESULT DSoundRender_create(IUnknown * pUnkOuter, LPVOID * ppv) DECLSPEC_HIDDEN;
 HRESULT VideoRenderer_create(IUnknown * pUnkOuter, LPVOID * ppv) DECLSPEC_HIDDEN;
-HRESULT NullRenderer_create(IUnknown * pUnkOuter, LPVOID * ppv) DECLSPEC_HIDDEN;
 HRESULT VideoRendererDefault_create(IUnknown * pUnkOuter, LPVOID * ppv) DECLSPEC_HIDDEN;
 HRESULT QUARTZ_CreateSystemClock(IUnknown * pUnkOuter, LPVOID * ppv) DECLSPEC_HIDDEN;
 HRESULT ACMWrapper_create(IUnknown * pUnkOuter, LPVOID * ppv) DECLSPEC_HIDDEN;
diff --git a/dlls/quartz/quartz_strmif.idl b/dlls/quartz/quartz_strmif.idl
index 44dc668ae51..ab1af89ac42 100644
--- a/dlls/quartz/quartz_strmif.idl
+++ b/dlls/quartz/quartz_strmif.idl
@@ -119,13 +119,6 @@ coclass DSoundRender { interface IBaseFilter; }
 ]
 coclass AudioRender { interface IBaseFilter; }
 
-[
-    helpstring("Null Renderer"),
-    threading(both),
-    uuid(c1f400a4-3f08-11d3-9f0b-006008039e37)
-]
-coclass NullRenderer { interface IBaseFilter; }
-
 [
     helpstring("Video Renderer"),
     threading(both),