From d1ff5dd973fff3f286d7ec75df826f3de42d8a43 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Thu, 20 Apr 2017 09:14:20 +0200
Subject: [PATCH] Header include cleanups

---
 audio/audio_driver.c                          |  2 -
 .../gl_legacy_renderchain.c                   | 39 ++-----------------
 2 files changed, 3 insertions(+), 38 deletions(-)

diff --git a/audio/audio_driver.c b/audio/audio_driver.c
index d0bb46c671..6d5e20b5f0 100644
--- a/audio/audio_driver.c
+++ b/audio/audio_driver.c
@@ -989,8 +989,6 @@ bool audio_driver_start(bool is_shutdown)
    if (!current_audio || !current_audio->start 
          || !audio_driver_context_audio_data)
       goto error;
-   if (audio_driver_alive())
-      return true;
    if (!settings || settings->audio.mute_enable)
       goto error;
    if (!current_audio->start(audio_driver_context_audio_data, is_shutdown))
diff --git a/gfx/drivers_renderchain/gl_legacy_renderchain.c b/gfx/drivers_renderchain/gl_legacy_renderchain.c
index 5d66099f6f..58fc6246b3 100644
--- a/gfx/drivers_renderchain/gl_legacy_renderchain.c
+++ b/gfx/drivers_renderchain/gl_legacy_renderchain.c
@@ -30,46 +30,21 @@
 
 #include <compat/strl.h>
 #include <gfx/scaler/scaler.h>
-#include <gfx/math/matrix_4x4.h>
 #include <formats/image.h>
 #include <retro_inline.h>
 #include <retro_miscellaneous.h>
 #include <string/stdstring.h>
-#include <libretro.h>
 
 #include <gfx/gl_capabilities.h>
 #include <gfx/video_frame.h>
 
-#include "../../driver.h"
-#include "../../configuration.h"
-#include "../../record/record_driver.h"
-#include "../../performance_counters.h"
-
 #include "gl_legacy_renderchain.h"
 #include "../video_renderchain_driver.h"
-
-#include "../../retroarch.h"
-#include "../../verbosity.h"
 #include "../common/gl_common.h"
 
-#ifdef HAVE_THREADS
-#include "../video_thread_wrapper.h"
-#endif
-
-#include "../font_driver.h"
-#include "../video_context_driver.h"
-
-#ifdef HAVE_GLSL
-#include "../drivers_shader/shader_glsl.h"
-#endif
-
-#ifdef GL_DEBUG
-#include <lists/string_list.h>
-#endif
-
-#ifdef HAVE_MENU
-#include "../../menu/menu_driver.h"
-#endif
+#include "../../driver.h"
+#include "../../configuration.h"
+#include "../../verbosity.h"
 
 #if defined(_WIN32) && !defined(_XBOX)
 #include "../common/win32_common.h"
@@ -77,14 +52,6 @@
 
 #include "../video_shader_driver.h"
 
-#ifndef GL_SYNC_GPU_COMMANDS_COMPLETE
-#define GL_SYNC_GPU_COMMANDS_COMPLETE     0x9117
-#endif
-
-#ifndef GL_SYNC_FLUSH_COMMANDS_BIT
-#define GL_SYNC_FLUSH_COMMANDS_BIT        0x00000001
-#endif
-
 #define set_texture_coords(coords, xamt, yamt) \
    coords[2] = xamt; \
    coords[6] = xamt; \