diff --git a/Makefile.common b/Makefile.common
index b8e2d8c9cf..2d2ab36332 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -246,7 +246,6 @@ OBJ += \
        wifi/drivers/nullwifi.o \
        gfx/display_servers/dispserv_null.o \
        playlist.o \
-       record/drivers/record_null.o \
        $(LIBRETRO_COMM_DIR)/features/features_cpu.o \
        performance_counters.o \
        verbosity.o \
diff --git a/griffin/griffin.c b/griffin/griffin.c
index b03330ee2e..c06851ec9d 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -1137,8 +1137,6 @@ WIFI
 /*============================================================
 RECORDING
 ============================================================ */
-#include "../record/drivers/record_null.c"
-
 #ifdef HAVE_FFMPEG
 #include "../record/drivers/record_ffmpeg.c"
 #endif
diff --git a/record/drivers/record_null.c b/record/drivers/record_null.c
deleted file mode 100644
index 3b6f3cbb6e..0000000000
--- a/record/drivers/record_null.c
+++ /dev/null
@@ -1,63 +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 <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <boolean.h>
-#include <compat/msvc.h>
-
-#ifdef HAVE_CONFIG_H
-#include "../../config.h"
-#endif
-
-#include "../../retroarch.h"
-
-static void record_null_free(void *data)
-{
-}
-
-static void *record_null_new(const struct record_params *params)
-{
-   return NULL;
-}
-
-static bool record_null_push_video(void *data,
-      const struct record_video_data *video_data)
-{
-   return false;
-}
-
-static bool record_null_push_audio(void *data,
-      const struct record_audio_data *audio_data)
-{
-   return false;
-}
-
-static bool record_null_finalize(void *data)
-{
-   return false;
-}
-
-const record_driver_t record_null = {
-   record_null_new,
-   record_null_free,
-   record_null_push_video,
-   record_null_push_audio,
-   record_null_finalize,
-   "null",
-};
diff --git a/retroarch.c b/retroarch.c
index db935dcb46..e654335c6a 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -849,6 +849,15 @@ static const ui_companion_driver_t *ui_companion_drivers[] = {
    NULL
 };
 
+static const record_driver_t record_null = {
+   NULL, /* new */
+   NULL, /* free */
+   NULL, /* push_video */
+   NULL, /* push_audio */
+   NULL, /* finalize */
+   "null",
+};
+
 static const record_driver_t *record_drivers[] = {
 #ifdef HAVE_FFMPEG
    &record_ffmpeg,
diff --git a/retroarch.h b/retroarch.h
index 7843a650d0..c9d03648d5 100644
--- a/retroarch.h
+++ b/retroarch.h
@@ -709,7 +709,6 @@ typedef struct record_driver
 } record_driver_t;
 
 extern const record_driver_t record_ffmpeg;
-extern const record_driver_t record_null;
 
 /**
  * config_get_record_driver_options: