[Scummvm-git-logs] scummvm master -> 605061c7249391aa95d086c7c4d2536eed283b4c

sev- noreply at scummvm.org
Sat Jun 13 17:03:41 UTC 2026 

This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
11657be06d PELROCK: Reduce header dependency
d543f07c85 PELROCK: Further reducing of header dependency
605061c724 PELROCK: Final pass on reducing header dependencies


Commit: 11657be06d4c65c84745a0cdfdb8c02b95f1c331
    https://github.com/scummvm/scummvm/commit/11657be06d4c65c84745a0cdfdb8c02b95f1c331
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-06-13T18:14:37+02:00

Commit Message:
PELROCK: Reduce header dependency

Changed paths:
    engines/pelrock/actions.cpp
    engines/pelrock/actions.h
    engines/pelrock/backgroundbook.cpp
    engines/pelrock/backgroundbook.h
    engines/pelrock/cdplayer.cpp
    engines/pelrock/chrono.cpp
    engines/pelrock/computer.cpp
    engines/pelrock/console.cpp
    engines/pelrock/dialog.cpp
    engines/pelrock/events.cpp
    engines/pelrock/graphics.cpp
    engines/pelrock/menu.cpp
    engines/pelrock/menu.h
    engines/pelrock/pelrock.cpp
    engines/pelrock/pelrock.h
    engines/pelrock/resources.cpp
    engines/pelrock/room.cpp
    engines/pelrock/saveload.cpp
    engines/pelrock/slidingpuzzle.cpp
    engines/pelrock/spellbook.cpp
    engines/pelrock/util.cpp
    engines/pelrock/video.cpp


diff --git a/engines/pelrock/actions.cpp b/engines/pelrock/actions.cpp
index 8324af1ae82..56d98fd2ada 100644
--- a/engines/pelrock/actions.cpp
+++ b/engines/pelrock/actions.cpp
@@ -27,8 +27,13 @@
 #include "pelrock/actions.h"
 #include "pelrock/backgroundbook.h"
 #include "pelrock/cdplayer.h"
+#include "pelrock/chrono.h"
+#include "pelrock/dialog.h"
 #include "pelrock/offsets.h"
 #include "pelrock/pelrock.h"
+#include "pelrock/resources.h"
+#include "pelrock/room.h"
+#include "pelrock/sound.h"
 #include "pelrock/spellbook.h"
 #include "pelrock/util.h"
 
diff --git a/engines/pelrock/actions.h b/engines/pelrock/actions.h
index a5eb7a62804..b1b29305706 100644
--- a/engines/pelrock/actions.h
+++ b/engines/pelrock/actions.h
@@ -22,7 +22,6 @@
 #define PELROCK_ACTIONS_H
 
 #include "pelrock/pelrock.h"
