[Scummvm-git-logs] scummvm master -> 5219c9940089099f6b5b5558f27ac706c7ee1305
bluegr
noreply at scummvm.org
Tue Mar 12 10:24:06 UTC 2024
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
5219c99400 GRAPHICS: Move PaletteManager definition to a separate header
Commit: 5219c9940089099f6b5b5558f27ac706c7ee1305
https://github.com/scummvm/scummvm/commit/5219c9940089099f6b5b5558f27ac706c7ee1305
Author: Matthew Jimenez (matthew.jimenez at outlook.com)
Date: 2024-03-12T12:24:00+02:00
Commit Message:
GRAPHICS: Move PaletteManager definition to a separate header
Changed paths:
A graphics/paletteman.h
audio/softsynth/mt32.cpp
backends/graphics/default-palette.h
backends/graphics/graphics.h
backends/platform/3ds/osystem.h
backends/platform/dc/dc.h
backends/platform/ds/osystem_ds.h
backends/platform/libretro/include/libretro-os.h
backends/platform/n64/osys_n64.h
backends/platform/psp/osys_psp.h
backends/platform/wii/osystem.h
engines/access/data.cpp
engines/access/screen.cpp
engines/access/video/movie_decoder.cpp
engines/adl/adl.cpp
engines/adl/display_a2.cpp
engines/agi/graphics.cpp
engines/agos/animation.cpp
engines/agos/draw.cpp
engines/agos/script_s1.cpp
engines/agos/vga_e2.cpp
engines/agos/vga_ww.cpp
engines/ags/lib/allegro/color.cpp
engines/asylum/system/screen.cpp
engines/asylum/system/screen.h
engines/avalanche/avalot.cpp
engines/avalanche/graphics.cpp
engines/bbvs/bbvs.cpp
engines/bbvs/graphics.cpp
engines/bbvs/graphics.h
engines/bbvs/videoplayer.cpp
engines/buried/graphics.cpp
engines/cge/cge_main.cpp
engines/cge/vga13h.cpp
engines/cge2/saveload.cpp
engines/cge2/vga13h.cpp
engines/chamber/cga.cpp
engines/chewy/mcga_graphics.cpp
engines/chewy/video/cfo_decoder.cpp
engines/chewy/video/video_player.cpp
engines/cine/cine.cpp
engines/cine/pal.cpp
engines/composer/graphics.cpp
engines/composer/saveload.cpp
engines/crab/crab.cpp
engines/cruise/gfxModule.cpp
engines/cryo/cryo.cpp
engines/cryo/cryolib.cpp
engines/cryo/eden_graphics.cpp
engines/cryomni3d/cryomni3d.cpp
engines/cryomni3d/versailles/menus.cpp
engines/director/castmember/digitalvideo.cpp
engines/director/graphics.cpp
engines/director/lingo/xlibs/batqt.cpp
engines/director/lingo/xlibs/moovxobj.cpp
engines/dm/dm.cpp
engines/dm/gfx.cpp
engines/draci/screen.cpp
engines/drascula/palette.cpp
engines/dreamweb/dreamweb.cpp
engines/efh/graphics.cpp
engines/efh/savegames.cpp
engines/gob/util.cpp
engines/gob/video.cpp
engines/groovie/debug.cpp
engines/groovie/graphics.cpp
engines/groovie/video/roq.cpp
engines/groovie/video/vdx.cpp
engines/hadesch/gfx_context.cpp
engines/hadesch/hadesch.cpp
engines/hopkins/anim.cpp
engines/hopkins/graphics.cpp
engines/hopkins/objects.cpp
engines/hopkins/script.cpp
engines/hugo/display.cpp
engines/hypno/hypno.cpp
engines/hypno/hypno.h
engines/illusions/bbdou/illusions_bbdou.cpp
engines/illusions/duckman/illusions_duckman.cpp
engines/illusions/illusions.cpp
engines/illusions/screen.cpp
engines/illusions/screentext.cpp
engines/immortal/immortal.h
engines/immortal/kernal.cpp
engines/kingdom/kingdom.cpp
engines/kyra/graphics/screen.cpp
engines/kyra/graphics/screen_eob.cpp
engines/kyra/graphics/screen_lok.cpp
engines/kyra/graphics/screen_lol.cpp
engines/kyra/graphics/vqa.cpp
engines/lab/dispman.cpp
engines/lilliput/lilliput.cpp
engines/lilliput/lilliput.h
engines/lure/screen.cpp
engines/m4/graphics/gr_pal.cpp
engines/m4/m4.cpp
engines/made/screen.cpp
engines/mads/game.cpp
engines/mads/palette.cpp
engines/mads/sprites.cpp
engines/metaengine.cpp
engines/mm/mm1/gfx/gfx.cpp
engines/mm/mm1/gfx/gfx.h
engines/mm/mm1/gfx/screen_decoder.cpp
engines/mm/mm1/mm1.cpp
engines/mm/shared/xeen/sprites.cpp
engines/mm/xeen/screen.cpp
engines/mohawk/graphics.cpp
engines/mohawk/livingbooks.cpp
engines/mohawk/livingbooks_graphics.cpp
engines/mohawk/myst_graphics.cpp
engines/mohawk/video.cpp
engines/mohawk/view.cpp
engines/mortevielle/graphics.cpp
engines/mortevielle/mortevielle.cpp
engines/mortevielle/saveload.cpp
engines/mortevielle/saveload.h
engines/mtropolis/modifiers.cpp
engines/mtropolis/mtropolis.cpp
engines/mtropolis/runtime.cpp
engines/neverhood/screen.cpp
engines/neverhood/smackerplayer.cpp
engines/ngi/modal.cpp
engines/parallaction/graphics.cpp
engines/pink/objects/actions/action_text.cpp
engines/pink/screen.cpp
engines/plumbers/3do.cpp
engines/plumbers/plumbers.cpp
engines/plumbers/windows.cpp
engines/prince/draw.cpp
engines/prince/graphics.cpp
engines/prince/saveload.cpp
engines/prince/videoplayer.cpp
engines/private/private.cpp
engines/private/private.h
engines/queen/display.cpp
engines/saga/gfx.cpp
engines/saga2/console.cpp
engines/saga2/loadmsg.cpp
engines/saga2/video.cpp
engines/saga2/vpal.cpp
engines/sci/engine/kvideo.cpp
engines/sci/graphics/frameout.cpp
engines/sci/graphics/palette32.cpp
engines/sci/graphics/screen.cpp
engines/sci/graphics/transitions.cpp
engines/sci/graphics/video32.cpp
engines/scumm/he/cup_player_he.cpp
engines/scumm/he/palette_he.cpp
engines/scumm/macgui/macgui_impl.cpp
engines/scumm/palette.cpp
engines/scumm/smush/smush_player.cpp
engines/sherlock/screen.cpp
engines/sky/screen.cpp
engines/startrek/graphics.cpp
engines/supernova/game-manager.cpp
engines/supernova/graphics.cpp
engines/supernova/resman.cpp
engines/supernova/room.cpp
engines/supernova/screen.cpp
engines/supernova/supernova.cpp
engines/supernova/supernova1/rooms.cpp
engines/supernova/supernova1/state.cpp
engines/supernova/supernova2/rooms.cpp
engines/supernova/supernova2/state.cpp
engines/sword1/animation.cpp
engines/sword1/control.cpp
engines/sword1/screen.cpp
engines/sword2/animation.cpp
engines/sword2/palette.cpp
engines/teenagent/scene.cpp
engines/teenagent/teenagent.cpp
engines/testbed/graphics.cpp
engines/testbed/video.cpp
engines/tetraedge/tetraedge.cpp
engines/tinsel/palette.cpp
engines/toltecs/palette.cpp
engines/toon/movie.cpp
engines/toon/toon.cpp
engines/touche/touche.cpp
engines/tsage/core.cpp
engines/tsage/graphics.cpp
engines/tsage/saveload.cpp
engines/tucker/locations.cpp
engines/tucker/sequences.cpp
engines/tucker/tucker.cpp
engines/voyeur/events.cpp
engines/voyeur/screen.cpp
engines/voyeur/voyeur.cpp
engines/wage/gui.h
graphics/macgui/macwindow.h
graphics/macgui/macwindowmanager.cpp
graphics/macgui/macwindowmanager.h
graphics/palette.h
graphics/scaler/thumbnail_intern.cpp
graphics/screen.cpp
gui/options.cpp
video/3do_decoder.cpp
video/mve_decoder.cpp
video/video_decoder.cpp
diff --git a/audio/softsynth/mt32.cpp b/audio/softsynth/mt32.cpp
index 29400398817..1250ac0a24d 100644
--- a/audio/softsynth/mt32.cpp
+++ b/audio/softsynth/mt32.cpp
@@ -43,7 +43,6 @@
#include "graphics/fontman.h"
#include "graphics/surface.h"
#include "graphics/pixelformat.h"
-#include "graphics/palette.h"
#include "graphics/font.h"
#include "gui/message.h"
diff --git a/backends/graphics/default-palette.h b/backends/graphics/default-palette.h
index 1188d10ea3a..b986340babf 100644
--- a/backends/graphics/default-palette.h
+++ b/backends/graphics/default-palette.h
@@ -22,7 +22,7 @@
#ifndef BACKENDS_GRAPHICS_DEFAULT_PALETTE_H
#define BACKENDS_GRAPHICS_DEFAULT_PALETTE_H
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
/**
* This is a default implementation of the PaletteManager interface
diff --git a/backends/graphics/graphics.h b/backends/graphics/graphics.h
index d73fa98f037..2a060e67000 100644
--- a/backends/graphics/graphics.h
+++ b/backends/graphics/graphics.h
@@ -27,7 +27,7 @@
#include "common/keyboard.h"
#include "graphics/mode.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
/**
* Abstract class for graphics manager. Subclasses
diff --git a/backends/platform/3ds/osystem.h b/backends/platform/3ds/osystem.h
index 137bc302846..dc0bb43f0e5 100644
--- a/backends/platform/3ds/osystem.h
+++ b/backends/platform/3ds/osystem.h
@@ -25,7 +25,7 @@
#define FORBIDDEN_SYMBOL_EXCEPTION_time_h
#include "backends/base-backend.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "base/main.h"
#include "audio/mixer_intern.h"
#include "backends/graphics/graphics.h"
diff --git a/backends/platform/dc/dc.h b/backends/platform/dc/dc.h
index a8b4a0ce3dd..dd3b23c937e 100644
--- a/backends/platform/dc/dc.h
+++ b/backends/platform/dc/dc.h
@@ -21,7 +21,7 @@
#include "backends/base-backend.h"
#include <graphics/surface.h>
-#include <graphics/palette.h>
+#include <graphics/paletteman.h>
#include <ronin/soundcommon.h>
#include "backends/timer/default/default-timer.h"
#include "backends/audiocd/default/default-audiocd.h"
diff --git a/backends/platform/ds/osystem_ds.h b/backends/platform/ds/osystem_ds.h
index 9430789a72b..093ee713b3a 100644
--- a/backends/platform/ds/osystem_ds.h
+++ b/backends/platform/ds/osystem_ds.h
@@ -29,7 +29,7 @@
#include "backends/platform/ds/background.h"
#include "backends/platform/ds/keyboard.h"
#include "graphics/surface.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
enum {
GFX_NOSCALE = 0,
diff --git a/backends/platform/libretro/include/libretro-os.h b/backends/platform/libretro/include/libretro-os.h
index d9891b9244b..3504d0932d5 100644
--- a/backends/platform/libretro/include/libretro-os.h
+++ b/backends/platform/libretro/include/libretro-os.h
@@ -24,7 +24,7 @@
#include "common/mutex.h"
#include "common/list.h"
#include "common/events.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "graphics/surface.h"
#define BASE_CURSOR_SPEED 4
diff --git a/backends/platform/n64/osys_n64.h b/backends/platform/n64/osys_n64.h
index b05c1cf2135..1107ebcd045 100644
--- a/backends/platform/n64/osys_n64.h
+++ b/backends/platform/n64/osys_n64.h
@@ -30,7 +30,7 @@
#include "base/main.h"
#include "graphics/surface.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "graphics/pixelformat.h"
#include "audio/mixer_intern.h"
diff --git a/backends/platform/psp/osys_psp.h b/backends/platform/psp/osys_psp.h
index 57fc4cf51b4..abf9d978be5 100644
--- a/backends/platform/psp/osys_psp.h
+++ b/backends/platform/psp/osys_psp.h
@@ -24,7 +24,7 @@
#include "common/scummsys.h"
#include "graphics/surface.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "audio/mixer_intern.h"
#include "backends/base-backend.h"
#include "backends/fs/psp/psp-fs-factory.h"
diff --git a/backends/platform/wii/osystem.h b/backends/platform/wii/osystem.h
index 4c568539940..6c1432d0746 100644
--- a/backends/platform/wii/osystem.h
+++ b/backends/platform/wii/osystem.h
@@ -32,7 +32,7 @@
#include "common/rect.h"
#include "common/events.h"
#include "backends/base-backend.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "graphics/surface.h"
#include "audio/mixer_intern.h"
diff --git a/engines/access/data.cpp b/engines/access/data.cpp
index 29ceb70c1fb..e181bb83b86 100644
--- a/engines/access/data.cpp
+++ b/engines/access/data.cpp
@@ -22,7 +22,6 @@
#include "common/algorithm.h"
#include "common/stream.h"
#include "common/system.h"
-#include "graphics/palette.h"
#include "access/data.h"
namespace Access {
diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
index da4e958f5f8..5e19ce2f415 100644
--- a/engines/access/screen.cpp
+++ b/engines/access/screen.cpp
@@ -24,7 +24,7 @@
#include "common/rect.h"
#include "common/textconsole.h"
#include "common/system.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "access/access.h"
#include "access/screen.h"
#include "access/resources.h"
diff --git a/engines/access/video/movie_decoder.cpp b/engines/access/video/movie_decoder.cpp
index b760eb8586e..a64b0559c9a 100644
--- a/engines/access/video/movie_decoder.cpp
+++ b/engines/access/video/movie_decoder.cpp
@@ -35,7 +35,7 @@
#include "common/keyboard.h"
#include "engines/engine.h"
#include "engines/util.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "graphics/pixelformat.h"
#include "graphics/surface.h"
diff --git a/engines/adl/adl.cpp b/engines/adl/adl.cpp
index db900c8301c..e0c9b77c60a 100644
--- a/engines/adl/adl.cpp
+++ b/engines/adl/adl.cpp
@@ -32,7 +32,6 @@
#include "engines/util.h"
-#include "graphics/palette.h"
#include "graphics/thumbnail.h"
#include "adl/adl.h"
diff --git a/engines/adl/display_a2.cpp b/engines/adl/display_a2.cpp
index e63d8f68388..31596a79fb2 100644
--- a/engines/adl/display_a2.cpp
+++ b/engines/adl/display_a2.cpp
@@ -33,7 +33,6 @@
#include "common/memstream.h"
#include "graphics/surface.h"
-#include "graphics/palette.h"
#include "graphics/thumbnail.h"
#include "engines/util.h"
diff --git a/engines/agi/graphics.cpp b/engines/agi/graphics.cpp
index 26cc7a70ca4..867cd048b0c 100644
--- a/engines/agi/graphics.cpp
+++ b/engines/agi/graphics.cpp
@@ -25,7 +25,7 @@
#include "engines/util.h"
#include "graphics/cursorman.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "agi/agi.h"
#include "agi/graphics.h"
diff --git a/engines/agos/animation.cpp b/engines/agos/animation.cpp
index d0befbff2d4..6a762ad86c2 100644
--- a/engines/agos/animation.cpp
+++ b/engines/agos/animation.cpp
@@ -31,7 +31,7 @@
#include "common/translation.h"
#include "graphics/cursorman.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "graphics/surface.h"
#include "agos/animation.h"
diff --git a/engines/agos/draw.cpp b/engines/agos/draw.cpp
index d8eb82ccaf5..944797f9484 100644
--- a/engines/agos/draw.cpp
+++ b/engines/agos/draw.cpp
@@ -23,7 +23,7 @@
#include "common/system.h"
#include "graphics/surface.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "agos/agos.h"
#include "agos/intern.h"
diff --git a/engines/agos/script_s1.cpp b/engines/agos/script_s1.cpp
index aacfb565c53..a1d7030b80b 100644
--- a/engines/agos/script_s1.cpp
+++ b/engines/agos/script_s1.cpp
@@ -22,7 +22,7 @@
#include "common/system.h"
#include "common/localization.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "agos/agos.h"
#include "agos/intern.h"
diff --git a/engines/agos/vga_e2.cpp b/engines/agos/vga_e2.cpp
index 496d09b0402..fe7e11fbace 100644
--- a/engines/agos/vga_e2.cpp
+++ b/engines/agos/vga_e2.cpp
@@ -30,7 +30,7 @@
#include "common/system.h"
#include "graphics/surface.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
namespace AGOS {
diff --git a/engines/agos/vga_ww.cpp b/engines/agos/vga_ww.cpp
index 15077160c85..b228ea3790e 100644
--- a/engines/agos/vga_ww.cpp
+++ b/engines/agos/vga_ww.cpp
@@ -29,7 +29,7 @@
#include "common/system.h"
#include "graphics/surface.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
namespace AGOS {
diff --git a/engines/ags/lib/allegro/color.cpp b/engines/ags/lib/allegro/color.cpp
index 08057e6480e..f9e98c90439 100644
--- a/engines/ags/lib/allegro/color.cpp
+++ b/engines/ags/lib/allegro/color.cpp
@@ -27,7 +27,7 @@
#include "ags/globals.h"
#include "common/textconsole.h"
#include "common/system.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
namespace AGS3 {
diff --git a/engines/asylum/system/screen.cpp b/engines/asylum/system/screen.cpp
index 0b1ccb0875e..e1b72a72e2e 100644
--- a/engines/asylum/system/screen.cpp
+++ b/engines/asylum/system/screen.cpp
@@ -20,6 +20,7 @@
*/
#include "common/scummsys.h"
+#include "graphics/paletteman.h"
#include "asylum/system/screen.h"
diff --git a/engines/asylum/system/screen.h b/engines/asylum/system/screen.h
index da350dd9574..0165cd313a5 100644
--- a/engines/asylum/system/screen.h
+++ b/engines/asylum/system/screen.h
@@ -26,7 +26,6 @@
#include "common/queue.h"
#include "common/rect.h"
-#include "graphics/palette.h"
#include "graphics/surface.h"
#include "asylum/shared.h"
diff --git a/engines/avalanche/avalot.cpp b/engines/avalanche/avalot.cpp
index 7a0f3fb1bba..cb29cc8f148 100644
--- a/engines/avalanche/avalot.cpp
+++ b/engines/avalanche/avalot.cpp
@@ -32,7 +32,7 @@
#include "common/random.h"
#include "common/system.h"
#include "common/config-manager.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
namespace Avalanche {
diff --git a/engines/avalanche/graphics.cpp b/engines/avalanche/graphics.cpp
index 32595c44589..96b56298c23 100644
--- a/engines/avalanche/graphics.cpp
+++ b/engines/avalanche/graphics.cpp
@@ -30,7 +30,7 @@
#include "common/math.h"
#include "common/system.h"
#include "engines/util.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
namespace Avalanche {
diff --git a/engines/bbvs/bbvs.cpp b/engines/bbvs/bbvs.cpp
index 6839beeb802..0083ba91b11 100644
--- a/engines/bbvs/bbvs.cpp
+++ b/engines/bbvs/bbvs.cpp
@@ -45,7 +45,6 @@
#include "graphics/cursorman.h"
#include "graphics/font.h"
#include "graphics/fontman.h"
-#include "graphics/palette.h"
#include "graphics/surface.h"
namespace Bbvs {
diff --git a/engines/bbvs/graphics.cpp b/engines/bbvs/graphics.cpp
index 07ce4722068..e4582c56fca 100644
--- a/engines/bbvs/graphics.cpp
+++ b/engines/bbvs/graphics.cpp
@@ -19,6 +19,8 @@
*
*/
+#include "graphics/paletteman.h"
+
#include "bbvs/graphics.h"
namespace Bbvs {
diff --git a/engines/bbvs/graphics.h b/engines/bbvs/graphics.h
index 5a3b451da18..53752334db3 100644
--- a/engines/bbvs/graphics.h
+++ b/engines/bbvs/graphics.h
@@ -25,7 +25,6 @@
#include "bbvs/spritemodule.h"
#include "common/array.h"
#include "common/system.h"
-#include "graphics/palette.h"
#include "graphics/surface.h"
namespace Bbvs {
diff --git a/engines/bbvs/videoplayer.cpp b/engines/bbvs/videoplayer.cpp
index 63e5d2052a6..f3810e8f6b1 100644
--- a/engines/bbvs/videoplayer.cpp
+++ b/engines/bbvs/videoplayer.cpp
@@ -21,7 +21,6 @@
#include "bbvs/bbvs.h"
#include "engines/util.h"
-#include "graphics/palette.h"
#include "graphics/surface.h"
#include "video/avi_decoder.h"
diff --git a/engines/buried/graphics.cpp b/engines/buried/graphics.cpp
index f03259884ce..c058491011b 100644
--- a/engines/buried/graphics.cpp
+++ b/engines/buried/graphics.cpp
@@ -29,7 +29,7 @@
#include "common/compression/unzip.h"
#include "graphics/cursorman.h"
#include "graphics/font.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "graphics/surface.h"
#include "graphics/wincursor.h"
#include "graphics/fonts/ttf.h"
diff --git a/engines/cge/cge_main.cpp b/engines/cge/cge_main.cpp
index 5e4dc3559ec..16838325d22 100644
--- a/engines/cge/cge_main.cpp
+++ b/engines/cge/cge_main.cpp
@@ -30,7 +30,7 @@
#include "common/savefile.h"
#include "common/serializer.h"
#include "common/str.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "graphics/scaler.h"
#include "graphics/thumbnail.h"
#include "cge/vga13h.h"
diff --git a/engines/cge/vga13h.cpp b/engines/cge/vga13h.cpp
index a1063cfe95b..05a40b5eab1 100644
--- a/engines/cge/vga13h.cpp
+++ b/engines/cge/vga13h.cpp
@@ -27,7 +27,7 @@
#include "common/array.h"
#include "common/config-manager.h"
#include "common/rect.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "cge/general.h"
#include "cge/vga13h.h"
#include "cge/bitmap.h"
diff --git a/engines/cge2/saveload.cpp b/engines/cge2/saveload.cpp
index ffaddde0286..f7e6a6ac68b 100644
--- a/engines/cge2/saveload.cpp
+++ b/engines/cge2/saveload.cpp
@@ -29,7 +29,7 @@
#include "common/system.h"
#include "graphics/thumbnail.h"
#include "graphics/surface.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "graphics/scaler.h"
#include "cge2/events.h"
#include "cge2/snail.h"
diff --git a/engines/cge2/vga13h.cpp b/engines/cge2/vga13h.cpp
index 1201d996aeb..30a422c3eea 100644
--- a/engines/cge2/vga13h.cpp
+++ b/engines/cge2/vga13h.cpp
@@ -27,7 +27,7 @@
#include "common/array.h"
#include "common/config-manager.h"
#include "common/rect.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "cge2/general.h"
#include "cge2/vga13h.h"
#include "cge2/bitmap.h"
diff --git a/engines/chamber/cga.cpp b/engines/chamber/cga.cpp
index 62b3fecf71e..464662e0d5d 100644
--- a/engines/chamber/cga.cpp
+++ b/engines/chamber/cga.cpp
@@ -20,7 +20,7 @@
*/
#include "common/system.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "chamber/chamber.h"
#include "chamber/common.h"
diff --git a/engines/chewy/mcga_graphics.cpp b/engines/chewy/mcga_graphics.cpp
index 0dc167b6c86..1e57b0c3475 100644
--- a/engines/chewy/mcga_graphics.cpp
+++ b/engines/chewy/mcga_graphics.cpp
@@ -21,7 +21,7 @@
#include "common/memstream.h"
#include "common/system.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "chewy/chewy.h"
#include "chewy/events.h"
#include "chewy/font.h"
diff --git a/engines/chewy/video/cfo_decoder.cpp b/engines/chewy/video/cfo_decoder.cpp
index 57d1175dded..b156a38a491 100644
--- a/engines/chewy/video/cfo_decoder.cpp
+++ b/engines/chewy/video/cfo_decoder.cpp
@@ -23,7 +23,7 @@
#include "common/stream.h"
#include "common/system.h"
#include "engines/engine.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "video/flic_decoder.h"
#include "chewy/globals.h"
#include "chewy/sound.h"
diff --git a/engines/chewy/video/video_player.cpp b/engines/chewy/video/video_player.cpp
index 37365b41a70..07df666cd07 100644
--- a/engines/chewy/video/video_player.cpp
+++ b/engines/chewy/video/video_player.cpp
@@ -27,7 +27,7 @@
#include "chewy/resource.h"
#include "chewy/sound.h"
#include "common/events.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
namespace Chewy {
diff --git a/engines/cine/cine.cpp b/engines/cine/cine.cpp
index 79c426f1c75..3689ef14fa5 100644
--- a/engines/cine/cine.cpp
+++ b/engines/cine/cine.cpp
@@ -26,7 +26,7 @@
#include "engines/util.h"
#include "graphics/cursorman.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "image/iff.h"
diff --git a/engines/cine/pal.cpp b/engines/cine/pal.cpp
index 7f457714242..d47d85a3d33 100644
--- a/engines/cine/pal.cpp
+++ b/engines/cine/pal.cpp
@@ -25,7 +25,7 @@
#include "common/system.h" // For g_system->getPaletteManager()->setPalette
#include "common/textconsole.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
namespace Cine {
diff --git a/engines/composer/graphics.cpp b/engines/composer/graphics.cpp
index ed6873df706..9cb374f5c6b 100644
--- a/engines/composer/graphics.cpp
+++ b/engines/composer/graphics.cpp
@@ -20,7 +20,7 @@
*/
#include "common/scummsys.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "audio/audiostream.h"
#include "audio/decoders/raw.h"
diff --git a/engines/composer/saveload.cpp b/engines/composer/saveload.cpp
index 1c3a4e501fc..9189a78460f 100644
--- a/engines/composer/saveload.cpp
+++ b/engines/composer/saveload.cpp
@@ -27,7 +27,7 @@
#include "common/serializer.h"
#include "common/system.h"
#include "common/compression/deflate.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "composer/composer.h"
#include "composer/graphics.h"
diff --git a/engines/crab/crab.cpp b/engines/crab/crab.cpp
index 0ea9f803342..25735fd9d1e 100644
--- a/engines/crab/crab.cpp
+++ b/engines/crab/crab.cpp
@@ -24,7 +24,6 @@
#include "engines/util.h"
#include "graphics/cursorman.h"
#include "graphics/managed_surface.h"
-#include "graphics/palette.h"
#include "graphics/screen.h"
#include "crab/crab.h"
#include "crab/app.h"
diff --git a/engines/cruise/gfxModule.cpp b/engines/cruise/gfxModule.cpp
index e3946b10489..0f6baf6b422 100644
--- a/engines/cruise/gfxModule.cpp
+++ b/engines/cruise/gfxModule.cpp
@@ -25,7 +25,7 @@
#include "common/list.h"
#include "common/rect.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "cruise/cruise.h"
#include "cruise/cruise_main.h"
diff --git a/engines/cryo/cryo.cpp b/engines/cryo/cryo.cpp
index c4c9c9df384..41445c4aa3b 100644
--- a/engines/cryo/cryo.cpp
+++ b/engines/cryo/cryo.cpp
@@ -26,7 +26,6 @@
#include "common/error.h"
#include "graphics/surface.h"
#include "graphics/screen.h"
-#include "graphics/palette.h"
#include "common/system.h"
#include "engines/util.h"
diff --git a/engines/cryo/cryolib.cpp b/engines/cryo/cryolib.cpp
index d55dc8179db..93de432910b 100644
--- a/engines/cryo/cryolib.cpp
+++ b/engines/cryo/cryolib.cpp
@@ -23,7 +23,7 @@
#include "common/events.h"
#include "common/timer.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "cryo/cryo.h"
#include "cryo/cryolib.h"
diff --git a/engines/cryo/eden_graphics.cpp b/engines/cryo/eden_graphics.cpp
index 40f727a5233..6aee4e6265a 100644
--- a/engines/cryo/eden_graphics.cpp
+++ b/engines/cryo/eden_graphics.cpp
@@ -26,7 +26,6 @@
#include "cryo/eden_graphics.h"
#include "graphics/blit.h"
-#include "graphics/palette.h"
#include "video/hnm_decoder.h"
namespace Cryo {
diff --git a/engines/cryomni3d/cryomni3d.cpp b/engines/cryomni3d/cryomni3d.cpp
index 1270758fb5f..3333afad4bf 100644
--- a/engines/cryomni3d/cryomni3d.cpp
+++ b/engines/cryomni3d/cryomni3d.cpp
@@ -31,7 +31,7 @@
#include "engines/util.h"
#include "audio/mixer.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "cryomni3d/cryomni3d.h"
#include "cryomni3d/datstream.h"
diff --git a/engines/cryomni3d/versailles/menus.cpp b/engines/cryomni3d/versailles/menus.cpp
index e1013c20250..ceec9d2ff8a 100644
--- a/engines/cryomni3d/versailles/menus.cpp
+++ b/engines/cryomni3d/versailles/menus.cpp
@@ -24,7 +24,6 @@
#include "common/file.h"
#include "common/system.h"
#include "graphics/managed_surface.h"
-#include "graphics/palette.h"
#include "image/bmp.h"
#include "image/image_decoder.h"
diff --git a/engines/director/castmember/digitalvideo.cpp b/engines/director/castmember/digitalvideo.cpp
index 851839919e5..1790ff1e97c 100644
--- a/engines/director/castmember/digitalvideo.cpp
+++ b/engines/director/castmember/digitalvideo.cpp
@@ -19,6 +19,7 @@
*
*/
+#include "graphics/paletteman.h"
#include "graphics/surface.h"
#include "graphics/macgui/macwidget.h"
diff --git a/engines/director/graphics.cpp b/engines/director/graphics.cpp
index e0cc5ad10b2..55ce85c1a13 100644
--- a/engines/director/graphics.cpp
+++ b/engines/director/graphics.cpp
@@ -21,6 +21,7 @@
#include "common/system.h"
#include "common/memstream.h"
+#include "graphics/paletteman.h"
#include "graphics/macgui/macwindowmanager.h"
#include "director/director.h"
diff --git a/engines/director/lingo/xlibs/batqt.cpp b/engines/director/lingo/xlibs/batqt.cpp
index 8bd406a2ded..7df78d27f01 100644
--- a/engines/director/lingo/xlibs/batqt.cpp
+++ b/engines/director/lingo/xlibs/batqt.cpp
@@ -53,6 +53,7 @@
* XS mSetBatch -- Applies a set of batch commands
*/
+#include "graphics/paletteman.h"
#include "video/qt_decoder.h"
#include "director/director.h"
#include "director/util.h"
diff --git a/engines/director/lingo/xlibs/moovxobj.cpp b/engines/director/lingo/xlibs/moovxobj.cpp
index f7252f49982..939f9bbefd4 100644
--- a/engines/director/lingo/xlibs/moovxobj.cpp
+++ b/engines/director/lingo/xlibs/moovxobj.cpp
@@ -45,6 +45,7 @@
* ScummVM Note: mMovieDone returns true when the movie is _not_ done.
*/
+#include "graphics/paletteman.h"
#include "video/qt_decoder.h"
#include "director/director.h"
diff --git a/engines/dm/dm.cpp b/engines/dm/dm.cpp
index dde1e37889c..ec1471f4844 100644
--- a/engines/dm/dm.cpp
+++ b/engines/dm/dm.cpp
@@ -44,7 +44,6 @@
#include "engines/engine.h"
#include "graphics/cursorman.h"
-#include "graphics/palette.h"
#include "graphics/surface.h"
#include "gui/saveload.h"
diff --git a/engines/dm/gfx.cpp b/engines/dm/gfx.cpp
index a423a11c642..f189df2d706 100644
--- a/engines/dm/gfx.cpp
+++ b/engines/dm/gfx.cpp
@@ -28,7 +28,7 @@
#include "common/system.h"
#include "common/file.h"
#include "common/endian.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "dm/gfx.h"
#include "dm/dungeonman.h"
diff --git a/engines/draci/screen.cpp b/engines/draci/screen.cpp
index 096ecbfc2dd..554b7087ca6 100644
--- a/engines/draci/screen.cpp
+++ b/engines/draci/screen.cpp
@@ -22,7 +22,7 @@
#include "common/memstream.h"
#include "common/system.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "draci/draci.h"
#include "draci/screen.h"
diff --git a/engines/drascula/palette.cpp b/engines/drascula/palette.cpp
index a18d24b076b..b5a4ba5b54d 100644
--- a/engines/drascula/palette.cpp
+++ b/engines/drascula/palette.cpp
@@ -19,7 +19,7 @@
*
*/
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "drascula/drascula.h"
diff --git a/engines/dreamweb/dreamweb.cpp b/engines/dreamweb/dreamweb.cpp
index 0aaac3ce1eb..0a5cea9e2bd 100644
--- a/engines/dreamweb/dreamweb.cpp
+++ b/engines/dreamweb/dreamweb.cpp
@@ -31,7 +31,7 @@
#include "engines/advancedDetector.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "graphics/surface.h"
#include "dreamweb/detection.h"
diff --git a/engines/efh/graphics.cpp b/engines/efh/graphics.cpp
index bc403f9dc0b..3d1211357d7 100644
--- a/engines/efh/graphics.cpp
+++ b/engines/efh/graphics.cpp
@@ -19,7 +19,7 @@
*
*/
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "common/system.h"
#include "efh/efh.h"
diff --git a/engines/efh/savegames.cpp b/engines/efh/savegames.cpp
index 0dee11838fe..83151e2058a 100644
--- a/engines/efh/savegames.cpp
+++ b/engines/efh/savegames.cpp
@@ -23,7 +23,7 @@
#include "graphics/scaler.h"
#include "graphics/thumbnail.h"
#include "common/system.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "efh/efh.h"
diff --git a/engines/gob/util.cpp b/engines/gob/util.cpp
index 356c25635f4..8eddfaf9d4c 100644
--- a/engines/gob/util.cpp
+++ b/engines/gob/util.cpp
@@ -27,7 +27,7 @@
#include "common/stream.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "gob/gob.h"
#include "gob/util.h"
diff --git a/engines/gob/video.cpp b/engines/gob/video.cpp
index 00c5bf4b3cf..db73abf4bd4 100644
--- a/engines/gob/video.cpp
+++ b/engines/gob/video.cpp
@@ -30,7 +30,7 @@
#include "engines/util.h"
#include "graphics/cursorman.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "graphics/surface.h"
#include "gob/gob.h"
diff --git a/engines/groovie/debug.cpp b/engines/groovie/debug.cpp
index 2d8bd7767e7..2dc20e135aa 100644
--- a/engines/groovie/debug.cpp
+++ b/engines/groovie/debug.cpp
@@ -28,7 +28,7 @@
#include "common/debug-channels.h"
#include "common/system.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
namespace Groovie {
diff --git a/engines/groovie/graphics.cpp b/engines/groovie/graphics.cpp
index fc109de8af3..37b8343b5a6 100644
--- a/engines/groovie/graphics.cpp
+++ b/engines/groovie/graphics.cpp
@@ -25,7 +25,7 @@
#include "common/rect.h"
#include "common/system.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
namespace Groovie {
diff --git a/engines/groovie/video/roq.cpp b/engines/groovie/video/roq.cpp
index de4ff442aa2..462b1c136e3 100644
--- a/engines/groovie/video/roq.cpp
+++ b/engines/groovie/video/roq.cpp
@@ -32,7 +32,6 @@
#include "common/substream.h"
#include "common/textconsole.h"
-#include "graphics/palette.h"
#include "image/jpeg.h"
#ifdef USE_RGB_COLOR
diff --git a/engines/groovie/video/vdx.cpp b/engines/groovie/video/vdx.cpp
index aecb076eaff..1c2e5153d7c 100644
--- a/engines/groovie/video/vdx.cpp
+++ b/engines/groovie/video/vdx.cpp
@@ -30,7 +30,7 @@
#include "audio/audiostream.h"
#include "audio/mixer.h"
#include "audio/decoders/raw.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#define TILE_SIZE 4 // Size of each tile on the image: only ever seen 4 so far
#define VDX_IDENT 0x9267 // 37479
diff --git a/engines/hadesch/gfx_context.cpp b/engines/hadesch/gfx_context.cpp
index b4177c15a3d..d8e3345d88e 100644
--- a/engines/hadesch/gfx_context.cpp
+++ b/engines/hadesch/gfx_context.cpp
@@ -24,7 +24,7 @@
#include "hadesch/video.h"
#include "hadesch/baptr.h"
#include "common/system.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "graphics/font.h"
#include "graphics/fontman.h"
#include "hadesch/hadesch.h"
diff --git a/engines/hadesch/hadesch.cpp b/engines/hadesch/hadesch.cpp
index 70df204b4f3..2fe395d099b 100644
--- a/engines/hadesch/hadesch.cpp
+++ b/engines/hadesch/hadesch.cpp
@@ -47,7 +47,6 @@
#include "hadesch/video.h"
#include "hadesch/pod_image.h"
-#include "graphics/palette.h"
#include "common/memstream.h"
#include "common/formats/winexe_pe.h"
#include "common/substream.h"
diff --git a/engines/hopkins/anim.cpp b/engines/hopkins/anim.cpp
index ff47d8325d8..adf244d9387 100644
--- a/engines/hopkins/anim.cpp
+++ b/engines/hopkins/anim.cpp
@@ -27,7 +27,6 @@
#include "hopkins/hopkins.h"
#include "common/system.h"
-#include "graphics/palette.h"
#include "common/file.h"
#include "common/rect.h"
#include "engines/util.h"
diff --git a/engines/hopkins/graphics.cpp b/engines/hopkins/graphics.cpp
index 442298d3757..7563f3a3287 100644
--- a/engines/hopkins/graphics.cpp
+++ b/engines/hopkins/graphics.cpp
@@ -26,7 +26,6 @@
#include "hopkins/hopkins.h"
#include "common/system.h"
-#include "graphics/palette.h"
#include "image/pcx.h"
#include "common/file.h"
#include "common/rect.h"
diff --git a/engines/hopkins/objects.cpp b/engines/hopkins/objects.cpp
index d9809565067..eb478003a87 100644
--- a/engines/hopkins/objects.cpp
+++ b/engines/hopkins/objects.cpp
@@ -27,7 +27,6 @@
#include "hopkins/hopkins.h"
#include "common/system.h"
-#include "graphics/palette.h"
#include "common/file.h"
#include "common/rect.h"
#include "engines/util.h"
diff --git a/engines/hopkins/script.cpp b/engines/hopkins/script.cpp
index 34fbf7788dc..f0b76421d57 100644
--- a/engines/hopkins/script.cpp
+++ b/engines/hopkins/script.cpp
@@ -27,7 +27,6 @@
#include "hopkins/hopkins.h"
#include "common/system.h"
-#include "graphics/palette.h"
#include "common/file.h"
#include "common/rect.h"
#include "engines/util.h"
diff --git a/engines/hugo/display.cpp b/engines/hugo/display.cpp
index 5c233f767b1..e8078f4d9aa 100644
--- a/engines/hugo/display.cpp
+++ b/engines/hugo/display.cpp
@@ -32,7 +32,7 @@
#include "common/system.h"
#include "common/textconsole.h"
#include "graphics/cursorman.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "hugo/hugo.h"
#include "hugo/display.h"
diff --git a/engines/hypno/hypno.cpp b/engines/hypno/hypno.cpp
index 23d652fd1d7..0a323e6ec03 100644
--- a/engines/hypno/hypno.cpp
+++ b/engines/hypno/hypno.cpp
@@ -36,6 +36,7 @@
#include "common/timer.h"
#include "engines/advancedDetector.h"
#include "engines/util.h"
+#include "graphics/paletteman.h"
#include "image/bmp.h"
#include "hypno/grammar.h"
diff --git a/engines/hypno/hypno.h b/engines/hypno/hypno.h
index 48630402ffd..ef441c895b1 100644
--- a/engines/hypno/hypno.h
+++ b/engines/hypno/hypno.h
@@ -32,7 +32,6 @@
#include "graphics/font.h"
#include "graphics/fontman.h"
#include "graphics/surface.h"
-#include "graphics/palette.h"
#include "hypno/grammar.h"
#include "hypno/libfile.h"
diff --git a/engines/illusions/bbdou/illusions_bbdou.cpp b/engines/illusions/bbdou/illusions_bbdou.cpp
index 772928bd500..b3e871088c8 100644
--- a/engines/illusions/bbdou/illusions_bbdou.cpp
+++ b/engines/illusions/bbdou/illusions_bbdou.cpp
@@ -64,7 +64,6 @@
#include "graphics/cursorman.h"
#include "graphics/font.h"
#include "graphics/fontman.h"
-#include "graphics/palette.h"
#include "graphics/surface.h"
namespace Illusions {
diff --git a/engines/illusions/duckman/illusions_duckman.cpp b/engines/illusions/duckman/illusions_duckman.cpp
index 10f89a327d5..df4376db7be 100644
--- a/engines/illusions/duckman/illusions_duckman.cpp
+++ b/engines/illusions/duckman/illusions_duckman.cpp
@@ -68,7 +68,6 @@
#include "graphics/cursorman.h"
#include "graphics/font.h"
#include "graphics/fontman.h"
-#include "graphics/palette.h"
#include "graphics/surface.h"
namespace Illusions {
diff --git a/engines/illusions/illusions.cpp b/engines/illusions/illusions.cpp
index 3573dc45266..b85574e59f0 100644
--- a/engines/illusions/illusions.cpp
+++ b/engines/illusions/illusions.cpp
@@ -55,7 +55,6 @@
#include "graphics/cursorman.h"
#include "graphics/font.h"
#include "graphics/fontman.h"
-#include "graphics/palette.h"
#include "graphics/surface.h"
namespace Illusions {
diff --git a/engines/illusions/screen.cpp b/engines/illusions/screen.cpp
index 8855166ec15..b3a9979cf4e 100644
--- a/engines/illusions/screen.cpp
+++ b/engines/illusions/screen.cpp
@@ -23,7 +23,7 @@
#include "illusions/screen.h"
#include "illusions/resources/fontresource.h"
#include "engines/util.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
namespace Illusions {
diff --git a/engines/illusions/screentext.cpp b/engines/illusions/screentext.cpp
index 259b1204b40..62f26f8eabe 100644
--- a/engines/illusions/screentext.cpp
+++ b/engines/illusions/screentext.cpp
@@ -26,7 +26,6 @@
#include "illusions/screen.h"
#include "illusions/textdrawer.h"
#include "engines/util.h"
-#include "graphics/palette.h"
namespace Illusions {
diff --git a/engines/immortal/immortal.h b/engines/immortal/immortal.h
index cce7511db0a..ec5287aaa0a 100644
--- a/engines/immortal/immortal.h
+++ b/engines/immortal/immortal.h
@@ -31,7 +31,6 @@
// Theorectically, all graphics should be handled through driver, which is part of kernal, which is in immortal.h
#include "graphics/screen.h"
-#include "graphics/palette.h"
#include "graphics/surface.h"
// Detection is only needed by the main engine
diff --git a/engines/immortal/kernal.cpp b/engines/immortal/kernal.cpp
index 3be41d7c001..f99812b16ba 100644
--- a/engines/immortal/kernal.cpp
+++ b/engines/immortal/kernal.cpp
@@ -26,6 +26,8 @@
* considered part of the same process.
*/
+#include "graphics/paletteman.h"
+
#include "immortal/immortal.h"
namespace Immortal {
diff --git a/engines/kingdom/kingdom.cpp b/engines/kingdom/kingdom.cpp
index 76698c4de7a..d58a0c01240 100644
--- a/engines/kingdom/kingdom.cpp
+++ b/engines/kingdom/kingdom.cpp
@@ -29,7 +29,7 @@
#include "graphics/cursorman.h"
#include "graphics/surface.h"
#include "graphics/screen.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "common/system.h"
#include "image/iff.h"
#include "engines/util.h"
diff --git a/engines/kyra/graphics/screen.cpp b/engines/kyra/graphics/screen.cpp
index eed2da15ce7..d65a705cdbf 100644
--- a/engines/kyra/graphics/screen.cpp
+++ b/engines/kyra/graphics/screen.cpp
@@ -31,7 +31,7 @@
#include "engines/util.h"
#include "graphics/cursorman.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "graphics/sjis.h"
diff --git a/engines/kyra/graphics/screen_eob.cpp b/engines/kyra/graphics/screen_eob.cpp
index 502620aba70..74bfc062d22 100644
--- a/engines/kyra/graphics/screen_eob.cpp
+++ b/engines/kyra/graphics/screen_eob.cpp
@@ -35,7 +35,7 @@
#include "common/memstream.h"
#include "graphics/cursorman.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "graphics/sjis.h"
#include "graphics/fonts/dosfont.h"
diff --git a/engines/kyra/graphics/screen_lok.cpp b/engines/kyra/graphics/screen_lok.cpp
index 50588a05f51..1c6f3408176 100644
--- a/engines/kyra/graphics/screen_lok.cpp
+++ b/engines/kyra/graphics/screen_lok.cpp
@@ -24,7 +24,7 @@
#include "common/system.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
namespace Kyra {
diff --git a/engines/kyra/graphics/screen_lol.cpp b/engines/kyra/graphics/screen_lol.cpp
index 36e56d21d2c..a2dd10aa370 100644
--- a/engines/kyra/graphics/screen_lol.cpp
+++ b/engines/kyra/graphics/screen_lol.cpp
@@ -26,7 +26,7 @@
#include "common/system.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
namespace Kyra {
diff --git a/engines/kyra/graphics/vqa.cpp b/engines/kyra/graphics/vqa.cpp
index 66fb1b82e14..c1d373c081b 100644
--- a/engines/kyra/graphics/vqa.cpp
+++ b/engines/kyra/graphics/vqa.cpp
@@ -37,7 +37,7 @@
#include "common/system.h"
#include "common/events.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "graphics/surface.h"
namespace Kyra {
diff --git a/engines/lab/dispman.cpp b/engines/lab/dispman.cpp
index 636f550ca38..6e84b75bc82 100644
--- a/engines/lab/dispman.cpp
+++ b/engines/lab/dispman.cpp
@@ -28,7 +28,7 @@
*/
#include "common/file.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "lab/lab.h"
diff --git a/engines/lilliput/lilliput.cpp b/engines/lilliput/lilliput.cpp
index 56843e7bcef..13740d0505d 100644
--- a/engines/lilliput/lilliput.cpp
+++ b/engines/lilliput/lilliput.cpp
@@ -29,6 +29,7 @@
#include "common/events.h"
#include "engines/util.h"
#include "graphics/cursorman.h"
+#include "graphics/paletteman.h"
#include "lilliput/lilliput.h"
#include "engines/util.h"
diff --git a/engines/lilliput/lilliput.h b/engines/lilliput/lilliput.h
index 5ce465823d1..b197c33a32f 100644
--- a/engines/lilliput/lilliput.h
+++ b/engines/lilliput/lilliput.h
@@ -33,7 +33,6 @@
#include "common/events.h"
#include "engines/engine.h"
-#include "graphics/palette.h"
#include "graphics/surface.h"
namespace Common {
diff --git a/engines/lure/screen.cpp b/engines/lure/screen.cpp
index 19353d568ae..7e4e76d98a6 100644
--- a/engines/lure/screen.cpp
+++ b/engines/lure/screen.cpp
@@ -26,7 +26,7 @@
#include "lure/decode.h"
#include "lure/events.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
namespace Lure {
diff --git a/engines/m4/graphics/gr_pal.cpp b/engines/m4/graphics/gr_pal.cpp
index 4f0be9586ce..830dd0c1a07 100644
--- a/engines/m4/graphics/gr_pal.cpp
+++ b/engines/m4/graphics/gr_pal.cpp
@@ -20,7 +20,7 @@
*/
#include "common/system.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "common/textconsole.h"
#include "m4/graphics/gr_pal.h"
#include "m4/core/errors.h"
diff --git a/engines/m4/m4.cpp b/engines/m4/m4.cpp
index cc8414b384e..1c67b018552 100644
--- a/engines/m4/m4.cpp
+++ b/engines/m4/m4.cpp
@@ -27,7 +27,7 @@
#include "common/savefile.h"
#include "engines/util.h"
#include "graphics/managed_surface.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "m4/m4.h"
#include "m4/adv_r/adv_control.h"
#include "m4/adv_r/adv_file.h"
diff --git a/engines/made/screen.cpp b/engines/made/screen.cpp
index 8e0ba293c7f..331542877a9 100644
--- a/engines/made/screen.cpp
+++ b/engines/made/screen.cpp
@@ -27,7 +27,7 @@
#include "common/system.h"
#include "graphics/surface.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "graphics/cursorman.h"
namespace Made {
diff --git a/engines/mads/game.cpp b/engines/mads/game.cpp
index 561fce012ca..7e32a04ffe1 100644
--- a/engines/mads/game.cpp
+++ b/engines/mads/game.cpp
@@ -23,7 +23,6 @@
#include "common/config-manager.h"
#include "common/memstream.h"
#include "common/serializer.h"
-#include "graphics/palette.h"
#include "graphics/scaler.h"
#include "graphics/thumbnail.h"
#include "mads/mads.h"
diff --git a/engines/mads/palette.cpp b/engines/mads/palette.cpp
index e08c63dc8d2..90ddbed5ce4 100644
--- a/engines/mads/palette.cpp
+++ b/engines/mads/palette.cpp
@@ -21,7 +21,7 @@
#include "common/scummsys.h"
#include "engines/util.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "mads/mads.h"
#include "mads/msurface.h"
#include "mads/staticres.h"
diff --git a/engines/mads/sprites.cpp b/engines/mads/sprites.cpp
index 7e53133e2f2..2971bb6658b 100644
--- a/engines/mads/sprites.cpp
+++ b/engines/mads/sprites.cpp
@@ -21,7 +21,6 @@
#include "common/scummsys.h"
#include "engines/util.h"
-#include "graphics/palette.h"
#include "mads/mads.h"
#include "mads/screen.h"
#include "mads/msurface.h"
diff --git a/engines/metaengine.cpp b/engines/metaengine.cpp
index 25593c931c1..676bd952a47 100644
--- a/engines/metaengine.cpp
+++ b/engines/metaengine.cpp
@@ -31,7 +31,6 @@
#include "engines/dialogs.h"
-#include "graphics/palette.h"
#include "graphics/scaler.h"
#include "graphics/managed_surface.h"
#include "graphics/thumbnail.h"
diff --git a/engines/mm/mm1/gfx/gfx.cpp b/engines/mm/mm1/gfx/gfx.cpp
index 79fc4541403..4eec3eb329f 100644
--- a/engines/mm/mm1/gfx/gfx.cpp
+++ b/engines/mm/mm1/gfx/gfx.cpp
@@ -21,7 +21,7 @@
#include "common/system.h"
#include "common/debug.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "graphics/screen.h"
#include "mm/mm1/gfx/gfx.h"
diff --git a/engines/mm/mm1/gfx/gfx.h b/engines/mm/mm1/gfx/gfx.h
index b99fbafdc7c..d22552d3f44 100644
--- a/engines/mm/mm1/gfx/gfx.h
+++ b/engines/mm/mm1/gfx/gfx.h
@@ -22,8 +22,6 @@
#ifndef MM1_GFX_H
#define MM1_GFX_H
-#include "graphics/palette.h"
-
namespace MM {
namespace MM1 {
namespace Gfx {
diff --git a/engines/mm/mm1/gfx/screen_decoder.cpp b/engines/mm/mm1/gfx/screen_decoder.cpp
index 22ea1592576..a4b701e451d 100644
--- a/engines/mm/mm1/gfx/screen_decoder.cpp
+++ b/engines/mm/mm1/gfx/screen_decoder.cpp
@@ -21,7 +21,6 @@
#include "common/file.h"
#include "common/system.h"
-#include "graphics/palette.h"
#include "graphics/screen.h"
#include "mm/mm1/gfx/gfx.h"
#include "mm/mm1/gfx/screen_decoder.h"
diff --git a/engines/mm/mm1/mm1.cpp b/engines/mm/mm1/mm1.cpp
index 36d31712732..9ab7ce7331a 100644
--- a/engines/mm/mm1/mm1.cpp
+++ b/engines/mm/mm1/mm1.cpp
@@ -26,7 +26,7 @@
#include "common/system.h"
#include "common/translation.h"
#include "engines/util.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "mm/mm1/mm1.h"
#include "mm/mm1/console.h"
#include "mm/mm1/gfx/gfx.h"
diff --git a/engines/mm/shared/xeen/sprites.cpp b/engines/mm/shared/xeen/sprites.cpp
index ce719e522ab..67e1f96ae3f 100644
--- a/engines/mm/shared/xeen/sprites.cpp
+++ b/engines/mm/shared/xeen/sprites.cpp
@@ -23,7 +23,7 @@
#include "common/archive.h"
#include "common/memstream.h"
#include "common/textconsole.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "mm/shared/xeen/sprites.h"
#include "mm/mm.h"
diff --git a/engines/mm/xeen/screen.cpp b/engines/mm/xeen/screen.cpp
index 945b92991fd..6e66fcd290e 100644
--- a/engines/mm/xeen/screen.cpp
+++ b/engines/mm/xeen/screen.cpp
@@ -20,7 +20,7 @@
*/
#include "common/system.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "graphics/surface.h"
#include "mm/xeen/screen.h"
#include "mm/xeen/resources.h"
diff --git a/engines/mohawk/graphics.cpp b/engines/mohawk/graphics.cpp
index a0da16cdaf2..96d776674b5 100644
--- a/engines/mohawk/graphics.cpp
+++ b/engines/mohawk/graphics.cpp
@@ -25,7 +25,7 @@
#include "common/system.h"
#include "engines/util.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
namespace Mohawk {
diff --git a/engines/mohawk/livingbooks.cpp b/engines/mohawk/livingbooks.cpp
index cfb8dc9f77d..67284eea808 100644
--- a/engines/mohawk/livingbooks.cpp
+++ b/engines/mohawk/livingbooks.cpp
@@ -33,7 +33,7 @@
#include "common/system.h"
#include "common/memstream.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "engines/util.h"
diff --git a/engines/mohawk/livingbooks_graphics.cpp b/engines/mohawk/livingbooks_graphics.cpp
index 7419185ac41..50d857cbbb2 100644
--- a/engines/mohawk/livingbooks_graphics.cpp
+++ b/engines/mohawk/livingbooks_graphics.cpp
@@ -26,7 +26,7 @@
#include "common/substream.h"
#include "common/system.h"
#include "engines/util.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
namespace Mohawk {
diff --git a/engines/mohawk/myst_graphics.cpp b/engines/mohawk/myst_graphics.cpp
index 5c37351af24..a507ab33a4d 100644
--- a/engines/mohawk/myst_graphics.cpp
+++ b/engines/mohawk/myst_graphics.cpp
@@ -29,7 +29,7 @@
#include "engines/util.h"
#include "graphics/fonts/ttf.h"
#include "graphics/fontman.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "graphics/scaler.h"
#include "image/pict.h"
diff --git a/engines/mohawk/video.cpp b/engines/mohawk/video.cpp
index 15d4073a37f..88f2a920d28 100644
--- a/engines/mohawk/video.cpp
+++ b/engines/mohawk/video.cpp
@@ -29,7 +29,7 @@
#include "common/textconsole.h"
#include "common/system.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "graphics/surface.h"
#include "video/qt_decoder.h"
diff --git a/engines/mohawk/view.cpp b/engines/mohawk/view.cpp
index b90f0b46abc..31c799333b6 100644
--- a/engines/mohawk/view.cpp
+++ b/engines/mohawk/view.cpp
@@ -25,7 +25,7 @@
#include "common/stream.h"
#include "common/system.h"
#include "common/textconsole.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
namespace Mohawk {
diff --git a/engines/mortevielle/graphics.cpp b/engines/mortevielle/graphics.cpp
index b555dc96f33..8757c1bd06c 100644
--- a/engines/mortevielle/graphics.cpp
+++ b/engines/mortevielle/graphics.cpp
@@ -30,7 +30,7 @@
#include "common/endian.h"
#include "common/system.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
namespace Mortevielle {
diff --git a/engines/mortevielle/mortevielle.cpp b/engines/mortevielle/mortevielle.cpp
index 97270b413ee..eba59b77025 100644
--- a/engines/mortevielle/mortevielle.cpp
+++ b/engines/mortevielle/mortevielle.cpp
@@ -39,7 +39,6 @@
#include "common/translation.h"
#include "engines/util.h"
#include "engines/engine.h"
-#include "graphics/palette.h"
#include "graphics/pixelformat.h"
namespace Mortevielle {
diff --git a/engines/mortevielle/saveload.cpp b/engines/mortevielle/saveload.cpp
index cd55df3e92d..e4dc06f123c 100644
--- a/engines/mortevielle/saveload.cpp
+++ b/engines/mortevielle/saveload.cpp
@@ -32,6 +32,8 @@
#include "common/file.h"
#include "common/system.h"
+#include "graphics/paletteman.h"
+
namespace Mortevielle {
static const char SAVEGAME_ID[4] = { 'M', 'O', 'R', 'T' };
diff --git a/engines/mortevielle/saveload.h b/engines/mortevielle/saveload.h
index 972c96c217f..d10f3423184 100644
--- a/engines/mortevielle/saveload.h
+++ b/engines/mortevielle/saveload.h
@@ -29,7 +29,6 @@
#include "common/savefile.h"
#include "common/serializer.h"
-#include "graphics/palette.h"
#include "graphics/scaler.h"
#include "graphics/thumbnail.h"
#include "engines/savestate.h"
diff --git a/engines/mtropolis/modifiers.cpp b/engines/mtropolis/modifiers.cpp
index b8f95e27e08..ea030f4832e 100644
--- a/engines/mtropolis/modifiers.cpp
+++ b/engines/mtropolis/modifiers.cpp
@@ -23,7 +23,6 @@
#include "common/random.h"
#include "graphics/managed_surface.h"
-#include "graphics/palette.h"
#include "mtropolis/assets.h"
#include "mtropolis/audio_player.h"
diff --git a/engines/mtropolis/mtropolis.cpp b/engines/mtropolis/mtropolis.cpp
index e7c30a040ed..d15fd15f385 100644
--- a/engines/mtropolis/mtropolis.cpp
+++ b/engines/mtropolis/mtropolis.cpp
@@ -36,7 +36,6 @@
#include "graphics/cursorman.h"
#include "graphics/maccursor.h"
-#include "graphics/palette.h"
#include "graphics/surface.h"
#include "graphics/pixelformat.h"
#include "graphics/wincursor.h"
diff --git a/engines/mtropolis/runtime.cpp b/engines/mtropolis/runtime.cpp
index 1228e22e179..df536fa824e 100644
--- a/engines/mtropolis/runtime.cpp
+++ b/engines/mtropolis/runtime.cpp
@@ -28,7 +28,7 @@
#include "graphics/cursorman.h"
#include "graphics/managed_surface.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "graphics/surface.h"
#include "graphics/wincursor.h"
#include "graphics/maccursor.h"
diff --git a/engines/neverhood/screen.cpp b/engines/neverhood/screen.cpp
index fc0d7879aec..11e8c6324de 100644
--- a/engines/neverhood/screen.cpp
+++ b/engines/neverhood/screen.cpp
@@ -19,7 +19,7 @@
*
*/
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "video/smk_decoder.h"
#include "neverhood/screen.h"
diff --git a/engines/neverhood/smackerplayer.cpp b/engines/neverhood/smackerplayer.cpp
index c1e92b1e9ed..79812aa97a0 100644
--- a/engines/neverhood/smackerplayer.cpp
+++ b/engines/neverhood/smackerplayer.cpp
@@ -19,7 +19,6 @@
*
*/
-#include "graphics/palette.h"
#include "neverhood/gamemodule.h"
#include "neverhood/smackerplayer.h"
#include "neverhood/palette.h"
diff --git a/engines/ngi/modal.cpp b/engines/ngi/modal.cpp
index 8c1b12c7087..23ea65a8ace 100644
--- a/engines/ngi/modal.cpp
+++ b/engines/ngi/modal.cpp
@@ -32,7 +32,7 @@
#include "engines/savestate.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "graphics/surface.h"
namespace NGI {
diff --git a/engines/parallaction/graphics.cpp b/engines/parallaction/graphics.cpp
index a7287f09e1b..317e31dc291 100644
--- a/engines/parallaction/graphics.cpp
+++ b/engines/parallaction/graphics.cpp
@@ -23,7 +23,7 @@
#include "common/system.h"
#include "common/file.h"
#include "common/textconsole.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "graphics/primitives.h"
#include "engines/util.h"
diff --git a/engines/pink/objects/actions/action_text.cpp b/engines/pink/objects/actions/action_text.cpp
index fb46d6862b9..93af1a70e1c 100644
--- a/engines/pink/objects/actions/action_text.cpp
+++ b/engines/pink/objects/actions/action_text.cpp
@@ -23,6 +23,8 @@
#include "common/substream.h"
#include "common/unicode-bidi.h"
+#include "graphics/paletteman.h"
+
#include "pink/archive.h"
#include "pink/screen.h"
#include "pink/pink.h"
diff --git a/engines/pink/screen.cpp b/engines/pink/screen.cpp
index b28c1fb7de3..bfa7abac497 100644
--- a/engines/pink/screen.cpp
+++ b/engines/pink/screen.cpp
@@ -21,7 +21,7 @@
#include "graphics/macgui/macfontmanager.h"
#include "graphics/macgui/mactext.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "graphics/fonts/ttf.h"
#include "pink/pink.h"
diff --git a/engines/plumbers/3do.cpp b/engines/plumbers/3do.cpp
index ece10d26166..86ba31653a9 100644
--- a/engines/plumbers/3do.cpp
+++ b/engines/plumbers/3do.cpp
@@ -39,7 +39,6 @@
#include "graphics/cursorman.h"
#include "graphics/font.h"
#include "graphics/fontman.h"
-#include "graphics/palette.h"
#include "graphics/surface.h"
#include "image/cel_3do.h"
diff --git a/engines/plumbers/plumbers.cpp b/engines/plumbers/plumbers.cpp
index bd8d51f8c1f..c6105e9f65a 100644
--- a/engines/plumbers/plumbers.cpp
+++ b/engines/plumbers/plumbers.cpp
@@ -39,7 +39,7 @@
#include "graphics/cursorman.h"
#include "graphics/font.h"
#include "graphics/fontman.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "graphics/scaler/downscaler.h"
#include "graphics/surface.h"
diff --git a/engines/plumbers/windows.cpp b/engines/plumbers/windows.cpp
index 2882fc6e957..f569f292e1d 100644
--- a/engines/plumbers/windows.cpp
+++ b/engines/plumbers/windows.cpp
@@ -39,7 +39,6 @@
#include "graphics/cursorman.h"
#include "graphics/font.h"
#include "graphics/fontman.h"
-#include "graphics/palette.h"
#include "graphics/surface.h"
#include "graphics/scaler/downscaler.h"
diff --git a/engines/prince/draw.cpp b/engines/prince/draw.cpp
index 8808d0eafc9..ca3aff1411a 100644
--- a/engines/prince/draw.cpp
+++ b/engines/prince/draw.cpp
@@ -19,7 +19,7 @@
*
*/
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "prince/prince.h"
diff --git a/engines/prince/graphics.cpp b/engines/prince/graphics.cpp
index b283fb1f7f2..c2a76b46e0b 100644
--- a/engines/prince/graphics.cpp
+++ b/engines/prince/graphics.cpp
@@ -23,7 +23,7 @@
#include "prince/prince.h"
#include "prince/mhwanh.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "common/memstream.h"
diff --git a/engines/prince/saveload.cpp b/engines/prince/saveload.cpp
index 6c5612e50c8..4809217260a 100644
--- a/engines/prince/saveload.cpp
+++ b/engines/prince/saveload.cpp
@@ -33,7 +33,7 @@
#include "graphics/thumbnail.h"
#include "graphics/surface.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "graphics/scaler.h"
#include "gui/saveload.h"
diff --git a/engines/prince/videoplayer.cpp b/engines/prince/videoplayer.cpp
index 0228f2061c8..50e77df029f 100644
--- a/engines/prince/videoplayer.cpp
+++ b/engines/prince/videoplayer.cpp
@@ -21,7 +21,6 @@
#include "prince/prince.h"
#include "engines/util.h"
-#include "graphics/palette.h"
#include "graphics/surface.h"
#include "video/avi_decoder.h"
diff --git a/engines/private/private.cpp b/engines/private/private.cpp
index 1cd579c48d7..053fec3746f 100644
--- a/engines/private/private.cpp
+++ b/engines/private/private.cpp
@@ -34,6 +34,7 @@
#include "common/timer.h"
#include "common/macresman.h"
#include "common/compression/stuffit.h"
+#include "graphics/paletteman.h"
#include "engines/util.h"
#include "image/bmp.h"
diff --git a/engines/private/private.h b/engines/private/private.h
index e02587dc2bb..b22bad4b765 100644
--- a/engines/private/private.h
+++ b/engines/private/private.h
@@ -28,7 +28,6 @@
#include "engines/engine.h"
#include "graphics/managed_surface.h"
#include "video/smk_decoder.h"
-#include "graphics/palette.h"
#include "private/grammar.h"
diff --git a/engines/queen/display.cpp b/engines/queen/display.cpp
index ccd6e5af2f7..97da0fc7d36 100644
--- a/engines/queen/display.cpp
+++ b/engines/queen/display.cpp
@@ -26,7 +26,7 @@
#include "common/stream.h"
#include "common/memstream.h"
#include "graphics/cursorman.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "graphics/surface.h"
#include "image/iff.h"
diff --git a/engines/saga/gfx.cpp b/engines/saga/gfx.cpp
index e25e6c261cb..436e104cee0 100644
--- a/engines/saga/gfx.cpp
+++ b/engines/saga/gfx.cpp
@@ -30,7 +30,7 @@
#include "common/system.h"
#include "graphics/cursorman.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "engines/util.h"
namespace Saga {
diff --git a/engines/saga2/console.cpp b/engines/saga2/console.cpp
index d5a9ec82dcb..1a6815044ca 100644
--- a/engines/saga2/console.cpp
+++ b/engines/saga2/console.cpp
@@ -20,7 +20,7 @@
*/
#include "common/file.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "graphics/surface.h"
#include "image/png.h"
diff --git a/engines/saga2/loadmsg.cpp b/engines/saga2/loadmsg.cpp
index 16ddfac755c..52003cdbfd3 100644
--- a/engines/saga2/loadmsg.cpp
+++ b/engines/saga2/loadmsg.cpp
@@ -26,7 +26,7 @@
#include "saga2/saga2.h"
#include "saga2/detection.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
namespace Saga2 {
diff --git a/engines/saga2/video.cpp b/engines/saga2/video.cpp
index b11dd78a2fe..193f6b82f31 100644
--- a/engines/saga2/video.cpp
+++ b/engines/saga2/video.cpp
@@ -23,7 +23,7 @@
* (c) 1993-1996 The Wyrmkeep Entertainment Co.
*/
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "video/smk_decoder.h"
#include "saga2/saga2.h"
diff --git a/engines/saga2/vpal.cpp b/engines/saga2/vpal.cpp
index 4b2007c2889..538cbf8a6a6 100644
--- a/engines/saga2/vpal.cpp
+++ b/engines/saga2/vpal.cpp
@@ -25,7 +25,7 @@
#include "common/debug.h"
#include "common/savefile.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "saga2/saga2.h"
#include "saga2/fta.h"
diff --git a/engines/sci/engine/kvideo.cpp b/engines/sci/engine/kvideo.cpp
index a37d77d16a6..234e3fe69bc 100644
--- a/engines/sci/engine/kvideo.cpp
+++ b/engines/sci/engine/kvideo.cpp
@@ -33,7 +33,6 @@
#include "common/str.h"
#include "common/system.h"
#include "common/textconsole.h"
-#include "graphics/palette.h"
#include "graphics/pixelformat.h"
#include "graphics/surface.h"
#include "video/video_decoder.h"
diff --git a/engines/sci/graphics/frameout.cpp b/engines/sci/graphics/frameout.cpp
index 4c717398526..f006499c082 100644
--- a/engines/sci/graphics/frameout.cpp
+++ b/engines/sci/graphics/frameout.cpp
@@ -29,7 +29,7 @@
#include "common/textconsole.h"
#include "engines/engine.h"
#include "engines/util.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "graphics/surface.h"
#include "sci/sci.h"
diff --git a/engines/sci/graphics/palette32.cpp b/engines/sci/graphics/palette32.cpp
index a958045b1af..c7d12225918 100644
--- a/engines/sci/graphics/palette32.cpp
+++ b/engines/sci/graphics/palette32.cpp
@@ -21,7 +21,7 @@
#include "common/file.h"
#include "common/system.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "sci/sci.h"
#include "sci/event.h"
diff --git a/engines/sci/graphics/screen.cpp b/engines/sci/graphics/screen.cpp
index 3a897558321..81faa11e824 100644
--- a/engines/sci/graphics/screen.cpp
+++ b/engines/sci/graphics/screen.cpp
@@ -24,7 +24,7 @@
#include "common/system.h"
#include "common/timer.h"
#include "graphics/surface.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "graphics/cursorman.h"
#include "engines/util.h"
diff --git a/engines/sci/graphics/transitions.cpp b/engines/sci/graphics/transitions.cpp
index c07d03c6c1e..79ad3227e77 100644
--- a/engines/sci/graphics/transitions.cpp
+++ b/engines/sci/graphics/transitions.cpp
@@ -21,7 +21,6 @@
#include "common/events.h"
#include "common/system.h"
-#include "graphics/palette.h"
#include "graphics/surface.h"
#include "sci/sci.h"
diff --git a/engines/sci/graphics/video32.cpp b/engines/sci/graphics/video32.cpp
index 347b8a00c08..952168bad57 100644
--- a/engines/sci/graphics/video32.cpp
+++ b/engines/sci/graphics/video32.cpp
@@ -28,7 +28,7 @@
#include "common/util.h" // for ARRAYSIZE
#include "common/system.h" // for g_system
#include "engines/engine.h" // for Engine, g_engine
-#include "graphics/palette.h" // for PaletteManager
+#include "graphics/paletteman.h" // for PaletteManager
#include "sci/console.h" // for Console
#include "sci/engine/features.h" // for GameFeatures
#include "sci/engine/state.h" // for EngineState
diff --git a/engines/scumm/he/cup_player_he.cpp b/engines/scumm/he/cup_player_he.cpp
index 1512e180dc6..e8bc7f8cc59 100644
--- a/engines/scumm/he/cup_player_he.cpp
+++ b/engines/scumm/he/cup_player_he.cpp
@@ -26,7 +26,7 @@
#include "audio/audiostream.h"
#include "audio/mixer.h"
#include "audio/decoders/raw.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "scumm/scumm.h"
#include "scumm/util.h"
#include "scumm/he/intern_he.h"
diff --git a/engines/scumm/he/palette_he.cpp b/engines/scumm/he/palette_he.cpp
index c2c833377fc..b940a3b20dd 100644
--- a/engines/scumm/he/palette_he.cpp
+++ b/engines/scumm/he/palette_he.cpp
@@ -22,7 +22,7 @@
#ifdef ENABLE_HE
#include "common/system.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "scumm/scumm.h"
#include "scumm/he/intern_he.h"
#include "scumm/resource.h"
diff --git a/engines/scumm/macgui/macgui_impl.cpp b/engines/scumm/macgui/macgui_impl.cpp
index a22084d3142..03cacdcffbb 100644
--- a/engines/scumm/macgui/macgui_impl.cpp
+++ b/engines/scumm/macgui/macgui_impl.cpp
@@ -24,6 +24,7 @@
#include "common/macresman.h"
#include "graphics/cursorman.h"
+#include "graphics/paletteman.h"
#include "graphics/fonts/macfont.h"
#include "graphics/macgui/macwindowmanager.h"
diff --git a/engines/scumm/palette.cpp b/engines/scumm/palette.cpp
index 5e785dd702a..b0bd9d7ca78 100644
--- a/engines/scumm/palette.cpp
+++ b/engines/scumm/palette.cpp
@@ -25,7 +25,7 @@
#include "common/util.h"
#include "graphics/macega.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "scumm/resource.h"
#include "scumm/scumm.h"
diff --git a/engines/scumm/smush/smush_player.cpp b/engines/scumm/smush/smush_player.cpp
index f0a978ba3c9..fd9d6acc066 100644
--- a/engines/scumm/smush/smush_player.cpp
+++ b/engines/scumm/smush/smush_player.cpp
@@ -28,7 +28,7 @@
#include "audio/mixer.h"
#include "graphics/cursorman.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "scumm/file.h"
#include "scumm/imuse_digi/dimuse_engine.h"
diff --git a/engines/sherlock/screen.cpp b/engines/sherlock/screen.cpp
index bc02ca52f8b..a505fe7d996 100644
--- a/engines/sherlock/screen.cpp
+++ b/engines/sherlock/screen.cpp
@@ -26,7 +26,6 @@
#include "sherlock/tattoo/tattoo_screen.h"
#include "common/system.h"
#include "common/util.h"
-#include "graphics/palette.h"
namespace Sherlock {
diff --git a/engines/sky/screen.cpp b/engines/sky/screen.cpp
index 2131fa54d45..11f5f3002fd 100644
--- a/engines/sky/screen.cpp
+++ b/engines/sky/screen.cpp
@@ -25,7 +25,7 @@
#include "common/system.h"
#include "common/textconsole.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "sky/disk.h"
#include "sky/logic.h"
diff --git a/engines/startrek/graphics.cpp b/engines/startrek/graphics.cpp
index 3db56188b57..56b789a106d 100644
--- a/engines/startrek/graphics.cpp
+++ b/engines/startrek/graphics.cpp
@@ -28,7 +28,7 @@
#include "common/events.h"
#include "common/rendermode.h"
#include "graphics/cursorman.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "graphics/surface.h"
namespace StarTrek {
diff --git a/engines/supernova/game-manager.cpp b/engines/supernova/game-manager.cpp
index 5352970a2ff..0d3f8ac77f1 100644
--- a/engines/supernova/game-manager.cpp
+++ b/engines/supernova/game-manager.cpp
@@ -23,7 +23,6 @@
#include "common/config-manager.h"
#include "common/text-to-speech.h"
#include "graphics/cursorman.h"
-#include "graphics/palette.h"
#include "gui/message.h"
#include "supernova/screen.h"
diff --git a/engines/supernova/graphics.cpp b/engines/supernova/graphics.cpp
index 07ab0fa4a14..6605d2321ac 100644
--- a/engines/supernova/graphics.cpp
+++ b/engines/supernova/graphics.cpp
@@ -25,7 +25,7 @@
#include "common/system.h"
#include "common/config-manager.h"
#include "common/memstream.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "graphics/surface.h"
#include "supernova/graphics.h"
diff --git a/engines/supernova/resman.cpp b/engines/supernova/resman.cpp
index 51f19389cc6..1b4b0df6159 100644
--- a/engines/supernova/resman.cpp
+++ b/engines/supernova/resman.cpp
@@ -26,7 +26,6 @@
#include "common/memstream.h"
#include "common/system.h"
#include "graphics/cursorman.h"
-#include "graphics/palette.h"
#include "supernova/graphics.h"
#include "supernova/resman.h"
diff --git a/engines/supernova/room.cpp b/engines/supernova/room.cpp
index 1441352c7c3..71cd9195261 100644
--- a/engines/supernova/room.cpp
+++ b/engines/supernova/room.cpp
@@ -20,7 +20,6 @@
*/
#include "common/system.h"
-#include "graphics/palette.h"
#include "graphics/cursorman.h"
#include "supernova/screen.h"
diff --git a/engines/supernova/screen.cpp b/engines/supernova/screen.cpp
index b4699e2e866..de009f6ba28 100644
--- a/engines/supernova/screen.cpp
+++ b/engines/supernova/screen.cpp
@@ -23,7 +23,7 @@
#include "common/system.h"
#include "engines/util.h"
#include "graphics/cursorman.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "graphics/surface.h"
#include "common/config-manager.h"
#include "common/text-to-speech.h"
diff --git a/engines/supernova/supernova.cpp b/engines/supernova/supernova.cpp
index 20256e45919..3c2967d259a 100644
--- a/engines/supernova/supernova.cpp
+++ b/engines/supernova/supernova.cpp
@@ -38,7 +38,6 @@
#include "graphics/cursorman.h"
#include "graphics/surface.h"
#include "graphics/screen.h"
-#include "graphics/palette.h"
#include "graphics/thumbnail.h"
#include "gui/saveload.h"
diff --git a/engines/supernova/supernova1/rooms.cpp b/engines/supernova/supernova1/rooms.cpp
index b7bf2af7c17..e98fc54a579 100644
--- a/engines/supernova/supernova1/rooms.cpp
+++ b/engines/supernova/supernova1/rooms.cpp
@@ -20,7 +20,7 @@
*/
#include "common/system.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "graphics/cursorman.h"
#include "supernova/screen.h"
diff --git a/engines/supernova/supernova1/state.cpp b/engines/supernova/supernova1/state.cpp
index fe2f0c34bd4..8f398f32097 100644
--- a/engines/supernova/supernova1/state.cpp
+++ b/engines/supernova/supernova1/state.cpp
@@ -21,7 +21,7 @@
#include "common/system.h"
#include "graphics/cursorman.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "gui/message.h"
#include "supernova/screen.h"
diff --git a/engines/supernova/supernova2/rooms.cpp b/engines/supernova/supernova2/rooms.cpp
index 33124145d7d..c59641b116c 100644
--- a/engines/supernova/supernova2/rooms.cpp
+++ b/engines/supernova/supernova2/rooms.cpp
@@ -21,7 +21,7 @@
#include "common/system.h"
#include "common/config-manager.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "graphics/cursorman.h"
#include "supernova/screen.h"
diff --git a/engines/supernova/supernova2/state.cpp b/engines/supernova/supernova2/state.cpp
index 81ea02a9614..673bebf5e20 100644
--- a/engines/supernova/supernova2/state.cpp
+++ b/engines/supernova/supernova2/state.cpp
@@ -23,7 +23,6 @@
#include "common/config-manager.h"
#include "common/text-to-speech.h"
#include "graphics/cursorman.h"
-#include "graphics/palette.h"
#include "gui/message.h"
#include "supernova/screen.h"
diff --git a/engines/sword1/animation.cpp b/engines/sword1/animation.cpp
index 4bab868e359..e72a483b205 100644
--- a/engines/sword1/animation.cpp
+++ b/engines/sword1/animation.cpp
@@ -31,7 +31,7 @@
#include "common/str.h"
#include "common/system.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "graphics/surface.h"
#include "gui/message.h"
diff --git a/engines/sword1/control.cpp b/engines/sword1/control.cpp
index 1026f9ee50c..8c93a729912 100644
--- a/engines/sword1/control.cpp
+++ b/engines/sword1/control.cpp
@@ -29,7 +29,6 @@
#include "common/translation.h"
#include "common/memstream.h"
-#include "graphics/palette.h"
#include "graphics/thumbnail.h"
#include "gui/message.h"
diff --git a/engines/sword1/screen.cpp b/engines/sword1/screen.cpp
index 06511504484..6c4a96f0c53 100644
--- a/engines/sword1/screen.cpp
+++ b/engines/sword1/screen.cpp
@@ -24,7 +24,7 @@
#include "common/textconsole.h"
#include "common/util.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "sword1/screen.h"
#include "sword1/logic.h"
diff --git a/engines/sword2/animation.cpp b/engines/sword2/animation.cpp
index da24b49ab01..67b28a59d6b 100644
--- a/engines/sword2/animation.cpp
+++ b/engines/sword2/animation.cpp
@@ -37,7 +37,7 @@
#include "sword2/screen.h"
#include "sword2/animation.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "gui/message.h"
diff --git a/engines/sword2/palette.cpp b/engines/sword2/palette.cpp
index f838aa531a2..a2b282e8123 100644
--- a/engines/sword2/palette.cpp
+++ b/engines/sword2/palette.cpp
@@ -25,7 +25,7 @@
#include "common/system.h"
#include "common/textconsole.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "sword2/sword2.h"
#include "sword2/defs.h"
diff --git a/engines/teenagent/scene.cpp b/engines/teenagent/scene.cpp
index 759207cda32..08d8ba171a2 100644
--- a/engines/teenagent/scene.cpp
+++ b/engines/teenagent/scene.cpp
@@ -26,7 +26,7 @@
#include "common/ptr.h"
#include "common/textconsole.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "teenagent/scene.h"
#include "teenagent/inventory.h"
diff --git a/engines/teenagent/teenagent.cpp b/engines/teenagent/teenagent.cpp
index 0c6e7896ed6..847b86cdbbe 100644
--- a/engines/teenagent/teenagent.cpp
+++ b/engines/teenagent/teenagent.cpp
@@ -36,7 +36,7 @@
#include "audio/decoders/raw.h"
#include "graphics/cursorman.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "graphics/thumbnail.h"
#include "teenagent/console.h"
diff --git a/engines/testbed/graphics.cpp b/engines/testbed/graphics.cpp
index a4d25e747d3..bcce7300605 100644
--- a/engines/testbed/graphics.cpp
+++ b/engines/testbed/graphics.cpp
@@ -30,7 +30,7 @@
#include "graphics/cursorman.h"
#include "graphics/fontman.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "graphics/surface.h"
#include "graphics/VectorRendererSpec.h"
diff --git a/engines/testbed/video.cpp b/engines/testbed/video.cpp
index 6d40f5291d2..8ada429af75 100644
--- a/engines/testbed/video.cpp
+++ b/engines/testbed/video.cpp
@@ -27,7 +27,7 @@
#include "testbed/testbed.h"
#include "testbed/video.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "gui/browser.h"
namespace Testbed {
diff --git a/engines/tetraedge/tetraedge.cpp b/engines/tetraedge/tetraedge.cpp
index 9e14f5a50d1..d99659243d2 100644
--- a/engines/tetraedge/tetraedge.cpp
+++ b/engines/tetraedge/tetraedge.cpp
@@ -29,7 +29,6 @@
#include "common/savefile.h"
#include "engines/util.h"
#include "engines/dialogs.h"
-#include "graphics/palette.h"
#include "tetraedge/game/amerzone_game.h"
#include "tetraedge/game/syberia_game.h"
diff --git a/engines/tinsel/palette.cpp b/engines/tinsel/palette.cpp
index 1b0cc90f0b0..fc3e98ec20a 100644
--- a/engines/tinsel/palette.cpp
+++ b/engines/tinsel/palette.cpp
@@ -29,7 +29,7 @@
#include "common/system.h"
#include "common/textconsole.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
namespace Tinsel {
diff --git a/engines/toltecs/palette.cpp b/engines/toltecs/palette.cpp
index 095060fc7f0..dca6680a649 100644
--- a/engines/toltecs/palette.cpp
+++ b/engines/toltecs/palette.cpp
@@ -19,7 +19,7 @@
*
*/
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "toltecs/toltecs.h"
#include "toltecs/palette.h"
diff --git a/engines/toon/movie.cpp b/engines/toon/movie.cpp
index 552be3355e1..ca120bda872 100644
--- a/engines/toon/movie.cpp
+++ b/engines/toon/movie.cpp
@@ -24,7 +24,7 @@
#include "common/keyboard.h"
#include "common/stream.h"
#include "common/system.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "graphics/surface.h"
#include "toon/audio.h"
diff --git a/engines/toon/toon.cpp b/engines/toon/toon.cpp
index 9559ff09af5..43a4ada42f2 100644
--- a/engines/toon/toon.cpp
+++ b/engines/toon/toon.cpp
@@ -31,7 +31,7 @@
#include "audio/mididrv.h"
#include "engines/advancedDetector.h"
#include "engines/util.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "graphics/surface.h"
#include "graphics/thumbnail.h"
#include "gui/saveload.h"
diff --git a/engines/touche/touche.cpp b/engines/touche/touche.cpp
index 3ad521e13c3..fd93d37e904 100644
--- a/engines/touche/touche.cpp
+++ b/engines/touche/touche.cpp
@@ -36,7 +36,7 @@
#include "engines/util.h"
#include "graphics/cursorman.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "gui/debugger.h"
#include "touche/midi.h"
diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index 3456faa76e8..51a09684ceb 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -23,7 +23,7 @@
#include "common/config-manager.h"
#include "common/util.h"
#include "engines/engine.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "tsage/tsage.h"
#include "tsage/core.h"
#include "tsage/dialogs.h"
diff --git a/engines/tsage/graphics.cpp b/engines/tsage/graphics.cpp
index cf69371b579..63bfbcebf57 100644
--- a/engines/tsage/graphics.cpp
+++ b/engines/tsage/graphics.cpp
@@ -25,7 +25,7 @@
#include "tsage/tsage.h"
#include "tsage/core.h"
#include "common/algorithm.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "graphics/surface.h"
#include "tsage/globals.h"
diff --git a/engines/tsage/saveload.cpp b/engines/tsage/saveload.cpp
index e8679d1a631..cffa04748e0 100644
--- a/engines/tsage/saveload.cpp
+++ b/engines/tsage/saveload.cpp
@@ -21,7 +21,7 @@
#include "common/savefile.h"
#include "common/mutex.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "graphics/scaler.h"
#include "graphics/thumbnail.h"
#include "tsage/globals.h"
diff --git a/engines/tucker/locations.cpp b/engines/tucker/locations.cpp
index d09ea199430..5330604cf40 100644
--- a/engines/tucker/locations.cpp
+++ b/engines/tucker/locations.cpp
@@ -22,7 +22,7 @@
#include "tucker/tucker.h"
#include "tucker/graphics.h"
#include "common/system.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
namespace Tucker {
diff --git a/engines/tucker/sequences.cpp b/engines/tucker/sequences.cpp
index d99c36f4973..44850c04945 100644
--- a/engines/tucker/sequences.cpp
+++ b/engines/tucker/sequences.cpp
@@ -26,7 +26,7 @@
#include "audio/decoders/raw.h"
#include "audio/decoders/wave.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "graphics/surface.h"
#include "tucker/tucker.h"
diff --git a/engines/tucker/tucker.cpp b/engines/tucker/tucker.cpp
index d3192c653bf..84a93df8bef 100644
--- a/engines/tucker/tucker.cpp
+++ b/engines/tucker/tucker.cpp
@@ -32,7 +32,7 @@
#include "engines/util.h"
#include "graphics/cursorman.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "gui/debugger.h"
#include "tucker/tucker.h"
diff --git a/engines/voyeur/events.cpp b/engines/voyeur/events.cpp
index 549f024a54d..877314ef967 100644
--- a/engines/voyeur/events.cpp
+++ b/engines/voyeur/events.cpp
@@ -26,7 +26,7 @@
#include "graphics/cursorman.h"
#include "graphics/font.h"
#include "graphics/fontman.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
namespace Voyeur {
diff --git a/engines/voyeur/screen.cpp b/engines/voyeur/screen.cpp
index 95201f63828..6f756a939b2 100644
--- a/engines/voyeur/screen.cpp
+++ b/engines/voyeur/screen.cpp
@@ -23,7 +23,7 @@
#include "voyeur/voyeur.h"
#include "voyeur/staticres.h"
#include "engines/util.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "graphics/surface.h"
namespace Voyeur {
diff --git a/engines/voyeur/voyeur.cpp b/engines/voyeur/voyeur.cpp
index a4efc381f26..306c78756d3 100644
--- a/engines/voyeur/voyeur.cpp
+++ b/engines/voyeur/voyeur.cpp
@@ -27,7 +27,6 @@
#include "common/config-manager.h"
#include "common/debug-channels.h"
#include "common/events.h"
-#include "graphics/palette.h"
#include "graphics/scaler.h"
#include "graphics/thumbnail.h"
#include "video/mve_decoder.h"
diff --git a/engines/wage/gui.h b/engines/wage/gui.h
index 88e0626608c..b939c7a68c4 100644
--- a/engines/wage/gui.h
+++ b/engines/wage/gui.h
@@ -64,8 +64,6 @@
#include "graphics/pixelformat.h"
#include "image/bmp.h"
-#include "graphics/palette.h"
-
namespace Wage {
using namespace Graphics::MacWindowConstants;
diff --git a/graphics/macgui/macwindow.h b/graphics/macgui/macwindow.h
index 9d9a1dd203a..3049adb401f 100644
--- a/graphics/macgui/macwindow.h
+++ b/graphics/macgui/macwindow.h
@@ -26,7 +26,6 @@
#include "graphics/managed_surface.h"
#include "graphics/nine_patch.h"
-#include "graphics/palette.h"
#include "graphics/font.h"
#include "graphics/macgui/macwidget.h"
diff --git a/graphics/macgui/macwindowmanager.cpp b/graphics/macgui/macwindowmanager.cpp
index bfdb959b7c5..03dca274123 100644
--- a/graphics/macgui/macwindowmanager.cpp
+++ b/graphics/macgui/macwindowmanager.cpp
@@ -25,6 +25,7 @@
#include "graphics/cursorman.h"
#include "graphics/managed_surface.h"
#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "graphics/primitives.h"
#include "graphics/macgui/macwindowmanager.h"
#include "graphics/macgui/macfontmanager.h"
diff --git a/graphics/macgui/macwindowmanager.h b/graphics/macgui/macwindowmanager.h
index 902b3c485fb..064f84c23c7 100644
--- a/graphics/macgui/macwindowmanager.h
+++ b/graphics/macgui/macwindowmanager.h
@@ -30,6 +30,7 @@
#include "graphics/font.h"
#include "graphics/fontman.h"
+#include "graphics/palette.h"
#include "graphics/macgui/macwindow.h"
#include "graphics/macgui/macmenu.h"
diff --git a/graphics/palette.h b/graphics/palette.h
index 02ff1b6089f..705d19fc681 100644
--- a/graphics/palette.h
+++ b/graphics/palette.h
@@ -22,92 +22,7 @@
#ifndef GRAPHICS_PALETTE_H
#define GRAPHICS_PALETTE_H
-#include "common/scummsys.h"
#include "common/hashmap.h"
-#include "common/noncopyable.h"
-
-/**
- * @defgroup graphics_palette PaletteManager
- * @ingroup graphics
- *
- * @brief The PaletteManager class.
- *
- * @{
- */
-
-/**
- * The PaletteManager is part of the OSystem backend API and responsible
- * for handling the (possibly emulated) "hardware" palette needed for
- * many old games (e.g. in EGA and VGA mode).
- *
- * By itself it is a pure abstract class, i.e. an "interface"; you can
- * use the OSystem::getPaletteManager() method to obtain an instance
- * that you can use to perform actual palette modifications.
- */
-class PaletteManager : Common::NonCopyable {
-public:
- virtual ~PaletteManager() {}
-
- /**
- * Replace the specified range of the palette with new colors.
- * The palette entries from 'start' till (start+num-1) will be replaced - so
- * a full palette update is accomplished via start=0, num=256.
- *
- * The palette data is specified in interleaved RGB format. That is, the
- * first byte of the memory block 'colors' points at is the red component
- * of the first new color; the second byte the green component of the first
- * new color; the third byte the blue component, the last byte to the alpha
- * (transparency) value. Then the second color starts, and so on. So memory
- * looks like this: R1-G1-B1-R2-G2-B2-R3-...
- *
- * @param colors the new palette data, in interleaved RGB format
- * @param start the first palette entry to be updated
- * @param num the number of palette entries to be updated
- *
- * @note It is an error if start+num exceeds 256, behavior is undefined
- * in that case (the backend may ignore it silently or assert).
- * @note It is an error if this function gets called when the pixel format
- * in use (the return value of getScreenFormat) has more than one
- * byte per pixel.
- *
- * @see getScreenFormat
- */
- virtual void setPalette(const byte *colors, uint start, uint num) = 0;
-
- /**
- * Grabs a specified part of the currently active palette.
- * The format is the same as for setPalette.
- *
- * This should return exactly the same RGB data as was setup via previous
- * setPalette calls.
- *
- * For example, for every valid value of start and num of the following
- * code:
- *
- * byte origPal[num*3];
- * // Setup origPal's data however you like
- * g_system->setPalette(origPal, start, num);
- * byte obtainedPal[num*3];
- * g_system->grabPalette(obtainedPal, start, num);
- *
- * the following should be true:
- *
- * memcmp(origPal, obtainedPal, num*3) == 0
- *
- * @see setPalette
- * @param colors the palette data, in interleaved RGB format
- * @param start the first platte entry to be read
- * @param num the number of palette entries to be read
- *
- * @note It is an error if this function gets called when the pixel format
- * in use (the return value of getScreenFormat) has more than one
- * byte per pixel.
- *
- * @see getScreenFormat
- */
- virtual void grabPalette(byte *colors, uint start, uint num) const = 0;
-};
- /** @} */
namespace Graphics {
diff --git a/graphics/paletteman.h b/graphics/paletteman.h
new file mode 100644
index 00000000000..fba234284f4
--- /dev/null
+++ b/graphics/paletteman.h
@@ -0,0 +1,111 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef GRAPHICS_PALETTEMAN_H
+#define GRAPHICS_PALETTEMAN_H
+
+#include "common/scummsys.h"
+#include "common/noncopyable.h"
+
+/**
+ * @defgroup graphics_palette PaletteManager
+ * @ingroup graphics
+ *
+ * @brief The PaletteManager class.
+ *
+ * @{
+ */
+
+/**
+ * The PaletteManager is part of the OSystem backend API and responsible
+ * for handling the (possibly emulated) "hardware" palette needed for
+ * many old games (e.g. in EGA and VGA mode).
+ *
+ * By itself it is a pure abstract class, i.e. an "interface"; you can
+ * use the OSystem::getPaletteManager() method to obtain an instance
+ * that you can use to perform actual palette modifications.
+ */
+class PaletteManager : Common::NonCopyable {
+public:
+ virtual ~PaletteManager() {}
+
+ /**
+ * Replace the specified range of the palette with new colors.
+ * The palette entries from 'start' till (start+num-1) will be replaced - so
+ * a full palette update is accomplished via start=0, num=256.
+ *
+ * The palette data is specified in interleaved RGB format. That is, the
+ * first byte of the memory block 'colors' points at is the red component
+ * of the first new color; the second byte the green component of the first
+ * new color; the third byte the blue component, the last byte to the alpha
+ * (transparency) value. Then the second color starts, and so on. So memory
+ * looks like this: R1-G1-B1-R2-G2-B2-R3-...
+ *
+ * @param colors the new palette data, in interleaved RGB format
+ * @param start the first palette entry to be updated
+ * @param num the number of palette entries to be updated
+ *
+ * @note It is an error if start+num exceeds 256, behavior is undefined
+ * in that case (the backend may ignore it silently or assert).
+ * @note It is an error if this function gets called when the pixel format
+ * in use (the return value of getScreenFormat) has more than one
+ * byte per pixel.
+ *
+ * @see getScreenFormat
+ */
+ virtual void setPalette(const byte *colors, uint start, uint num) = 0;
+
+ /**
+ * Grabs a specified part of the currently active palette.
+ * The format is the same as for setPalette.
+ *
+ * This should return exactly the same RGB data as was setup via previous
+ * setPalette calls.
+ *
+ * For example, for every valid value of start and num of the following
+ * code:
+ *
+ * byte origPal[num*3];
+ * // Setup origPal's data however you like
+ * g_system->setPalette(origPal, start, num);
+ * byte obtainedPal[num*3];
+ * g_system->grabPalette(obtainedPal, start, num);
+ *
+ * the following should be true:
+ *
+ * memcmp(origPal, obtainedPal, num*3) == 0
+ *
+ * @see setPalette
+ * @param colors the palette data, in interleaved RGB format
+ * @param start the first platte entry to be read
+ * @param num the number of palette entries to be read
+ *
+ * @note It is an error if this function gets called when the pixel format
+ * in use (the return value of getScreenFormat) has more than one
+ * byte per pixel.
+ *
+ * @see getScreenFormat
+ */
+ virtual void grabPalette(byte *colors, uint start, uint num) const = 0;
+};
+ /** @} */
+
+#endif
diff --git a/graphics/scaler/thumbnail_intern.cpp b/graphics/scaler/thumbnail_intern.cpp
index 173bc8ec900..11f20630172 100644
--- a/graphics/scaler/thumbnail_intern.cpp
+++ b/graphics/scaler/thumbnail_intern.cpp
@@ -26,7 +26,7 @@
#include "graphics/colormasks.h"
#include "graphics/scaler.h"
#include "graphics/scaler/intern.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "graphics/managed_surface.h"
template<typename ColorMask>
diff --git a/graphics/screen.cpp b/graphics/screen.cpp
index 3109518f450..be81655b064 100644
--- a/graphics/screen.cpp
+++ b/graphics/screen.cpp
@@ -22,7 +22,7 @@
#include "common/system.h"
#include "common/algorithm.h"
#include "graphics/screen.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
namespace Graphics {
diff --git a/gui/options.cpp b/gui/options.cpp
index 7b8570bf641..863e9f54c76 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -68,7 +68,7 @@
#endif
#endif
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
#include "graphics/pm5544.h"
#include "graphics/renderer.h"
#include "graphics/scalerplugin.h"
diff --git a/video/3do_decoder.cpp b/video/3do_decoder.cpp
index 8efe5786757..f8ac4bd1555 100644
--- a/video/3do_decoder.cpp
+++ b/video/3do_decoder.cpp
@@ -35,7 +35,6 @@
#include "common/keyboard.h"
#include "engines/engine.h"
#include "engines/util.h"
-#include "graphics/palette.h"
#include "graphics/pixelformat.h"
#include "graphics/surface.h"
diff --git a/video/mve_decoder.cpp b/video/mve_decoder.cpp
index a39b78df2b8..4a20b54d263 100644
--- a/video/mve_decoder.cpp
+++ b/video/mve_decoder.cpp
@@ -32,7 +32,7 @@
#include "common/events.h"
#include "graphics/surface.h"
-#include "graphics/palette.h"
+#include "graphics/paletteman.h"
namespace Video {
diff --git a/video/video_decoder.cpp b/video/video_decoder.cpp
index 43dadbc7fdd..b9bce8e6e96 100644
--- a/video/video_decoder.cpp
+++ b/video/video_decoder.cpp
@@ -28,8 +28,6 @@
#include "common/file.h"
#include "common/system.h"
-#include "graphics/palette.h"
-
namespace Video {
VideoDecoder::VideoDecoder() {
More information about the Scummvm-git-logs
mailing list