diff --git a/audio/drivers/alsa.c b/audio/drivers/alsa.c
index 67263fe617..c3ed0a207c 100644
--- a/audio/drivers/alsa.c
+++ b/audio/drivers/alsa.c
@@ -14,6 +14,7 @@
  */
 
 #include <stdlib.h>
+
 #include <alsa/asoundlib.h>
 
 #include "../../driver.h"
diff --git a/audio/drivers/alsa_qsa.c b/audio/drivers/alsa_qsa.c
index e0e8f22ef7..a0aef4a1dd 100644
--- a/audio/drivers/alsa_qsa.c
+++ b/audio/drivers/alsa_qsa.c
@@ -14,13 +14,13 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../general.h"
-#include "../../driver.h"
-
 #define ALSA_PCM_NEW_HW_PARAMS_API
 #define ALSA_PCM_NEW_SW_PARAMS_API
 #include <sys/asoundlib.h>
 
+#include "../../general.h"
+#include "../../driver.h"
+
 #define MAX_FRAG_SIZE 3072
 #define DEFAULT_RATE 48000
 
diff --git a/audio/drivers/alsathread.c b/audio/drivers/alsathread.c
index fcddbae17e..d2ebb04ecf 100644
--- a/audio/drivers/alsathread.c
+++ b/audio/drivers/alsathread.c
@@ -14,14 +14,16 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
-#include "../../driver.h"
 #include <stdlib.h>
+
 #include <alsa/asoundlib.h>
-#include "../../general.h"
+
 #include <rthreads/rthreads.h>
 #include <queues/fifo_buffer.h>
 
+#include "../../driver.h"
+#include "../../general.h"
+
 #define TRY_ALSA(x) if (x < 0) { \
                   goto error; \
                }
diff --git a/audio/drivers/ctr_audio.c b/audio/drivers/ctr_audio.c
index 8b4240462d..a4119ef6a9 100644
--- a/audio/drivers/ctr_audio.c
+++ b/audio/drivers/ctr_audio.c
@@ -17,7 +17,6 @@
 #include "../../driver.h"
 #include "../../performance.h"
 
