diff --git a/Makefile.common b/Makefile.common
index 81f850788e..dc96774b20 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -1035,9 +1035,6 @@ ifeq ($(HAVE_PLAIN_DRM), 1)
    LIBS += -ldrm
 endif
 
-OBJ += \
-		 gfx/drivers_renderchain/null_renderchain.o
-
 ifeq ($(HAVE_GL_CONTEXT), 1)
    DEFINES += -DHAVE_OPENGL -DHAVE_GLSL
    OBJ += gfx/drivers/gl.o \
diff --git a/gfx/drivers/d3d9.c b/gfx/drivers/d3d9.c
index bb5593314c..1f66f5b1d7 100644
--- a/gfx/drivers/d3d9.c
+++ b/gfx/drivers/d3d9.c
@@ -138,7 +138,6 @@ static bool d3d9_init_imports(d3d_video_t *d3d)
 
 extern d3d_renderchain_driver_t cg_d3d9_renderchain;
 extern d3d_renderchain_driver_t hlsl_d3d9_renderchain;
-extern d3d_renderchain_driver_t null_d3d_renderchain;
 
 static bool renderchain_d3d_init_first(
       enum gfx_ctx_api api,
@@ -157,7 +156,6 @@ static bool renderchain_d3d_init_first(
 #if defined(_WIN32) && defined(HAVE_HLSL)
                &hlsl_d3d9_renderchain,
 #endif
-               &null_d3d_renderchain,
                NULL
             };
             unsigned i;
diff --git a/gfx/drivers_renderchain/null_renderchain.c b/gfx/drivers_renderchain/null_renderchain.c
deleted file mode 100644
index 6da4458bc2..0000000000
--- a/gfx/drivers_renderchain/null_renderchain.c
+++ /dev/null
@@ -1,135 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2017 - Daniel De Matteis
- *
- *  RetroArch is free software: you can redistribute it and/or modify it under the terms
- *  of the GNU General Public License as published by the Free Software Found-
- *  ation, either version 3 of the License, or (at your option) any later version.
- *
- *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- *  PURPOSE.  See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <stdlib.h>
-#include <string.h>
-#include <retro_inline.h>
-
-#include "../video_driver.h"
-
-typedef struct null_renderchain
-{
-   void *empty;
-} null_renderchain_t;
-
-static void null_renderchain_free(void *data)
-{
-}
-
-static void *null_renderchain_new(void)
-{
-   null_renderchain_t *renderchain = (null_renderchain_t*)calloc(1, sizeof(*renderchain));
-   if (!renderchain)
-      return NULL;
-
-   return renderchain;
-}
-
-static bool null_renderchain_init(void *data,
-      const void *info,
-      void *dev_data,
-      const void *final_viewport_data,
-      const void *info_data,
-      bool rgb32
-      )
-{
-   (void)data;
-   (void)info;
-   (void)dev_data;
-   (void)final_viewport_data;
-   (void)info_data;
-   (void)rgb32;
-
-   return true;
-}
-
-static void null_renderchain_set_final_viewport(void *data,
-      void *renderchain_data, const void *viewport_data)
-{
-   (void)data;
-   (void)renderchain_data;
-   (void)viewport_data;
-}
-
-static bool null_renderchain_render(void *data, const void *frame,
-      unsigned width, unsigned height,
-      unsigned pitch, unsigned rotation)
-{
-   (void)data;
-   (void)frame;
-   (void)width;
-   (void)height;
-   (void)pitch;
-   (void)rotation;
-
-   return true;
-}
-
-static bool null_renderchain_add_lut(void *data,
-      const char *id, const char *path, bool smooth)
-{
-   (void)data;
-   (void)id;
-   (void)path;
-   (void)smooth;
-
-   return true;
-}
-
-static bool null_renderchain_add_pass(void *data, const void *info_data)
-{
-   (void)data;
-   (void)info_data;
-
-   return true;
-}
-
-static void null_renderchain_add_state_tracker(void *data, void *tracker_data)
-{
-   (void)data;
-   (void)tracker_data;
-}
-
-static void null_renderchain_convert_geometry(
-	  void *data, const void *info_data,
-      unsigned *out_width, unsigned *out_height,
-      unsigned width, unsigned height,
-      void *final_viewport_data)
-{
-   (void)data;
-   (void)info_data;
-   (void)out_width;
-   (void)out_height;
-   (void)width;
-   (void)height;
-   (void)final_viewport_data;
-}
-
-d3d_renderchain_driver_t null_d3d_renderchain = {
-   null_renderchain_free,
-   null_renderchain_new,
-   null_renderchain_init,
-   null_renderchain_set_final_viewport,
-   null_renderchain_add_pass,
-   null_renderchain_add_lut,
-   null_renderchain_add_state_tracker,
-   null_renderchain_render,
-   null_renderchain_convert_geometry,
-   NULL,
-   NULL,
-   NULL,
-   "null",
-};
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 6bab9b6631..8f73ea6e0c 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -394,7 +394,6 @@ VIDEO DRIVER
 #include "../gfx/drivers/drm_gfx.c"
 #endif
 
-#include "../gfx/drivers_renderchain/null_renderchain.c"
 #include "../gfx/display_servers/dispserv_null.c"
 
 #ifdef HAVE_OPENGL