diff --git a/input/input_driver.c b/input/input_driver.c
index d302e88cf5..9450e3c029 100644
--- a/input/input_driver.c
+++ b/input/input_driver.c
@@ -1392,7 +1392,7 @@ bool input_joypad_set_rumble(const input_device_driver_t *drv,
 int16_t input_joypad_analog(const input_device_driver_t *drv,
       rarch_joypad_info_t joypad_info,
       unsigned port, unsigned idx, unsigned ident,
-      const void *binds_data)
+      const struct retro_keybind *binds)
 {
    uint32_t axis_minus, axis_plus;
    int16_t  pressed_minus, pressed_plus, res;
@@ -1400,8 +1400,6 @@ int16_t input_joypad_analog(const input_device_driver_t *drv,
    unsigned ident_plus                    = 0;
    const struct retro_keybind *bind_minus = NULL;
    const struct retro_keybind *bind_plus  = NULL;
-   const struct retro_keybind *binds      = (const struct retro_keybind*)
-      binds_data;
 
    input_conv_analog_id_to_bind_id(idx, ident, &ident_minus, &ident_plus);
 
diff --git a/input/input_driver.h b/input/input_driver.h
index 24841ba7a8..4ee542cd64 100644
--- a/input/input_driver.h
+++ b/input/input_driver.h
@@ -487,7 +487,7 @@ static INLINE bool input_joypad_pressed(
 int16_t input_joypad_analog(const input_device_driver_t *driver,
       rarch_joypad_info_t joypad_info,
       unsigned port, unsigned idx, unsigned ident,
-      const void *binds);
+      const struct retro_keybind *binds);
 
 /**
  * input_joypad_set_rumble:
diff --git a/input/input_joypad_driver.h b/input/input_joypad_driver.h
deleted file mode 100644
index c6491f511f..0000000000
--- a/input/input_joypad_driver.h
+++ /dev/null
@@ -1,30 +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/>.
- */
-
-#ifndef INPUT_JOYPAD_DRIVER_H__
-#define INPUT_JOYPAD_DRIVER_H__
-
-#include <stdint.h>
-
-#include <boolean.h>
-#include <retro_common_api.h>
-#include <libretro.h>
-
-RETRO_BEGIN_DECLS
-
-RETRO_END_DECLS
-
-#endif