diff --git a/input/drivers_joypad/dinput_joypad.c b/input/drivers_joypad/dinput_joypad.c
index 424f0b8283..b4c9a2be19 100644
--- a/input/drivers_joypad/dinput_joypad.c
+++ b/input/drivers_joypad/dinput_joypad.c
@@ -14,15 +14,15 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <dinput.h>
-
 #include <stdlib.h>
 #include <stddef.h>
 #include <string.h>
 #include <windowsx.h>
 
-#include <retro_log.h>
+#include <dinput.h>
+
 #include <boolean.h>
+#include <retro_log.h>
 
 #include "../../general.h"
 #include "../input_autodetect.h"
diff --git a/input/drivers_joypad/gx_joypad.c b/input/drivers_joypad/gx_joypad.c
index 8b3250edb0..289d64f9ae 100644
--- a/input/drivers_joypad/gx_joypad.c
+++ b/input/drivers_joypad/gx_joypad.c
@@ -17,21 +17,11 @@
 
 #include "../input_autodetect.h"
 
-#if 0
-#ifdef HW_RVL
-#include <gccore.h>
-#include <ogc/pad.h>
-#include <wiiuse/wpad.h>
-#else
-#include <cafe/pads/wpad/wpad.h>
-#endif
-#else
 #include <gccore.h>
 #include <ogc/pad.h>
 #ifdef HW_RVL
 #include <wiiuse/wpad.h>
 #endif
-#endif
 
 #ifdef GEKKO
 #define WPADInit WPAD_Init
diff --git a/input/drivers_joypad/linuxraw_joypad.c b/input/drivers_joypad/linuxraw_joypad.c
index 973bbdce20..8941bad1d6 100644
--- a/input/drivers_joypad/linuxraw_joypad.c
+++ b/input/drivers_joypad/linuxraw_joypad.c
@@ -13,20 +13,21 @@
  *  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 <unistd.h>
 #include <string.h>
 #include <limits.h>
 #include <errno.h>
+
 #include <sys/types.h>
 #include <sys/inotify.h>
 #include <sys/epoll.h>
 #include <fcntl.h>
 #include <linux/joystick.h>
 
+#include "../input_autodetect.h"
+#include "../../general.h"
+
 #define NUM_BUTTONS 32
 #define NUM_AXES 32
 
diff --git a/input/drivers_joypad/udev_joypad.c b/input/drivers_joypad/udev_joypad.c
index bb006ff34e..e4e39b51f5 100644
--- a/input/drivers_joypad/udev_joypad.c
+++ b/input/drivers_joypad/udev_joypad.c
@@ -13,23 +13,25 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../input_autodetect.h"
-#include "../../general.h"
-#include <unistd.h>
 #include <stdint.h>
+#include <unistd.h>
 #include <string.h>
 #include <limits.h>
+#include <fcntl.h>
 #include <errno.h>
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/poll.h>
-#include <fcntl.h>
 #include <libudev.h>
 #include <linux/types.h>
 #include <linux/input.h>
 
 #include <retro_inline.h>
 
+#include "../input_autodetect.h"
+#include "../../general.h"
+
 /* Udev/evdev Linux joypad driver.
  * More complex and extremely low level,
  * but only Linux driver which can support joypad rumble.
diff --git a/input/drivers_joypad/xinput_joypad.c b/input/drivers_joypad/xinput_joypad.c
index 6e3b6f7462..f8db49049e 100644
--- a/input/drivers_joypad/xinput_joypad.c
+++ b/input/drivers_joypad/xinput_joypad.c
@@ -21,18 +21,19 @@
  * Some wrappers for other controllers also simulate xinput (as it is easier to implement)
  * so this may be useful for those also.
  **/
-#include "../input_autodetect.h"
-#include "../input_common.h"
-
-#include <dynamic/dylib.h>
-#include "../../general.h"
-#include <boolean.h>
-
 #include <stdlib.h>
 #include <stddef.h>
 #include <string.h>
 
 #include <retro_inline.h>
+#include <dynamic/dylib.h>
+#include <boolean.h>
+
+#include "../input_autodetect.h"
+#include "../input_common.h"
+
+#include "../../general.h"
+
 
 /* Check if the definitions do not already exist.
  * Official and mingw xinput headers have different include guards.