Cleanups

configuration.c

@@ -24,6 +24,10 @@
 #include <retro_assert.h>
 #include <string/stdstring.h>
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "file_path_special.h"
 #include "audio/audio_driver.h"
 #include "configuration.h"
@@ -41,10 +45,6 @@
 
 #include "tasks/tasks_internal.h"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 /* All config related settings go here. */
 
 struct config_bool_setting

driver.c

@@ -22,6 +22,10 @@
 #include "config.h"
 #endif
 
+#ifdef HAVE_MENU
+#include "menu/menu_driver.h"
+#endif
+
 #include "command.h"
 #include "msg_hash.h"
 
@@ -35,10 +39,6 @@
 #include "runloop.h"
 #include "verbosity.h"
 
-#ifdef HAVE_MENU
-#include "menu/menu_driver.h"
-#endif
-
 #define HASH_LOCATION_DRIVER           0x09189689U
 #define HASH_CAMERA_DRIVER             0xf25db959U
 #define HASH_MENU_DRIVER               0xd607fb05U

dynamic.c

@@ -32,6 +32,10 @@
 #include "config.h"
 #endif
 
+#ifdef HAVE_CHEEVOS
+#include "cheevos.h"
+#endif
+
 #include "dynamic.h"
 #include "command.h"
 
@@ -46,9 +50,6 @@
 #include "cores/internal_cores.h"
 #include "frontend/frontend_driver.h"
 #include "content.h"
-#ifdef HAVE_CHEEVOS
-#include "cheevos.h"
-#endif
 #include "retroarch.h"
 #include "runloop.h"
 #include "configuration.h"

file_path_special.c

@@ -13,15 +13,6 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <stdlib.h>
-#include <boolean.h>
-#include <string.h>
-#include <time.h>
-#include <errno.h>
 
 #ifdef _WIN32
 #include <direct.h>
@@ -33,6 +24,12 @@
 #include <CoreFoundation/CoreFoundation.h>
 #endif
 
+#include <stdlib.h>
+#include <boolean.h>
+#include <string.h>
+#include <time.h>
+#include <errno.h>
+
 #include <file/file_path.h>
 #include <string/stdstring.h>
 
@@ -41,6 +38,10 @@
 #include <retro_assert.h>
 #include <retro_miscellaneous.h>
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "configuration.h"
 #include "file_path_special.h"
 

list_special.c

@@ -24,10 +24,6 @@
 #include "config.h"
 #endif
 
-#include "list_special.h"
-#include "frontend/frontend_driver.h"
-#include "core_info.h"
-
 #ifdef HAVE_MENU
 #include "menu/menu_driver.h"
 #endif
@@ -40,6 +36,8 @@
 #include "location/location_driver.h"
 #endif
 
+#include "list_special.h"
+#include "frontend/frontend_driver.h"
 #include "core_info.h"
 #include "gfx/video_driver.h"
 #include "input/input_driver.h"

verbosity.c

@@ -35,6 +35,10 @@
 
 #include <string/stdstring.h>
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "file_path_special.h"
 #include "verbosity.h"