diff --git a/cheevos/cheevos_locals.h b/cheevos/cheevos_locals.h
index 55a598ae14..9cc07aad34 100644
--- a/cheevos/cheevos_locals.h
+++ b/cheevos/cheevos_locals.h
@@ -18,11 +18,8 @@
 #define __RARCH_CHEEVOS_LOCALS_H
 
 #include "../deps/rcheevos/include/rc_runtime.h"
-
 #include "../deps/rcheevos/src/rcheevos/rc_libretro.h"
 
-#include <../command.h>
-#include <../verbosity.h>
 #include <boolean.h>
 #include <queues/task_queue.h>
 
@@ -32,6 +29,9 @@
 
 #include <retro_common_api.h>
 
+#include "../command.h"
+#include "../verbosity.h"
+
 RETRO_BEGIN_DECLS
 
 /************************************************************************
diff --git a/input/connect/connect_ps3.c b/input/connect/connect_ps3.c
index c423c5e103..36969612fe 100644
--- a/input/connect/connect_ps3.c
+++ b/input/connect/connect_ps3.c
@@ -21,7 +21,7 @@
 #include <boolean.h>
 #include "joypad_connection.h"
 #include "../input_defines.h"
-#include "verbosity.h"
+#include "../../verbosity.h"
 
 #define DS3_ACTIVATION_REPORT_ID 0xf4
 
diff --git a/input/connect/connect_retrode.c b/input/connect/connect_retrode.c
index 648bf18a01..69d59a2d9b 100644
--- a/input/connect/connect_retrode.c
+++ b/input/connect/connect_retrode.c
@@ -23,8 +23,6 @@
 
 #include "../input_defines.h"
 
-static int port_count = 0;
-
 /* store device for each port */
 static struct hidpad_retrode_data* port_device[4];
 
@@ -33,13 +31,14 @@ struct hidpad_retrode_data
    struct pad_connection* connection;
    uint32_t slot;
    uint32_t buttons;
+   int port_count;
    uint8_t data[64];
 };
 
 static void* hidpad_retrode_init(void *data, uint32_t slot, hid_driver_t *driver)
 {
-   struct pad_connection* connection = (struct pad_connection*)data;
-   struct hidpad_retrode_data* device    = (struct hidpad_retrode_data*)
+   struct pad_connection* connection  = (struct pad_connection*)data;
+   struct hidpad_retrode_data* device = (struct hidpad_retrode_data*)
       calloc(1, sizeof(struct hidpad_retrode_data));
 
    if (!device)
@@ -54,8 +53,8 @@ static void* hidpad_retrode_init(void *data, uint32_t slot, hid_driver_t *driver
    device->connection   = connection;
    device->slot         = slot;
 
-   port_device[port_count] = device;
-   port_count++;
+   port_device[device->port_count] = device;
+   device->port_count++;
 
    return device;
 }
@@ -67,7 +66,6 @@ static void hidpad_retrode_deinit(void *data)
    if (device)
       free(device);
 
-   port_count = 0;
    port_device[0] = NULL;
    port_device[1] = NULL;
    port_device[2] = NULL;
diff --git a/led/led_driver.c b/led/led_driver.c
index 9805fc97c6..d2dfbbe9d5 100644
--- a/led/led_driver.c
+++ b/led/led_driver.c
@@ -12,11 +12,10 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdio.h>
 #include <string/stdstring.h>
 
 #include "led_driver.h"
-#include "verbosity.h"
+#include "../verbosity.h"
 
 static const led_driver_t *current_led_driver = NULL;
 
diff --git a/midi/drivers/alsa_midi.c b/midi/drivers/alsa_midi.c
index 632074e31f..c4a6813a06 100644
--- a/midi/drivers/alsa_midi.c
+++ b/midi/drivers/alsa_midi.c
@@ -16,11 +16,11 @@
 #include <alsa/asoundlib.h>
 
 #include <libretro.h>
-#include <verbosity.h>
 #include <lists/string_list.h>
 #include <string/stdstring.h>
 
 #include "../midi_driver.h"
+#include "../../verbosity.h"
 
 typedef struct
 {
diff --git a/network/drivers_wifi/connmanctl.c b/network/drivers_wifi/connmanctl.c
index 155e68fb57..7fcb8dce62 100644
--- a/network/drivers_wifi/connmanctl.c
+++ b/network/drivers_wifi/connmanctl.c
@@ -19,11 +19,13 @@
 #include <lists/string_list.h>
 #include <string/stdstring.h>
 #include <retro_miscellaneous.h>
-#include <configuration.h>
-#include <verbosity.h>
 #include <time.h>
+
 #include "../wifi_driver.h"
+
+#include "../../configuration.h"
 #include "../../retroarch.h"
+#include "../../verbosity.h"
 #include "../../lakka.h"
 #ifdef HAVE_GFX_WIDGETS
 #include "../../gfx/gfx_widgets.h"
diff --git a/network/drivers_wifi/nmcli.c b/network/drivers_wifi/nmcli.c
index 6efe9dfdb8..afe9b823fc 100644
--- a/network/drivers_wifi/nmcli.c
+++ b/network/drivers_wifi/nmcli.c
@@ -19,13 +19,14 @@
 #include <array/rbuf.h>
 #include <string/stdstring.h>
 #include <retro_miscellaneous.h>
-#include <configuration.h>
-#include <verbosity.h>
 #include <string.h>
 
 #include <libretro.h>
+
 #include "../wifi_driver.h"
 #include "../../retroarch.h"
+#include "../../configuration.h"
+#include "../../verbosity.h"
 
 typedef struct
 {