diff --git a/gfx/font_driver.c b/gfx/font_driver.c
index 65b2e7dc69..be73ac176e 100644
--- a/gfx/font_driver.c
+++ b/gfx/font_driver.c
@@ -15,7 +15,6 @@
  */
 
 #include "font_driver.h"
-#include "font_renderer_driver.h"
 #include "../general.h"
 
 #ifdef HAVE_D3D
diff --git a/gfx/font_renderer_driver.c b/gfx/font_renderer_driver.c
index a2fd02a09b..0bb2f5e916 100644
--- a/gfx/font_renderer_driver.c
+++ b/gfx/font_renderer_driver.c
@@ -14,7 +14,6 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "font_renderer_driver.h"
 #include "../general.h"
 
 #ifdef HAVE_CONFIG_H
diff --git a/gfx/video_driver.c b/gfx/video_driver.c
index 8f0499958c..8d595e4646 100644
--- a/gfx/video_driver.c
+++ b/gfx/video_driver.c
@@ -15,14 +15,14 @@
  */
 
 #include <string.h>
+
 #include <string/string_list.h>
-#include "video_driver.h"
+
 #include "video_thread_wrapper.h"
 #include "video_pixel_converter.h"
 #include "video_monitor.h"
 #include "../general.h"
 #include "../performance.h"
-#include "../retroarch.h"
 
 #ifndef MEASURE_FRAME_TIME_SAMPLES_COUNT
 #define MEASURE_FRAME_TIME_SAMPLES_COUNT (2 * 1024)
diff --git a/gfx/video_filter.c b/gfx/video_filter.c
index 58487a2cc1..84b8317ccf 100644
--- a/gfx/video_filter.c
+++ b/gfx/video_filter.c
@@ -14,16 +14,18 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "video_filter.h"
-#include "video_filters/softfilter.h"
-#include "../dynamic.h"
+#include <stdlib.h>
+
 #include <file/config_file_userdata.h>
 #include <file/file_path.h>
-#include "../file_ext.h"
 #include <file/dir_list.h>
+
+#include "../dynamic.h"
+#include "../file_ext.h"
 #include "../general.h"
 #include "../performance.h"
-#include <stdlib.h>
+#include "video_filter.h"
+#include "video_filters/softfilter.h"
 
 struct rarch_soft_plug
 {
diff --git a/gfx/video_texture.c b/gfx/video_texture.c
index b1d8ae965b..80ecf923f0 100644
--- a/gfx/video_texture.c
+++ b/gfx/video_texture.c
@@ -14,8 +14,9 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "video_texture.h"
 #include <file/file_path.h>
+
+#include "video_texture.h"
 #include "video_pixel_converter.h"
 #include "video_thread_wrapper.h"
 
diff --git a/gfx/video_thread_wrapper.c b/gfx/video_thread_wrapper.c
index fbf2fb02f3..9ce7b5a456 100644
--- a/gfx/video_thread_wrapper.c
+++ b/gfx/video_thread_wrapper.c
@@ -14,12 +14,13 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "video_thread_wrapper.h"
-#include "../performance.h"
 #include <stdlib.h>
 #include <string.h>
 #include <limits.h>
 
+#include "video_thread_wrapper.h"
+#include "../performance.h"
+
 static void *thread_init_never_call(const video_info_t *video,
       const input_driver_t **input, void **input_data)
 {
diff --git a/input/input_driver.c b/input/input_driver.c
index 1f0023ea2c..bf96eccf32 100644
--- a/input/input_driver.c
+++ b/input/input_driver.c
@@ -15,13 +15,10 @@
  */
 
 #include <string.h>
+
 #include <string/string_list.h>
 
-#include "input_driver.h"
-#include "../driver.h"
 #include "../general.h"
-#include "../libretro.h"
-
 
 static const input_driver_t *input_drivers[] = {
 #ifdef __CELLOS_LV2__
diff --git a/input/input_hid_driver.c b/input/input_hid_driver.c
index 48780d1014..97db84095e 100644
--- a/input/input_hid_driver.c
+++ b/input/input_hid_driver.c
@@ -21,7 +21,6 @@
 #include <string/string_list.h>
 
 #include "input_hid_driver.h"
-#include "../driver.h"
 #include "../general.h"
 
 static hid_driver_t *hid_drivers[] = {
diff --git a/input/input_joypad.c b/input/input_joypad.c
index bb5db05520..ad69dd607d 100644
--- a/input/input_joypad.c
+++ b/input/input_joypad.c
@@ -14,11 +14,12 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "input_joypad.h"
-#include <string.h>
 #include <stdlib.h>
+#include <string.h>
 #include <ctype.h>
 
+#include "input_joypad.h"
+
 #include "../general.h"
 #ifdef HAVE_CONFIG_H
 #include "../config.h"
diff --git a/input/input_joypad_driver.c b/input/input_joypad_driver.c
index 0829c3d384..96c3086e4c 100644
--- a/input/input_joypad_driver.c
+++ b/input/input_joypad_driver.c
@@ -14,12 +14,13 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "input_joypad_driver.h"
-#include "input_keymaps.h"
-#include <string.h>
 #include <stdlib.h>
+#include <string.h>
 #include <ctype.h>
+
 #include <string/string_list.h>
+
+#include "input_keymaps.h"
 #include "../general.h"
 
 static input_device_driver_t *joypad_drivers[] = {
diff --git a/input/input_overlay.c b/input/input_overlay.c
index eaa1830c9b..882c2e3e8c 100644
--- a/input/input_overlay.c
+++ b/input/input_overlay.c
@@ -28,9 +28,7 @@
 #include <clamping.h>
 #include <rhash.h>
 
-#include "input_overlay.h"
 #include "../configuration.h"
-#include "../driver.h"
 #include "input_common.h"
 
 #define BOX_RADIAL       0x18df06d2U
diff --git a/input/input_remapping.c b/input/input_remapping.c
index 680d40c08a..c262a8fb6c 100644
--- a/input/input_remapping.c
+++ b/input/input_remapping.c
@@ -13,8 +13,6 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "input_remapping.h"
-
 #include <file/config_file.h>
 #include <file/file_path.h>
 
diff --git a/input/input_sensor.c b/input/input_sensor.c
index f2ec540692..e5a97d8af0 100644
--- a/input/input_sensor.c
+++ b/input/input_sensor.c
@@ -14,7 +14,6 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "input_sensor.h"
 #include "../driver.h"
 
 /**
diff --git a/input/keyboard_line.c b/input/keyboard_line.c
index e5965193a4..56371fe4d4 100644
--- a/input/keyboard_line.c
+++ b/input/keyboard_line.c
@@ -18,10 +18,7 @@
 #include <string.h>
 #include <ctype.h>
 
-#include "keyboard_line.h"
 #include "../general.h"
-#include "../driver.h"
-#include "../retroarch.h"
 
 struct input_keyboard_line
 {