diff --git a/Makefile.common b/Makefile.common
index c1b1fffff4..b8e2d8c9cf 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -245,7 +245,6 @@ OBJ += \
        $(LIBRETRO_COMM_DIR)/utils/md5.o \
        wifi/drivers/nullwifi.o \
        gfx/display_servers/dispserv_null.o \
-       input/drivers_hid/null_hid.o \
        playlist.o \
        record/drivers/record_null.o \
        $(LIBRETRO_COMM_DIR)/features/features_cpu.o \
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 64d9f04f8f..b03330ee2e 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -718,7 +718,6 @@ INPUT (HID)
 #ifdef HAVE_HID
 #include "../input/common/input_hid_common.c"
 #include "../input/drivers_joypad/hid_joypad.c"
-#include "../input/drivers_hid/null_hid.c"
 
 #if defined(HAVE_LIBUSB) && defined(HAVE_THREADS)
 #include "../input/drivers_hid/libusb_hid.c"
diff --git a/input/drivers_hid/null_hid.c b/input/drivers_hid/null_hid.c
deleted file mode 100644
index 44d1cc397b..0000000000
--- a/input/drivers_hid/null_hid.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2013-2014 - Jason Fetters
- *  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 "../input_defines.h"
-#include "../input_driver.h"
-#include "../include/hid_driver.h"
-
-typedef struct null_hid
-{
-   void *empty;
-} null_hid_t;
-
-static bool null_hid_joypad_query(void *data, unsigned pad)
-{
-   return pad < MAX_USERS;
-}
-
-static const char *null_hid_joypad_name(void *data, unsigned pad)
-{
-   /* TODO/FIXME - implement properly */
-   if (pad >= MAX_USERS)
-      return NULL;
-
-   return NULL;
-}
-
-static void null_hid_joypad_get_buttons(void *data,
-      unsigned port, input_bits_t *state)
-{
-   (void)data;
-   (void)port;
-
-   BIT256_CLEAR_ALL_PTR(state);
-}
-
-static bool null_hid_joypad_button(void *data, unsigned port, uint16_t joykey)
-{
-   (void)data;
-   (void)port;
-   (void)joykey;
-
-   return false;
-}
-
-static bool null_hid_joypad_rumble(void *data, unsigned pad,
-      enum retro_rumble_effect effect, uint16_t strength)
-{
-   (void)data;
-   (void)pad;
-   (void)effect;
-   (void)strength;
-
-   return false;
-}
-
-static int16_t null_hid_joypad_axis(void *data, unsigned port, uint32_t joyaxis)
-{
-   (void)data;
-   (void)port;
-   (void)joyaxis;
-
-   return 0;
-}
-
-static void *null_hid_init(void)
-{
-   return (null_hid_t*)calloc(1, sizeof(null_hid_t));
-}
-
-static void null_hid_free(const void *data)
-{
-   null_hid_t *hid_null = (null_hid_t*)data;
-
-   if (hid_null)
-      free(hid_null);
-}
-
-static void null_hid_poll(void *data)
-{
-   (void)data;
-}
-
-hid_driver_t null_hid = {
-   null_hid_init,
-   null_hid_joypad_query,
-   null_hid_free,
-   null_hid_joypad_button,
-   null_hid_joypad_get_buttons,
-   null_hid_joypad_axis,
-   null_hid_poll,
-   null_hid_joypad_rumble,
-   null_hid_joypad_name,
-   "null",
-};
diff --git a/input/input_driver.h b/input/input_driver.h
index 8a01e79e64..1123ff3494 100644
--- a/input/input_driver.h
+++ b/input/input_driver.h
@@ -604,7 +604,6 @@ extern hid_driver_t iohidmanager_hid;
 extern hid_driver_t btstack_hid;
 extern hid_driver_t libusb_hid;
 extern hid_driver_t wiiusb_hid;
-extern hid_driver_t null_hid;
 #endif
 
 typedef struct menu_input_ctx_line
diff --git a/retroarch.c b/retroarch.c
index a393b938c1..db935dcb46 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -758,6 +758,19 @@ static input_device_driver_t *joypad_drivers[] = {
 };
 
 #ifdef HAVE_HID
+static hid_driver_t null_hid = {
+   NULL, /* init */
+   NULL, /* joypad_query */
+   NULL, /* free */
+   NULL, /* button */
+   NULL, /* get_buttons */
+   NULL, /* axis */
+   NULL, /* poll */
+   NULL, /* rumble */
+   NULL, /* joypad_name */
+   "null",
+};
+
 static hid_driver_t *hid_drivers[] = {
 #if defined(HAVE_BTSTACK)
    &btstack_hid,