vo_opengl: remove some indirect GL header inclusions from core renderer

video/out/opengl/hwdec.h

@@ -1,7 +1,7 @@
 #ifndef MPGL_HWDEC_H_
 #define MPGL_HWDEC_H_
 
-#include "common.h"
+#include "video/mp_image.h"
 #include "ra.h"
 #include "video/hwdec.h"
 

video/out/opengl/lcms.h

@@ -4,6 +4,7 @@
 #include <stddef.h>
 #include <stdbool.h>
 #include "misc/bstr.h"
+#include "video/csputils.h"
 #include <libavutil/buffer.h>
 
 extern const struct m_sub_options mp_icc_conf;

video/out/opengl/user_shaders.h

@@ -18,7 +18,6 @@
 #ifndef MP_GL_USER_SHADERS_H
 #define MP_GL_USER_SHADERS_H
 
-#include "common.h"
 #include "utils.h"
 #include "ra.h"
 

video/out/opengl/video.c

@@ -31,13 +31,10 @@
 #include "options/m_config.h"
 #include "common/global.h"
 #include "options/options.h"
-#include "common.h"
-#include "formats.h"
 #include "utils.h"
 #include "hwdec.h"
 #include "osd.h"
 #include "ra.h"
-#include "ra_gl.h"
 #include "stream/stream.h"
 #include "video_shaders.h"
 #include "user_shaders.h"

video/out/opengl/video.h

@@ -22,10 +22,10 @@
 
 #include "options/m_option.h"
 #include "sub/osd.h"
-#include "common.h"
 #include "utils.h"
 #include "lcms.h"
 #include "shader_cache.h"
+#include "video/csputils.h"
 #include "video/out/filter_kernels.h"
 
 // Assume we have this many texture units for sourcing additional passes.
@@ -163,6 +163,7 @@ void gl_video_resize(struct gl_video *p,
                      struct mp_rect *src, struct mp_rect *dst,
                      struct mp_osd_res *osd);
 void gl_video_set_fb_depth(struct gl_video *p, int fb_depth);
+struct voctrl_performance_data;
 void gl_video_perfdata(struct gl_video *p, struct voctrl_performance_data *out);
 struct mp_csp_equalizer;
 struct mp_csp_equalizer *gl_video_eq_ptr(struct gl_video *p);

video/out/opengl/video_shaders.h

@@ -20,7 +20,6 @@
 
 #include <libavutil/lfg.h>
 
-#include "common.h"
 #include "utils.h"
 #include "video.h"