Cleanup: includes in source/blender/imbuf

Remove 25 includes.

source/blender/imbuf/intern/anim_movie.cc

@@ -62,7 +62,6 @@
 #include "IMB_metadata.hh"
 
 #ifdef WITH_FFMPEG
-#  include "BKE_global.hh" /* ENDIAN_ORDER */
 #  include "BKE_writeffmpeg.hh"
 
 extern "C" {

source/blender/imbuf/intern/colormanagement.cc

@@ -39,7 +39,6 @@
 #include "BKE_appdir.hh"
 #include "BKE_colortools.hh"
 #include "BKE_context.hh"
-#include "BKE_image.h"
 #include "BKE_image_format.h"
 #include "BKE_main.hh"
 

source/blender/imbuf/intern/format_svg.cc

@@ -14,7 +14,6 @@
 #include "IMB_colormanagement.hh"
 #include "IMB_filetype.hh"
 #include "IMB_imbuf_types.hh"
-#include "nanosvg.h"
 #include "nanosvgrast.h"
 
 ImBuf *imb_load_filepath_thumbnail_svg(const char *filepath,

source/blender/imbuf/intern/iris.cc

@@ -17,7 +17,6 @@
 #include "IMB_filetype.hh"
 #include "IMB_imbuf.hh"
 #include "IMB_imbuf_types.hh"
-#include "imbuf.hh"
 
 #define IMAGIC 0732
 

source/blender/imbuf/intern/jpeg.cc

@@ -27,7 +27,6 @@
 #include "IMB_imbuf.hh"
 #include "IMB_imbuf_types.hh"
 #include "IMB_metadata.hh"
-#include "imbuf.hh"
 
 #include <cstring>
 #include <jerror.h>

source/blender/imbuf/intern/metadata.cc

@@ -17,9 +17,6 @@
 
 #include "DNA_ID.h" /* ID property definitions. */
 
-#include "MEM_guardedalloc.h"
-
-#include "IMB_imbuf.hh"
 #include "IMB_imbuf_types.hh"
 
 #include "IMB_metadata.hh"

source/blender/imbuf/intern/moviecache.cc

@@ -18,7 +18,6 @@
 #include "BLI_ghash.h"
 #include "BLI_mempool.h"
 #include "BLI_string.h"
-#include "BLI_threads.h"
 #include "BLI_utildefines.h"
 
 #include "IMB_moviecache.hh"

source/blender/imbuf/intern/openexr/openexr_api.cpp

@@ -79,7 +79,6 @@
 #include "BLI_fileops.h"
 #include "BLI_math_color.h"
 #include "BLI_mmap.h"
-#include "BLI_string_utils.hh"
 #include "BLI_threads.h"
 
 #include "BKE_idprop.h"

source/blender/imbuf/intern/readimage.cc

@@ -14,7 +14,7 @@
 
 #include "BLI_fileops.h"
 #include "BLI_mmap.h"
-#include "BLI_path_util.h"
+#include "BLI_path_util.h" /* For assertions. */
 #include "BLI_string.h"
 #include "BLI_utildefines.h"
 #include <cstdlib>

source/blender/imbuf/intern/scaling.cc

@@ -8,7 +8,6 @@
 
 #include <cmath>
 
-#include "BLI_math_color.h"
 #include "BLI_utildefines.h"
 #include "MEM_guardedalloc.h"
 
@@ -16,7 +15,6 @@
 #include "IMB_imbuf.hh"
 #include "IMB_imbuf_types.hh"
 #include "IMB_interp.hh"
-#include "imbuf.hh"
 
 #include "BLI_sys_types.h" /* for intptr_t support */
 

source/blender/imbuf/intern/stereoimbuf.cc

@@ -12,11 +12,6 @@
 #include "IMB_imbuf.hh"
 #include "IMB_imbuf_types.hh"
 
-#include "IMB_allocimbuf.hh"
-#include "IMB_colormanagement_intern.hh"
-#include "IMB_filetype.hh"
-#include "IMB_metadata.hh"
-
 #include "imbuf.hh"
 
 #include "MEM_guardedalloc.h"

source/blender/imbuf/intern/thumbs_blend.cc

@@ -10,20 +10,15 @@
 #include <cstdlib>
 #include <cstring>
 
-#include "BLI_linklist.h"
 #include "BLI_listbase.h" /* Needed due to import of BLO_readfile.hh */
 #include "BLI_utildefines.h"
 
-#include "BLO_blend_defs.hh"
 #include "BLO_readfile.hh"
 
 #include "BKE_idtype.hh"
 #include "BKE_main.hh"
 #include "BKE_preview_image.hh"
 
-#include "DNA_ID.h" /* For preview images... */
-
-#include "IMB_imbuf.hh"
 #include "IMB_imbuf_types.hh"
 #include "IMB_thumbs.hh"
 

source/blender/imbuf/intern/thumbs_font.cc

@@ -6,7 +6,6 @@
  * \ingroup imbuf
  */
 
-#include "BLI_fileops.h"
 #include "BLI_hash_md5.hh"
 #include "BLI_utildefines.h"
 

source/blender/imbuf/intern/util.cc

@@ -37,7 +37,7 @@ extern "C" {
 #  include <libavformat/avformat.h>
 #  include <libavutil/log.h>
 
-#  include "ffmpeg_compat.h"
+#  include "ffmpeg_compat.h" /* Keep for compatibility. */
 }
 
 #endif

source/blender/imbuf/intern/util_gpu.cc

@@ -6,15 +6,10 @@
  * \ingroup imbuf
  */
 
-#include "imbuf.hh"
-
 #include "BLI_utildefines.h"
 #include "MEM_guardedalloc.h"
 
-#include "BKE_global.hh"
-
 #include "GPU_capabilities.h"
-#include "GPU_state.h"
 #include "GPU_texture.h"
 
 #include "IMB_colormanagement.hh"

source/blender/imbuf/intern/writeimage.cc

@@ -10,7 +10,7 @@
 #include <cstdio>
 #include <cstdlib>
 
-#include "BLI_path_util.h"
+#include "BLI_path_util.h" /* For assertions. */
 #include "BLI_utildefines.h"
 
 #include "IMB_colormanagement.hh"