Code cleanup: remove unused includes

Opted to keep includes if they are used indirectly (even if removing is possible).

12 files changed, 9 insertions, 27 deletions

diff --git a/source/blender/imbuf/intern/allocimbuf.c b/source/blender/imbuf/intern/allocimbuf.c
index d0e81f2f383..ff9bef74a79 100644
--- a/source/blender/imbuf/intern/allocimbuf.c
+++ b/source/blender/imbuf/intern/allocimbuf.c
@@ -46,9 +46,7 @@
 #include "imbuf.h"
 
 #include "MEM_guardedalloc.h"
-#include "MEM_CacheLimiterC-Api.h"
 
-#include "BLI_utildefines.h"
 #include "BLI_threads.h"
 
 static SpinLock refcounter_spin;
diff --git a/source/blender/imbuf/intern/anim_movie.c b/source/blender/imbuf/intern/anim_movie.c
index 40fdf19ccc1..eef7964ef3f 100644
--- a/source/blender/imbuf/intern/anim_movie.c
+++ b/source/blender/imbuf/intern/anim_movie.c
@@ -67,14 +67,12 @@
 #include "BLI_utildefines.h"
 #include "BLI_string.h"
 #include "BLI_path_util.h"
-#include "BLI_math_base.h"
 
 #include "MEM_guardedalloc.h"
 
 #include "DNA_userdef_types.h"
 
 #include "BKE_global.h"
-#include "BKE_depsgraph.h"
 
 #include "imbuf.h"
 
