diff --git a/makefile.lst b/makefile.lst
index 39c08486b..adfeb0b9b 100644
--- a/makefile.lst
+++ b/makefile.lst
@@ -168,7 +168,6 @@ COMMON_SOURCES =					\
 	src/modules/palettes.cpp			\
 	src/modules/recent.cpp				\
 	src/modules/rootmenu.cpp			\
-	src/modules/sprites.cpp				\
 	src/modules/tools.cpp				\
 	src/raster/algo.cpp				\
 	src/raster/algofill.cpp				\
@@ -194,6 +193,7 @@ COMMON_SOURCES =					\
 	src/util/col_file.cpp				\
 	src/util/filetoks.cpp				\
 	src/util/hash.cpp				\
+	src/util/images_ref.cpp				\
 	src/util/misc.cpp				\
 	src/util/msk_file.cpp				\
 	src/util/pic_file.cpp				\
diff --git a/src/commands/cmd_background_from_layer.cpp b/src/commands/cmd_background_from_layer.cpp
index bc7850385..0d5f3f80e 100644
--- a/src/commands/cmd_background_from_layer.cpp
+++ b/src/commands/cmd_background_from_layer.cpp
@@ -21,7 +21,6 @@
 #include "commands/commands.h"
 #include "core/app.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/layer.h"
 #include "raster/sprite.h"
 #include "undoable.h"
diff --git a/src/commands/cmd_canvas_size.cpp b/src/commands/cmd_canvas_size.cpp
index 4f87766db..f80b45c53 100644
--- a/src/commands/cmd_canvas_size.cpp
+++ b/src/commands/cmd_canvas_size.cpp
@@ -25,7 +25,6 @@
 #include "commands/commands.h"
 #include "core/app.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/image.h"
 #include "raster/mask.h"
 #include "raster/sprite.h"
diff --git a/src/commands/cmd_cel_properties.cpp b/src/commands/cmd_cel_properties.cpp
index 34141aee0..cb896cf2e 100644
--- a/src/commands/cmd_cel_properties.cpp
+++ b/src/commands/cmd_cel_properties.cpp
@@ -26,7 +26,6 @@
 #include "core/app.h"
 #include "core/core.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/cel.h"
 #include "raster/image.h"
 #include "raster/layer.h"
diff --git a/src/commands/cmd_change_image_type.cpp b/src/commands/cmd_change_image_type.cpp
index a24f5afb6..921517490 100644
--- a/src/commands/cmd_change_image_type.cpp
+++ b/src/commands/cmd_change_image_type.cpp
@@ -24,7 +24,6 @@
 #include "core/app.h"
 #include "modules/gui.h"
 #include "modules/palettes.h"
-#include "modules/sprites.h"
 #include "raster/image.h"
 #include "raster/quant.h"
 #include "raster/sprite.h"
diff --git a/src/commands/cmd_clear.cpp b/src/commands/cmd_clear.cpp
index 73c9af1c4..e49500362 100644
--- a/src/commands/cmd_clear.cpp
+++ b/src/commands/cmd_clear.cpp
@@ -21,7 +21,6 @@
 #include "commands/commands.h"
 #include "core/app.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/layer.h"
 #include "raster/sprite.h"
 #include "raster/undo.h"
diff --git a/src/commands/cmd_close_file.cpp b/src/commands/cmd_close_file.cpp
index 8c05efdb1..67a6d1ce7 100644
--- a/src/commands/cmd_close_file.cpp
+++ b/src/commands/cmd_close_file.cpp
@@ -24,7 +24,6 @@
 #include "ui_context.h"
 #include "commands/commands.h"
 #include "core/app.h"
-#include "modules/sprites.h"
 #include "raster/sprite.h"
 
 static bool close_current_sprite();
diff --git a/src/commands/cmd_configure_tools.cpp b/src/commands/cmd_configure_tools.cpp
index a24a7969b..da338384a 100644
--- a/src/commands/cmd_configure_tools.cpp
+++ b/src/commands/cmd_configure_tools.cpp
@@ -28,7 +28,6 @@
 #include "modules/gfx.h"
 #include "modules/gui.h"
 #include "modules/rootmenu.h"
-#include "modules/sprites.h"
 #include "modules/tools.h"
 #include "raster/brush.h"
 #include "raster/image.h"
diff --git a/src/commands/cmd_copy.cpp b/src/commands/cmd_copy.cpp
index 66fbad37b..57a7929a0 100644
--- a/src/commands/cmd_copy.cpp
+++ b/src/commands/cmd_copy.cpp
@@ -21,7 +21,6 @@
 #include "jinete/jbase.h"
 
 #include "commands/commands.h"
-#include "modules/sprites.h"
 #include "raster/layer.h"
 #include "raster/mask.h"
 #include "raster/sprite.h"
diff --git a/src/commands/cmd_crop.cpp b/src/commands/cmd_crop.cpp
index d9fb69c56..2e7c82e73 100644
--- a/src/commands/cmd_crop.cpp
+++ b/src/commands/cmd_crop.cpp
@@ -21,7 +21,6 @@
 #include "commands/commands.h"
 #include "core/app.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/image.h"
 #include "raster/layer.h"
 #include "raster/mask.h"
