diff --git a/input/drivers_joypad/ctr_joypad.c b/input/drivers_joypad/ctr_joypad.c
index 1a1819bdb6..fa91a68518 100644
--- a/input/drivers_joypad/ctr_joypad.c
+++ b/input/drivers_joypad/ctr_joypad.c
@@ -23,8 +23,6 @@
 
 #include "../../tasks/tasks_internal.h"
 
-#include "../../configuration.h"
-#include "../../configuration.h"
 #include "../../retroarch.h"
 #include "../../command.h"
 #include "string.h"
diff --git a/input/drivers_joypad/dinput_joypad.c b/input/drivers_joypad/dinput_joypad.c
index b41748acb5..f3d6d2e1e8 100644
--- a/input/drivers_joypad/dinput_joypad.c
+++ b/input/drivers_joypad/dinput_joypad.c
@@ -207,7 +207,6 @@ static BOOL CALLBACK enum_joypad_cb(const DIDEVICEINSTANCE *inst, void *p)
    bool is_xinput_pad;
 #endif
    LPDIRECTINPUTDEVICE8 *pad = NULL;
-   settings_t *settings = config_get_ptr();
 
    (void)p;
 
diff --git a/input/drivers_joypad/gx_joypad.c b/input/drivers_joypad/gx_joypad.c
index 6a93b7c526..7d2b582a9b 100644
--- a/input/drivers_joypad/gx_joypad.c
+++ b/input/drivers_joypad/gx_joypad.c
@@ -21,7 +21,6 @@
 #include <wiiuse/wpad.h>
 #endif
 
-#include "../../configuration.h"
 #include "../../tasks/tasks_internal.h"
 
 #ifdef GEKKO
diff --git a/input/drivers_joypad/ps3_joypad.c b/input/drivers_joypad/ps3_joypad.c
index 3b5734bb17..91c2ca5b74 100644
--- a/input/drivers_joypad/ps3_joypad.c
+++ b/input/drivers_joypad/ps3_joypad.c
@@ -19,8 +19,6 @@
 
 #include "../../tasks/tasks_internal.h"
 
-#include "../../configuration.h"
-
 static uint64_t pad_state[MAX_PADS];
 static int16_t analog_state[MAX_PADS][2][2];
 static uint64_t pads_connected[MAX_PADS];
diff --git a/input/drivers_joypad/psp_joypad.c b/input/drivers_joypad/psp_joypad.c
index 656306d60d..983de1570f 100644
--- a/input/drivers_joypad/psp_joypad.c
+++ b/input/drivers_joypad/psp_joypad.c
@@ -168,7 +168,9 @@ static void psp_joypad_poll(void)
 {
    unsigned player;
    unsigned players_count = PSP_MAX_PADS;
+#if defined(VITA)
    settings_t *settings = config_get_ptr();
+#endif
 
 #ifdef PSP
    sceCtrlSetSamplingCycle(0);
@@ -233,10 +235,14 @@ static void psp_joypad_poll(void)
 #if defined(VITA)
       if (psp2_model == SCE_KERNEL_MODEL_VITA 
          && !menu_driver_ctl(RARCH_MENU_CTL_IS_ALIVE, NULL)
-         && settings->input.backtouch_enable) {
+         && settings->input.backtouch_enable)
+      {
+         unsigned i;
          SceTouchData touch_surface = {0};
          sceTouchPeek(settings->input.backtouch_toggle ? SCE_TOUCH_PORT_FRONT : SCE_TOUCH_PORT_BACK, &touch_surface, 1);
-         for (int i = 0; i < touch_surface.reportNum; i++) {
+
+         for (i = 0; i < touch_surface.reportNum; i++)
+         {
             int x = LERP(touch_surface.report[i].x, TOUCH_MAX_WIDTH, SCREEN_WIDTH);
             int y = LERP(touch_surface.report[i].y, TOUCH_MAX_HEIGHT, SCREEN_HEIGHT);
             if (NW_AREA(x, y)) state_tmp.buttons |= PSP_CTRL_L2;
diff --git a/input/drivers_joypad/sdl_joypad.c b/input/drivers_joypad/sdl_joypad.c
index e409faf7ea..8b97630ae3 100644
--- a/input/drivers_joypad/sdl_joypad.c
+++ b/input/drivers_joypad/sdl_joypad.c
@@ -20,7 +20,6 @@
 
 #include "SDL.h"
 
-#include "../../configuration.h"
 #include "../input_driver.h"
 #include "../../tasks/tasks_internal.h"
 #include "../../verbosity.h"
diff --git a/input/drivers_joypad/wiiu_joypad.c b/input/drivers_joypad/wiiu_joypad.c
index d6ae61dba9..424fbf74cc 100644
--- a/input/drivers_joypad/wiiu_joypad.c
+++ b/input/drivers_joypad/wiiu_joypad.c
@@ -23,8 +23,6 @@
 #include "../input_joypad_driver.h"
 #include "../input_driver.h"
 #include "../../tasks/tasks_internal.h"
-#include "../../configuration.h"
-#include "../../configuration.h"
 #include "../../retroarch.h"
 #include "../../command.h"
 #include "string.h"
diff --git a/input/drivers_joypad/xinput_joypad.c b/input/drivers_joypad/xinput_joypad.c
index 2dcc75598b..ef2d720061 100644
--- a/input/drivers_joypad/xinput_joypad.c
+++ b/input/drivers_joypad/xinput_joypad.c
@@ -38,7 +38,6 @@
 #include "../../tasks/tasks_internal.h"
 #include "../input_config.h"
 
-#include "../../configuration.h"
 #include "../../verbosity.h"
 
 /* Check if the definitions do not already exist.
@@ -174,7 +173,6 @@ static bool xinput_joypad_init(void *data)
    unsigned i, autoconf_pad;
    XINPUT_STATE dummy_state;
    const char *version = "1.4";
-   settings_t *settings = config_get_ptr();
 
    (void)data;