-
 typedef struct
 {
    bool nonblocking;
diff --git a/audio/drivers/dsound.c b/audio/drivers/dsound.c
index de916d9ba8..aeb27713fd 100644
--- a/audio/drivers/dsound.c
+++ b/audio/drivers/dsound.c
@@ -24,6 +24,7 @@
 #include <mmreg.h>
 #include <mmsystem.h>
 #endif
+
 #include <dsound.h>
 
 #include <boolean.h>
diff --git a/audio/drivers/gx_audio.c b/audio/drivers/gx_audio.c
index 566d6af4c8..df01e01d7d 100644
--- a/audio/drivers/gx_audio.c
+++ b/audio/drivers/gx_audio.c
@@ -14,12 +14,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../driver.h"
 #include <stdlib.h>
-#include <boolean.h>
-#include "../../general.h"
 #include <string.h>
-#include <retro_inline.h>
 
 #ifdef GEKKO
 #include <gccore.h>
@@ -28,6 +24,11 @@
 #include <cafe/ai.h>
 #endif
 
+#include <boolean.h>
+#include <retro_inline.h>
+
+#include "../../driver.h"
+#include "../../general.h"
 #include "../../defines/gx_defines.h"
 
 #define CHUNK_FRAMES 64
diff --git a/audio/drivers/jack.c b/audio/drivers/jack.c
index eadd5ce3c8..49cc67a06c 100644
--- a/audio/drivers/jack.c
+++ b/audio/drivers/jack.c
@@ -13,20 +13,22 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
-#include "../../driver.h"
+#include <stdint.h>
 #include <stdlib.h>
-#include "../../general.h"
+#include <string.h>
+
+#include <assert.h>
 
 #include <jack/jack.h>
 #include <jack/types.h>
 #include <jack/ringbuffer.h>
-#include <stdint.h>
+
 #include <boolean.h>
-#include <string.h>
-#include <assert.h>
 #include <rthreads/rthreads.h>
 
+#include "../../driver.h"
+#include "../../general.h"
+
 #define FRAMES(x) (x / (sizeof(float) * 2))
 
 typedef struct jack
diff --git a/audio/drivers/openal.c b/audio/drivers/openal.c
index 2b51e819c1..1a746e5a6b 100644
--- a/audio/drivers/openal.c
+++ b/audio/drivers/openal.c
@@ -13,8 +13,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../driver.h"
-#include "../../general.h"
+#include <string.h>
+#include <time.h>
 
 #ifdef __APPLE__
 #include <OpenAL/al.h>
@@ -24,13 +24,13 @@
 #include <AL/alc.h>
 #endif
 
-#include <time.h>
-#include <string.h>
-
 #ifdef _WIN32
 #include <windows.h>
 #endif
 
+#include "../../driver.h"
+#include "../../general.h"
+
 #define BUFSIZE 1024
 
 typedef struct al
diff --git a/audio/drivers/opensl.c b/audio/drivers/opensl.c
index 042006c730..08c396803d 100644
--- a/audio/drivers/opensl.c
+++ b/audio/drivers/opensl.c
@@ -14,15 +14,16 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../driver.h"
-#include "../../general.h"
-#include <rthreads/rthreads.h>
-
 #include <SLES/OpenSLES.h>
 #ifdef ANDROID
 #include <SLES/OpenSLES_Android.h>
 #endif
 
+#include <rthreads/rthreads.h>
+
+#include "../../driver.h"
+#include "../../general.h"
+
 /* Helper macros, COM-style. */
 #define SLObjectItf_Realize(a, ...) ((*(a))->Realize(a, __VA_ARGS__))
 #define SLObjectItf_GetInterface(a, ...) ((*(a))->GetInterface(a, __VA_ARGS__))
diff --git a/audio/drivers/ps3_audio.c b/audio/drivers/ps3_audio.c
index eb8acbf71d..2775941931 100644
--- a/audio/drivers/ps3_audio.c
+++ b/audio/drivers/ps3_audio.c
@@ -14,12 +14,13 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <stdlib.h>
+#include <string.h>
+
+#include <queues/fifo_buffer.h>
+
 #include "../driver.h"
 #include "../general.h"
-#include <stdlib.h>
-
-#include <string.h>
-#include <queues/fifo_buffer.h>
 
 #include "../../defines/ps3_defines.h"
 
diff --git a/audio/drivers/psp_audio.c b/audio/drivers/psp_audio.c
index 78c45f3781..b07d14903a 100644
--- a/audio/drivers/psp_audio.c
+++ b/audio/drivers/psp_audio.c
@@ -15,8 +15,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../general.h"
-#include "../../driver.h"
+#include <stdint.h>
+#include <malloc.h>
 
 #ifdef VITA
 #include <psp2/kernel/processmgr.h>
@@ -27,8 +27,9 @@
 #include <pspkernel.h>
 #include <pspaudio.h>
 #endif
-#include <stdint.h>
-#include <malloc.h>
+
+#include "../../general.h"
+#include "../../driver.h"
 
 typedef struct psp_audio
 {
diff --git a/audio/drivers/roar.c b/audio/drivers/roar.c
index 1ada97dc6d..02190232da 100644
--- a/audio/drivers/roar.c
+++ b/audio/drivers/roar.c
@@ -13,13 +13,16 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <stdint.h>
+#include <stdlib.h>
+
+#include <errno.h>
+
+#include <roaraudio.h>
+
+#include <boolean.h>
 
 #include "../../driver.h"
-#include <stdlib.h>
-#include <roaraudio.h>
-#include <errno.h>
-#include <stdint.h>
-#include <boolean.h>
 #include "../../general.h"
 
 typedef struct
diff --git a/audio/drivers/rsound.c b/audio/drivers/rsound.c
index 1f13e5cf41..11a2dc901c 100644
--- a/audio/drivers/rsound.c
+++ b/audio/drivers/rsound.c
@@ -13,13 +13,15 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <stdlib.h>
+
+#include <boolean.h>
+
+#include <queues/fifo_buffer.h>
+#include <rthreads/rthreads.h>
 
 #include "../audio_driver.h"
-#include <stdlib.h>
 #include "rsound.h"
-#include <queues/fifo_buffer.h>
-#include <boolean.h>
-#include <rthreads/rthreads.h>
 
 typedef struct rsd
 {
diff --git a/audio/drivers/sdl_audio.c b/audio/drivers/sdl_audio.c
index 776dcb0a3b..bc43a5953a 100644
--- a/audio/drivers/sdl_audio.c
+++ b/audio/drivers/sdl_audio.c
@@ -13,22 +13,22 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
-#include "../../driver.h"
-#include <stdlib.h>
-#include <boolean.h>
-#include <stddef.h>
 #include <stdint.h>
+#include <stddef.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include "SDL.h"
 #include "SDL_audio.h"
-#include <rthreads/rthreads.h>
 
-#include "../../general.h"
+#include <boolean.h>
+#include <rthreads/rthreads.h>
 #include <queues/fifo_buffer.h>
 #include <retro_inline.h>
 
+#include "../../driver.h"
+#include "../../general.h"
+
 typedef struct sdl_audio
 {
    bool nonblock;
diff --git a/audio/drivers/xenon360_audio.c b/audio/drivers/xenon360_audio.c
index 0ccdd941d2..51a4885f06 100644
--- a/audio/drivers/xenon360_audio.c
+++ b/audio/drivers/xenon360_audio.c
@@ -14,14 +14,16 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../driver.h"
 #include <stdlib.h>
 #include <boolean.h>
-#include "../../general.h"
-#include <retro_inline.h>
 
 #include <xenon_sound/sound.h>
 
+#include <retro_inline.h>
+
+#include "../../driver.h"
+#include "../../general.h"
+
 #define SOUND_FREQUENCY 48000
 #define MAX_BUFFER 2048