diff --git a/src/commands/cmd_cut.cpp b/src/commands/cmd_cut.cpp
index 1efa43436..0d5f53704 100644
--- a/src/commands/cmd_cut.cpp
+++ b/src/commands/cmd_cut.cpp
@@ -21,7 +21,6 @@
 #include "jinete/jbase.h"
 
 #include "commands/commands.h"
-#include "modules/sprites.h"
 #include "raster/layer.h"
 #include "raster/mask.h"
 #include "raster/sprite.h"
diff --git a/src/commands/cmd_deselect_mask.cpp b/src/commands/cmd_deselect_mask.cpp
index da0fa7285..5922f00f0 100644
--- a/src/commands/cmd_deselect_mask.cpp
+++ b/src/commands/cmd_deselect_mask.cpp
@@ -20,7 +20,6 @@
 
 #include "commands/commands.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/mask.h"
 #include "raster/sprite.h"
 #include "raster/undo.h"
diff --git a/src/commands/cmd_draw_text.cpp b/src/commands/cmd_draw_text.cpp
index 54a83a2c0..c73896a81 100644
--- a/src/commands/cmd_draw_text.cpp
+++ b/src/commands/cmd_draw_text.cpp
@@ -22,7 +22,6 @@
 
 #include "commands/commands.h"
 #include "core/app.h"
-#include "modules/sprites.h"
 #include "raster/sprite.h"
 
 /* static void cmd_draw_text_execute(const char *argument) */
diff --git a/src/commands/cmd_duplicate_layer.cpp b/src/commands/cmd_duplicate_layer.cpp
index c2126b13b..2ccf1b148 100644
--- a/src/commands/cmd_duplicate_layer.cpp
+++ b/src/commands/cmd_duplicate_layer.cpp
@@ -24,7 +24,6 @@
 #include "console.h"
 #include "core/app.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/layer.h"
 #include "raster/sprite.h"
 #include "raster/undo.h"
diff --git a/src/commands/cmd_duplicate_sprite.cpp b/src/commands/cmd_duplicate_sprite.cpp
index d99d5d257..717de2c65 100644
--- a/src/commands/cmd_duplicate_sprite.cpp
+++ b/src/commands/cmd_duplicate_sprite.cpp
@@ -27,7 +27,6 @@
 #include "core/app.h"
 #include "core/cfg.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/sprite.h"
 
 static bool cmd_duplicate_sprite_enabled(const char *argument)
diff --git a/src/commands/cmd_exit.cpp b/src/commands/cmd_exit.cpp
index 1d82a9fe2..c10acfa37 100644
--- a/src/commands/cmd_exit.cpp
+++ b/src/commands/cmd_exit.cpp
@@ -23,7 +23,6 @@
 #include "ui_context.h"
 #include "commands/commands.h"
 #include "core/app.h"
-#include "modules/sprites.h"
 #include "raster/sprite.h"
 
 static void cmd_exit_execute(const char *argument)
diff --git a/src/commands/cmd_eyedropper_tool.cpp b/src/commands/cmd_eyedropper_tool.cpp
index 26bc73972..373b65e8d 100644
--- a/src/commands/cmd_eyedropper_tool.cpp
+++ b/src/commands/cmd_eyedropper_tool.cpp
@@ -25,7 +25,6 @@
 #include "commands/commands.h"
 #include "core/app.h"
 #include "modules/editors.h"
-#include "modules/sprites.h"
 #include "raster/sprite.h"
 #include "raster/image.h"
 #include "widgets/colbar.h"
diff --git a/src/commands/cmd_film_editor.cpp b/src/commands/cmd_film_editor.cpp
index 6e3b3c67d..dc66e6571 100644
--- a/src/commands/cmd_film_editor.cpp
+++ b/src/commands/cmd_film_editor.cpp
@@ -21,7 +21,6 @@
 #include "jinete/jinete.h"
 
 #include "commands/commands.h"
-#include "modules/sprites.h"
 #include "dialogs/aniedit.h"
 
 static bool cmd_film_editor_enabled(const char *argument)
diff --git a/src/commands/cmd_flip.cpp b/src/commands/cmd_flip.cpp
index 30a870a14..a47a076e5 100644
--- a/src/commands/cmd_flip.cpp
+++ b/src/commands/cmd_flip.cpp
@@ -25,7 +25,6 @@
 #include "commands/commands.h"
 #include "modules/editors.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/cel.h"
 #include "raster/image.h"
 #include "raster/mask.h"
diff --git a/src/commands/cmd_frame_properties.cpp b/src/commands/cmd_frame_properties.cpp
index e664c096b..f43f6b1ec 100644
--- a/src/commands/cmd_frame_properties.cpp
+++ b/src/commands/cmd_frame_properties.cpp
@@ -22,7 +22,6 @@
 
 #include "commands/commands.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/sprite.h"
 #include "undoable.h"
 
