[Scummvm-git-logs] scummvm master -> 437002af599d1f9685e377f904921692b791476f

[sev-]

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

Summary:
437002af59 Revert "SLUDGE: self-contained headers"


Commit: 437002af599d1f9685e377f904921692b791476f
    https://github.com/scummvm/scummvm/commit/437002af599d1f9685e377f904921692b791476f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-08-22T00:45:23+02:00

Commit Message:
Revert "SLUDGE: self-contained headers"

This reverts commit 6d985f53a6997063a21b064fb32f68270967e41f.

This change increases header dependency, bloats codebase for no
logical reason and finally, solves no existing problem.

Changed paths:
    engines/sludge/freeze.h
    engines/sludge/imgloader.h
    engines/sludge/main_loop.h
    engines/sludge/moreio.h
    engines/sludge/objtypes.h
    engines/sludge/people.h
    engines/sludge/region.h
    engines/sludge/savedata.h
    engines/sludge/saveload.h
    engines/sludge/speech.h
    engines/sludge/statusba.h
    engines/sludge/timing.h
    engines/sludge/variable.h
    engines/sludge/zbuffer.h


diff --git a/engines/sludge/freeze.h b/engines/sludge/freeze.h
index a71d78f81bf..6ca044ac69d 100644
--- a/engines/sludge/freeze.h
+++ b/engines/sludge/freeze.h
@@ -21,10 +21,7 @@
 #ifndef SLUDGE_FREEZE_H
 #define SLUDGE_FREEZE_H
 
