diff --git a/input/drivers/dos_input.c b/input/drivers/dos_input.c
index c183dcf344..e901946d3a 100644
--- a/input/drivers/dos_input.c
+++ b/input/drivers/dos_input.c
@@ -31,11 +31,6 @@
 /* TODO/FIXME -
  * fix game focus toggle */
 
-typedef struct dos_input
-{
-   void *empty;
-} dos_input_t;
-
 /* First ports are used to keeping track of gamepad states. Last port is used for keyboard state */
 /* TODO/FIXME - static globals */
 static uint16_t dos_key_state[DEFAULT_MAX_PADS+1][MAX_KEYS];
@@ -113,23 +108,14 @@ static int16_t dos_input_state(
 
 static void dos_input_free_input(void *data)
 {
-   dos_input_t *dos = (dos_input_t*)data;
-
    dos_keyboard_free();
-
-   free(data);
 }
 
 static void* dos_input_init(const char *joypad_driver)
 {
-   dos_input_t *dos = (dos_input_t*)calloc(1, sizeof(*dos));
-
-   if (!dos)
-      return NULL;
-
    input_keymaps_init_keyboard_lut(rarch_key_map_dos);
 
-   return dos;
+   return (void*)-1;
 }
 
 static uint64_t dos_input_get_capabilities(void *data)
diff --git a/input/drivers/wiiu_input.c b/input/drivers/wiiu_input.c
index 160e895c02..80413e180d 100644
--- a/input/drivers/wiiu_input.c
+++ b/input/drivers/wiiu_input.c
@@ -39,11 +39,6 @@
 static uint8_t keyboard_channel         = 0x00;
 static bool keyboard_state[RETROK_LAST] = { 0 };
 
-typedef struct wiiu_input
-{
-   void *empty;
-} wiiu_input_t;
-
 static void kb_connection_callback(KBDKeyEvent *key)
 {
    keyboard_channel += (key->channel + 0x01);
@@ -141,16 +136,10 @@ static int16_t wiiu_input_state(
 static void wiiu_input_free_input(void *data)
 {
    KBDTeardown();
-
-   free(data);
 }
 
 static void* wiiu_input_init(const char *joypad_driver)
 {
-   wiiu_input_t *wiiu = (wiiu_input_t*)calloc(1, sizeof(*wiiu));
-   if (!wiiu)
-      return NULL;
-
    KBDSetup(
          &kb_connection_callback,
          &kb_disconnection_callback,
@@ -158,7 +147,7 @@ static void* wiiu_input_init(const char *joypad_driver)
 
    input_keymaps_init_keyboard_lut(rarch_key_map_wiiu);
 
-   return wiiu;
+   return (void*)-1;
 }
 
 static uint64_t wiiu_input_get_capabilities(void *data)