Remove header includes

gfx/common/gl_common.h

@@ -30,7 +30,6 @@
 #include <gfx/scaler/scaler.h>
 #include <formats/image.h>
 
-#include "../../general.h"
 #include "../../verbosity.h"
 #include "../font_driver.h"
 #include "../video_coord_array.h"

gfx/drivers_context/xegl_ctx.c

@@ -19,6 +19,7 @@
 #include <stdint.h>
 
 #include "../../driver.h"
+#include "../../configuration.h"
 #include "../../frontend/frontend_driver.h"
 
 #include "../common/egl_common.h"

gfx/drivers_font/gl_raster_font.c

@@ -14,11 +14,16 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <stdlib.h>
+
+#include <encodings/utf.h>
+
 #include "../common/gl_common.h"
 #include "../font_driver.h"
 #include "../video_shader_driver.h"
 #include "../video_context_driver.h"
-#include <encodings/utf.h>
+
+#include "../../configuration.h"
 
 /* TODO: Move viewport side effects to the caller: it's a source of bugs. */
 

gfx/drivers_shader/shader_glsl.c

@@ -16,6 +16,10 @@
 #include <stdlib.h>
 #include <string.h>
 
+#ifdef HAVE_CONFIG_H
+#include "../../config.h"
+#endif
+
 #include <compat/strl.h>
 #include <compat/posix_string.h>
 #include <file/file_path.h>
@@ -23,17 +27,12 @@
 #include <streams/file_stream.h>
 #include <string/stdstring.h>
 
-#include "../../general.h"
 #include "shader_glsl.h"
 #include "../video_state_tracker.h"
 #include "../../dynamic.h"
 #include "../../managers/state_manager.h"
 #include "../../core.h"
 
-#ifdef HAVE_CONFIG_H
-#include "../../config.h"
-#endif
-
 #ifdef HAVE_OPENGL
 #include "../common/gl_common.h"
 #endif

gfx/drivers_shader/shader_null.c

@@ -23,7 +23,6 @@
 #include <gfx/math/matrix_4x4.h>
 #include <string/stdstring.h>
 
-#include "../../general.h"
 #include "../video_state_tracker.h"
 #include "../../dynamic.h"