diff --git a/src/commands/cmd_goto_frame.cpp b/src/commands/cmd_goto_frame.cpp
index b8abddc92..f27170bd1 100644
--- a/src/commands/cmd_goto_frame.cpp
+++ b/src/commands/cmd_goto_frame.cpp
@@ -21,7 +21,6 @@
 #include "commands/commands.h"
 #include "modules/gui.h"
 #include "modules/editors.h"
-#include "modules/sprites.h"
 #include "raster/sprite.h"
 #include "widgets/editor.h"
 
diff --git a/src/commands/cmd_goto_layer.cpp b/src/commands/cmd_goto_layer.cpp
index 6c00155d2..9303aa276 100644
--- a/src/commands/cmd_goto_layer.cpp
+++ b/src/commands/cmd_goto_layer.cpp
@@ -22,7 +22,6 @@
 #include "core/app.h"
 #include "modules/gui.h"
 #include "modules/editors.h"
-#include "modules/sprites.h"
 #include "raster/layer.h"
 #include "raster/sprite.h"
 #include "widgets/editor.h"
diff --git a/src/commands/cmd_invert_mask.cpp b/src/commands/cmd_invert_mask.cpp
index 8bfa2dd95..923cd8355 100644
--- a/src/commands/cmd_invert_mask.cpp
+++ b/src/commands/cmd_invert_mask.cpp
@@ -20,7 +20,6 @@
 
 #include "commands/commands.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/image.h"
 #include "raster/mask.h"
 #include "raster/sprite.h"
diff --git a/src/commands/cmd_layer_properties.cpp b/src/commands/cmd_layer_properties.cpp
index 1da01b292..1f6fabdfd 100644
--- a/src/commands/cmd_layer_properties.cpp
+++ b/src/commands/cmd_layer_properties.cpp
@@ -23,7 +23,6 @@
 #include "commands/commands.h"
 #include "core/app.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/layer.h"
 #include "raster/sprite.h"
 
diff --git a/src/commands/cmd_load_mask.cpp b/src/commands/cmd_load_mask.cpp
index b863b212e..a16abbc32 100644
--- a/src/commands/cmd_load_mask.cpp
+++ b/src/commands/cmd_load_mask.cpp
@@ -23,7 +23,6 @@
 #include "commands/commands.h"
 #include "dialogs/filesel.h"
 #include "modules/gui.h" 
-#include "modules/sprites.h"
 #include "raster/mask.h"
 #include "raster/sprite.h"
 #include "raster/undo.h"
diff --git a/src/commands/cmd_mask_all.cpp b/src/commands/cmd_mask_all.cpp
index d32672775..04a4e46dd 100644
--- a/src/commands/cmd_mask_all.cpp
+++ b/src/commands/cmd_mask_all.cpp
@@ -20,7 +20,6 @@
 
 #include "commands/commands.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/mask.h"
 #include "raster/sprite.h"
 #include "raster/undo.h"
diff --git a/src/commands/cmd_mask_by_color.cpp b/src/commands/cmd_mask_by_color.cpp
index eddeb99fc..337fcd24a 100644
--- a/src/commands/cmd_mask_by_color.cpp
+++ b/src/commands/cmd_mask_by_color.cpp
@@ -22,7 +22,6 @@
 
 #include "commands/commands.h"
 #include "dialogs/maskcol.h"