-#include "pelrock/types.h"
 
 namespace Pelrock {
 
diff --git a/engines/pelrock/backgroundbook.cpp b/engines/pelrock/backgroundbook.cpp
index bcf50b15a8c..37e0c81e990 100644
--- a/engines/pelrock/backgroundbook.cpp
+++ b/engines/pelrock/backgroundbook.cpp
@@ -21,10 +21,15 @@
 
 #include "common/events.h"
 #include "graphics/paletteman.h"
+#include "graphics/screen.h"
 
+#include "pelrock/pelrock.h"
 #include "pelrock/backgroundbook.h"
+#include "pelrock/events.h"
+#include "pelrock/resources.h"
 #include "pelrock/room.h"
 #include "pelrock/util.h"
+#include "pelrock/fonts/small_font.h"
 
 namespace Pelrock {
 
diff --git a/engines/pelrock/backgroundbook.h b/engines/pelrock/backgroundbook.h
index f037f4d32ab..32b8b8e86a3 100644
--- a/engines/pelrock/backgroundbook.h
+++ b/engines/pelrock/backgroundbook.h
@@ -22,14 +22,10 @@
 #ifndef PELROCK_BACKGROUNDBOOK_H
 #define PELROCK_BACKGROUNDBOOK_H
 
-#include "common/array.h"
-#include "common/rect.h"
-#include "common/str.h"
-#include "graphics/managed_surface.h"
-
-#include "pelrock/pelrock.h"
-
 namespace Pelrock {
+class PelrockEventManager;
+class ResourceManager;
+class RoomManager;
 
 class BackgroundBook {
 
diff --git a/engines/pelrock/cdplayer.cpp b/engines/pelrock/cdplayer.cpp
index c51c3fe1b9c..17bbccee018 100644
--- a/engines/pelrock/cdplayer.cpp
+++ b/engines/pelrock/cdplayer.cpp
@@ -21,10 +21,15 @@
 
 #include "common/events.h"
 #include "graphics/paletteman.h"
+#include "graphics/screen.h"
 
 #include "pelrock/cdplayer.h"
+#include "pelrock/events.h"
+#include "pelrock/resources.h"
 #include "pelrock/room.h"
+#include "pelrock/sound.h"
 #include "pelrock/util.h"
+#include "pelrock/fonts/small_font.h"
 
 namespace Pelrock {
 
diff --git a/engines/pelrock/chrono.cpp b/engines/pelrock/chrono.cpp
index 73f091dc016..c586912e7f4 100644
--- a/engines/pelrock/chrono.cpp
+++ b/engines/pelrock/chrono.cpp
@@ -22,6 +22,8 @@
 #include "common/events.h"
 #include "common/system.h"
 
+#include "graphics/screen.h"
+
 #include "pelrock/chrono.h"
 #include "pelrock/pelrock.h"
 
diff --git a/engines/pelrock/computer.cpp b/engines/pelrock/computer.cpp
index 3f4b407ffdd..1799456bccf 100644
--- a/engines/pelrock/computer.cpp
+++ b/engines/pelrock/computer.cpp
@@ -21,11 +21,17 @@
 
 #include "common/events.h"
 #include "common/system.h"
+
 #include "graphics/cursorman.h"
 #include "graphics/paletteman.h"
+#include "graphics/screen.h"
 
 #include "pelrock/computer.h"
+#include "pelrock/graphics.h"
 #include "pelrock/pelrock.h"
+#include "pelrock/resources.h"
+#include "pelrock/room.h"
+#include "pelrock/fonts/small_font.h"
 
 namespace Pelrock {
 
diff --git a/engines/pelrock/console.cpp b/engines/pelrock/console.cpp
index b8240c13e6c..3546269451b 100644
--- a/engines/pelrock/console.cpp
+++ b/engines/pelrock/console.cpp
@@ -22,6 +22,7 @@
 #include "console.h"
 
 #include "pelrock/console.h"
+#include "pelrock/room.h"
 #include "pelrock/types.h"
 
 namespace Pelrock {
diff --git a/engines/pelrock/dialog.cpp b/engines/pelrock/dialog.cpp
index 774dc0c5622..56850a3b36d 100644
--- a/engines/pelrock/dialog.cpp
+++ b/engines/pelrock/dialog.cpp
@@ -20,10 +20,14 @@
  */
 #include "common/stack.h"
 
+#include "pelrock/chrono.h"
 #include "pelrock/dialog.h"
 #include "pelrock/offsets.h"
 #include "pelrock/pelrock.h"
+#include "pelrock/resources.h"
+#include "pelrock/room.h"
 #include "pelrock/util.h"
+#include "pelrock/fonts/small_font_double.h"
 
 namespace Pelrock {
 
diff --git a/engines/pelrock/events.cpp b/engines/pelrock/events.cpp
index 81558395938..8acd092359b 100644
--- a/engines/pelrock/events.cpp
+++ b/engines/pelrock/events.cpp
@@ -20,6 +20,8 @@
  */
 #include "common/events.h"
 
+#include "graphics/screen.h"
+
 #include "pelrock/events.h"
 #include "pelrock/pelrock.h"
 #include "pelrock/util.h"
diff --git a/engines/pelrock/graphics.cpp b/engines/pelrock/graphics.cpp
index 863d107e4cb..37e8844a060 100644
--- a/engines/pelrock/graphics.cpp
+++ b/engines/pelrock/graphics.cpp
@@ -21,11 +21,16 @@
 
 #include "common/scummsys.h"
 #include "engines/util.h"
+
 #include "graphics/cursorman.h"
 #include "graphics/paletteman.h"
+#include "graphics/screen.h"
 
+#include "pelrock/chrono.h"
+#include "pelrock/events.h"
 #include "pelrock/graphics.h"
 #include "pelrock/pelrock.h"
+#include "pelrock/room.h"
 #include "pelrock/util.h"
 
 namespace Pelrock {
diff --git a/engines/pelrock/menu.cpp b/engines/pelrock/menu.cpp
index 537055817e9..708dba6b571 100644
--- a/engines/pelrock/menu.cpp
+++ b/engines/pelrock/menu.cpp
@@ -26,10 +26,16 @@
 #include "graphics/paletteman.h"
 #include "graphics/thumbnail.h"
 
+#include "pelrock/events.h"
+#include "pelrock/graphics.h"
 #include "pelrock/menu.h"
 #include "pelrock/offsets.h"
 #include "pelrock/pelrock.h"
+#include "pelrock/resources.h"
+#include "pelrock/room.h"
+#include "pelrock/sound.h"
 #include "pelrock/util.h"
+#include "pelrock/fonts/small_font.h"
 
 namespace Pelrock {
 
diff --git a/engines/pelrock/menu.h b/engines/pelrock/menu.h
index a8952090c57..260b3585d75 100644
--- a/engines/pelrock/menu.h
+++ b/engines/pelrock/menu.h
@@ -21,16 +21,18 @@
 #ifndef PELROCK_MENU_H
 #define PELROCK_MENU_H
 
-#include "graphics/font.h"
-#include "graphics/managed_surface.h"
-#include "graphics/screen.h"
-
-#include "pelrock/events.h"
-#include "pelrock/resources.h"
-#include "pelrock/sound.h"
+#include "common/keyboard.h"
 
+#include "graphics/screen.h"
+namespace Graphics {
+class Screen;
+}
 namespace Pelrock {
 
+class PelrockEventManager;
+class ResourceManager;
+class SoundManager;
+
 enum MainMenuButton {
 	QUESTION_MARK_BUTTON,
 	INVENTORY_PREV_BUTTON,
diff --git a/engines/pelrock/pelrock.cpp b/engines/pelrock/pelrock.cpp
index de64f32b278..71b460193c7 100644
--- a/engines/pelrock/pelrock.cpp
+++ b/engines/pelrock/pelrock.cpp
@@ -28,15 +28,22 @@
 #include "graphics/paletteman.h"
 
 #include "pelrock/actions.h"
+#include "pelrock/chrono.h"
 #include "pelrock/computer.h"
 #include "pelrock/console.h"
 #include "pelrock/detection.h"
+#include "pelrock/dialog.h"
 #include "pelrock/fonts/small_font.h"
+#include "pelrock/fonts/small_font_double.h"
+#include "pelrock/menu.h"
 #include "pelrock/offsets.h"
 #include "pelrock/pathfinding.h"
 #include "pelrock/pelrock.h"
+#include "pelrock/resources.h"
+#include "pelrock/room.h"
 #include "pelrock/slidingpuzzle.h"
 #include "pelrock/util.h"
+#include "pelrock/video.h"
 
 namespace Pelrock {
 
diff --git a/engines/pelrock/pelrock.h b/engines/pelrock/pelrock.h
index 91254d1e19f..3583cd02364 100644
--- a/engines/pelrock/pelrock.h
+++ b/engines/pelrock/pelrock.h
@@ -22,40 +22,36 @@
 #ifndef PELROCK_H
 #define PELROCK_H
 
-#include "common/error.h"
-#include "common/file.h"
-#include "common/fs.h"
-#include "common/hash-str.h"
 #include "common/random.h"
-#include "common/scummsys.h"
 #include "common/serializer.h"
-#include "common/system.h"
-#include "common/util.h"
-#include "engines/engine.h"
-#include "engines/savestate.h"
+
 #include "graphics/managed_surface.h"
-#include "graphics/screen.h"
-#include "image/png.h"
 
-#include "pelrock/chrono.h"
 #include "pelrock/detection.h"
-#include "pelrock/dialog.h"
-#include "pelrock/events.h"
-#include "pelrock/fonts/large_font.h"
-#include "pelrock/fonts/small_font.h"
-#include "pelrock/fonts/small_font_double.h"
-#include "pelrock/graphics.h"
-#include "pelrock/menu.h"
-#include "pelrock/resources.h"
-#include "pelrock/room.h"
-#include "pelrock/sound.h"
 #include "pelrock/types.h"
-#include "pelrock/video.h"
+
+namespace Graphics {
+class Screen;
+}
 
 namespace Pelrock {
 
 struct PelrockGameDescription;
 
+class ChronoManager;
+class DialogManager;
+class DoubleSmallFont;
+class GraphicsManager;
+class LargeFont;
+class MenuManager;
+class PelrockEventManager;
+class RoomManager;
+class ResourceManager;
+class SmallFont;
+class SoundManager;
+class VideoManager;
+
+
 class PelrockEngine : public Engine {
 private:
 	const ADGameDescription *_gameDescription;
diff --git a/engines/pelrock/resources.cpp b/engines/pelrock/resources.cpp
index c196cb3cb71..d14cc818e86 100644
--- a/engines/pelrock/resources.cpp
+++ b/engines/pelrock/resources.cpp
@@ -19,6 +19,7 @@
  *
  */
 
+#include "pelrock/dialog.h"
 #include "pelrock/resources.h"
 #include "pelrock/offsets.h"
 #include "pelrock/pelrock.h"
diff --git a/engines/pelrock/room.cpp b/engines/pelrock/room.cpp
index dda7365bb17..43f2b60a581 100644
--- a/engines/pelrock/room.cpp
+++ b/engines/pelrock/room.cpp
@@ -20,7 +20,10 @@
  */
 #include "common/scummsys.h"
 
+#include "graphics/screen.h"
+
 #include "pelrock/pelrock.h"
+#include "pelrock/resources.h"
 #include "pelrock/room.h"
 #include "pelrock/util.h"
 #include "pelrock/room.h"
diff --git a/engines/pelrock/saveload.cpp b/engines/pelrock/saveload.cpp
index bd94497a05e..98926962aa0 100644
--- a/engines/pelrock/saveload.cpp
+++ b/engines/pelrock/saveload.cpp
@@ -21,6 +21,8 @@
 #include "common/savefile.h"
 
 #include "pelrock/pelrock.h"
+#include "pelrock/room.h"
+#include "pelrock/resources.h"
 #include "pelrock/types.h"
 
 namespace Pelrock {
diff --git a/engines/pelrock/slidingpuzzle.cpp b/engines/pelrock/slidingpuzzle.cpp
index 0e0b0ab8d57..e8bdf8cea0f 100644
--- a/engines/pelrock/slidingpuzzle.cpp
+++ b/engines/pelrock/slidingpuzzle.cpp
@@ -20,7 +20,9 @@
  */
 
 #include "common/system.h"
+
 #include "graphics/paletteman.h"
+#include "graphics/screen.h"
 
 #include "pelrock/events.h"
 #include "pelrock/pelrock.h"
diff --git a/engines/pelrock/spellbook.cpp b/engines/pelrock/spellbook.cpp
index b8f3cdf4b8a..21198e927f4 100644
--- a/engines/pelrock/spellbook.cpp
+++ b/engines/pelrock/spellbook.cpp
@@ -22,10 +22,13 @@
 #include "common/events.h"
 #include "graphics/paletteman.h"
 
+#include "pelrock/events.h"
 #include "pelrock/graphics.h"
 #include "pelrock/room.h"
+#include "pelrock/resources.h"
 #include "pelrock/spellbook.h"
 #include "pelrock/util.h"
+#include "pelrock/fonts/small_font.h"
 
 namespace Pelrock {
 
diff --git a/engines/pelrock/util.cpp b/engines/pelrock/util.cpp
index 2af0fd7f944..592fa3f99c7 100644
--- a/engines/pelrock/util.cpp
+++ b/engines/pelrock/util.cpp
@@ -22,8 +22,10 @@
 
 #include "graphics/cursorman.h"
 #include "graphics/font.h"
+#include "graphics/screen.h"
 
 #include "pelrock/pelrock.h"
+#include "pelrock/chrono.h"
 #include "pelrock/types.h"
 #include "pelrock/util.h"
 
diff --git a/engines/pelrock/video.cpp b/engines/pelrock/video.cpp
index 2fed22ef082..447a91ca1d1 100644
--- a/engines/pelrock/video.cpp
+++ b/engines/pelrock/video.cpp
@@ -24,7 +24,9 @@
 #include "graphics/screen.h"
 
 #include "pelrock/chrono.h"
+#include "pelrock/dialog.h"
 #include "pelrock/pelrock.h"
+#include "pelrock/sound.h"
 #include "pelrock/util.h"
 #include "pelrock/video.h"
 


Commit: d543f07c851c9a2890f6386e62a24b852b09dd40
    https://github.com/scummvm/scummvm/commit/d543f07c851c9a2890f6386e62a24b852b09dd40
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-06-13T18:43:30+02:00

Commit Message:
PELROCK: Further reducing of header dependency

Changed paths:
    engines/pelrock/actions.cpp
    engines/pelrock/backgroundbook.cpp
    engines/pelrock/cdplayer.cpp
    engines/pelrock/cdplayer.h
    engines/pelrock/chrono.h
    engines/pelrock/computer.cpp
    engines/pelrock/computer.h
    engines/pelrock/dialog.cpp
    engines/pelrock/dialog.h
    engines/pelrock/events.h
    engines/pelrock/fonts/large_font.cpp
    engines/pelrock/fonts/large_font.h
    engines/pelrock/fonts/small_font.cpp
    engines/pelrock/fonts/small_font.h
    engines/pelrock/fonts/small_font_double.cpp
    engines/pelrock/fonts/small_font_double.h
    engines/pelrock/graphics.h
    engines/pelrock/menu.cpp
    engines/pelrock/menu.h
    engines/pelrock/metaengine.h
    engines/pelrock/offsets.h
    engines/pelrock/pathfinding.h
    engines/pelrock/pelrock.cpp
    engines/pelrock/resources.cpp
    engines/pelrock/resources.h
    engines/pelrock/room.cpp
    engines/pelrock/room.h
    engines/pelrock/slidingpuzzle.h
    engines/pelrock/sound.h
    engines/pelrock/spellbook.cpp
    engines/pelrock/spellbook.h
    engines/pelrock/types.h
    engines/pelrock/util.h
    engines/pelrock/video.cpp
    engines/pelrock/video.h


diff --git a/engines/pelrock/actions.cpp b/engines/pelrock/actions.cpp
index 56d98fd2ada..ce475dd995c 100644
--- a/engines/pelrock/actions.cpp
+++ b/engines/pelrock/actions.cpp
@@ -22,13 +22,19 @@
 #include "audio/audiostream.h"
 #include "audio/decoders/raw.h"
 #include "audio/mixer.h"
+
+#include "common/file.h"
+
 #include "graphics/paletteman.h"
+#include "graphics/screen.h"
 
 #include "pelrock/actions.h"
 #include "pelrock/backgroundbook.h"
 #include "pelrock/cdplayer.h"
 #include "pelrock/chrono.h"
 #include "pelrock/dialog.h"
+#include "pelrock/events.h"
+#include "pelrock/graphics.h"
 #include "pelrock/offsets.h"
 #include "pelrock/pelrock.h"
 #include "pelrock/resources.h"
@@ -36,6 +42,7 @@
 #include "pelrock/sound.h"
 #include "pelrock/spellbook.h"
 #include "pelrock/util.h"
+#include "pelrock/fonts/large_font.h"
 
 namespace Pelrock {
 
diff --git a/engines/pelrock/backgroundbook.cpp b/engines/pelrock/backgroundbook.cpp
index 37e0c81e990..089ba924331 100644
--- a/engines/pelrock/backgroundbook.cpp
+++ b/engines/pelrock/backgroundbook.cpp
@@ -20,6 +20,7 @@
  */
 
 #include "common/events.h"
+#include "common/file.h"
 #include "graphics/paletteman.h"
 #include "graphics/screen.h"
 
diff --git a/engines/pelrock/cdplayer.cpp b/engines/pelrock/cdplayer.cpp
index 17bbccee018..52cddb2efff 100644
--- a/engines/pelrock/cdplayer.cpp
+++ b/engines/pelrock/cdplayer.cpp
@@ -20,9 +20,12 @@
  */
 
 #include "common/events.h"
+#include "common/file.h"
+
 #include "graphics/paletteman.h"
 #include "graphics/screen.h"
 
+#include "pelrock/pelrock.h"
 #include "pelrock/cdplayer.h"
 #include "pelrock/events.h"
 #include "pelrock/resources.h"
diff --git a/engines/pelrock/cdplayer.h b/engines/pelrock/cdplayer.h
index afc519f36f3..5ca1410d7c5 100644
--- a/engines/pelrock/cdplayer.h
+++ b/engines/pelrock/cdplayer.h
@@ -21,14 +21,12 @@
 #ifndef PELROCK_CDPLAYER_H
 #define PELROCK_CDPLAYER_H
 
-#include "common/rect.h"
-#include "common/str.h"
-#include "graphics/managed_surface.h"
-
-#include "pelrock/pelrock.h"
-
 namespace Pelrock {
 
+class PelrockEventManager;
+class ResourceManager;
+class SoundManager;
+
 class CDPlayer {
 
 	enum CDControls {
diff --git a/engines/pelrock/chrono.h b/engines/pelrock/chrono.h
index cbd348868ab..143c555ca96 100644
--- a/engines/pelrock/chrono.h
+++ b/engines/pelrock/chrono.h
@@ -21,8 +21,6 @@
 #ifndef PELROCK_CHRONO_H
 #define PELROCK_CHRONO_H
 
-#include "common/scummsys.h"
-
 namespace Pelrock {
 
 const uint32 kTickMs = 55;
diff --git a/engines/pelrock/computer.cpp b/engines/pelrock/computer.cpp
index 1799456bccf..394b1183015 100644
--- a/engines/pelrock/computer.cpp
+++ b/engines/pelrock/computer.cpp
@@ -20,6 +20,7 @@
  */
 
 #include "common/events.h"
+#include "common/file.h"
 #include "common/system.h"
 
 #include "graphics/cursorman.h"
@@ -27,6 +28,7 @@
 #include "graphics/screen.h"
 
 #include "pelrock/computer.h"
+#include "pelrock/events.h"
 #include "pelrock/graphics.h"
 #include "pelrock/pelrock.h"
 #include "pelrock/resources.h"
diff --git a/engines/pelrock/computer.h b/engines/pelrock/computer.h
index 3c5603bcd02..3acb7b04299 100644
--- a/engines/pelrock/computer.h
+++ b/engines/pelrock/computer.h
@@ -22,14 +22,10 @@
 #ifndef PELROCK_COMPUTER_H
 #define PELROCK_COMPUTER_H
 
-#include "common/array.h"
-#include "common/str.h"
-#include "graphics/managed_surface.h"
-
-#include "pelrock/events.h"
-
 namespace Pelrock {
 
+class PelrockEventManager;
+
 // Book data location in ALFRED.7
 static const uint32 kBookDataOffset = 0x309E0;
 static const uint32 kBookDataEnd = 0x33F05;
diff --git a/engines/pelrock/dialog.cpp b/engines/pelrock/dialog.cpp
index 56850a3b36d..1a80b2100c9 100644
--- a/engines/pelrock/dialog.cpp
+++ b/engines/pelrock/dialog.cpp
@@ -20,13 +20,18 @@
  */
 #include "common/stack.h"
 
+#include "graphics/screen.h"
+
 #include "pelrock/chrono.h"
 #include "pelrock/dialog.h"
+#include "pelrock/events.h"
+#include "pelrock/graphics.h"
 #include "pelrock/offsets.h"
 #include "pelrock/pelrock.h"
 #include "pelrock/resources.h"
 #include "pelrock/room.h"
 #include "pelrock/util.h"
+#include "pelrock/fonts/large_font.h"
 #include "pelrock/fonts/small_font_double.h"
 
 namespace Pelrock {
diff --git a/engines/pelrock/dialog.h b/engines/pelrock/dialog.h
index 045da583084..e4c99c150fe 100644
--- a/engines/pelrock/dialog.h
+++ b/engines/pelrock/dialog.h
@@ -21,19 +21,21 @@
 #ifndef PELROCK_DIALOG_H
 #define PELROCK_DIALOG_H
 
-#include "common/scummsys.h"
 #include "common/stack.h"
-#include "graphics/managed_surface.h"
-#include "graphics/screen.h"
 
-#include "pelrock/events.h"
-#include "pelrock/fonts/large_font.h"
-#include "pelrock/fonts/small_font.h"
-#include "pelrock/graphics.h"
+#include "graphics/font.h"
+
 #include "pelrock/types.h"
 
+namespace Graphics {
+class Screen;
+}
+
 namespace Pelrock {
 
+class GraphicsManager;
+class PelrockEventManager;
+
 // Control character codes
 const byte kCtrlSpace                = 0x20; /* ' ' */
 const byte kCtrlSpeakerId            = 0x08; /* Next byte is speaker ID (color) */
diff --git a/engines/pelrock/events.h b/engines/pelrock/events.h
index 3198089d687..0f184a1b15b 100644
--- a/engines/pelrock/events.h
+++ b/engines/pelrock/events.h
@@ -22,7 +22,6 @@
 #define PELROCK_EVENTS_H
 
 #include "common/events.h"
-#include "common/scummsys.h"
 
 namespace Pelrock {
 static const int kDoubleClickDelay = 300; // in milliseconds
diff --git a/engines/pelrock/fonts/large_font.cpp b/engines/pelrock/fonts/large_font.cpp
index 2228bda30c9..b34692d0230 100644
--- a/engines/pelrock/fonts/large_font.cpp
+++ b/engines/pelrock/fonts/large_font.cpp
@@ -19,6 +19,10 @@
  *
  */
 
+#include "common/file.h"
+
+#include "graphics/surface.h"
+
 #include "pelrock/fonts/large_font.h"
 
 namespace Pelrock {
diff --git a/engines/pelrock/fonts/large_font.h b/engines/pelrock/fonts/large_font.h
index fc6e39ebeea..8f89d508ac2 100644
--- a/engines/pelrock/fonts/large_font.h
+++ b/engines/pelrock/fonts/large_font.h
@@ -21,10 +21,7 @@
 #ifndef PELROCK_LARGEFONT_H
 #define PELROCK_LARGEFONT_H
 
-#include "common/file.h"
-#include "common/str.h"
 #include "graphics/font.h"
-#include "graphics/surface.h"
 
 namespace Pelrock {
 class LargeFont : public Graphics::Font {
diff --git a/engines/pelrock/fonts/small_font.cpp b/engines/pelrock/fonts/small_font.cpp
index 083c9adc3f5..fed8b97796c 100644
--- a/engines/pelrock/fonts/small_font.cpp
+++ b/engines/pelrock/fonts/small_font.cpp
@@ -19,6 +19,10 @@
  *
  */
 
+#include "common/file.h"
+
+#include "graphics/surface.h"
+
 #include "pelrock/fonts/small_font.h"
 
 namespace Pelrock {
diff --git a/engines/pelrock/fonts/small_font.h b/engines/pelrock/fonts/small_font.h
index f64e3fa4a19..927a9dce280 100644
--- a/engines/pelrock/fonts/small_font.h
+++ b/engines/pelrock/fonts/small_font.h
@@ -21,10 +21,7 @@
 #ifndef PELROCK_SMALLFONT_H
 #define PELROCK_SMALLFONT_H
 
-#include "common/file.h"
-#include "common/str.h"
 #include "graphics/font.h"
-#include "graphics/surface.h"
 
 namespace Pelrock {
 
diff --git a/engines/pelrock/fonts/small_font_double.cpp b/engines/pelrock/fonts/small_font_double.cpp
index 4f1484685ef..e55f29be74e 100644
--- a/engines/pelrock/fonts/small_font_double.cpp
+++ b/engines/pelrock/fonts/small_font_double.cpp
@@ -18,8 +18,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-#include "pelrock/fonts/small_font_double.h"
+
 #include "common/debug.h"
+#include "graphics/surface.h"
+
+#include "pelrock/fonts/small_font_double.h"
 
 namespace Pelrock {
 
diff --git a/engines/pelrock/fonts/small_font_double.h b/engines/pelrock/fonts/small_font_double.h
index 68a603ff28e..9fa79eef5a6 100644
--- a/engines/pelrock/fonts/small_font_double.h
+++ b/engines/pelrock/fonts/small_font_double.h
@@ -21,11 +21,6 @@
 #ifndef PELROCK_SMALLFONTDOUBLE_H
 #define PELROCK_SMALLFONTDOUBLE_H
 
-#include "common/file.h"
-#include "common/str.h"
-#include "graphics/font.h"
-#include "graphics/surface.h"
-
 #include "pelrock/fonts/small_font.h"
 
 namespace Pelrock {
diff --git a/engines/pelrock/graphics.h b/engines/pelrock/graphics.h
index 910c4d87eb2..1e557623860 100644
--- a/engines/pelrock/graphics.h
+++ b/engines/pelrock/graphics.h
@@ -21,16 +21,12 @@
 #ifndef PELROCK_GRAPHICS_H
 #define PELROCK_GRAPHICS_H
 
-#include "common/array.h"
-#include "common/scummsys.h"
-#include "common/str-array.h"
-
-#include "graphics/font.h"
-#include "graphics/managed_surface.h"
-#include "graphics/screen.h"
-
 #include "pelrock/types.h"
 
+namespace Graphics {
+class Font;
+}
+
 namespace Pelrock {
 
 class GraphicsManager {
diff --git a/engines/pelrock/menu.cpp b/engines/pelrock/menu.cpp
index 708dba6b571..1eaec4922d8 100644
--- a/engines/pelrock/menu.cpp
+++ b/engines/pelrock/menu.cpp
@@ -24,6 +24,7 @@
 #include "common/file.h"
 #include "engines/metaengine.h"
 #include "graphics/paletteman.h"
+#include "graphics/screen.h"
 #include "graphics/thumbnail.h"
 
 #include "pelrock/events.h"
diff --git a/engines/pelrock/menu.h b/engines/pelrock/menu.h
index 260b3585d75..5ff0e1b624f 100644
--- a/engines/pelrock/menu.h
+++ b/engines/pelrock/menu.h
@@ -21,9 +21,6 @@
 #ifndef PELROCK_MENU_H
 #define PELROCK_MENU_H
 
-#include "common/keyboard.h"
-
-#include "graphics/screen.h"
 namespace Graphics {
 class Screen;
 }
diff --git a/engines/pelrock/metaengine.h b/engines/pelrock/metaengine.h
index 596f967bf63..19bccc24c81 100644
--- a/engines/pelrock/metaengine.h
+++ b/engines/pelrock/metaengine.h
@@ -23,7 +23,6 @@
 #define PELROCK_METAENGINE_H
 
 #include "engines/advancedDetector.h"
-#include "graphics/surface.h"
 
 class PelrockMetaEngine : public AdvancedMetaEngine<ADGameDescription> {
 public:
diff --git a/engines/pelrock/offsets.h b/engines/pelrock/offsets.h
index 770032ee022..2eb8e116442 100644
--- a/engines/pelrock/offsets.h
+++ b/engines/pelrock/offsets.h
@@ -21,10 +21,6 @@
 #ifndef PELROCK_OFFSETS_H
 #define PELROCK_OFFSETS_H
 
-#include "common/scummsys.h"
-
-#include "pelrock/types.h"
-
 namespace Pelrock {
 
 // Indices to in game text responses in JUEGO.EXE
diff --git a/engines/pelrock/pathfinding.h b/engines/pelrock/pathfinding.h
index 6775cf3a4a9..79f9e21e52b 100644
--- a/engines/pelrock/pathfinding.h
+++ b/engines/pelrock/pathfinding.h
@@ -21,9 +21,6 @@
 #ifndef PELROCK_PATHFINDING_H
 #define PELROCK_PATHFINDING_H
 
-#include "common/scummsys.h"
-#include "graphics/screen.h"
-
 #include "pelrock/types.h"
 
 namespace Pelrock {
diff --git a/engines/pelrock/pelrock.cpp b/engines/pelrock/pelrock.cpp
index 71b460193c7..1d08953a428 100644
--- a/engines/pelrock/pelrock.cpp
+++ b/engines/pelrock/pelrock.cpp
@@ -23,9 +23,12 @@
 #include "common/events.h"
 #include "common/file.h"
 #include "common/scummsys.h"
+
 #include "engines/util.h"
+
 #include "graphics/cursorman.h"
 #include "graphics/paletteman.h"
+#include "graphics/screen.h"
 
 #include "pelrock/actions.h"
 #include "pelrock/chrono.h"
@@ -33,8 +36,11 @@
 #include "pelrock/console.h"
 #include "pelrock/detection.h"
 #include "pelrock/dialog.h"
+#include "pelrock/events.h"
+#include "pelrock/fonts/large_font.h"
 #include "pelrock/fonts/small_font.h"
 #include "pelrock/fonts/small_font_double.h"
+#include "pelrock/graphics.h"
 #include "pelrock/menu.h"
 #include "pelrock/offsets.h"
 #include "pelrock/pathfinding.h"
@@ -42,6 +48,7 @@
 #include "pelrock/resources.h"
 #include "pelrock/room.h"
 #include "pelrock/slidingpuzzle.h"
+#include "pelrock/sound.h"
 #include "pelrock/util.h"
 #include "pelrock/video.h"
 
diff --git a/engines/pelrock/resources.cpp b/engines/pelrock/resources.cpp
index d14cc818e86..ebd91933a37 100644
--- a/engines/pelrock/resources.cpp
+++ b/engines/pelrock/resources.cpp
@@ -19,6 +19,8 @@
  *
  */
 
+#include "common/file.h"
+
 #include "pelrock/dialog.h"
 #include "pelrock/resources.h"
 #include "pelrock/offsets.h"
diff --git a/engines/pelrock/resources.h b/engines/pelrock/resources.h
index 315fa895a4a..3436d769e30 100644
--- a/engines/pelrock/resources.h
+++ b/engines/pelrock/resources.h
@@ -21,12 +21,6 @@
 #ifndef PELROCK_RESOURCES_H
 #define PELROCK_RESOURCES_H
 
-#include "common/scummsys.h"
-#include "common/stream.h"
-
-#include "pelrock/offsets.h"
-#include "pelrock/types.h"
-
 namespace Pelrock {
 
 static const int walkingAnimLengths[4] = {8, 8, 4, 4}; // size of each inner array
diff --git a/engines/pelrock/room.cpp b/engines/pelrock/room.cpp
index 43f2b60a581..61d6c332e32 100644
--- a/engines/pelrock/room.cpp
+++ b/engines/pelrock/room.cpp
@@ -19,6 +19,7 @@
  *
  */
 #include "common/scummsys.h"
+#include "common/file.h"
 
 #include "graphics/screen.h"
 
diff --git a/engines/pelrock/room.h b/engines/pelrock/room.h
index 93bfd8e24a2..c187ae617c2 100644
--- a/engines/pelrock/room.h
+++ b/engines/pelrock/room.h
@@ -21,11 +21,9 @@
 #ifndef PELROCK_ROOM_H
 #define PELROCK_ROOM_H
 
-#include "common/array.h"
-#include "common/file.h"
-#include "common/scummsys.h"
-
-#include "pelrock/types.h"
+namespace Common {
+class File;
+}
 
 namespace Pelrock {
 
diff --git a/engines/pelrock/slidingpuzzle.h b/engines/pelrock/slidingpuzzle.h
index e7f37cada51..af9bcbe83ab 100644
--- a/engines/pelrock/slidingpuzzle.h
+++ b/engines/pelrock/slidingpuzzle.h
@@ -22,11 +22,6 @@
 #ifndef PELROCK_SLIDINGPUZZLE_H
 #define PELROCK_SLIDINGPUZZLE_H
 
-#include "graphics/managed_surface.h"
-
-#include "pelrock/events.h"
-#include "pelrock/sound.h"
-
 namespace Pelrock {
 
 static const int kPuzzleScreenWidth = 640;
diff --git a/engines/pelrock/sound.h b/engines/pelrock/sound.h
index 0d93194bfa4..98e36a44f9d 100644
--- a/engines/pelrock/sound.h
+++ b/engines/pelrock/sound.h
@@ -23,9 +23,6 @@
 #define PELROCK_SOUND_H
 
 #include "audio/mixer.h"
-#include "common/file.h"
-#include "common/scummsys.h"
-#include "common/str.h"
 
 namespace Pelrock {
 
diff --git a/engines/pelrock/spellbook.cpp b/engines/pelrock/spellbook.cpp
index 21198e927f4..84f32a0d466 100644
--- a/engines/pelrock/spellbook.cpp
+++ b/engines/pelrock/spellbook.cpp
@@ -20,8 +20,12 @@
  */
 
 #include "common/events.h"
+#include "common/file.h"
+
 #include "graphics/paletteman.h"
+#include "graphics/screen.h"
 
+#include "pelrock/pelrock.h"
 #include "pelrock/events.h"
 #include "pelrock/graphics.h"
 #include "pelrock/room.h"
diff --git a/engines/pelrock/spellbook.h b/engines/pelrock/spellbook.h
index 9d944fd7d37..e32f0f1f072 100644
--- a/engines/pelrock/spellbook.h
+++ b/engines/pelrock/spellbook.h
@@ -22,10 +22,6 @@
 #ifndef PELROCK_SPELLBOOK_H
 #define PELROCK_SPELLBOOK_H
 
-#include "graphics/managed_surface.h"
-
-#include "pelrock/pelrock.h"
-
 namespace Pelrock {
 
 struct Spell {
diff --git a/engines/pelrock/types.h b/engines/pelrock/types.h
index e5b6b797ee2..c3c2c21227a 100644
--- a/engines/pelrock/types.h
+++ b/engines/pelrock/types.h
@@ -21,11 +21,8 @@
 #ifndef PELROCK_TYPES_H
 #define PELROCK_TYPES_H
 
-#include "common/debug.h"
 #include "common/rect.h"
-#include "common/scummsys.h"
 #include "common/system.h"
-#include "common/types.h"
 
 namespace Pelrock {
 
diff --git a/engines/pelrock/util.h b/engines/pelrock/util.h
index 865558294e7..836f304af51 100644
--- a/engines/pelrock/util.h
+++ b/engines/pelrock/util.h
@@ -22,12 +22,8 @@
 #define PELROCK_UTIL_H
 
 #include "common/events.h"
-#include "common/stream.h"
-#include "common/types.h"
 
 #include "graphics/font.h"
-#include "graphics/managed_surface.h"
-#include "graphics/surface.h"
 
 namespace Pelrock {
 
diff --git a/engines/pelrock/video.cpp b/engines/pelrock/video.cpp
index 447a91ca1d1..dea213120b5 100644
--- a/engines/pelrock/video.cpp
+++ b/engines/pelrock/video.cpp
@@ -25,6 +25,7 @@
 
 #include "pelrock/chrono.h"
 #include "pelrock/dialog.h"
+#include "pelrock/events.h"
 #include "pelrock/pelrock.h"
 #include "pelrock/sound.h"
 #include "pelrock/util.h"
diff --git a/engines/pelrock/video.h b/engines/pelrock/video.h
index e3ed6b7bc9b..ccdaab53fd1 100644
--- a/engines/pelrock/video.h
+++ b/engines/pelrock/video.h
@@ -22,11 +22,6 @@
 #ifndef PELROCK_VIDEO_H
 #define PELROCK_VIDEO_H
 
-#include "graphics/surface.h"
-
-#include "pelrock/events.h"
-#include "pelrock/fonts/large_font.h"
-
 namespace Pelrock {
 
 struct ChunkHeader {


Commit: 605061c7249391aa95d086c7c4d2536eed283b4c
    https://github.com/scummvm/scummvm/commit/605061c7249391aa95d086c7c4d2536eed283b4c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-06-13T19:03:09+02:00

Commit Message:
PELROCK: Final pass on reducing header dependencies

Changed paths:
    engines/pelrock/actions.cpp
    engines/pelrock/backgroundbook.cpp
    engines/pelrock/cdplayer.cpp
    engines/pelrock/chrono.cpp
    engines/pelrock/computer.cpp
    engines/pelrock/console.cpp
    engines/pelrock/detection.cpp
    engines/pelrock/events.cpp
    engines/pelrock/graphics.cpp
    engines/pelrock/menu.cpp
    engines/pelrock/pathfinding.cpp
    engines/pelrock/pelrock.cpp
    engines/pelrock/resources.cpp
    engines/pelrock/room.cpp
    engines/pelrock/saveload.cpp
    engines/pelrock/slidingpuzzle.cpp
    engines/pelrock/sound.cpp
    engines/pelrock/spellbook.cpp
    engines/pelrock/util.cpp
    engines/pelrock/video.cpp


diff --git a/engines/pelrock/actions.cpp b/engines/pelrock/actions.cpp
index ce475dd995c..d4a847eaf63 100644
--- a/engines/pelrock/actions.cpp
+++ b/engines/pelrock/actions.cpp
@@ -21,7 +21,6 @@
 
 #include "audio/audiostream.h"
 #include "audio/decoders/raw.h"
-#include "audio/mixer.h"
 
 #include "common/file.h"
 
@@ -36,7 +35,6 @@
 #include "pelrock/events.h"
 #include "pelrock/graphics.h"
 #include "pelrock/offsets.h"
-#include "pelrock/pelrock.h"
 #include "pelrock/resources.h"
 #include "pelrock/room.h"
 #include "pelrock/sound.h"
diff --git a/engines/pelrock/backgroundbook.cpp b/engines/pelrock/backgroundbook.cpp
index 089ba924331..dafa1bc2685 100644
--- a/engines/pelrock/backgroundbook.cpp
+++ b/engines/pelrock/backgroundbook.cpp
@@ -19,7 +19,6 @@
  *
  */
 
-#include "common/events.h"
 #include "common/file.h"
 #include "graphics/paletteman.h"
 #include "graphics/screen.h"
diff --git a/engines/pelrock/cdplayer.cpp b/engines/pelrock/cdplayer.cpp
index 52cddb2efff..dd1f516ba3b 100644
--- a/engines/pelrock/cdplayer.cpp
+++ b/engines/pelrock/cdplayer.cpp
@@ -19,7 +19,6 @@
  *
  */
 
-#include "common/events.h"
 #include "common/file.h"
 
 #include "graphics/paletteman.h"
diff --git a/engines/pelrock/chrono.cpp b/engines/pelrock/chrono.cpp
index c586912e7f4..e02f7e62126 100644
--- a/engines/pelrock/chrono.cpp
+++ b/engines/pelrock/chrono.cpp
@@ -20,7 +20,6 @@
  */
 
 #include "common/events.h"
-#include "common/system.h"
 
 #include "graphics/screen.h"
 
diff --git a/engines/pelrock/computer.cpp b/engines/pelrock/computer.cpp
index 394b1183015..c07b00f6c19 100644
--- a/engines/pelrock/computer.cpp
+++ b/engines/pelrock/computer.cpp
@@ -19,9 +19,7 @@
  *
  */
 
-#include "common/events.h"
 #include "common/file.h"
-#include "common/system.h"
 
 #include "graphics/cursorman.h"
 #include "graphics/paletteman.h"
diff --git a/engines/pelrock/console.cpp b/engines/pelrock/console.cpp
index 3546269451b..1ab35dea772 100644
--- a/engines/pelrock/console.cpp
+++ b/engines/pelrock/console.cpp
@@ -19,8 +19,6 @@
  *
  */
 
-#include "console.h"
-
 #include "pelrock/console.h"
 #include "pelrock/room.h"
 #include "pelrock/types.h"
diff --git a/engines/pelrock/detection.cpp b/engines/pelrock/detection.cpp
index 90c368e4324..24cf5c212b3 100644
--- a/engines/pelrock/detection.cpp
+++ b/engines/pelrock/detection.cpp
@@ -19,14 +19,6 @@
  *
  */
 
-#include "base/plugins.h"
-#include "common/config-manager.h"
-#include "common/file.h"
-#include "common/md5.h"
-#include "common/str-array.h"
-#include "common/translation.h"
-#include "common/util.h"
-
 #include "pelrock/detection.h"
 #include "pelrock/detection_tables.h"
 
diff --git a/engines/pelrock/events.cpp b/engines/pelrock/events.cpp
index 8acd092359b..1fa11e21cef 100644
--- a/engines/pelrock/events.cpp
+++ b/engines/pelrock/events.cpp
@@ -18,8 +18,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-#include "common/events.h"
-
 #include "graphics/screen.h"
 
 #include "pelrock/events.h"
diff --git a/engines/pelrock/graphics.cpp b/engines/pelrock/graphics.cpp
index 37e8844a060..43b8895ece6 100644
--- a/engines/pelrock/graphics.cpp
+++ b/engines/pelrock/graphics.cpp
@@ -19,10 +19,6 @@
  *
  */
 
-#include "common/scummsys.h"
-#include "engines/util.h"
-
-#include "graphics/cursorman.h"
 #include "graphics/paletteman.h"
 #include "graphics/screen.h"
 
diff --git a/engines/pelrock/menu.cpp b/engines/pelrock/menu.cpp
index 1eaec4922d8..0523b391b7e 100644
--- a/engines/pelrock/menu.cpp
+++ b/engines/pelrock/menu.cpp
@@ -20,9 +20,8 @@
  */
 
 #include "common/config-manager.h"
-#include "common/debug.h"
 #include "common/file.h"
-#include "engines/metaengine.h"
+
 #include "graphics/paletteman.h"
 #include "graphics/screen.h"
 #include "graphics/thumbnail.h"
@@ -30,7 +29,6 @@
 #include "pelrock/events.h"
 #include "pelrock/graphics.h"
 #include "pelrock/menu.h"
-#include "pelrock/offsets.h"
 #include "pelrock/pelrock.h"
 #include "pelrock/resources.h"
 #include "pelrock/room.h"
diff --git a/engines/pelrock/pathfinding.cpp b/engines/pelrock/pathfinding.cpp
index 49fe3446ec8..bdfa93ef377 100644
--- a/engines/pelrock/pathfinding.cpp
+++ b/engines/pelrock/pathfinding.cpp
@@ -18,12 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-#include "common/debug.h"
-#include "common/scummsys.h"
-
 #include "pelrock/pathfinding.h"
-#include "pelrock/types.h"
-#include "pelrock/util.h"
 
 namespace Pelrock {
 
diff --git a/engines/pelrock/pelrock.cpp b/engines/pelrock/pelrock.cpp
index 1d08953a428..dfb92fd487e 100644
--- a/engines/pelrock/pelrock.cpp
+++ b/engines/pelrock/pelrock.cpp
@@ -20,9 +20,7 @@
  */
 
 #include "common/config-manager.h"
-#include "common/events.h"
 #include "common/file.h"
-#include "common/scummsys.h"
 
 #include "engines/util.h"
 
@@ -34,7 +32,6 @@
 #include "pelrock/chrono.h"
 #include "pelrock/computer.h"
 #include "pelrock/console.h"
-#include "pelrock/detection.h"
 #include "pelrock/dialog.h"
 #include "pelrock/events.h"
 #include "pelrock/fonts/large_font.h"
@@ -44,7 +41,6 @@
 #include "pelrock/menu.h"
 #include "pelrock/offsets.h"
 #include "pelrock/pathfinding.h"
-#include "pelrock/pelrock.h"
 #include "pelrock/resources.h"
 #include "pelrock/room.h"
 #include "pelrock/slidingpuzzle.h"
diff --git a/engines/pelrock/resources.cpp b/engines/pelrock/resources.cpp
index ebd91933a37..311d9cdf1f2 100644
--- a/engines/pelrock/resources.cpp
+++ b/engines/pelrock/resources.cpp
@@ -24,8 +24,6 @@
 #include "pelrock/dialog.h"
 #include "pelrock/resources.h"
 #include "pelrock/offsets.h"
-#include "pelrock/pelrock.h"
-#include "pelrock/room.h"
 #include "pelrock/util.h"
 
 namespace Pelrock {
diff --git a/engines/pelrock/room.cpp b/engines/pelrock/room.cpp
index 61d6c332e32..b787a94ad74 100644
--- a/engines/pelrock/room.cpp
+++ b/engines/pelrock/room.cpp
@@ -18,16 +18,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-#include "common/scummsys.h"
 #include "common/file.h"
 
 #include "graphics/screen.h"
 
 #include "pelrock/pelrock.h"
-#include "pelrock/resources.h"
 #include "pelrock/room.h"
+#include "pelrock/resources.h"
 #include "pelrock/util.h"
-#include "pelrock/room.h"
 
 namespace Pelrock {
 
diff --git a/engines/pelrock/saveload.cpp b/engines/pelrock/saveload.cpp
index 98926962aa0..b8b3d2a3ebd 100644
--- a/engines/pelrock/saveload.cpp
+++ b/engines/pelrock/saveload.cpp
@@ -23,7 +23,6 @@
 #include "pelrock/pelrock.h"
 #include "pelrock/room.h"
 #include "pelrock/resources.h"
-#include "pelrock/types.h"
 
 namespace Pelrock {
 
diff --git a/engines/pelrock/slidingpuzzle.cpp b/engines/pelrock/slidingpuzzle.cpp
index e8bdf8cea0f..0ee4e96a70f 100644
--- a/engines/pelrock/slidingpuzzle.cpp
+++ b/engines/pelrock/slidingpuzzle.cpp
@@ -19,14 +19,10 @@
  *
  */
 
-#include "common/system.h"
-
-#include "graphics/paletteman.h"
 #include "graphics/screen.h"
 
 #include "pelrock/events.h"
 #include "pelrock/pelrock.h"
-#include "pelrock/room.h"
 #include "pelrock/slidingpuzzle.h"
 #include "pelrock/sound.h"
 
diff --git a/engines/pelrock/sound.cpp b/engines/pelrock/sound.cpp
index 5457c06fd11..54f1fdb0c55 100644
--- a/engines/pelrock/sound.cpp
+++ b/engines/pelrock/sound.cpp
@@ -25,17 +25,13 @@
 #include "audio/mixer.h"
 
 #include "common/config-manager.h"
-#include "common/debug.h"
-#include "common/endian.h"
 #include "common/file.h"
 #include "common/memstream.h"
-#include "common/scummsys.h"
 
 #include "backends/audiocd/audiocd.h"
 
 #include "pelrock/pelrock.h"
 #include "pelrock/sound.h"
-#include "sound.h"
 
 namespace Pelrock {
 
diff --git a/engines/pelrock/spellbook.cpp b/engines/pelrock/spellbook.cpp
index 84f32a0d466..5b2fba910bb 100644
--- a/engines/pelrock/spellbook.cpp
+++ b/engines/pelrock/spellbook.cpp
@@ -19,7 +19,6 @@
  *
  */
 
-#include "common/events.h"
 #include "common/file.h"
 
 #include "graphics/paletteman.h"
diff --git a/engines/pelrock/util.cpp b/engines/pelrock/util.cpp
index 592fa3f99c7..e824b2e4bf6 100644
--- a/engines/pelrock/util.cpp
+++ b/engines/pelrock/util.cpp
@@ -18,15 +18,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-#include "common/stream.h"
 
-#include "graphics/cursorman.h"
-#include "graphics/font.h"
 #include "graphics/screen.h"
 
 #include "pelrock/pelrock.h"
 #include "pelrock/chrono.h"
-#include "pelrock/types.h"
 #include "pelrock/util.h"
 
 namespace Pelrock {
diff --git a/engines/pelrock/video.cpp b/engines/pelrock/video.cpp
index dea213120b5..00917ec87a5 100644
--- a/engines/pelrock/video.cpp
+++ b/engines/pelrock/video.cpp
@@ -20,6 +20,7 @@
  */
 
 #include "common/file.h"
+
 #include "graphics/paletteman.h"
 #include "graphics/screen.h"
 
@@ -28,7 +29,6 @@
 #include "pelrock/events.h"
 #include "pelrock/pelrock.h"
 #include "pelrock/sound.h"
-#include "pelrock/util.h"
 #include "pelrock/video.h"
 
 namespace Pelrock {

More information about the Scummvm-git-logs mailing list