Cleanups

audio/audio_driver.c

@@ -15,15 +15,12 @@
  */
 
 #include <string.h>
+
 #include <string/string_list.h>
-#include "audio_driver.h"
-#include "audio_monitor.h"
+
 #include "audio_utils.h"
 #include "audio_thread_wrapper.h"
-#include "../driver.h"
 #include "../general.h"
-#include "../retroarch.h"
-#include "../performance.h"
 
 #ifndef AUDIO_BUFFER_FREE_SAMPLES_COUNT
 #define AUDIO_BUFFER_FREE_SAMPLES_COUNT (8 * 1024)

frontend/frontend.c

@@ -24,8 +24,6 @@
 #include "../runloop.h"
 #include "../runloop_data.h"
 
-#include "frontend.h"
-
 #define MAX_ARGS 32
 
 /**

frontend/frontend_driver.c

@@ -14,10 +14,10 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "frontend_driver.h"
-#include "../driver.h"
 #include <string.h>
 
+#include "../driver.h"
+
 #ifdef HAVE_CONFIG_H
 #include "../config.h"
 #endif

gfx/common/x11_common.c

@@ -14,13 +14,15 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "x11_common.h"
 #include <stdlib.h>
 #include <string.h>
-#include <X11/Xatom.h>
 #include <math.h>
 #include <sys/types.h>
 #include <sys/wait.h>
+
+#include <X11/Xatom.h>
+
+#include "x11_common.h"
 #include "../../general.h"
 
 static void x11_hide_mouse(Display *dpy, Window win)

gfx/video_viewport.c

@@ -14,7 +14,6 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "video_viewport.h"
 #include "../general.h"
 
 static video_viewport_t video_viewport_custom;

libretro-common/file/dir_list.c

@@ -22,8 +22,9 @@
 
 #include <stdlib.h>
 
-#include <file/dir_list.h>
 #include <file/file_path.h>
+#include <string/string_list.h>
+
 #include <compat/strl.h>
 #include <compat/posix_string.h>
 #include <retro_dirent.h>

libretro-common/formats/png/rpng_decode.c

@@ -20,19 +20,20 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <file/file_extract.h>
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "rpng_internal.h"
-#include "rpng_decode.h"
-
 #ifdef GEKKO
 #include <malloc.h>
 #endif
 
+#include <file/file_extract.h>
+
+#include "rpng_internal.h"
+#include "rpng_decode.h"
+
+
 enum png_chunk_type png_chunk_type(const struct png_chunk *chunk)
 {
    unsigned i;

libretro-common/formats/png/rpng_fbio.c

@@ -24,6 +24,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include <boolean.h>
 
 #include "rpng_internal.h"

libretro-common/gfx/math/matrix_4x4.c

@@ -20,10 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <gfx/math/matrix_4x4.h>
 #include <string.h>
 #include <math.h>
 
+#include <gfx/math/matrix_4x4.h>
+
 /*
  * Sets mat to an identity matrix
  */

libretro-common/gfx/scaler/pixconv.c

@@ -20,13 +20,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <gfx/scaler/pixconv.h>
+#include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
+
 #include <retro_inline.h>
 
+#include <gfx/scaler/pixconv.h>
+
 #ifdef SCALER_NO_SIMD
 #undef __SSE2__
 #endif

libretro-common/gfx/scaler/scaler.c

@@ -20,16 +20,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+
 #include <gfx/scaler/scaler.h>
 #include <gfx/scaler/scaler_int.h>
 #include <gfx/scaler/filter.h>
 #include <gfx/scaler/pixconv.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <math.h>
-
-/* In case aligned allocs are needed later. */
 
 /**
  * scaler_alloc:

libretro-common/gfx/scaler/scaler_int.c

@@ -21,6 +21,7 @@
  */
 
 #include <gfx/scaler/scaler_int.h>
+
 #include <retro_inline.h>
 
 #ifdef SCALER_NO_SIMD

record/record_driver.c

@@ -15,16 +15,11 @@
  */
 
 #include <string.h>
+
 #include <file/file_path.h>
-#include "record_driver.h"
 
 #include "../driver.h"
-#include "../dynamic.h"
 #include "../general.h"
-#include "../retroarch.h"
-#include "../runloop.h"
-#include "../gfx/video_driver.h"
-#include "../gfx/video_viewport.h"
 #include "../msg_hash.h"
 
 #ifdef HAVE_CONFIG_H

tasks/task_database.c

@@ -24,7 +24,6 @@
 #include "../file_ops.h"
 #include "../msg_hash.h"
 #include "../general.h"
-#include "tasks.h"
 
 #define CB_DB_SCAN_FILE    0x70ce56d2U
 #define CB_DB_SCAN_FOLDER  0xde2bef8eU

tasks/task_overlay.c

@@ -19,7 +19,6 @@
 #endif
 
 #include "../input/input_overlay.h"
-#include "tasks.h"
 
 #ifdef HAVE_THREADS
 static slock_t *overlay_lock;

ui/ui_companion_driver.c

@@ -13,12 +13,12 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ui_companion_driver.h"
-#include "../driver.h"
 #include <string.h>
 
 #include <boolean.h>
 
+#include "../driver.h"
+
 #ifdef HAVE_CONFIG_H
 #include "../config.h"
 #endif