-#include "modules/sprites.h"
 
 static bool cmd_mask_by_color_enabled(const char *argument)
 {
diff --git a/src/commands/cmd_merge_down_layer.cpp b/src/commands/cmd_merge_down_layer.cpp
index 738cc61c4..d3376002d 100644
--- a/src/commands/cmd_merge_down_layer.cpp
+++ b/src/commands/cmd_merge_down_layer.cpp
@@ -23,7 +23,6 @@
 #include "commands/commands.h"
 #include "core/app.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/cel.h"
 #include "raster/image.h"
 #include "raster/layer.h"
diff --git a/src/commands/cmd_new_cel.cpp b/src/commands/cmd_new_cel.cpp
index 6288dd88b..de12741e2 100644
--- a/src/commands/cmd_new_cel.cpp
+++ b/src/commands/cmd_new_cel.cpp
@@ -24,7 +24,6 @@
 #include "console.h"
 #include "core/color.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/cel.h"
 #include "raster/image.h"
 #include "raster/layer.h"
diff --git a/src/commands/cmd_new_file.cpp b/src/commands/cmd_new_file.cpp
index 1b1a8ef28..3891575f3 100644
--- a/src/commands/cmd_new_file.cpp
+++ b/src/commands/cmd_new_file.cpp
@@ -31,7 +31,6 @@
 #include "core/cfg.h"
 #include "core/color.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/image.h"
 #include "raster/layer.h"
 #include "raster/sprite.h"
diff --git a/src/commands/cmd_new_frame.cpp b/src/commands/cmd_new_frame.cpp
index 4bd9dce4b..4ed1d5d41 100644
--- a/src/commands/cmd_new_frame.cpp
+++ b/src/commands/cmd_new_frame.cpp
@@ -26,7 +26,6 @@
 #include "core/color.h"
 #include "core/app.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/cel.h"
 #include "raster/image.h"
 #include "raster/layer.h"
diff --git a/src/commands/cmd_new_layer.cpp b/src/commands/cmd_new_layer.cpp
index 998fbb660..44f21e920 100644
--- a/src/commands/cmd_new_layer.cpp
+++ b/src/commands/cmd_new_layer.cpp
@@ -23,7 +23,6 @@
 #include "commands/commands.h"
 #include "core/app.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/layer.h"
 #include "raster/sprite.h"
 #include "undoable.h"
diff --git a/src/commands/cmd_new_layer_set.cpp b/src/commands/cmd_new_layer_set.cpp
index 681401fa5..52e6daf96 100644
--- a/src/commands/cmd_new_layer_set.cpp
+++ b/src/commands/cmd_new_layer_set.cpp
@@ -23,7 +23,6 @@
 #include "commands/commands.h"
 #include "core/app.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/layer.h"
 #include "raster/sprite.h"
 
diff --git a/src/commands/cmd_open_file.cpp b/src/commands/cmd_open_file.cpp
index d694d28ea..c30efa74f 100644
--- a/src/commands/cmd_open_file.cpp
+++ b/src/commands/cmd_open_file.cpp
@@ -33,7 +33,6 @@
 #include "modules/editors.h"
 #include "modules/gui.h"
 #include "modules/recent.h"
-#include "modules/sprites.h"
 #include "widgets/statebar.h"
 
 typedef struct OpenFileData
diff --git a/src/commands/cmd_palette_editor.cpp b/src/commands/cmd_palette_editor.cpp
index 55be78c54..ab81b9606 100644
--- a/src/commands/cmd_palette_editor.cpp
+++ b/src/commands/cmd_palette_editor.cpp
@@ -31,7 +31,6 @@
 #include "dialogs/filesel.h"
 #include "modules/gui.h"
 #include "modules/palettes.h"
-#include "modules/sprites.h"
 #include "raster/image.h"
 #include "raster/palette.h"
 #include "raster/sprite.h"
diff --git a/src/commands/cmd_paste.cpp b/src/commands/cmd_paste.cpp
index e233d5507..5c578db7b 100644
--- a/src/commands/cmd_paste.cpp
+++ b/src/commands/cmd_paste.cpp
@@ -19,7 +19,6 @@
 #include "config.h"
 
 #include "commands/commands.h"
-#include "modules/sprites.h"
 #include "raster/sprite.h"
 #include "raster/undo.h"
 #include "util/clipboard.h"
diff --git a/src/commands/cmd_play_animation.cpp b/src/commands/cmd_play_animation.cpp
index 3605bc950..37622b317 100644
--- a/src/commands/cmd_play_animation.cpp
+++ b/src/commands/cmd_play_animation.cpp
@@ -26,7 +26,6 @@
 #include "modules/editors.h"
 #include "modules/gui.h"
 #include "modules/palettes.h"
-#include "modules/sprites.h"
 #include "modules/tools.h"
 #include "raster/palette.h"
 #include "raster/sprite.h"
diff --git a/src/commands/cmd_play_flic.cpp b/src/commands/cmd_play_flic.cpp
index c3c08c8a4..b2bfa7cd9 100644
--- a/src/commands/cmd_play_flic.cpp
+++ b/src/commands/cmd_play_flic.cpp
@@ -22,7 +22,6 @@
 
 #include "commands/commands.h"
 #include "core/app.h"
-#include "modules/sprites.h"
 #include "raster/sprite.h"
 
 /* static void cmd_play_flic_execute(const char *argument) */
diff --git a/src/commands/cmd_preview.cpp b/src/commands/cmd_preview.cpp
index 36cea94a9..0bc980520 100644
--- a/src/commands/cmd_preview.cpp
+++ b/src/commands/cmd_preview.cpp
@@ -18,7 +18,6 @@
 
 #include "config.h"
 
-#include "modules/sprites.h"
 
 #include <allegro.h>
 
diff --git a/src/commands/cmd_redo.cpp b/src/commands/cmd_redo.cpp
index 65ac86ec1..4d96d9b7f 100644
--- a/src/commands/cmd_redo.cpp
+++ b/src/commands/cmd_redo.cpp
@@ -21,7 +21,6 @@
 #include "commands/commands.h"
 #include "core/app.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/sprite.h"
 #include "raster/undo.h"
 #include "widgets/statebar.h"
diff --git a/src/commands/cmd_remove_cel.cpp b/src/commands/cmd_remove_cel.cpp
index 83ffbac22..b9c592017 100644
--- a/src/commands/cmd_remove_cel.cpp
+++ b/src/commands/cmd_remove_cel.cpp
@@ -20,7 +20,6 @@
 
 #include "commands/commands.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/cel.h"
 #include "raster/layer.h"
 #include "raster/sprite.h"
diff --git a/src/commands/cmd_remove_frame.cpp b/src/commands/cmd_remove_frame.cpp
index 5083a2e6e..a42ac2e0f 100644
--- a/src/commands/cmd_remove_frame.cpp
+++ b/src/commands/cmd_remove_frame.cpp
@@ -22,7 +22,6 @@
 
 #include "commands/commands.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/sprite.h"
 #include "undoable.h"
 
diff --git a/src/commands/cmd_remove_layer.cpp b/src/commands/cmd_remove_layer.cpp
index 940da94d0..d7f9dd5d0 100644
--- a/src/commands/cmd_remove_layer.cpp
+++ b/src/commands/cmd_remove_layer.cpp
@@ -20,7 +20,6 @@
 
 #include "commands/commands.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/sprite.h"
 #include "raster/undo.h"
 #include "undoable.h"
diff --git a/src/commands/cmd_reselect_mask.cpp b/src/commands/cmd_reselect_mask.cpp
index bc82aaaf7..98a7dc938 100644
--- a/src/commands/cmd_reselect_mask.cpp
+++ b/src/commands/cmd_reselect_mask.cpp
@@ -20,7 +20,6 @@
 
 #include "commands/commands.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/mask.h"
 #include "raster/sprite.h"
 #include "raster/undo.h"
diff --git a/src/commands/cmd_rotate_canvas.cpp b/src/commands/cmd_rotate_canvas.cpp
index 04cac4a00..5e34ecf03 100644
--- a/src/commands/cmd_rotate_canvas.cpp
+++ b/src/commands/cmd_rotate_canvas.cpp
@@ -26,7 +26,6 @@
 #include "core/app.h"
 #include "core/job.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/cel.h"
 #include "raster/image.h"
 #include "raster/mask.h"
diff --git a/src/commands/cmd_save_file.cpp b/src/commands/cmd_save_file.cpp
index 5289779a6..9f4c8a9d1 100644
--- a/src/commands/cmd_save_file.cpp
+++ b/src/commands/cmd_save_file.cpp
@@ -29,7 +29,6 @@
 #include "file/file.h"
 #include "modules/gui.h"
 #include "modules/recent.h"
-#include "modules/sprites.h"
 #include "raster/sprite.h"
 #include "widgets/statebar.h"
 
diff --git a/src/commands/cmd_save_mask.cpp b/src/commands/cmd_save_mask.cpp
index d16fa1871..20d5773c8 100644
--- a/src/commands/cmd_save_mask.cpp
+++ b/src/commands/cmd_save_mask.cpp
@@ -24,7 +24,6 @@
 
 #include "commands/commands.h"
 #include "dialogs/filesel.h"
-#include "modules/sprites.h"
 #include "raster/mask.h"
 #include "raster/sprite.h"
 #include "util/msk_file.h"
diff --git a/src/commands/cmd_select_file.cpp b/src/commands/cmd_select_file.cpp
index 73fb911e0..c644a9d2b 100644
--- a/src/commands/cmd_select_file.cpp
+++ b/src/commands/cmd_select_file.cpp
@@ -27,7 +27,6 @@
 #include "ui_context.h"
 #include "commands/commands.h"
 #include "core/app.h"
-#include "modules/sprites.h"
 #include "raster/sprite.h"
 
 static bool cmd_select_file_enabled(const char *argument)
diff --git a/src/commands/cmd_sprite_properties.cpp b/src/commands/cmd_sprite_properties.cpp
index ae3c66be6..e0cd76a00 100644
--- a/src/commands/cmd_sprite_properties.cpp
+++ b/src/commands/cmd_sprite_properties.cpp
@@ -26,7 +26,6 @@
 #include "core/core.h"
 #include "core/color.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/image.h"
 #include "raster/sprite.h"
 #include "widgets/colbut.h"
diff --git a/src/commands/cmd_sprite_size.cpp b/src/commands/cmd_sprite_size.cpp
index a05d87df8..2d1b29d53 100644
--- a/src/commands/cmd_sprite_size.cpp
+++ b/src/commands/cmd_sprite_size.cpp
@@ -27,7 +27,6 @@
 #include "commands/commands.h"
 #include "modules/gui.h"
 #include "modules/palettes.h"
-#include "modules/sprites.h"
 #include "raster/cel.h"
 #include "raster/image.h"
 #include "raster/mask.h"
diff --git a/src/commands/cmd_undo.cpp b/src/commands/cmd_undo.cpp
index 8c73153bf..dbdff1ae7 100644
--- a/src/commands/cmd_undo.cpp
+++ b/src/commands/cmd_undo.cpp
@@ -21,7 +21,6 @@
 #include "commands/commands.h"
 #include "core/app.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/sprite.h"
 #include "raster/undo.h"
 #include "widgets/statebar.h"
diff --git a/src/commands/fx/cmd_color_curve.cpp b/src/commands/fx/cmd_color_curve.cpp
index b568b55cd..1e46eb430 100644
--- a/src/commands/fx/cmd_color_curve.cpp
+++ b/src/commands/fx/cmd_color_curve.cpp
@@ -30,7 +30,6 @@
 #include "effect/colcurve.h"
 #include "effect/effect.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/mask.h"
 #include "raster/sprite.h"
 #include "util/misc.h"
diff --git a/src/commands/fx/cmd_convolution_matrix.cpp b/src/commands/fx/cmd_convolution_matrix.cpp
index f871a63ef..cb6c36391 100644
--- a/src/commands/fx/cmd_convolution_matrix.cpp
+++ b/src/commands/fx/cmd_convolution_matrix.cpp
@@ -41,7 +41,6 @@
 #include "effect/convmatr.h"
 #include "effect/effect.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "modules/tools.h"
 #include "raster/mask.h"
 #include "raster/sprite.h"
diff --git a/src/commands/fx/cmd_despeckle.cpp b/src/commands/fx/cmd_despeckle.cpp
index 1cf072d7c..e787afac7 100644
--- a/src/commands/fx/cmd_despeckle.cpp
+++ b/src/commands/fx/cmd_despeckle.cpp
@@ -35,7 +35,6 @@
 #include "effect/effect.h"
 #include "effect/median.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "modules/tools.h"
 #include "raster/mask.h"
 #include "raster/sprite.h"
diff --git a/src/commands/fx/cmd_invert_color.cpp b/src/commands/fx/cmd_invert_color.cpp
index f90300320..0b246e599 100644
--- a/src/commands/fx/cmd_invert_color.cpp
+++ b/src/commands/fx/cmd_invert_color.cpp
@@ -34,7 +34,6 @@
 #include "core/core.h"
 #include "effect/effect.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/image.h"
 #include "raster/mask.h"
 #include "raster/sprite.h"
diff --git a/src/commands/fx/cmd_replace_color.cpp b/src/commands/fx/cmd_replace_color.cpp
index 43b9e7caf..0bd246e32 100644
--- a/src/commands/fx/cmd_replace_color.cpp
+++ b/src/commands/fx/cmd_replace_color.cpp
@@ -32,7 +32,6 @@
 #include "effect/effect.h"
 #include "effect/replcol.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/image.h"
 #include "raster/mask.h"
 #include "raster/sprite.h"
diff --git a/src/commands/fx/effectbg.cpp b/src/commands/fx/effectbg.cpp
index 49b3db536..2f1c5f63b 100644
--- a/src/commands/fx/effectbg.cpp
+++ b/src/commands/fx/effectbg.cpp
@@ -28,7 +28,6 @@
 #include "effect/effect.h"
 #include "modules/editors.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/sprite.h"
 #include "widgets/editor.h"
 #include "widgets/statebar.h"
diff --git a/src/core/app.cpp b/src/core/app.cpp
index ae11679e6..686c683ff 100644
--- a/src/core/app.cpp
+++ b/src/core/app.cpp
@@ -50,7 +50,6 @@
 #include "modules/palettes.h"
 #include "modules/recent.h"
 #include "modules/rootmenu.h"
-#include "modules/sprites.h"
 #include "raster/image.h"
 #include "raster/layer.h"
 #include "raster/palette.h"
diff --git a/src/dialogs/aniedit.cpp b/src/dialogs/aniedit.cpp
index 9e6b926b1..cdd8f253e 100644
--- a/src/dialogs/aniedit.cpp
+++ b/src/dialogs/aniedit.cpp
@@ -32,7 +32,6 @@
 #include "modules/gui.h"
 /* #include "modules/palettes.h" */
 #include "modules/rootmenu.h"
-#include "modules/sprites.h"
 #include "raster/raster.h"
 #include "undoable.h"
 #include "util/celmove.h"
diff --git a/src/dialogs/drawtext.cpp b/src/dialogs/drawtext.cpp
index 7f34ac97c..b3a23093b 100644
--- a/src/dialogs/drawtext.cpp
+++ b/src/dialogs/drawtext.cpp
@@ -31,7 +31,6 @@
 #include "dialogs/filesel.h"
 #include "modules/gui.h"
 #include "modules/palettes.h"
-#include "modules/sprites.h"
 #include "raster/blend.h"
 #include "raster/image.h"
 #include "raster/sprite.h"
diff --git a/src/dialogs/maskcol.cpp b/src/dialogs/maskcol.cpp
index 2162f1a72..1d630f32e 100644
--- a/src/dialogs/maskcol.cpp
+++ b/src/dialogs/maskcol.cpp
@@ -32,7 +32,6 @@
 #include "core/core.h"
 #include "modules/editors.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/image.h"
 #include "raster/mask.h"
 #include "raster/sprite.h"
diff --git a/src/dialogs/vectmap.cpp b/src/dialogs/vectmap.cpp
index 542d16007..c48f57701 100644
--- a/src/dialogs/vectmap.cpp
+++ b/src/dialogs/vectmap.cpp
@@ -23,7 +23,6 @@
 
 #include "core/core.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/image.h"
 #include "raster/sprite.h"
 #include "raster/undo.h"
diff --git a/src/effect/effect.cpp b/src/effect/effect.cpp
index dbe0608d2..7ecc301bc 100644
--- a/src/effect/effect.cpp
+++ b/src/effect/effect.cpp
@@ -35,8 +35,8 @@
 #include "effect/invrtcol.h"
 #include "effect/median.h"
 #include "effect/replcol.h"
+#include "effect/images_ref.h"
 #include "modules/editors.h"
-#include "modules/sprites.h"
 #include "raster/cel.h"
 #include "raster/image.h"
 #include "raster/layer.h"
diff --git a/src/modules/sprites.cpp b/src/effect/images_ref.cpp
similarity index 81%
rename from src/modules/sprites.cpp
rename to src/effect/images_ref.cpp
index 4e42d07a1..da7a216bd 100644
--- a/src/modules/sprites.cpp
+++ b/src/effect/images_ref.cpp
@@ -22,22 +22,20 @@
 
 #include "jinete/jlist.h"
 
-#include "ui_context.h"
 #include "effect/effect.h"
-#include "modules/sprites.h"
+#include "effect/images_ref.h"
 #include "raster/cel.h"
 #include "raster/image.h"
 #include "raster/layer.h"
 #include "raster/mask.h"
 #include "raster/sprite.h"
 #include "raster/stock.h"
-#include "util/misc.h"
 
-static ImageRef *images_ref_get_from_layer(Sprite* sprite, Layer *layer, int target, bool write);
+static ImageRef* images_ref_get_from_layer(Sprite* sprite, Layer* layer, int target, bool write);
 
-ImageRef *images_ref_get_from_sprite(Sprite* sprite, int target, bool write)
+ImageRef* images_ref_get_from_sprite(Sprite* sprite, int target, bool write)
 {
-  Layer *layer = target & TARGET_ALL_LAYERS ? sprite->set:
+  Layer* layer = target & TARGET_ALL_LAYERS ? sprite->set:
 					      sprite->layer;
 
   return images_ref_get_from_layer(sprite, layer, target, write);
@@ -53,7 +51,7 @@ void images_ref_free(ImageRef* image_ref)
   }
 }
 