-#include "common/list.h"
-#include "graphics/managed_surface.h"
-
-#include "sludge/graphics.h"
+#include "graphics/surface.h"
 
 namespace Sludge {
 
diff --git a/engines/sludge/imgloader.h b/engines/sludge/imgloader.h
index 0a7f16c480c..1472189febc 100644
--- a/engines/sludge/imgloader.h
+++ b/engines/sludge/imgloader.h
@@ -24,14 +24,6 @@
 
 #include "common/file.h"
 
-namespace Common {
-class SeekableReadStream;
-}
-
-namespace Graphics {
-class ManagedSurface;
-}
-
 namespace Sludge {
 
 class ImgLoader {
diff --git a/engines/sludge/main_loop.h b/engines/sludge/main_loop.h
index 46abb4cef7e..6ed3c647091 100644
--- a/engines/sludge/main_loop.h
+++ b/engines/sludge/main_loop.h
@@ -21,10 +21,6 @@
 #ifndef SLUDGE_MAIN_LOOP_H
 #define SLUDGE_MAIN_LOOP_H
 
-namespace Common { 
-class String; 
-}
-
 namespace Sludge {
 
 int main_loop(Common::String filename);
diff --git a/engines/sludge/moreio.h b/engines/sludge/moreio.h
index 49d1e335b9d..c162ceffde2 100644
--- a/engines/sludge/moreio.h
+++ b/engines/sludge/moreio.h
@@ -21,12 +21,6 @@
 #ifndef SLUDGE_MOREIO_H
 #define SLUDGE_MOREIO_H
 
-namespace Common {
-class SeekableReadStream;
-class String;
-class WriteStream;
-}
-
 namespace Sludge {
 
 // Read & Write
diff --git a/engines/sludge/objtypes.h b/engines/sludge/objtypes.h
index c4ae4fcb383..b83e801d8f7 100644
--- a/engines/sludge/objtypes.h
+++ b/engines/sludge/objtypes.h
@@ -21,14 +21,6 @@
 #ifndef SLUDGE_OBJTYPES_H
 #define SLUDGE_OBJTYPES_H
 
-#include "common/list.h"
-#include "common/str.h"
-
-namespace Common {
-class SeekableReadStream;
-class WriteStream;
-}
-
 namespace Sludge {
 
 class SludgeEngine;
diff --git a/engines/sludge/people.h b/engines/sludge/people.h
index 0bc2887c8de..a30cb570c83 100644
--- a/engines/sludge/people.h
+++ b/engines/sludge/people.h
@@ -23,11 +23,6 @@
 
 #include "common/list.h"
 
-namespace Common {
-class SeekableReadStream;
-class WriteStream;
-}
-
 namespace Sludge {
 
 struct FrozenStuffStruct;
diff --git a/engines/sludge/region.h b/engines/sludge/region.h
index 8471efe2a2d..35c18745af8 100644
--- a/engines/sludge/region.h
+++ b/engines/sludge/region.h
@@ -21,18 +21,9 @@
 #ifndef SLUDGE_REGION_H
 #define SLUDGE_REGION_H
 
-#include "common/list.h"
-
-namespace Common {
-class SeekableReadStream;
-class WriteStream;
-}
-
 namespace Sludge {
 
-struct FrozenStuffStruct;
 struct ObjectType;
-class SludgeEngine;
 
 struct ScreenRegion {
 	int x1, y1, x2, y2, sX, sY, di;
diff --git a/engines/sludge/savedata.h b/engines/sludge/savedata.h
index 4e3d9a0cba9..2240f2a406e 100644
--- a/engines/sludge/savedata.h
+++ b/engines/sludge/savedata.h
@@ -21,14 +21,6 @@
 #ifndef SLUDGE_SAVEDATA_H
 #define SLUDGE_SAVEDATA_H
 
-#include "common/types.h"
-
-namespace Common {
-class SeekableReadStream;
-class String;
-class WriteStream;
-}
-
 namespace Sludge {
 
 struct StackHandler;
diff --git a/engines/sludge/saveload.h b/engines/sludge/saveload.h
index c72ef7f6691..af419f5e04f 100644
--- a/engines/sludge/saveload.h
+++ b/engines/sludge/saveload.h
@@ -23,7 +23,6 @@
 
 namespace Common {
 class OutSaveFile;
-class String;
 }
 
 namespace Sludge {
diff --git a/engines/sludge/speech.h b/engines/sludge/speech.h
index aa1fe40506d..addc6c0d711 100644
--- a/engines/sludge/speech.h
+++ b/engines/sludge/speech.h
@@ -23,17 +23,9 @@
 
 #include "sludge/sprites.h"
 
-namespace Common {
-class SeekableReadStream;
-class WriteStream;
-}
-
 namespace Sludge {
 
-struct FrozenStuffStruct;
 struct ObjectType;
-struct OnScreenPerson;
-class SludgeEngine;
 
 struct SpeechLine {
 	Common::String textLine;
diff --git a/engines/sludge/statusba.h b/engines/sludge/statusba.h
index 03490b3ad08..ba53eb41b0c 100644
--- a/engines/sludge/statusba.h
+++ b/engines/sludge/statusba.h
@@ -21,17 +21,8 @@
 #ifndef SLUDGE_STATUSBA_H
 #define SLUDGE_STATUSBA_H
 
-#include "sludge/sprites.h"
-
-namespace Common {
-class SeekableReadStream;
-class WriteStream;
-}
-
 namespace Sludge {
 
-class SludgeEngine;
-
 struct StatusBar {
 	Common::String text;
 	StatusBar *next;
diff --git a/engines/sludge/timing.h b/engines/sludge/timing.h
index 1073b9c981b..e1f9fa21eb9 100644
--- a/engines/sludge/timing.h
+++ b/engines/sludge/timing.h
@@ -21,8 +21,6 @@
 #ifndef SLUDGE_TIMING_H
 #define SLUDGE_TIMING_H
 
-#include "common/types.h"
-
 namespace Sludge {
 
 class Timer {
diff --git a/engines/sludge/variable.h b/engines/sludge/variable.h
index 78078533ba7..9959c834871 100644
--- a/engines/sludge/variable.h
+++ b/engines/sludge/variable.h
@@ -21,11 +21,8 @@
 #ifndef SLUDGE_VARIABLE_H
 #define SLUDGE_VARIABLE_H
 
-#include "common/types.h"
-
 namespace Common {
 class SeekableReadStream;
-class String;
 class WriteStream;
 }
 
diff --git a/engines/sludge/zbuffer.h b/engines/sludge/zbuffer.h
index a8e38136d56..23cb6a694b6 100644
--- a/engines/sludge/zbuffer.h
+++ b/engines/sludge/zbuffer.h
@@ -21,8 +21,6 @@
 #ifndef SLUDGE_ZBUFFER_H
 #define SLUDGE_ZBUFFER_H
 
-#include "common/types.h"
-
 namespace Sludge {
 
 struct ZBufferData {