Cleanup: unused headers

2014-11-28 22:16:14 +01:00 · 2014-11-28 22:16:14 +01:00 · 915235c87a
parent bcbbc66795
commit 915235c87a
163 changed files with 8 additions and 402 deletions
--- a/source/blender/blenfont/intern/blf_util.c
+++ b/source/blender/blenfont/intern/blf_util.c
@ -38,7 +38,6 @@
 #include "blf_internal.h"

 #include "BLI_utildefines.h"
-#include "BLI_string_utf8.h"

 unsigned int blf_next_p2(unsigned int x)
 {
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@ -73,10 +73,8 @@ static DerivedMesh *navmesh_dm_createNavMeshForVisualization(DerivedMesh *dm);
 #include "BLI_sys_types.h" /* for intptr_t support */

 #include "GPU_buffers.h"
-#include "GPU_draw.h"
 #include "GPU_extensions.h"
 #include "GPU_glew.h"
-#include "GPU_material.h"

 /* very slow! enable for testing only! */
 // #define USE_MODIFIER_VALIDATE
--- a/source/blender/blenkernel/intern/addon.c
+++ b/source/blender/blenkernel/intern/addon.c
@ -29,15 +29,9 @@

 #include "BLI_utildefines.h"
 #include "BLI_ghash.h"
-#include "BLI_string.h"

 #include "BKE_addon.h"  /* own include */

-#include "RNA_access.h"
-#include "RNA_define.h"
-
-#include "BLF_translation.h"
-
 #include "MEM_guardedalloc.h"

 static GHash *global_addonpreftype_hash = NULL;
--- a/source/blender/blenkernel/intern/autoexec.c
+++ b/source/blender/blenkernel/intern/autoexec.c
@ -34,7 +34,6 @@

 #include "BLI_utildefines.h"
 #include "BLI_fnmatch.h"
-#include "BLI_string.h"
 #include "BLI_path_util.h"

 #include "BKE_autoexec.h"  /* own include */
--- a/source/blender/blenkernel/intern/brush.c
+++ b/source/blender/blenkernel/intern/brush.c
@ -33,7 +33,6 @@
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
 #include "BLI_rand.h"
-#include "BLI_rect.h"

 #include "BKE_brush.h"
 #include "BKE_colortools.h"
@ -49,7 +48,6 @@
 #include "IMB_imbuf_types.h"

 #include "RE_render_ext.h" /* externtex */
-#include "RE_shader_ext.h"

 static RNG *brush_rng;

--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@ -35,7 +35,6 @@
 */

 #include "BLI_math.h"
-#include "BLI_blenlib.h"
 #include "BLI_edgehash.h"
 #include "BLI_utildefines.h"
 #include "BLI_stackdefines.h"
@ -49,7 +48,6 @@
 #include "BKE_editmesh.h"
 #include "BKE_curve.h"

-#include "DNA_material_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
@ -61,7 +59,6 @@
 #include "GPU_draw.h"
 #include "GPU_extensions.h"
 #include "GPU_glew.h"
-#include "GPU_material.h"

 #include <string.h>
 #include <limits.h>
--- a/source/blender/blenkernel/intern/colortools.c
+++ b/source/blender/blenkernel/intern/colortools.c
@ -50,7 +50,6 @@


 #include "IMB_colormanagement.h"
-#include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"

 /* ********************************* color curve ********************* */
--- a/source/blender/blenkernel/intern/displist.c
+++ b/source/blender/blenkernel/intern/displist.c
@ -37,7 +37,6 @@
 #include "MEM_guardedalloc.h"

 #include "DNA_curve_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_object_types.h"
 #include "DNA_vfont_types.h"
--- a/source/blender/blenkernel/intern/dynamicpaint.c
+++ b/source/blender/blenkernel/intern/dynamicpaint.c
@ -71,10 +71,6 @@
 #include "BKE_scene.h"
 #include "BKE_texture.h"

-#include "RNA_access.h"
-#include "RNA_define.h"
-#include "RNA_enum_types.h"
-
 /* for image output	*/
 #include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"
--- a/source/blender/blenkernel/intern/lamp.c
+++ b/source/blender/blenkernel/intern/lamp.c
@ -41,7 +41,6 @@
 #include "DNA_scene_types.h"
 #include "DNA_texture_types.h"

-#include "BLI_listbase.h"
 #include "BLI_math.h"
 #include "BLI_utildefines.h"

--- a/source/blender/blenkernel/intern/linestyle.c
+++ b/source/blender/blenkernel/intern/linestyle.c
@ -53,8 +53,6 @@
 #include "BKE_colortools.h"
 #include "BKE_animsys.h"

-#include "RNA_access.h"
-
 static const char *modifier_name[LS_MODIFIER_NUM] = {
 	NULL,
 	"Along Stroke",
--- a/source/blender/blenkernel/intern/mask.c
+++ b/source/blender/blenkernel/intern/mask.c
@ -59,8 +59,6 @@
 #include "BKE_movieclip.h"
 #include "BKE_image.h"

-#include "NOD_composite.h"
-
 static struct {
 	ListBase splines;
 	struct GHash *id_hash;
--- a/source/blender/blenkernel/intern/mask_evaluate.c
+++ b/source/blender/blenkernel/intern/mask_evaluate.c
@ -40,8 +40,6 @@
 #include "BLI_math.h"

 #include "DNA_mask_types.h"
-#include "DNA_node_types.h"
-#include "DNA_scene_types.h"

 #include "BKE_curve.h"
 #include "BKE_mask.h"
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@ -47,7 +47,6 @@

 #include "DNA_armature_types.h"
 #include "DNA_object_types.h"
-#include "DNA_meshdata_types.h"

 #include "BLI_utildefines.h"
 #include "BLI_path_util.h"
--- a/source/blender/blenkernel/intern/movieclip.c
+++ b/source/blender/blenkernel/intern/movieclip.c
@ -69,7 +69,6 @@
 #include "BKE_image.h"  /* openanim */
 #include "BKE_tracking.h"

-#include "IMB_colormanagement.h"
 #include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"
 #include "IMB_moviecache.h"
@ -78,8 +77,6 @@
 #  include "intern/openexr/openexr_multi.h"
 #endif

-#include "NOD_composite.h"
-
 /*********************** movieclip buffer loaders *************************/

 static int sequence_guess_offset(const char *full_name, int head_len, unsigned short numlen)
--- a/source/blender/blenkernel/intern/pointcache.c
+++ b/source/blender/blenkernel/intern/pointcache.c
@ -50,7 +50,6 @@
 #include "BLI_threads.h"
 #include "BLI_math.h"
 #include "BLI_utildefines.h"
-#include "BLI_system.h"

 #include "BLF_translation.h"

--- a/source/blender/blenkernel/intern/rigidbody.c
+++ b/source/blender/blenkernel/intern/rigidbody.c
@ -62,8 +62,6 @@
 #include "BKE_pointcache.h"
 #include "BKE_rigidbody.h"

-#include "RNA_access.h"
-
 #ifdef WITH_BULLET

 /* ************************************** */
--- a/source/blender/blenkernel/intern/shrinkwrap.c
+++ b/source/blender/blenkernel/intern/shrinkwrap.c
@ -52,7 +52,6 @@
 #include "BKE_deform.h"
 #include "BKE_mesh.h"  /* for OMP limits. */
 #include "BKE_subsurf.h"
-#include "BKE_editmesh.h"

 #include "BLI_strict_flags.h"

--- a/source/blender/blenkernel/intern/subsurf_ccg.c
+++ b/source/blender/blenkernel/intern/subsurf_ccg.c
@ -41,7 +41,6 @@

 #include "MEM_guardedalloc.h"

-#include "DNA_material_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_modifier_types.h"
@ -66,8 +65,6 @@
 #include "BKE_scene.h"
 #include "BKE_subsurf.h"

-#include "PIL_time.h"
-
 #ifndef USE_DYNSIZE
 #  include "BLI_array.h"
 #endif
@ -75,7 +72,6 @@
 #include "GPU_draw.h"
 #include "GPU_extensions.h"
 #include "GPU_glew.h"
-#include "GPU_material.h"

 #include "CCGSubSurf.h"

--- a/source/blender/blenkernel/intern/texture.c
+++ b/source/blender/blenkernel/intern/texture.c
@ -37,7 +37,6 @@

 #include "MEM_guardedalloc.h"

-#include "BLI_blenlib.h"
 #include "BLI_math.h"
 #include "BLI_kdopbvh.h"
 #include "BLI_utildefines.h"
--- a/source/blender/blenkernel/intern/tracking_detect.c
+++ b/source/blender/blenkernel/intern/tracking_detect.c
@ -40,7 +40,6 @@
 #include "BKE_tracking.h"

 #include "IMB_imbuf_types.h"
-#include "IMB_imbuf.h"

 #include "libmv-capi.h"

--- a/source/blender/blenkernel/intern/tracking_region_tracker.c
+++ b/source/blender/blenkernel/intern/tracking_region_tracker.c
@ -35,11 +35,8 @@
 #include "MEM_guardedalloc.h"

 #include "DNA_movieclip_types.h"
-#include "DNA_object_types.h"   /* SELECT */

 #include "BLI_utildefines.h"
-#include "BLI_math.h"
-#include "BLI_ghash.h"
 #include "BLI_threads.h"

 #include "BKE_tracking.h"
--- a/source/blender/blenkernel/intern/world.c
+++ b/source/blender/blenkernel/intern/world.c
@ -38,7 +38,6 @@
 #include "DNA_scene_types.h"
 #include "DNA_texture_types.h"

-#include "BLI_listbase.h"
 #include "BLI_utildefines.h"

 #include "BKE_animsys.h"
--- a/source/blender/blenkernel/intern/writeavi.c
+++ b/source/blender/blenkernel/intern/writeavi.c
@ -80,7 +80,9 @@ static void filepath_avi(char *string, RenderData *rd);
 #  include "BKE_writeffmpeg.h"
 #endif

-#include "BKE_writeframeserver.h"
+#ifdef WITH_FRAMESERVER
+#  include "BKE_writeframeserver.h"
+#endif

 bMovieHandle *BKE_movie_handle_get(const char imtype)
 {
--- a/source/blender/blenkernel/intern/writeffmpeg.c
+++ b/source/blender/blenkernel/intern/writeffmpeg.c
@ -57,7 +57,6 @@
 #include "BKE_sound.h"
 #include "BKE_writeffmpeg.h"

-#include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"

 #include "ffmpeg_compat.h"
--- a/source/blender/blenlib/intern/lasso.c
+++ b/source/blender/blenlib/intern/lasso.c
@ -33,7 +33,6 @@
 #include "DNA_vec_types.h"

 #include "BLI_math.h"
-#include "BLI_rect.h"
 #include "BLI_strict_flags.h"

 #include "BLI_lasso.h" /* own include */
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@ -141,13 +141,9 @@
 #include "BKE_treehash.h"
 #include "BKE_sound.h"

-#include "IMB_imbuf.h"  // for proxy / timecode versioning stuff

 #include "NOD_common.h"
 #include "NOD_socket.h"
-#include "NOD_composite.h"
-#include "NOD_shader.h"
-#include "NOD_texture.h"

 #include "BLO_readfile.h"
 #include "BLO_undofile.h"
@ -157,7 +153,6 @@

 #include "readfile.h"

-#include "PIL_time.h"

 #include <errno.h>

--- a/source/blender/blenloader/intern/runtime.c
+++ b/source/blender/blenloader/intern/runtime.c
@ -51,7 +51,6 @@
 #include "BLO_readfile.h"
 #include "BLO_runtime.h"

-#include "BKE_blender.h"
 #include "BKE_report.h"

 /* Runtime reading */
--- a/source/blender/blenloader/intern/undofile.c
+++ b/source/blender/blenloader/intern/undofile.c
@ -40,7 +40,6 @@
 #include "DNA_listBase.h"

 #include "BLI_blenlib.h"
-#include "BLI_linklist.h"

 #include "BLO_undofile.h"

--- a/source/blender/blenloader/intern/versioning_250.c
+++ b/source/blender/blenloader/intern/versioning_250.c
@ -25,8 +25,6 @@
 *  \ingroup blenloader
 */

-#include "zlib.h"
-
 #ifndef WIN32
 #  include <unistd.h>  /* for read close */
 #else
@ -90,14 +88,9 @@
 #include "NOD_socket.h"

 #include "BLO_readfile.h"
-#include "BLO_undofile.h"
-
-#include "RE_engine.h"

 #include "readfile.h"

-#include "PIL_time.h"
-
 #include <errno.h>

 /* 2.50 patch */
--- a/source/blender/blenloader/intern/versioning_legacy.c
+++ b/source/blender/blenloader/intern/versioning_legacy.c
@ -30,8 +30,6 @@
 */


-#include "zlib.h"
-
 #include <limits.h>

 #ifndef WIN32
@ -94,14 +92,9 @@
 #include "BKE_scene.h"
 #include "BKE_sequencer.h"

-#include "IMB_imbuf.h"  // for proxy / timecode versioning stuff
-
 #include "NOD_socket.h"

 #include "BLO_readfile.h"
-#include "BLO_undofile.h"
-
-#include "RE_engine.h"

 #include "readfile.h"

--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@ -79,8 +79,6 @@
 #include <string.h>
 #include <stdlib.h>

-#include "zlib.h"
-
 #ifdef WIN32
 #  include "winsock2.h"
 #  include <io.h>
@ -156,7 +154,6 @@
 #include "BKE_node.h"
 #include "BKE_report.h"
 #include "BKE_sequencer.h"
-#include "BKE_sound.h"
 #include "BKE_subsurf.h"
 #include "BKE_modifier.h"
 #include "BKE_fcurve.h"
@ -164,11 +161,9 @@
 #include "BKE_mesh.h"

 #ifdef USE_NODE_COMPAT_CUSTOMNODES
-#include "NOD_common.h"
 #include "NOD_socket.h"	/* for sock->default_value data */
 #endif

-#include "RNA_access.h"

 #include "BLO_writefile.h"
 #include "BLO_readfile.h"
--- a/source/blender/bmesh/operators/bmo_wireframe.c
+++ b/source/blender/bmesh/operators/bmo_wireframe.c
@ -26,8 +26,6 @@
 * Creates a solid wireframe from connected faces.
 */

-#include "MEM_guardedalloc.h"
-
 #include "DNA_material_types.h"

 #include "BLI_sys_types.h"
--- a/source/blender/editors/animation/keyframes_edit.c
+++ b/source/blender/editors/animation/keyframes_edit.c
@ -41,7 +41,6 @@

 #include "DNA_anim_types.h"
 #include "DNA_object_types.h"
-#include "DNA_node_types.h"
 #include "DNA_scene_types.h"

 #include "BKE_fcurve.h"
--- a/source/blender/editors/animation/keyframes_general.c
+++ b/source/blender/editors/animation/keyframes_general.c
@ -49,7 +49,6 @@
 #include "BKE_global.h"

 #include "RNA_access.h"
-#include "RNA_enum_types.h"

 #include "ED_anim_api.h"
 #include "ED_keyframing.h"
--- a/source/blender/editors/gpencil/drawgpencil.c
+++ b/source/blender/editors/gpencil/drawgpencil.c
@ -58,8 +58,6 @@
 #include "ED_gpencil.h"
 #include "ED_view3d.h"

-#include "gpencil_intern.h"
-
 /* ************************************************** */
 /* GREASE PENCIL DRAWING */

--- a/source/blender/editors/gpencil/editaction_gpencil.c
+++ b/source/blender/editors/gpencil/editaction_gpencil.c
@ -49,8 +49,6 @@
 #include "ED_keyframes_edit.h"
 #include "ED_markers.h"

-#include "gpencil_intern.h"
-
 /* ***************************************** */
 /* NOTE ABOUT THIS FILE:
 *  This file contains code for editing Grease Pencil data in the Action Editor
--- a/source/blender/editors/gpencil/gpencil_buttons.c
+++ b/source/blender/editors/gpencil/gpencil_buttons.c
@ -55,8 +55,6 @@
 #include "UI_interface.h"
 #include "UI_resources.h"

-#include "gpencil_intern.h"
-
 /* ************************************************** */
 /* GREASE PENCIL PANEL-UI DRAWING */

--- a/source/blender/editors/io/io_ops.c
+++ b/source/blender/editors/io/io_ops.c
@ -28,14 +28,6 @@
 *  \ingroup collada
 */

-
-#include "io_collada.h"
-
-#include "BLI_utildefines.h"
-
-#include "WM_types.h"
-#include "WM_api.h"
-
 #include "io_ops.h"  /* own include */

 void ED_operatortypes_io(void) 
--- a/source/blender/editors/object/object_bake.c
+++ b/source/blender/editors/object/object_bake.c
@ -45,7 +45,6 @@
 #include "BLI_blenlib.h"
 #include "BLI_threads.h"
 #include "BLI_utildefines.h"
-#include "BLI_math.h"

 #include "BKE_blender.h"
 #include "BKE_screen.h"
--- a/source/blender/editors/physics/physics_fluid.c
+++ b/source/blender/editors/physics/physics_fluid.c
@ -72,8 +72,6 @@
 #include "DNA_scene_types.h"
 #include "DNA_mesh_types.h"

-#include "PIL_time.h"
-

 static float get_fluid_viscosity(FluidsimSettings *settings)
 {
--- a/source/blender/editors/sculpt_paint/paint_vertex.c
+++ b/source/blender/editors/sculpt_paint/paint_vertex.c
@ -66,8 +66,6 @@
 #include "WM_api.h"
 #include "WM_types.h"

-#include "GPU_buffers.h"
-
 #include "ED_armature.h"
 #include "ED_object.h"
 #include "ED_mesh.h"
--- a/source/blender/editors/space_node/node_templates.c
+++ b/source/blender/editors/space_node/node_templates.c
@ -30,7 +30,6 @@

 #include "DNA_node_types.h"
 #include "DNA_screen_types.h"
-#include "DNA_space_types.h"

 #include "BLI_listbase.h"
 #include "BLI_string.h"
--- a/source/blender/editors/space_sequencer/sequencer_modifier.c
+++ b/source/blender/editors/space_sequencer/sequencer_modifier.c
@ -34,7 +34,6 @@
 #include "BLI_utildefines.h"

 #include "DNA_scene_types.h"
-#include "DNA_userdef_types.h"

 #include "BKE_context.h"
 #include "BKE_sequencer.h"
--- a/source/blender/editors/space_view3d/drawmesh.c
+++ b/source/blender/editors/space_view3d/drawmesh.c
@ -60,7 +60,6 @@

 #include "UI_resources.h"

-#include "GPU_buffers.h"
 #include "GPU_extensions.h"
 #include "GPU_draw.h"
 #include "GPU_material.h"
--- a/source/blender/editors/uvedit/uvedit_parametrizer.c
+++ b/source/blender/editors/uvedit/uvedit_parametrizer.c
@ -35,7 +35,6 @@
 #include "BLI_boxpack2d.h"
 #include "BLI_convexhull2d.h"

-#include "uvedit_intern.h"
 #include "uvedit_parametrizer.h"

 #include <math.h>
--- a/source/blender/gpu/intern/gpu_buffers.c
+++ b/source/blender/gpu/intern/gpu_buffers.c
@ -46,13 +46,11 @@
 #include "BLI_ghash.h"
 #include "BLI_threads.h"

-#include "DNA_material_types.h"
 #include "DNA_meshdata_types.h"

 #include "BKE_ccg.h"
 #include "BKE_DerivedMesh.h"
 #include "BKE_paint.h"
-#include "BKE_material.h"
 #include "BKE_pbvh.h"

 #include "DNA_userdef_types.h"
@ -62,8 +60,6 @@

 #include "bmesh.h"

-#include "gpu_extensions_private.h"
-
 typedef enum {
 	GPU_BUFFER_VERTEX_STATE = (1 << 0),
 	GPU_BUFFER_NORMAL_STATE = (1 << 1),
--- a/source/blender/gpu/intern/gpu_codegen.c
+++ b/source/blender/gpu/intern/gpu_codegen.c
@ -51,8 +51,6 @@

 #include "gpu_codegen.h"

-#include "node_util.h" /* For muting node stuff... */
-
 #include <string.h>
 #include <stdarg.h>

--- a/source/blender/gpu/intern/gpu_init_exit.c
+++ b/source/blender/gpu/intern/gpu_init_exit.c
@ -31,7 +31,6 @@

 #include "BLI_sys_types.h"
 #include "GPU_init_exit.h"  /* interface */
-#include "GPU_extensions.h"  /* library */

 #include "intern/gpu_codegen.h"
 #include "intern/gpu_extensions_private.h"
--- a/source/blender/gpu/intern/gpu_select.c
+++ b/source/blender/gpu/intern/gpu_select.c
@ -33,8 +33,6 @@
 #include "GPU_extensions.h"
 #include "GPU_glew.h"
 
-#include "BLI_utildefines.h"
-
 #include "MEM_guardedalloc.h"

 #include "DNA_userdef_types.h"
--- a/source/blender/gpu/intern/gpu_simple_shader.c
+++ b/source/blender/gpu/intern/gpu_simple_shader.c
@ -47,9 +47,6 @@
 #include "BLI_math.h"
 #include "BLI_utildefines.h"

-#include "DNA_mesh_types.h"
-#include "DNA_object_types.h"
-
 #include "GPU_extensions.h"
 #include "GPU_simple_shader.h"

--- a/source/blender/ikplugin/intern/ikplugin_api.c
+++ b/source/blender/ikplugin/intern/ikplugin_api.c
@ -32,15 +32,10 @@

 #include "BIK_api.h"
 #include "BLI_blenlib.h"
-#include "BLI_math.h"
-
-#include "BKE_armature.h"

 #include "DNA_object_types.h"
 #include "DNA_action_types.h"
 #include "DNA_scene_types.h"
-#include "DNA_constraint_types.h"
-#include "DNA_armature_types.h"

 #include "ikplugin_api.h"

--- a/source/blender/imbuf/intern/allocimbuf.c
+++ b/source/blender/imbuf/intern/allocimbuf.c
@ -48,7 +48,6 @@
 #include "MEM_guardedalloc.h"

 #include "BLI_threads.h"
-#include "BLI_utildefines.h"

 static SpinLock refcounter_spin;

--- a/source/blender/imbuf/intern/anim_movie.c
+++ b/source/blender/imbuf/intern/anim_movie.c
@ -70,12 +70,8 @@

 #include "MEM_guardedalloc.h"

-#include "DNA_userdef_types.h"
-
 #include "BKE_global.h"

-#include "imbuf.h"
-
 #ifdef WITH_AVI
 #  include "AVI_avi.h"
 #endif
@ -89,7 +85,6 @@
 #include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"

-#include "IMB_allocimbuf.h"
 #include "IMB_anim.h"
 #include "IMB_indexer.h"

--- a/source/blender/imbuf/intern/bmp.c
+++ b/source/blender/imbuf/intern/bmp.c
@ -36,7 +36,6 @@

 #include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"
-#include "IMB_allocimbuf.h"
 #include "IMB_filetype.h"

 #include "IMB_colormanagement.h"
--- a/source/blender/imbuf/intern/colormanagement.c
+++ b/source/blender/imbuf/intern/colormanagement.c
@ -44,7 +44,6 @@
 #include "DNA_scene_types.h"
 #include "DNA_space_types.h"

-#include "IMB_filter.h"
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
 #include "IMB_filetype.h"
@ -53,7 +52,6 @@
 #include "MEM_guardedalloc.h"

 #include "BLI_blenlib.h"
-#include "BLI_fileops.h"
 #include "BLI_math.h"
 #include "BLI_math_color.h"
 #include "BLI_string.h"
--- a/source/blender/imbuf/intern/divers.c
+++ b/source/blender/imbuf/intern/divers.c
@ -37,7 +37,6 @@
 #include "imbuf.h"
 #include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"
-#include "IMB_allocimbuf.h"
 #include "IMB_filter.h"

 #include "IMB_colormanagement.h"
--- a/source/blender/imbuf/intern/filetype.c
+++ b/source/blender/imbuf/intern/filetype.c
@ -51,8 +51,6 @@
 #include "quicktime_import.h"
 #endif

-#include "imbuf.h"
-
 static int imb_ftype_default(ImFileType *type, ImBuf *ibuf)
 {
 	return (ibuf->ftype & type->filetype);
--- a/source/blender/imbuf/intern/iris.c
+++ b/source/blender/imbuf/intern/iris.c
@ -40,7 +40,6 @@
 #include "imbuf.h"
 #include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"
-#include "IMB_allocimbuf.h"
 #include "IMB_filetype.h"

 #include "IMB_colormanagement.h"
--- a/source/blender/imbuf/intern/jp2.c
+++ b/source/blender/imbuf/intern/jp2.c
@ -29,11 +29,8 @@
 #include "BLI_math.h"
 #include "BLI_fileops.h"

-#include "imbuf.h"
-
 #include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"
-#include "IMB_allocimbuf.h"
 #include "IMB_filetype.h"

 #include "IMB_colormanagement.h"
--- a/source/blender/imbuf/intern/png.c
+++ b/source/blender/imbuf/intern/png.c
@ -41,8 +41,6 @@

 #include "MEM_guardedalloc.h"

-#include "imbuf.h"
-
 #include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"

--- a/source/blender/imbuf/intern/rectop.c
+++ b/source/blender/imbuf/intern/rectop.c
@ -39,11 +39,9 @@
 #include "BLI_math_color_blend.h"
 #include "BLI_math_vector.h"

-#include "imbuf.h"
 #include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"

-#include "IMB_allocimbuf.h"
 #include "IMB_colormanagement.h"

 void IMB_blend_color_byte(unsigned char dst[4], unsigned char src1[4], unsigned char src2[4], IMB_BlendMode mode)
--- a/source/blender/imbuf/intern/rotate.c
+++ b/source/blender/imbuf/intern/rotate.c
@ -39,8 +39,6 @@
 #include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"

-#include "IMB_allocimbuf.h"
-
 void IMB_flipy(struct ImBuf *ibuf)
 {
 	int x, y;
--- a/source/blender/imbuf/intern/scaling.c
+++ b/source/blender/imbuf/intern/scaling.c
@ -33,7 +33,6 @@


 #include "BLI_utildefines.h"
-#include "BLI_math_base.h"
 #include "BLI_math_color.h"
 #include "BLI_math_interp.h"
 #include "MEM_guardedalloc.h"
@ -42,7 +41,6 @@
 #include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"

-#include "IMB_allocimbuf.h"
 #include "IMB_filter.h"

 #include "BLI_sys_types.h" // for intptr_t support
--- a/source/blender/imbuf/intern/targa.c
+++ b/source/blender/imbuf/intern/targa.c
@ -44,7 +44,6 @@
 #include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"

-#include "IMB_allocimbuf.h"
 #include "IMB_filetype.h"

 #include "IMB_colormanagement.h"
--- a/source/blender/imbuf/intern/thumbs_blend.c
+++ b/source/blender/imbuf/intern/thumbs_blend.c
@ -29,8 +29,6 @@

 #include "zlib.h"

-#include "MEM_guardedalloc.h"
-
 #include "BLI_utildefines.h"
 #include "BLI_endian_switch.h"
 #include "BLI_fileops.h"
--- a/source/blender/imbuf/intern/tiff.c
+++ b/source/blender/imbuf/intern/tiff.c
@ -53,9 +53,7 @@
 #include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"

-#include "IMB_allocimbuf.h"
 #include "IMB_filetype.h"
-#include "IMB_filter.h"

 #include "IMB_colormanagement.h"
 #include "IMB_colormanagement_intern.h"
--- a/source/blender/imbuf/intern/writeimage.c
+++ b/source/blender/imbuf/intern/writeimage.c
@ -41,8 +41,6 @@
 #include "IMB_colormanagement.h"
 #include "IMB_colormanagement_intern.h"

-#include "imbuf.h"
-
 static ImBuf *prepare_write_imbuf(ImFileType *type, ImBuf *ibuf)
 {
 	ImBuf *write_ibuf = ibuf;
--- a/source/blender/makesrna/intern/makesrna.c
+++ b/source/blender/makesrna/intern/makesrna.c
@ -35,7 +35,6 @@

 #include "BLI_utildefines.h"

-#include "RNA_access.h"
 #include "RNA_define.h"
 #include "RNA_types.h"

--- a/source/blender/modifiers/intern/MOD_boolean.c
+++ b/source/blender/modifiers/intern/MOD_boolean.c
@ -39,8 +39,6 @@

 #include "BLI_utildefines.h"

-#include "BLF_translation.h"
-
 #include "BKE_cdderivedmesh.h"
 #include "BKE_modifier.h"

@ -49,8 +47,6 @@
 #include "MOD_boolean_util.h"
 #include "MOD_util.h"

-#include "PIL_time.h"
-
 static void copyData(ModifierData *md, ModifierData *target)
 {
 #if 0
--- a/source/blender/modifiers/intern/MOD_build.c
+++ b/source/blender/modifiers/intern/MOD_build.c
@ -40,17 +40,13 @@
 #include "BLI_math_vector.h"
 #include "BLI_ghash.h"

-#include "DNA_scene_types.h"
 #include "DNA_meshdata_types.h"

 #include "BKE_cdderivedmesh.h"
-#include "BKE_mesh.h"
 #include "BKE_modifier.h"
 #include "BKE_particle.h"
 #include "BKE_scene.h"

-#include "MOD_util.h"
-
 static void initData(ModifierData *md)
 {
 	BuildModifierData *bmd = (BuildModifierData *) md;
--- a/source/blender/modifiers/intern/MOD_collision.c
+++ b/source/blender/modifiers/intern/MOD_collision.c
@ -32,7 +32,6 @@
 *  \ingroup modifiers
 */

-
 #include "DNA_object_types.h"
 #include "DNA_meshdata_types.h"

@ -49,8 +48,6 @@
 #include "BKE_pointcache.h"
 #include "BKE_scene.h"

-#include "MOD_util.h"
-
 static void initData(ModifierData *md) 
 {
 	CollisionModifierData *collmd = (CollisionModifierData *) md;
--- a/source/blender/modifiers/intern/MOD_curve.c
+++ b/source/blender/modifiers/intern/MOD_curve.c
@ -32,7 +32,6 @@
 *  \ingroup modifiers
 */

-
 #include <string.h>

 #include "DNA_scene_types.h"
@ -47,7 +46,6 @@

 #include "depsgraph_private.h"

-#include "MOD_util.h"

 static void initData(ModifierData *md)
 {
--- a/source/blender/modifiers/intern/MOD_decimate.c
+++ b/source/blender/modifiers/intern/MOD_decimate.c
@ -35,17 +35,12 @@
 #include "DNA_object_types.h"

 #include "BLI_math.h"
-#include "BLI_string.h"
 #include "BLI_utildefines.h"

-#include "BLF_translation.h"
-
 #include "MEM_guardedalloc.h"

-#include "BKE_mesh.h"
 #include "BKE_modifier.h"
 #include "BKE_deform.h"
-#include "BKE_particle.h"
 #include "BKE_cdderivedmesh.h"

 #include "bmesh.h"
--- a/source/blender/modifiers/intern/MOD_dynamicpaint.c
+++ b/source/blender/modifiers/intern/MOD_dynamicpaint.c
@ -28,7 +28,6 @@
 #include <stddef.h>

 #include "DNA_dynamicpaint_types.h"
-#include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"

@ -40,8 +39,6 @@

 #include "depsgraph_private.h"

-#include "MOD_util.h"
-

 static void initData(ModifierData *md) 
 {
--- a/source/blender/modifiers/intern/MOD_explode.c
+++ b/source/blender/modifiers/intern/MOD_explode.c
@ -54,7 +54,6 @@

 #include "MEM_guardedalloc.h"

-#include "MOD_util.h"

 static void initData(ModifierData *md)
 {
--- a/source/blender/modifiers/intern/MOD_fluidsim.c
+++ b/source/blender/modifiers/intern/MOD_fluidsim.c
@ -45,7 +45,6 @@

 #include "depsgraph_private.h"

-#include "MOD_util.h"
 #include "MOD_fluidsim_util.h"
 #include "MEM_guardedalloc.h"

--- a/source/blender/modifiers/intern/MOD_laplaciansmooth.c
+++ b/source/blender/modifiers/intern/MOD_laplaciansmooth.c
@ -41,7 +41,6 @@
 #include "BKE_deform.h"
 #include "BKE_modifier.h"

-#include "MOD_modifiertypes.h"
 #include "MOD_util.h"

 #ifdef WITH_OPENNL
--- a/source/blender/modifiers/intern/MOD_lattice.c
+++ b/source/blender/modifiers/intern/MOD_lattice.c
@ -38,7 +38,6 @@
 #include "DNA_object_types.h"

 #include "BLI_utildefines.h"
-#include "BLI_string.h"

 #include "BKE_cdderivedmesh.h"
 #include "BKE_lattice.h"
--- a/source/blender/modifiers/intern/MOD_mask.c
+++ b/source/blender/modifiers/intern/MOD_mask.c
@ -51,8 +51,6 @@

 #include "depsgraph_private.h"

-#include "MOD_util.h"
-
 static void copyData(ModifierData *md, ModifierData *target)
 {
 #if 0
--- a/source/blender/modifiers/intern/MOD_meshcache.c
+++ b/source/blender/modifiers/intern/MOD_meshcache.c
@ -48,8 +48,6 @@

 #include "MOD_modifiertypes.h"

-#include "MOD_util.h"
-
 static void initData(ModifierData *md)
 {
 	MeshCacheModifierData *mcmd = (MeshCacheModifierData *)md;
--- a/source/blender/modifiers/intern/MOD_meshcache_pc2.c
+++ b/source/blender/modifiers/intern/MOD_meshcache_pc2.c
@ -31,7 +31,6 @@
 #include "BLI_sys_types.h"
 #include "BLI_utildefines.h"
 #include "BLI_fileops.h"
-#include "BLI_math.h"
 #ifdef __BIG_ENDIAN__
 #  include "BLI_endian_switch.h"
 #endif
--- a/source/blender/modifiers/intern/MOD_meshdeform.c
+++ b/source/blender/modifiers/intern/MOD_meshdeform.c
@ -40,8 +40,6 @@
 #include "BLI_task.h"
 #include "BLI_utildefines.h"

-#include "BLF_translation.h"
-
 #include "BKE_cdderivedmesh.h"
 #include "BKE_global.h"
 #include "BKE_modifier.h"
--- a/source/blender/modifiers/intern/MOD_mirror.c
+++ b/source/blender/modifiers/intern/MOD_mirror.c
@ -42,8 +42,6 @@
 #include "BKE_modifier.h"
 #include "BKE_deform.h"

-#include "bmesh.h"
-
 #include "MEM_guardedalloc.h"
 #include "depsgraph_private.h"

--- a/source/blender/modifiers/intern/MOD_multires.c
+++ b/source/blender/modifiers/intern/MOD_multires.c
@ -44,11 +44,8 @@
 #include "BKE_mesh.h"
 #include "BKE_multires.h"
 #include "BKE_modifier.h"
-#include "BKE_paint.h"
 #include "BKE_subsurf.h"

-#include "MOD_util.h"
-
 static void initData(ModifierData *md)
 {
 	MultiresModifierData *mmd = (MultiresModifierData *)md;
--- a/source/blender/modifiers/intern/MOD_ocean.c
+++ b/source/blender/modifiers/intern/MOD_ocean.c
@ -43,8 +43,6 @@
 #include "BKE_modifier.h"
 #include "BKE_ocean.h"

-#include "MOD_util.h"
-
 #ifdef WITH_OCEANSIM
 static void init_cache_data(Object *ob, struct OceanModifierData *omd)
 {
--- a/source/blender/modifiers/intern/MOD_particleinstance.c
+++ b/source/blender/modifiers/intern/MOD_particleinstance.c
@ -48,8 +48,6 @@
 #include "BKE_particle.h"
 #include "BKE_pointcache.h"

-#include "MOD_util.h"
-
 #include "depsgraph_private.h"


--- a/source/blender/modifiers/intern/MOD_shrinkwrap.c
+++ b/source/blender/modifiers/intern/MOD_shrinkwrap.c
@ -38,7 +38,6 @@
 #include "DNA_object_types.h"

 #include "BLI_math.h"
-#include "BLI_string.h"
 #include "BLI_utildefines.h"

 #include "BKE_cdderivedmesh.h"
--- a/source/blender/modifiers/intern/MOD_skin.c
+++ b/source/blender/modifiers/intern/MOD_skin.c
@ -79,8 +79,6 @@

 #include "bmesh.h"

-#include "MOD_util.h"
-
 typedef struct {
 	float mat[3][3];
 	/* Vert that edge is pointing away from, no relation to
--- a/source/blender/modifiers/intern/MOD_smoke.c
+++ b/source/blender/modifiers/intern/MOD_smoke.c
@ -52,9 +52,6 @@

 #include "depsgraph_private.h"

-#include "MOD_util.h"
-
-
 static void initData(ModifierData *md) 
 {
 	SmokeModifierData *smd = (SmokeModifierData *) md;
--- a/source/blender/modifiers/intern/MOD_triangulate.c
+++ b/source/blender/modifiers/intern/MOD_triangulate.c
@ -31,7 +31,6 @@

 #include "BKE_cdderivedmesh.h"
 #include "BKE_modifier.h"
-#include "BKE_editmesh.h"

 #include "bmesh.h"
 #include "bmesh_tools.h"
--- a/source/blender/modifiers/intern/MOD_util.c
+++ b/source/blender/modifiers/intern/MOD_util.c
@ -32,7 +32,6 @@

 #include <string.h>

-#include "DNA_curve_types.h"
 #include "DNA_image_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_modifier_types.h"
@ -48,8 +47,6 @@
 #include "BKE_image.h"
 #include "BKE_lattice.h"
 #include "BKE_mesh.h"
-#include "BKE_displist.h"
-#include "BKE_scene.h"

 #include "BKE_modifier.h"

@ -58,8 +55,6 @@

 #include "MEM_guardedalloc.h"

-#include "RE_shader_ext.h"
-
 #ifdef OPENNL_THREADING_HACK
 #include "BLI_threads.h"
 #endif
--- a/source/blender/modifiers/intern/MOD_uvproject.c
+++ b/source/blender/modifiers/intern/MOD_uvproject.c
@ -49,7 +49,6 @@
 #include "BKE_DerivedMesh.h"

 #include "MOD_modifiertypes.h"
-#include "MOD_util.h"

 #include "MEM_guardedalloc.h"
 #include "depsgraph_private.h"
--- a/source/blender/modifiers/intern/MOD_weightvg_util.c
+++ b/source/blender/modifiers/intern/MOD_weightvg_util.c
@ -34,7 +34,6 @@
 #include "BLI_utildefines.h"

 #include "DNA_color_types.h"      /* CurveMapping. */
-#include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_modifier_types.h"
 #include "DNA_object_types.h"
@ -43,11 +42,9 @@
 #include "BKE_cdderivedmesh.h"
 #include "BKE_colortools.h"       /* CurveMapping. */
 #include "BKE_deform.h"
-#include "BKE_mesh.h"
 #include "BKE_modifier.h"
 #include "BKE_texture.h"          /* Texture masking. */

-#include "depsgraph_private.h"
 #include "MEM_guardedalloc.h"
 #include "MOD_util.h"
 #include "MOD_weightvg_util.h"
--- a/source/blender/modifiers/intern/MOD_weightvgedit.c
+++ b/source/blender/modifiers/intern/MOD_weightvgedit.c
@ -34,7 +34,6 @@
 #include "BLI_rand.h"

 #include "DNA_color_types.h"      /* CurveMapping. */
-#include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_modifier_types.h"
 #include "DNA_object_types.h"
@ -48,7 +47,6 @@

 #include "depsgraph_private.h"
 #include "MEM_guardedalloc.h"
-#include "MOD_util.h"
 #include "MOD_weightvg_util.h"

 /**************************************
--- a/source/blender/modifiers/intern/MOD_weightvgmix.c
+++ b/source/blender/modifiers/intern/MOD_weightvgmix.c
@ -44,7 +44,6 @@

 #include "depsgraph_private.h"
 #include "MEM_guardedalloc.h"
-#include "MOD_util.h"
 #include "MOD_weightvg_util.h"


--- a/source/blender/modifiers/intern/MOD_weightvgproximity.c
+++ b/source/blender/modifiers/intern/MOD_weightvgproximity.c
@ -47,7 +47,6 @@

 #include "depsgraph_private.h"
 #include "MEM_guardedalloc.h"
-#include "MOD_util.h"
 #include "MOD_weightvg_util.h"

 // #define USE_TIMEIT
--- a/source/blender/modifiers/intern/MOD_wireframe.c
+++ b/source/blender/modifiers/intern/MOD_wireframe.c
@ -23,20 +23,14 @@
 *  \ingroup modifiers
 */

-#include "MEM_guardedalloc.h"
-
 #include "DNA_object_types.h"
-#include "DNA_meshdata_types.h"

-#include "BLI_math.h"
 #include "BLI_utildefines.h"
-#include "BLI_string.h"

 #include "BKE_cdderivedmesh.h"
 #include "BKE_deform.h"

 #include "MOD_modifiertypes.h"
-#include "MOD_util.h"

 #include "bmesh.h"
 #include "tools/bmesh_wireframe.h"
--- a/source/blender/nodes/composite/node_composite_tree.c
+++ b/source/blender/nodes/composite/node_composite_tree.c
@ -36,11 +36,8 @@
 #include "DNA_scene_types.h"
 #include "DNA_node_types.h"

-#include "BLI_listbase.h"
-
 #include "BLF_translation.h"

-#include "BKE_colortools.h"
 #include "BKE_context.h"
 #include "BKE_global.h"
 #include "BKE_main.h"
@ -50,8 +47,6 @@
 #include "node_common.h"
 #include "node_util.h"

-#include "PIL_time.h"
-
 #include "RNA_access.h"

 #include "NOD_composite.h"
--- a/source/blender/nodes/composite/nodes/node_composite_common.c
+++ b/source/blender/nodes/composite/nodes/node_composite_common.c
@ -35,7 +35,6 @@
 #include "node_composite_util.h"
 #include "NOD_common.h"
 #include "node_common.h"
-#include "node_exec.h"

 #include "BKE_node.h"

--- a/Show More
+++ b/Show More