@@ -1048,7 +1046,7 @@ static ImBuf *ffmpeg_fetchibuf(struct anim *anim, int position,
 			av_log(anim->pFormatCtx, AV_LOG_DEBUG, 
 			       "TC INDEX seek pos = %lld\n", pos);
 			av_log(anim->pFormatCtx, AV_LOG_DEBUG, 
-			       "TC INDEX seek dts = %lld\n", dts);
+			       "TC INDEX seek dts = %llu\n", dts);
 
 			if (ffmpeg_seek_by_byte(anim->pFormatCtx)) {
 				av_log(anim->pFormatCtx, AV_LOG_DEBUG, 
diff --git a/source/blender/imbuf/intern/cineon/cineonlib.c b/source/blender/imbuf/intern/cineon/cineonlib.c
index b80a381ebbb..880df0ce5c3 100644
--- a/source/blender/imbuf/intern/cineon/cineonlib.c
+++ b/source/blender/imbuf/intern/cineon/cineonlib.c
@@ -37,7 +37,6 @@
 #include <string.h>
 
 #include "BLI_fileops.h"
-#include "BLI_math_base.h"
 #include "BLI_utildefines.h"
 
 #include "MEM_guardedalloc.h"
diff --git a/source/blender/imbuf/intern/cineon/dpxlib.c b/source/blender/imbuf/intern/cineon/dpxlib.c
index ff7d37893c7..626d05b05c5 100644
--- a/source/blender/imbuf/intern/cineon/dpxlib.c
+++ b/source/blender/imbuf/intern/cineon/dpxlib.c
@@ -37,7 +37,6 @@
 #include <string.h>
 
 #include "BLI_fileops.h"
-#include "BLI_math_base.h"
 #include "BLI_utildefines.h"
 
 #include "MEM_guardedalloc.h"
diff --git a/source/blender/imbuf/intern/colormanagement.c b/source/blender/imbuf/intern/colormanagement.c
index 7731de33be2..590b21259c3 100644
--- a/source/blender/imbuf/intern/colormanagement.c
+++ b/source/blender/imbuf/intern/colormanagement.c
@@ -42,9 +42,7 @@
 #include "DNA_image_types.h"
 #include "DNA_movieclip_types.h"
 #include "DNA_scene_types.h"
-#include "DNA_screen_types.h"
 #include "DNA_space_types.h"
-#include "DNA_windowmanager_types.h"
 
 #include "IMB_filter.h"
 #include "IMB_imbuf.h"
@@ -66,7 +64,6 @@
 #include "BKE_colortools.h"
 #include "BKE_context.h"
 #include "BKE_image.h"
-#include "BKE_utildefines.h"
 #include "BKE_main.h"
 
 #include "RNA_define.h"
diff --git a/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp b/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
index f6606711cc3..028026527dc 100644
--- a/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
+++ b/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
@@ -1475,20 +1475,20 @@ void DirectDrawSurface::printInfo() const
 	if (header.pf.fourcc != 0) {
 		// Display fourcc code even when DDPF_FOURCC flag not set.
 		printf("\tFourCC: '%c%c%c%c' (0x%.8X)\n",
-		       ((header.pf.fourcc >> 0) & 0xFF),
-		       ((header.pf.fourcc >> 8) & 0xFF),
-		       ((header.pf.fourcc >> 16) & 0xFF),
-		       ((header.pf.fourcc >> 24) & 0xFF),
+		       (int)((header.pf.fourcc >> 0) & 0xFF),
+		       (int)((header.pf.fourcc >> 8) & 0xFF),
+		       (int)((header.pf.fourcc >> 16) & 0xFF),
+		       (int)((header.pf.fourcc >> 24) & 0xFF),
 		       header.pf.fourcc);
 	}
 
 	if ((header.pf.flags & DDPF_FOURCC) && (header.pf.bitcount != 0))
 	{
 		printf("\tSwizzle: '%c%c%c%c' (0x%.8X)\n",
-		       (header.pf.bitcount >> 0) & 0xFF,
-		       (header.pf.bitcount >> 8) & 0xFF,
-		       (header.pf.bitcount >> 16) & 0xFF,
-		       (header.pf.bitcount >> 24) & 0xFF,
+		       (int)(header.pf.bitcount >> 0) & 0xFF,
+		       (int)(header.pf.bitcount >> 8) & 0xFF,
+		       (int)(header.pf.bitcount >> 16) & 0xFF,
+		       (int)(header.pf.bitcount >> 24) & 0xFF,
 		       header.pf.bitcount);
 	}
 	else
diff --git a/source/blender/imbuf/intern/divers.c b/source/blender/imbuf/intern/divers.c
index f896d975326..8f14205ac6b 100644
--- a/source/blender/imbuf/intern/divers.c
+++ b/source/blender/imbuf/intern/divers.c
@@ -43,7 +43,6 @@
 #include "IMB_colormanagement.h"
 #include "IMB_colormanagement_intern.h"
 
-#include "BLI_threads.h"
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/imbuf/intern/imageprocess.c b/source/blender/imbuf/intern/imageprocess.c
index 4cdfc295749..cf875bb247b 100644
--- a/source/blender/imbuf/intern/imageprocess.c
+++ b/source/blender/imbuf/intern/imageprocess.c
@@ -42,7 +42,6 @@
 
 #include "BLI_utildefines.h"
 #include "BLI_task.h"
-#include "BLI_listbase.h"
 #include "BLI_math.h"
 
 #include "IMB_imbuf_types.h"
diff --git a/source/blender/imbuf/intern/indexer.c b/source/blender/imbuf/intern/indexer.c
index 841e13d3ff1..547a8df4438 100644
--- a/source/blender/imbuf/intern/indexer.c
+++ b/source/blender/imbuf/intern/indexer.c
@@ -35,14 +35,12 @@
 #include "BLI_path_util.h"
 #include "BLI_string.h"
 #include "BLI_fileops.h"
-#include "BLI_math_base.h"
 
 #include "IMB_indexer.h"
 #include "IMB_anim.h"
 #include "imbuf.h"
 
 #include "MEM_guardedalloc.h"
-#include "DNA_userdef_types.h"
 #include "BKE_global.h"
 
 #ifdef WITH_AVI
diff --git a/source/blender/imbuf/intern/jpeg.c b/source/blender/imbuf/intern/jpeg.c
index f8a8beb72bc..f4b5f987869 100644
--- a/source/blender/imbuf/intern/jpeg.c
+++ b/source/blender/imbuf/intern/jpeg.c
@@ -37,7 +37,6 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_utildefines.h"
 #include "BLI_string.h"
 #include "BLI_fileops.h"
 
diff --git a/source/blender/imbuf/intern/radiance_hdr.c b/source/blender/imbuf/intern/radiance_hdr.c
index d45438e2853..db268546480 100644
--- a/source/blender/imbuf/intern/radiance_hdr.c
+++ b/source/blender/imbuf/intern/radiance_hdr.c
@@ -43,7 +43,6 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_utildefines.h"
 #include "BLI_fileops.h"
 
 #include "imbuf.h"
diff --git a/source/blender/imbuf/intern/thumbs.c b/source/blender/imbuf/intern/thumbs.c
index 29c621a712d..b4c97a2aea1 100644
--- a/source/blender/imbuf/intern/thumbs.c
+++ b/source/blender/imbuf/intern/thumbs.c
@@ -29,11 +29,8 @@
  *  \ingroup imbuf
  */
 
-
 #include <stdio.h>
 
-#include "MEM_guardedalloc.h"
-
 #include "BLI_utildefines.h"
 #include "BLI_string.h"
 #include "BLI_path_util.h"