diff --git a/input/connect/connect_nesusb.c b/input/connect/connect_nesusb.c
index 43f1f2d51b..fc484ea88d 100644
--- a/input/connect/connect_nesusb.c
+++ b/input/connect/connect_nesusb.c
@@ -59,7 +59,7 @@ static void hidpad_nesusb_deinit(void *data)
       free(device);
 }
 
-static void hidpad_nesusb_get_buttons(void *data, retro_bits_t* state)
+static void hidpad_nesusb_get_buttons(void *data, input_bits_t* state)
 {
 	struct hidpad_nesusb_data *device = (struct hidpad_nesusb_data*)data;
 	if (device)
diff --git a/input/connect/connect_ps2adapter.c b/input/connect/connect_ps2adapter.c
index c805cb85e2..4ee0e5e6cb 100644
--- a/input/connect/connect_ps2adapter.c
+++ b/input/connect/connect_ps2adapter.c
@@ -59,9 +59,11 @@ static void hidpad_ps2adapter_deinit(void *data)
       free(device);
 }
 
-static void hidpad_ps2adapter_get_buttons(void *data, retro_bits_t *state)
+static void hidpad_ps2adapter_get_buttons(void *data, input_bits_t *state)
 {
-	struct hidpad_ps2adapter_data *device = (struct hidpad_ps2adapter_data*)data;
+	struct hidpad_ps2adapter_data *device = (struct hidpad_ps2adapter_data*)
+      data;
+
 	if (device)
    {
 		BITS_COPY16_PTR(state, device->buttons);
diff --git a/input/connect/connect_ps3.c b/input/connect/connect_ps3.c
index 61269a9e88..5625ee09d1 100644
--- a/input/connect/connect_ps3.c
+++ b/input/connect/connect_ps3.c
@@ -134,7 +134,7 @@ static void hidpad_ps3_deinit(void *data)
       free(device);
 }
 
-static void hidpad_ps3_get_buttons(void *data, retro_bits_t *state)
+static void hidpad_ps3_get_buttons(void *data, input_bits_t *state)
 {
 	struct hidpad_ps3_data *device = (struct hidpad_ps3_data*)data;
 	if ( device )
diff --git a/input/connect/connect_ps4.c b/input/connect/connect_ps4.c
index 0356a91537..1de5d8d056 100644
--- a/input/connect/connect_ps4.c
+++ b/input/connect/connect_ps4.c
@@ -185,7 +185,7 @@ static bool hidpad_ps4_check_dpad(struct ps4 *rpt, unsigned id)
    return false;
 }
 
-static void hidpad_ps4_get_buttons(void *data, retro_bits_t* state)
+static void hidpad_ps4_get_buttons(void *data, input_bits_t* state)
 {
    struct hidpad_ps4_data *device = (struct hidpad_ps4_data*)data;
    struct ps4                *rpt = device ?
diff --git a/input/connect/connect_psxadapter.c b/input/connect/connect_psxadapter.c
index 68f921b0b6..cbc6a402f9 100644
--- a/input/connect/connect_psxadapter.c
+++ b/input/connect/connect_psxadapter.c
@@ -59,9 +59,11 @@ static void hidpad_psxadapter_deinit(void *data)
       free(device);
 }
 
-static void hidpad_psxadapter_get_buttons(void *data, retro_bits_t *state)
+static void hidpad_psxadapter_get_buttons(void *data, input_bits_t *state)
 {
-	struct hidpad_psxadapter_data *device = (struct hidpad_psxadapter_data*)data;
+	struct hidpad_psxadapter_data *device = (struct hidpad_psxadapter_data*)
+      data;
+
 	if (device)
    {
 		BITS_COPY16_PTR(state, device->buttons);
diff --git a/input/connect/connect_snesusb.c b/input/connect/connect_snesusb.c
index bdc9b16a05..314577d863 100644
--- a/input/connect/connect_snesusb.c
+++ b/input/connect/connect_snesusb.c
@@ -60,7 +60,7 @@ static void hidpad_snesusb_deinit(void *data)
       free(device);
 }
 
-static void hidpad_snesusb_get_buttons(void *data, retro_bits_t *state)
+static void hidpad_snesusb_get_buttons(void *data, input_bits_t *state)
 {
 	struct hidpad_snesusb_data *device = (struct hidpad_snesusb_data*)data;
 	if (device)
diff --git a/input/connect/connect_wii.c b/input/connect/connect_wii.c
index f02e1735be..be27bfcfef 100644
--- a/input/connect/connect_wii.c
+++ b/input/connect/connect_wii.c
@@ -672,7 +672,7 @@ static int16_t hidpad_wii_get_axis(void *data, unsigned axis)
    return 0;
 }
 
-static void hidpad_wii_get_buttons(void *data, retro_bits_t *state)
+static void hidpad_wii_get_buttons(void *data, input_bits_t *state)
 {
 	struct connect_wii_wiimote_t* device = (struct connect_wii_wiimote_t*)data;
 	if ( device )
diff --git a/input/connect/connect_wiiugca.c b/input/connect/connect_wiiugca.c
index 7e49969fd2..8283f2ac9d 100644
--- a/input/connect/connect_wiiugca.c
+++ b/input/connect/connect_wiiugca.c
@@ -68,7 +68,7 @@ static void hidpad_wiiugca_deinit(void *data)
       free(device);
 }
 
-static void hidpad_wiiugca_get_buttons(void *data, retro_bits_t *state)
+static void hidpad_wiiugca_get_buttons(void *data, input_bits_t *state)
 {
   struct hidpad_wiiugca_data *device = (struct hidpad_wiiugca_data*)data;
   if (device)
diff --git a/input/connect/connect_wiiupro.c b/input/connect/connect_wiiupro.c
index 836f17856e..dd9751114c 100644
--- a/input/connect/connect_wiiupro.c
+++ b/input/connect/connect_wiiupro.c
@@ -118,7 +118,7 @@ static void hidpad_wiiupro_deinit(void *data)
       free(device);
 }
 
-static void hidpad_wiiupro_get_buttons(void *data, retro_bits_t *state)
+static void hidpad_wiiupro_get_buttons(void *data, input_bits_t *state)
 {
    struct hidpad_wiiupro_data *device = (struct hidpad_wiiupro_data*)data;
    struct wiiupro                *rpt = device ?
diff --git a/input/connect/joypad_connection.c b/input/connect/joypad_connection.c
index 1c7c75353b..777ac5874d 100644
--- a/input/connect/joypad_connection.c
+++ b/input/connect/joypad_connection.c
@@ -228,7 +228,8 @@ void pad_connection_packet(joypad_connection_t *joyconn, uint32_t pad,
       joyconn->iface->packet_handler(joyconn->data, data, length);
 }
 
-void pad_connection_get_buttons(joypad_connection_t *joyconn, unsigned pad, retro_bits_t* state)
+void pad_connection_get_buttons(joypad_connection_t *joyconn,
+      unsigned pad, input_bits_t *state)
 {
 	if (joyconn && joyconn->iface)
 		joyconn->iface->get_buttons(joyconn->data, state);
diff --git a/input/connect/joypad_connection.h b/input/connect/joypad_connection.h
index ec78b3c4df..67bc34bcb9 100644
--- a/input/connect/joypad_connection.h
+++ b/input/connect/joypad_connection.h
@@ -58,7 +58,7 @@ typedef struct pad_connection_interface
    void     	(*packet_handler)(void* device, uint8_t *packet, uint16_t size);
    void     	(*set_rumble)(void* device, enum retro_rumble_effect effect,
 					uint16_t strength);
-   void			(*get_buttons)(void *data, retro_bits_t *state);
+   void			(*get_buttons)(void *data, input_bits_t *state);
    int16_t  	(*get_axis)(void *data, unsigned axis);
    const char*	(*get_name)(void *data);
 } pad_connection_interface_t;
@@ -90,7 +90,7 @@ void pad_connection_packet(joypad_connection_t *joyconn,
    uint32_t idx, uint8_t* data, uint32_t length);
 
 void pad_connection_get_buttons(joypad_connection_t *joyconn,
-   unsigned idx, retro_bits_t* state);
+   unsigned idx, input_bits_t* state);
 
 int16_t pad_connection_get_axis(joypad_connection_t *joyconn,
    unsigned idx, unsigned i);
diff --git a/input/drivers/cocoa_input.c b/input/drivers/cocoa_input.c
index da33ccef83..2cba64d44f 100644
--- a/input/drivers/cocoa_input.c
+++ b/input/drivers/cocoa_input.c
@@ -53,7 +53,7 @@ int32_t cocoa_input_find_any_key(void)
 }
 
 static int cocoa_input_find_any_button_ret(cocoa_input_data_t *apple,
-   retro_bits_t * state, unsigned port)
+   input_bits_t * state, unsigned port)
 {
    unsigned i;
 
@@ -78,7 +78,7 @@ int32_t cocoa_input_find_any_button(uint32_t port)
 
        if (apple->joypad->get_buttons)
        {
-          retro_bits_t state;
+          input_bits_t state;
           apple->joypad->get_buttons(port,&state);
           ret = cocoa_input_find_any_button_ret(apple, &state, port);
        }
@@ -93,7 +93,7 @@ int32_t cocoa_input_find_any_button(uint32_t port)
 
        if (apple->sec_joypad->get_buttons)
        {
-          retro_bits_t state;
+          input_bits_t state;
           apple->sec_joypad->poll();
           apple->sec_joypad->get_buttons(port,&state);
           ret = cocoa_input_find_any_button_ret(apple, &state, port);
diff --git a/input/drivers/wiiu_input.c b/input/drivers/wiiu_input.c
index 5a188c1f21..35ae955f68 100644
--- a/input/drivers/wiiu_input.c
+++ b/input/drivers/wiiu_input.c
@@ -100,7 +100,7 @@ static int16_t wiiu_pointer_device_state(wiiu_input_t* wiiu, unsigned id)
 	{
 		case RETRO_DEVICE_ID_POINTER_PRESSED:
 		{
-			retro_bits_t state;
+			input_bits_t state;
 			wiiu->joypad->get_buttons(0, &state);
 			return BIT256_GET(state, VPAD_BUTTON_TOUCH_BIT) ? 1 : 0;
 		}
diff --git a/input/drivers_hid/btstack_hid.c b/input/drivers_hid/btstack_hid.c
index 1d277484aa..fb701e7505 100644
--- a/input/drivers_hid/btstack_hid.c
+++ b/input/drivers_hid/btstack_hid.c
@@ -1364,7 +1364,8 @@ static const char *btstack_hid_joypad_name(void *data, unsigned pad)
    return NULL;
 }
 
-static void btstack_hid_joypad_get_buttons(void *data, unsigned port, retro_bits_t *state)
+static void btstack_hid_joypad_get_buttons(void *data, unsigned port,
+      input_bits_t *state)
 {
   btstack_hid_t        *hid   = (btstack_hid_t*)data;
   if (hid)
@@ -1373,9 +1374,10 @@ static void btstack_hid_joypad_get_buttons(void *data, unsigned port, retro_bits
     BIT256_CLEAR_ALL_PTR(state);
 }
 
-static bool btstack_hid_joypad_button(void *data, unsigned port, uint16_t joykey)
+static bool btstack_hid_joypad_button(void *data,
+      unsigned port, uint16_t joykey)
 {
-  retro_bits_t buttons;
+  input_bits_t buttons;
   btstack_hid_joypad_get_buttons(data, port, &buttons);
 
   /* Check hat. */
diff --git a/input/drivers_hid/iohidmanager_hid.c b/input/drivers_hid/iohidmanager_hid.c
index b85a3c1117..8c1556c652 100644
--- a/input/drivers_hid/iohidmanager_hid.c
+++ b/input/drivers_hid/iohidmanager_hid.c
@@ -133,7 +133,8 @@ static const char *iohidmanager_hid_joypad_name(void *data, unsigned pad)
    return NULL;
 }
 
-static void iohidmanager_hid_joypad_get_buttons(void *data, unsigned port, retro_bits_t *state)
+static void iohidmanager_hid_joypad_get_buttons(void *data,
+      unsigned port, input_bits_t *state)
 {
   iohidmanager_hid_t        *hid   = (iohidmanager_hid_t*)data;
   if (hid)
@@ -145,7 +146,7 @@ static void iohidmanager_hid_joypad_get_buttons(void *data, unsigned port, retro
 static bool iohidmanager_hid_joypad_button(void *data,
       unsigned port, uint16_t joykey)
 {
-  retro_bits_t buttons;
+  input_bits_t buttons;
   iohidmanager_hid_t *hid   = (iohidmanager_hid_t*)data;
   unsigned hat_dir = GET_HAT_DIR(joykey);
 
diff --git a/input/drivers_hid/libusb_hid.c b/input/drivers_hid/libusb_hid.c
index 44580359fa..b7622b92c1 100644
--- a/input/drivers_hid/libusb_hid.c
+++ b/input/drivers_hid/libusb_hid.c
@@ -443,7 +443,8 @@ static const char *libusb_hid_joypad_name(void *data, unsigned pad)
    return NULL;
 }
 
-static void libusb_hid_joypad_get_buttons(void *data, unsigned port, retro_bits_t *state)
+static void libusb_hid_joypad_get_buttons(void *data, unsigned port,
+      input_bits_t *state)
 {
    libusb_hid_t        *hid   = (libusb_hid_t*)data;
    if (hid)
@@ -458,7 +459,7 @@ static void libusb_hid_joypad_get_buttons(void *data, unsigned port, retro_bits_
 static bool libusb_hid_joypad_button(void *data,
       unsigned port, uint16_t joykey)
 {
-   retro_bits_t buttons;
+   input_bits_t buttons;
    libusb_hid_joypad_get_buttons(data, port, &buttons);
 
    /* Check hat. */
diff --git a/input/drivers_hid/null_hid.c b/input/drivers_hid/null_hid.c
index 70a34d4bf8..85056ecbb1 100644
--- a/input/drivers_hid/null_hid.c
+++ b/input/drivers_hid/null_hid.c
@@ -38,7 +38,8 @@ static const char *null_hid_joypad_name(void *data, unsigned pad)
    return NULL;
 }
 
-static void null_hid_joypad_get_buttons(void *data, unsigned port, retro_bits_t *state)
+static void null_hid_joypad_get_buttons(void *data,
+      unsigned port, input_bits_t *state)
 {
    (void)data;
    (void)port;
diff --git a/input/drivers_hid/wiiusb_hid.c b/input/drivers_hid/wiiusb_hid.c
index 397f0a0a64..9f4fea629a 100644
--- a/input/drivers_hid/wiiusb_hid.c
+++ b/input/drivers_hid/wiiusb_hid.c
@@ -478,7 +478,8 @@ static bool wiiusb_hid_joypad_query(void *data, unsigned pad)
    return pad < MAX_USERS;
 }
 
-static void wiiusb_hid_joypad_get_buttons(void *data, unsigned port, retro_bits_t *state)
+static void wiiusb_hid_joypad_get_buttons(void *data,
+      unsigned port, input_bits_t *state)
 {
   wiiusb_hid_t *hid = (wiiusb_hid_t*)data;
   if (hid)
@@ -489,9 +490,10 @@ static void wiiusb_hid_joypad_get_buttons(void *data, unsigned port, retro_bits_
   BIT256_CLEAR_ALL_PTR(state);
 }
 
-static bool wiiusb_hid_joypad_button(void *data, unsigned port, uint16_t joykey)
+static bool wiiusb_hid_joypad_button(void *data,
+      unsigned port, uint16_t joykey)
 {
-  retro_bits_t buttons;
+  input_bits_t buttons;
 
   wiiusb_hid_joypad_get_buttons(data, port, &buttons);
 
diff --git a/input/drivers_joypad/ctr_joypad.c b/input/drivers_joypad/ctr_joypad.c
index 711b88493d..1bfd559cd2 100644
--- a/input/drivers_joypad/ctr_joypad.c
+++ b/input/drivers_joypad/ctr_joypad.c
@@ -70,7 +70,7 @@ static bool ctr_joypad_button(unsigned port_num, uint16_t key)
    return (pad_state & (1 << key));
 }
 
-static void ctr_joypad_get_buttons(unsigned port_num, retro_bits_t *state)
+static void ctr_joypad_get_buttons(unsigned port_num, input_bits_t *state)
 {
 	if ( port_num < MAX_PADS )
    {
diff --git a/input/drivers_joypad/gx_joypad.c b/input/drivers_joypad/gx_joypad.c
index 392cb602a9..1e4c0b9a4b 100644
--- a/input/drivers_joypad/gx_joypad.c
+++ b/input/drivers_joypad/gx_joypad.c
@@ -162,7 +162,7 @@ static bool gx_joypad_button(unsigned port, uint16_t key)
    return (pad_state[port] & (UINT64_C(1) << key));
 }
 
-static void gx_joypad_get_buttons(unsigned port, retro_bits_t *state)
+static void gx_joypad_get_buttons(unsigned port, input_bits_t *state)
 {
 	if (port < MAX_PADS)
    {
diff --git a/input/drivers_joypad/hid_joypad.c b/input/drivers_joypad/hid_joypad.c
index 203a272922..c35aff850d 100644
--- a/input/drivers_joypad/hid_joypad.c
+++ b/input/drivers_joypad/hid_joypad.c
@@ -55,7 +55,7 @@ static bool hid_joypad_button(unsigned port, uint16_t joykey)
    return false;
 }
 
-static void hid_joypad_get_buttons(unsigned port, retro_bits_t *state)
+static void hid_joypad_get_buttons(unsigned port, input_bits_t *state)
 {
    if (generic_hid && generic_hid->get_buttons)
       generic_hid->get_buttons((void*)hid_driver_get_data(), port, state);
diff --git a/input/drivers_joypad/linuxraw_joypad.c b/input/drivers_joypad/linuxraw_joypad.c
index 4d852f406b..b87a6e7bd0 100644
--- a/input/drivers_joypad/linuxraw_joypad.c
+++ b/input/drivers_joypad/linuxraw_joypad.c
@@ -326,9 +326,11 @@ static bool linuxraw_joypad_button(unsigned port, uint16_t joykey)
    return joykey < NUM_BUTTONS && BIT32_GET(pad->buttons, joykey);
 }
 
-static void linuxraw_joypad_get_buttons(unsigned port, retro_bits_t *state)
+static void linuxraw_joypad_get_buttons(unsigned port, input_bits_t *state)
 {
-	const struct linuxraw_joypad *pad = (const struct linuxraw_joypad*)&linuxraw_pads[port];
+	const struct linuxraw_joypad *pad = (const struct linuxraw_joypad*)
+      &linuxraw_pads[port];
+
 	if (pad)
    {
 		BITS_COPY16_PTR(state, pad->buttons);
diff --git a/input/drivers_joypad/mfi_joypad.m b/input/drivers_joypad/mfi_joypad.m
index 94f56b2147..32f52e334c 100644
--- a/input/drivers_joypad/mfi_joypad.m
+++ b/input/drivers_joypad/mfi_joypad.m
@@ -221,7 +221,8 @@ static bool apple_gamecontroller_joypad_button(unsigned port, uint16_t joykey)
    return false;
 }
 
-static void apple_gamecontroller_joypad_get_buttons(unsigned port, retro_bits_t *state)
+static void apple_gamecontroller_joypad_get_buttons(unsigned port,
+      input_bits_t *state)
 {
 	BITS_COPY16_PTR(state, mfi_buttons[port]);
 }
diff --git a/input/drivers_joypad/null_joypad.c b/input/drivers_joypad/null_joypad.c
index 058d01d5b3..d41198a8bf 100644
--- a/input/drivers_joypad/null_joypad.c
+++ b/input/drivers_joypad/null_joypad.c
@@ -37,7 +37,7 @@ static bool null_joypad_button(unsigned port_num, uint16_t joykey)
    return false;
 }
 
-static void null_joypad_get_buttons(unsigned port_num, retro_bits_t *state)
+static void null_joypad_get_buttons(unsigned port_num, input_bits_t *state)
 {
 	BIT256_CLEAR_ALL_PTR(state);
 }
diff --git a/input/drivers_joypad/parport_joypad.c b/input/drivers_joypad/parport_joypad.c
index e236a36fc5..d392745acf 100644
--- a/input/drivers_joypad/parport_joypad.c
+++ b/input/drivers_joypad/parport_joypad.c
@@ -340,9 +340,11 @@ static bool parport_joypad_button(unsigned port, uint16_t joykey)
    return joykey < PARPORT_NUM_BUTTONS && BIT32_GET(pad->buttons, joykey);
 }
 
-static void parport_joypad_get_buttons(unsigned port, retro_bits_t *state)
+static void parport_joypad_get_buttons(unsigned port, input_bits_t *state)
 {
-	const struct parport_joypad *pad = (const struct parport_joypad*)&parport_pads[port];
+	const struct parport_joypad *pad = (const struct parport_joypad*)
+      &parport_pads[port];
+
 	if (pad)
    {
 		BITS_COPY16_PTR(state, pad->buttons);
diff --git a/input/drivers_joypad/ps3_joypad.c b/input/drivers_joypad/ps3_joypad.c
index a85a23fcf9..0088f6d256 100644
--- a/input/drivers_joypad/ps3_joypad.c
+++ b/input/drivers_joypad/ps3_joypad.c
@@ -68,7 +68,7 @@ static bool ps3_joypad_button(unsigned port_num, uint16_t joykey)
    return pad_state[port_num] & (UINT64_C(1) << joykey);
 }
 
-static void ps3_joypad_get_buttons(unsigned port_num, retro_bits_t *state)
+static void ps3_joypad_get_buttons(unsigned port_num, input_bits_t *state)
 {
 	if (port_num < MAX_PADS)
    {
diff --git a/input/drivers_joypad/psp_joypad.c b/input/drivers_joypad/psp_joypad.c
index d9cb4dd65a..309a8a0f3c 100644
--- a/input/drivers_joypad/psp_joypad.c
+++ b/input/drivers_joypad/psp_joypad.c
@@ -124,7 +124,7 @@ static bool psp_joypad_button(unsigned port_num, uint16_t key)
    return (pad_state[port_num] & (UINT64_C(1) << key));
 }
 
-static void psp_joypad_get_buttons(unsigned port_num, retro_bits_t *state)
+static void psp_joypad_get_buttons(unsigned port_num, input_bits_t *state)
 {
 	if (port_num < PSP_MAX_PADS)
    {
diff --git a/input/drivers_joypad/rwebpad_joypad.c b/input/drivers_joypad/rwebpad_joypad.c
index f061996e6e..4278afb757 100644
--- a/input/drivers_joypad/rwebpad_joypad.c
+++ b/input/drivers_joypad/rwebpad_joypad.c
@@ -130,12 +130,11 @@ static bool rwebpad_joypad_button(unsigned port_num, uint16_t joykey)
    return false;
 }
 
-static void rwebpad_joypad_get_buttons(unsigned port_num, retro_bits_t *state)
+static void rwebpad_joypad_get_buttons(unsigned port_num, input_bits_t *state)
 {
    EmscriptenGamepadEvent gamepad_state;
-   EMSCRIPTEN_RESULT r;
-
-   r = emscripten_get_gamepad_status(port_num, &gamepad_state);
+   EMSCRIPTEN_RESULT r = emscripten_get_gamepad_status(
+         port_num, &gamepad_state);
 
    if (r == EMSCRIPTEN_RESULT_SUCCESS)
    {
diff --git a/input/drivers_joypad/switch_joypad.c b/input/drivers_joypad/switch_joypad.c
index 5a88d9c70b..eb18024ee4 100644
--- a/input/drivers_joypad/switch_joypad.c
+++ b/input/drivers_joypad/switch_joypad.c
@@ -60,7 +60,7 @@ static bool switch_joypad_button(unsigned port_num, uint16_t key)
    return (pad_state[port_num] & (1 << key));
 }
 
-static void switch_joypad_get_buttons(unsigned port_num, retro_bits_t *state)
+static void switch_joypad_get_buttons(unsigned port_num, input_bits_t *state)
 {
    if(port_num < MAX_PADS)
    {
diff --git a/input/drivers_joypad/udev_joypad.c b/input/drivers_joypad/udev_joypad.c
index 9f79b19f7f..4475c62e5f 100644
--- a/input/drivers_joypad/udev_joypad.c
+++ b/input/drivers_joypad/udev_joypad.c
@@ -637,9 +637,11 @@ static bool udev_joypad_button(unsigned port, uint16_t joykey)
    return joykey < UDEV_NUM_BUTTONS && BIT64_GET(pad->buttons, joykey);
 }
 
-static void udev_joypad_get_buttons(unsigned port, retro_bits_t *state)
+static void udev_joypad_get_buttons(unsigned port, input_bits_t *state)
 {
-	const struct udev_joypad *pad = (const struct udev_joypad*)&udev_pads[port];
+	const struct udev_joypad *pad = (const struct udev_joypad*)
+      &udev_pads[port];
+
 	if (pad)
    {
 		BITS_COPY16_PTR( state, pad->buttons );
diff --git a/input/drivers_joypad/wiiu_joypad.c b/input/drivers_joypad/wiiu_joypad.c
index 4ae4a4863a..1f1b476439 100644
--- a/input/drivers_joypad/wiiu_joypad.c
+++ b/input/drivers_joypad/wiiu_joypad.c
@@ -26,7 +26,7 @@ static bool wiiu_joypad_init(void *data);
 static bool wiiu_joypad_query_pad(unsigned pad);
 static void wiiu_joypad_destroy(void);
 static bool wiiu_joypad_button(unsigned pad, uint16_t button);
-static void wiiu_joypad_get_buttons(unsigned pad, retro_bits_t *state);
+static void wiiu_joypad_get_buttons(unsigned pad, input_bits_t *state);
 static int16_t wiiu_joypad_axis(unsigned pad, uint32_t axis);
 static void wiiu_joypad_poll(void);
 static const char *wiiu_joypad_name(unsigned pad);
@@ -110,7 +110,7 @@ static bool wiiu_joypad_button(unsigned pad, uint16_t key)
   return pad_drivers[pad]->button(pad, key);
 }
 
-static void wiiu_joypad_get_buttons(unsigned pad, retro_bits_t *state)
+static void wiiu_joypad_get_buttons(unsigned pad, input_bits_t *state)
 {
   if(!wiiu_joypad_query_pad(pad))
     return;
diff --git a/input/input_driver.c b/input/input_driver.c
index 3df9740e19..21ab4016cf 100644
--- a/input/input_driver.c
+++ b/input/input_driver.c
@@ -823,7 +823,7 @@ void state_tracker_update_input(uint16_t *input1, uint16_t *input2)
 }
 
 static INLINE bool input_keys_pressed_iterate(unsigned i,
-      retro_bits_t* p_new_state)
+      input_bits_t* p_new_state)
 {
    if ((i >= RARCH_FIRST_META_KEY) &&
          BIT64_GET(lifecycle_state, i)
@@ -868,7 +868,7 @@ static INLINE bool input_keys_pressed_iterate(unsigned i,
  *
  * Returns: Input sample containing a mask of all pressed keys.
  */
-void input_menu_keys_pressed(void *data, retro_bits_t* p_new_state)
+void input_menu_keys_pressed(void *data, input_bits_t *p_new_state)
 {
    unsigned i, port;
    rarch_joypad_info_t joypad_info;
@@ -1073,7 +1073,7 @@ int16_t input_driver_input_state(
  *
  * Returns: Input sample containing a mask of all pressed keys.
  */
-void input_keys_pressed(void *data, retro_bits_t* p_new_state)
+void input_keys_pressed(void *data, input_bits_t *p_new_state)
 {
    unsigned i;
    rarch_joypad_info_t joypad_info;
@@ -1143,7 +1143,7 @@ void input_keys_pressed(void *data, retro_bits_t* p_new_state)
    }
 }
 
-void input_get_state_for_port(void *data, unsigned port, retro_bits_t* p_new_state)
+void input_get_state_for_port(void *data, unsigned port, input_bits_t *p_new_state)
 {
    unsigned i, j;
    int16_t val;
diff --git a/input/input_driver.h b/input/input_driver.h
index 07ff1a285f..6ffc894387 100644
--- a/input/input_driver.h
+++ b/input/input_driver.h
@@ -38,6 +38,12 @@
 
 RETRO_BEGIN_DECLS
 
+typedef struct
+{
+   uint32_t data[8];
+   uint16_t analogs[8];
+} input_bits_t;
+
 typedef struct rarch_joypad_driver input_device_driver_t;
 
 typedef struct hid_driver hid_driver_t;
@@ -172,7 +178,7 @@ struct rarch_joypad_driver
    bool (*query_pad)(unsigned);
    void (*destroy)(void);
    bool (*button)(unsigned, uint16_t);
-   void (*get_buttons)(unsigned, retro_bits_t *);
+   void (*get_buttons)(unsigned, input_bits_t *);
    int16_t (*axis)(unsigned, uint32_t);
    void (*poll)(void);
    bool (*set_rumble)(unsigned, enum retro_rumble_effect, uint16_t);
@@ -187,7 +193,7 @@ struct hid_driver
    bool (*query_pad)(void *, unsigned);
    void (*free)(const void *);
    bool (*button)(void *, unsigned, uint16_t);
-   void (*get_buttons)(void *, unsigned, retro_bits_t *);
+   void (*get_buttons)(void *, unsigned, input_bits_t *);
    int16_t (*axis)(void *, unsigned, uint32_t);
    void (*poll)(void *);
    bool (*set_rumble)(void *, unsigned, enum retro_rumble_effect, uint16_t);
@@ -335,15 +341,15 @@ void input_poll(void);
 int16_t input_state(unsigned port, unsigned device,
       unsigned idx, unsigned id);
 
-void input_keys_pressed(void *data, retro_bits_t* new_state);
+void input_keys_pressed(void *data, input_bits_t* new_state);
 
 #ifdef HAVE_MENU
-void input_menu_keys_pressed(void *data, retro_bits_t* new_state);
+void input_menu_keys_pressed(void *data, input_bits_t* new_state);
 #endif
 
 void *input_driver_get_data(void);
 
-void input_get_state_for_port(void *data, unsigned port, retro_bits_t* p_new_state);
+void input_get_state_for_port(void *data, unsigned port, input_bits_t *p_new_state);
 
 const input_driver_t *input_get_ptr(void);
 
diff --git a/input/input_mapper.c b/input/input_mapper.c
index 67da220234..48835179a3 100644
--- a/input/input_mapper.c
+++ b/input/input_mapper.c
@@ -55,7 +55,7 @@ struct input_mapper
    /* the whole keyboard state */
    uint32_t keys[RETROK_LAST / 32 + 1];
    /* This is a bitmask of (1 << key_bind_id). */
-   retro_bits_t buttons[MAX_USERS];
+   input_bits_t buttons[MAX_USERS];
 };
 
 input_mapper_t *input_mapper_new(void)
@@ -85,7 +85,7 @@ void input_mapper_poll(input_mapper_t *handle)
 {
    int i, j, k;
    settings_t *settings = config_get_ptr();
-   retro_bits_t current_input;
+   input_bits_t current_input;
    unsigned max_users   = *(input_driver_get_uint(INPUT_ACTION_MAX_USERS));
    unsigned device      = 0;
    unsigned current_button_value;
diff --git a/input/input_overlay.c b/input/input_overlay.c
index 99d57895bf..6e92f71989 100644
--- a/input/input_overlay.c
+++ b/input/input_overlay.c
@@ -46,7 +46,7 @@ typedef struct input_overlay_state
    int16_t analog[4];
    uint32_t keys[RETROK_LAST / 32 + 1];
    /* This is a bitmask of (1 << key_bind_id). */
-   retro_bits_t buttons;
+   input_bits_t buttons;
 } input_overlay_state_t;
 
 struct input_overlay
diff --git a/input/input_overlay.h b/input/input_overlay.h
index 468e6e5141..ed70af4cd6 100644
--- a/input/input_overlay.h
+++ b/input/input_overlay.h
@@ -177,7 +177,7 @@ struct overlay_desc
    unsigned retro_key_idx;
 
    /* This is a bit mask of all input binds to set with this overlay control */
-   retro_bits_t button_mask;
+   input_bits_t button_mask;
 
    char next_index_name[64];
 
diff --git a/libretro-common/include/retro_miscellaneous.h b/libretro-common/include/retro_miscellaneous.h
index d39b51feca..23f9ef02ac 100644
--- a/libretro-common/include/retro_miscellaneous.h
+++ b/libretro-common/include/retro_miscellaneous.h
@@ -153,8 +153,6 @@ static INLINE bool bits_any_set(uint32_t* ptr, uint32_t count)
 typedef struct
 {
    uint32_t data[8];
-   uint16_t analogs[8];
 } retro_bits_t;
 
-
 #endif
diff --git a/menu/menu_event.c b/menu/menu_event.c
index 01eb555188..f08fa404e1 100644
--- a/menu/menu_event.c
+++ b/menu/menu_event.c
@@ -139,7 +139,7 @@ void menu_event_kb_set(bool down, enum retro_key key)
  * entire button state either but do a separate event per button
  * state.
  */
-unsigned menu_event(retro_bits_t* p_input, retro_bits_t* p_trigger_input)
+unsigned menu_event(input_bits_t *p_input, input_bits_t *p_trigger_input)
 {
    menu_animation_ctx_delta_t delta;
    float delta_time;
diff --git a/menu/menu_event.h b/menu/menu_event.h
index ce00c5e5dd..cae9ec381b 100644
--- a/menu/menu_event.h
+++ b/menu/menu_event.h
@@ -44,7 +44,7 @@ RETRO_BEGIN_DECLS
  * entire button state either but do a separate event per button
  * state.
  */
-unsigned menu_event(retro_bits_t* p_input, retro_bits_t* p_trigger_state);
+unsigned menu_event(input_bits_t *p_input, input_bits_t *p_trigger_state);
 
 /* Set a specific keyboard key.
  *
diff --git a/retroarch.c b/retroarch.c
index eee794302a..2bc1c37638 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -2381,7 +2381,7 @@ bool runloop_msg_queue_pull(const char **ret)
 
 #ifdef HAVE_MENU
 static bool input_driver_toggle_button_combo(
-      unsigned mode, retro_bits_t* p_input)
+      unsigned mode, input_bits_t* p_input)
 {
    switch (mode)
    {
@@ -2431,9 +2431,9 @@ static enum runloop_state runloop_check_state(
       bool input_nonblock_state,
       unsigned *sleep_ms)
 {
-   retro_bits_t current_input;
+   input_bits_t current_input;
 #ifdef HAVE_MENU
-   static retro_bits_t last_input   = {{0}};
+   static input_bits_t last_input   = {{0}};
 #endif
    static bool old_fs_toggle_pressed= false;
    static bool old_focus            = true;
@@ -2599,7 +2599,7 @@ static enum runloop_state runloop_check_state(
 #ifdef HAVE_MENU
    if (menu_is_alive)
    {
-      static retro_bits_t old_input = {{0}};
+      static input_bits_t old_input = {{0}};
       menu_ctx_iterate_t iter;
 
       retro_ctx.poll_cb();
@@ -2607,7 +2607,7 @@ static enum runloop_state runloop_check_state(
       {
          enum menu_action action;
          bool focused               = false;
-         retro_bits_t trigger_input = current_input;
+         input_bits_t trigger_input = current_input;
 
          bits_clear_bits(trigger_input.data, old_input.data,
                ARRAY_SIZE(trigger_input.data));
diff --git a/wiiu/input/hidpad_driver.c b/wiiu/input/hidpad_driver.c
index 5cae6d710f..9bcbc8f3d0 100644
--- a/wiiu/input/hidpad_driver.c
+++ b/wiiu/input/hidpad_driver.c
@@ -20,7 +20,7 @@ static bool hidpad_init(void *data);
 static bool hidpad_query_pad(unsigned pad);
 static void hidpad_destroy(void);
 static bool hidpad_button(unsigned pad, uint16_t button);
-static void hidpad_get_buttons(unsigned pad, retro_bits_t *state);
+static void hidpad_get_buttons(unsigned pad, input_bits_t *state);
 static int16_t hidpad_axis(unsigned pad, uint32_t axis);
 static void hidpad_poll(void);
 static const char *hidpad_name(unsigned pad);
@@ -116,7 +116,7 @@ static bool hidpad_button(unsigned pad, uint16_t button)
 #endif
 }
 
-static void hidpad_get_buttons(unsigned pad, retro_bits_t *state)
+static void hidpad_get_buttons(unsigned pad, input_bits_t *state)
 {
   if (!hidpad_query_pad(pad))
     BIT256_CLEAR_ALL_PTR(state);
diff --git a/wiiu/input/kpad_driver.c b/wiiu/input/kpad_driver.c
index 48a7f428c3..de6efe7f64 100644
--- a/wiiu/input/kpad_driver.c
+++ b/wiiu/input/kpad_driver.c
@@ -26,7 +26,7 @@ static bool kpad_init(void *data);
 static bool kpad_query_pad(unsigned pad);
 static void kpad_destroy(void);
 static bool kpad_button(unsigned pad, uint16_t button);
-static void kpad_get_buttons(unsigned pad, retro_bits_t *state);
+static void kpad_get_buttons(unsigned pad, input_bits_t *state);
 static int16_t kpad_axis(unsigned pad, uint32_t axis);
 static void kpad_poll(void);
 static const char *kpad_name(unsigned pad);
@@ -92,7 +92,7 @@ static bool kpad_button(unsigned pad, uint16_t button_bit)
       & (UINT64_C(1) << button_bit);
 }
 
-static void kpad_get_buttons(unsigned pad, retro_bits_t *state)
+static void kpad_get_buttons(unsigned pad, input_bits_t *state)
 {
    if (!kpad_query_pad(pad))
       BIT256_CLEAR_ALL_PTR(state);
diff --git a/wiiu/input/wiiu_hid.c b/wiiu/input/wiiu_hid.c
index db0fcd074b..d0becc716e 100644
--- a/wiiu/input/wiiu_hid.c
+++ b/wiiu/input/wiiu_hid.c
@@ -38,7 +38,8 @@ static const char *wiiu_hid_joypad_name(void *data, unsigned slot)
    return hid->connections[slot].iface->get_name(data);
 }
 
-static void wiiu_hid_joypad_get_buttons(void *data, unsigned port, retro_bits_t *state)
+static void wiiu_hid_joypad_get_buttons(void *data, unsigned port,
+      input_bits_t *state)
 {
    (void)data;
    (void)port;
diff --git a/wiiu/input/wpad_driver.c b/wiiu/input/wpad_driver.c
index b707c63cb5..9dd778e19a 100644
--- a/wiiu/input/wpad_driver.c
+++ b/wiiu/input/wpad_driver.c
@@ -209,7 +209,7 @@ static bool wpad_button(unsigned pad, uint16_t button_bit)
    return button_state & (UINT64_C(1) << button_bit);
 }
 
-static void wpad_get_buttons(unsigned pad, retro_bits_t *state)
+static void wpad_get_buttons(unsigned pad, input_bits_t *state)
 {
    if (!wpad_query_pad(pad))
       BIT256_CLEAR_ALL_PTR(state);