diff --git a/camera/camera_driver.c b/camera/camera_driver.c
index ed9ea5b1a4..11e015f11e 100644
--- a/camera/camera_driver.c
+++ b/camera/camera_driver.c
@@ -16,10 +16,9 @@
 
 #include <string.h>
 #include <string/string_list.h>
+
 #include "camera_driver.h"
-#include "../driver.h"
 #include "../general.h"
-#include "../system.h"
 
 static const camera_driver_t *camera_drivers[] = {
 #ifdef HAVE_V4L2
diff --git a/input/input_common.c b/input/input_common.c
index e4f4f2bc9c..56b6b365ec 100644
--- a/input/input_common.c
+++ b/input/input_common.c
@@ -14,14 +14,15 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "input_common.h"
-#include "input_keymaps.h"
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
 
 #include <file/file_path.h>
 
+#include "input_common.h"
+#include "input_keymaps.h"
+
 #include "../general.h"
 #ifdef HAVE_CONFIG_H
 #include "../config.h"
diff --git a/input/input_driver.c b/input/input_driver.c
index 81fd836c1f..1f0023ea2c 100644
--- a/input/input_driver.c
+++ b/input/input_driver.c
@@ -16,6 +16,7 @@
 
 #include <string.h>
 #include <string/string_list.h>
+
 #include "input_driver.h"
 #include "../driver.h"
 #include "../general.h"
diff --git a/input/input_hid_driver.c b/input/input_hid_driver.c
index 018ff7e4bc..4f1966fa88 100644
--- a/input/input_hid_driver.c
+++ b/input/input_hid_driver.c
@@ -14,11 +14,13 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "input_hid_driver.h"
-#include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
+#include <string.h>
+
 #include <string/string_list.h>
+
+#include "input_hid_driver.h"
 #include "../driver.h"
 #include "../general.h"
 
diff --git a/input/input_keymaps.c b/input/input_keymaps.c
index 5f43f6b5bc..bd2f96e4d2 100644
--- a/input/input_keymaps.c
+++ b/input/input_keymaps.c
@@ -14,11 +14,16 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "input_keymaps.h"
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
 
+#ifdef __linux__
+#include <linux/input.h>
+#include <linux/kd.h>
+#endif
+
+#include "input_keymaps.h"
 #include "../general.h"
 #ifdef HAVE_CONFIG_H
 #include "../config.h"
@@ -28,11 +33,6 @@
 #include "drivers/apple_keycode.h"
 #endif
 
-#ifdef __linux__
-#include <linux/input.h>
-#include <linux/kd.h>
-#endif
-
 const struct input_key_map input_config_key_map[] = {
    { "left", RETROK_LEFT },
    { "right", RETROK_RIGHT },