diff --git a/input/drivers_hid/btstack_hid.c b/input/drivers_hid/btstack_hid.c
index d5932324e1..bc84fdf20f 100644
--- a/input/drivers_hid/btstack_hid.c
+++ b/input/drivers_hid/btstack_hid.c
@@ -14,10 +14,9 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../input_hid_driver.h"
+#include <stdio.h>
 #include <sys/types.h>
 #include <sys/sysctl.h>
-#include <stdio.h>
 #include <string.h>
 #ifdef __APPLE__
 #include <CoreFoundation/CFRunLoop.h>
@@ -25,11 +24,13 @@
 #ifdef HAVE_MFI
 #include "mfi_hid.h"
 #endif
-#include <rthreads/rthreads.h>
 
+#include <rthreads/rthreads.h>
+#include <dynamic/dylib.h>
+
+#include "../input_hid_driver.h"
 #define BUILDING_BTDYNAMIC
 #include "btstack_hid.h"
-#include <dynamic/dylib.h>
 #include "../connect/joypad_connection.h"
 
 typedef struct btstack_hid
diff --git a/input/drivers_hid/iohidmanager_hid.c b/input/drivers_hid/iohidmanager_hid.c
index 2670500b47..530b0b5b18 100644
--- a/input/drivers_hid/iohidmanager_hid.c
+++ b/input/drivers_hid/iohidmanager_hid.c
@@ -16,6 +16,7 @@
 
 #include <IOKit/hid/IOHIDManager.h>
 #include <IOKit/hid/IOHIDKeys.h>
+
 #include "../connect/joypad_connection.h"
 #include "../drivers/cocoa_input.h"
 #include "../input_autodetect.h"
diff --git a/input/drivers_hid/libusb_hid.c b/input/drivers_hid/libusb_hid.c
index aa5c9dcd37..efe38a5972 100644
--- a/input/drivers_hid/libusb_hid.c
+++ b/input/drivers_hid/libusb_hid.c
@@ -14,10 +14,12 @@
  */
 
 #include <libusb-1.0/libusb.h>
+
 #include <rthreads/rthreads.h>
 #include <compat/strl.h>
 #include <queues/fifo_buffer.h>
 #include <retro_log.h>
+
 #include "../connect/joypad_connection.h"
 #include "../input_autodetect.h"
 #include "../input_hid_driver.h"
diff --git a/input/drivers_hid/mfi_hid.m b/input/drivers_hid/mfi_hid.m
index 255b1eff7c..de4cecc563 100644
--- a/input/drivers_hid/mfi_hid.m
+++ b/input/drivers_hid/mfi_hid.m
@@ -13,9 +13,11 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <boolean.h>
+
 #include <AvailabilityMacros.h>
 #import <GameController/GameController.h>
-#include <boolean.h>
+
 #include "mfi_hid.h"
 #include "../../input/drivers/cocoa_input.h"
 
diff --git a/input/drivers_hid/wiiusb_hid.c b/input/drivers_hid/wiiusb_hid.c
index 78bdbc06fa..a6bf6829c7 100644
--- a/input/drivers_hid/wiiusb_hid.c
+++ b/input/drivers_hid/wiiusb_hid.c
@@ -14,10 +14,12 @@
  */
 
 #include <gccore.h>
+
 #include <rthreads/rthreads.h>
 #include <compat/strl.h>
 #include <queues/fifo_buffer.h>
 #include <retro_log.h>
+
 #include "../connect/joypad_connection.h"
 #include "../input_autodetect.h"
 #include "../input_hid_driver.h"
diff --git a/input/drivers_joypad/parport_joypad.c b/input/drivers_joypad/parport_joypad.c
index 93a5a16bd4..bebfb8930d 100644
--- a/input/drivers_joypad/parport_joypad.c
+++ b/input/drivers_joypad/parport_joypad.c
@@ -12,19 +12,20 @@
  *  You should have received a copy of the GNU General Public License along with RetroArch.
  *  If not, see <http://www.gnu.org/licenses/>.
  */
-
-#include "../input_autodetect.h"
-#include "../../general.h"
-#include <unistd.h>
 #include <stdint.h>
 #include <string.h>
+#include <unistd.h>
 #include <limits.h>
 #include <errno.h>
+
 #include <linux/parport.h>
 #include <linux/ppdev.h>
 #include <sys/ioctl.h>
 #include <fcntl.h>
 
+#include "../input_autodetect.h"
+#include "../../general.h"
+
 /* Linux parport driver does not support reading the control register
    Other platforms may support up to 17 buttons */
 #define PARPORT_NUM_BUTTONS 13
diff --git a/input/drivers_keyboard/keyboard_event_x11.c b/input/drivers_keyboard/keyboard_event_x11.c
index 9acd323b62..8bec63c531 100644
--- a/input/drivers_keyboard/keyboard_event_x11.c
+++ b/input/drivers_keyboard/keyboard_event_x11.c
@@ -14,6 +14,9 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <boolean.h>
+#include <retro_inline.h>
+
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/extensions/xf86vmode.h>
@@ -22,10 +25,6 @@
 #include <X11/extensions/Xinerama.h>
 #endif
 
-#include <boolean.h>
-#include <retro_inline.h>
-#include "../../driver.h"
-#include "../keyboard_line.h"
 #include "../input_keymaps.h"
 
 static INLINE unsigned leading_ones(uint8_t c)
diff --git a/input/drivers_keyboard/keyboard_event_xkb.c b/input/drivers_keyboard/keyboard_event_xkb.c
index 6f08812563..a6dea37e28 100644
--- a/input/drivers_keyboard/keyboard_event_xkb.c
+++ b/input/drivers_keyboard/keyboard_event_xkb.c
@@ -15,6 +15,7 @@
  */
 
 #include <xkbcommon/xkbcommon.h>
+
 #include "../input_joypad_driver.h"
 #include "../input_keymaps.h"
 #include "../keyboard_line.h"