-static ImageRef *images_ref_get_from_layer(Sprite* sprite, Layer *layer, int target, bool write)
+static ImageRef* images_ref_get_from_layer(Sprite* sprite, Layer* layer, int target, bool write)
 {
 #define ADD_IMAGES(images)			\
   {						\
@@ -72,7 +70,7 @@ static ImageRef *images_ref_get_from_layer(Sprite* sprite, Layer *layer, int tar
 
 #define NEW_IMAGE(layer, cel)					\
   {								\
-    ImageRef *image_ref = jnew(ImageRef, 1);			\
+    ImageRef* image_ref = jnew(ImageRef, 1);			\
 								\
     image_ref->image = layer->sprite->stock->image[cel->image];	\
     image_ref->layer = layer;					\
@@ -82,8 +80,8 @@ static ImageRef *images_ref_get_from_layer(Sprite* sprite, Layer *layer, int tar
     ADD_IMAGES(image_ref);					\
   }
   
-  ImageRef *first_image = NULL;
-  ImageRef *last_image = NULL;
+  ImageRef* first_image = NULL;
+  ImageRef* last_image = NULL;
   int frame = sprite->frame;
 
   if (!layer_is_readable(layer))
@@ -97,13 +95,13 @@ static ImageRef *images_ref_get_from_layer(Sprite* sprite, Layer *layer, int tar
     case GFXOBJ_LAYER_IMAGE: {
       if (target & TARGET_ALL_FRAMES) {
 	for (frame=0; frame<sprite->frames; frame++) {
-	  Cel *cel = layer_get_cel(layer, frame);
+	  Cel* cel = layer_get_cel(layer, frame);
 	  if (cel != NULL)
 	    NEW_IMAGE(layer, cel);
 	}
       }
       else {
-	Cel *cel = layer_get_cel(layer, frame);
+	Cel* cel = layer_get_cel(layer, frame);
 	if (cel != NULL)
 	  NEW_IMAGE(layer, cel);
       }
@@ -111,7 +109,7 @@ static ImageRef *images_ref_get_from_layer(Sprite* sprite, Layer *layer, int tar
     }
 
     case GFXOBJ_LAYER_SET: {
-      ImageRef *sub_images;
+      ImageRef* sub_images;
       JLink link;
 
       JI_LIST_FOR_EACH(layer->layers, link) {
diff --git a/src/modules/sprites.h b/src/effect/images_ref.h
similarity index 93%
rename from src/modules/sprites.h
rename to src/effect/images_ref.h
index 206b17cdb..a7de6d5e8 100644
--- a/src/modules/sprites.h
+++ b/src/effect/images_ref.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef MODULES_SPRITES_H_INCLUDED
-#define MODULES_SPRITES_H_INCLUDED
+#ifndef EFFECT_IMAGES_REF_H_INCLUDED
+#define EFFECT_IMAGES_REF_H_INCLUDED
 
 class Sprite;
 class Image;
diff --git a/src/modules/editors.cpp b/src/modules/editors.cpp
index 0d72afea8..f76347211 100644
--- a/src/modules/editors.cpp
+++ b/src/modules/editors.cpp
@@ -26,7 +26,6 @@
 #include "modules/editors.h"
 #include "modules/gui.h"
 #include "modules/palettes.h"
-#include "modules/sprites.h"
 #include "raster/image.h"
 #include "raster/sprite.h"
 #include "util/misc.h"
diff --git a/src/modules/gui.cpp b/src/modules/gui.cpp
index cd1542ddc..cef2bf494 100644
--- a/src/modules/gui.cpp
+++ b/src/modules/gui.cpp
@@ -47,7 +47,6 @@
 #include "modules/gui.h"
 #include "modules/palettes.h"
 #include "modules/rootmenu.h"
-#include "modules/sprites.h"
 #include "modules/tools.h"
 #include "raster/sprite.h"
 #include "util/recscr.h"
diff --git a/src/modules/tools.cpp b/src/modules/tools.cpp
index 8a318cd32..496a17ab8 100644
--- a/src/modules/tools.cpp
+++ b/src/modules/tools.cpp
@@ -40,7 +40,6 @@
 #include "modules/gfx.h"
 #include "modules/gui.h"
 #include "modules/palettes.h"
-#include "modules/sprites.h"
 #include "modules/tools.h"
 #include "raster/raster.h"
 #include "util/misc.h"
diff --git a/src/util/celmove.cpp b/src/util/celmove.cpp
index 683d8c6ef..54241a457 100644
--- a/src/util/celmove.cpp
+++ b/src/util/celmove.cpp
@@ -27,7 +27,6 @@
 #include "core/color.h"
 #include "core/core.h"
 #include "modules/gui.h"
-#include "modules/sprites.h"
 #include "raster/blend.h"
 #include "raster/cel.h"
 #include "raster/image.h"
diff --git a/src/util/clipboard.cpp b/src/util/clipboard.cpp
index 10bb0953b..544e13bdd 100644
--- a/src/util/clipboard.cpp
+++ b/src/util/clipboard.cpp
@@ -32,7 +32,6 @@
 #include "modules/gfx.h"
 #include "modules/gui.h"
 #include "modules/palettes.h"
-#include "modules/sprites.h"
 #include "modules/tools.h"
 #include "raster/cel.h"
 #include "raster/image.h"
diff --git a/src/util/misc.cpp b/src/util/misc.cpp
index ad0c9f673..edc54d7ea 100644
--- a/src/util/misc.cpp
+++ b/src/util/misc.cpp
@@ -34,7 +34,6 @@
 #include "modules/editors.h"
 #include "modules/gui.h"
 #include "modules/palettes.h"
-#include "modules/sprites.h"
 #include "raster/raster.h"
 #include "util/misc.h"
 #include "widgets/editor.h"
diff --git a/src/util/quantize.cpp b/src/util/quantize.cpp
index 9c9e88dc2..c8181fa70 100644
--- a/src/util/quantize.cpp
+++ b/src/util/quantize.cpp
@@ -22,7 +22,7 @@
 
 #include "console.h"
 #include "effect/effect.h"
-#include "modules/sprites.h"
+#include "effect/images_ref.h"
 #include "raster/image.h"
 #include "raster/palette.h"
 #include "raster/sprite.h"
diff --git a/src/widgets/colbar.cpp b/src/widgets/colbar.cpp
index 70a8b2f8a..46060bd84 100644
--- a/src/widgets/colbar.cpp
+++ b/src/widgets/colbar.cpp
@@ -32,7 +32,6 @@
 #include "modules/gfx.h"
 #include "modules/gui.h"
 #include "modules/palettes.h"
-#include "modules/sprites.h"
 #include "raster/image.h"
 #include "raster/palette.h"
 #include "raster/sprite.h"
diff --git a/src/widgets/editor/editor.cpp b/src/widgets/editor/editor.cpp
index e00430c74..e38f1b360 100644
--- a/src/widgets/editor/editor.cpp
+++ b/src/widgets/editor/editor.cpp
@@ -35,7 +35,6 @@
 #include "modules/gfx.h"
 #include "modules/gui.h"
 #include "modules/palettes.h"
-#include "modules/sprites.h"
 #include "modules/tools.h"
 #include "raster/brush.h"
 #include "raster/image.h"
diff --git a/src/widgets/fileview.cpp b/src/widgets/fileview.cpp
index 28a5b6733..e686110c5 100644
--- a/src/widgets/fileview.cpp
+++ b/src/widgets/fileview.cpp
@@ -34,7 +34,6 @@
 #include "modules/gui.h"
 #include "modules/palettes.h"
 #include "modules/recent.h"
-#include "modules/sprites.h"
 #include "raster/image.h"
 #include "raster/palette.h"
 #include "raster/rotate.h"
diff --git a/src/widgets/statebar.cpp b/src/widgets/statebar.cpp
index 000855218..15dceb1d7 100644
--- a/src/widgets/statebar.cpp
+++ b/src/widgets/statebar.cpp
@@ -31,7 +31,6 @@
 #include "modules/gfx.h"
 #include "modules/gui.h"
 #include "modules/palettes.h"
-#include "modules/sprites.h"
 #include "raster/cel.h"
 #include "raster/layer.h"
 #include "raster/sprite.h"