15 files changed, 20 insertions, 16 deletions
diff --git a/engines/bbvs/bbvs.h b/engines/bbvs/bbvs.h
index a9d37c2551..cfa7abf6e8 100644
--- a/engines/bbvs/bbvs.h
+++ b/engines/bbvs/bbvs.h
@@ -32,8 +32,6 @@
 #include "common/str.h"
 #include "common/substream.h"
 #include "common/system.h"
-#include "common/winexe.h"
-#include "common/winexe_pe.h"
 #include "engines/engine.h"
 
 struct ADGameDescription;
diff --git a/engines/gnap/gnap.cpp b/engines/gnap/gnap.cpp
index abacd3e6b2..ac4cc91bda 100644
--- a/engines/gnap/gnap.cpp
+++ b/engines/gnap/gnap.cpp
@@ -30,6 +30,9 @@
 #include "common/config-manager.h"
 #include "common/debug-channels.h"
 #include "common/timer.h"
+#include "common/winexe_pe.h"
+
+#include "graphics/wincursor.h"
 
 #include "engines/util.h"
 
diff --git a/engines/gnap/gnap.h b/engines/gnap/gnap.h
index dd653304e7..45d57fe79e 100644
--- a/engines/gnap/gnap.h
+++ b/engines/gnap/gnap.h
@@ -33,11 +33,8 @@
 #include "common/str.h"
 #include "common/substream.h"
 #include "common/system.h"
-#include "common/winexe.h"
-#include "common/winexe_pe.h"
 #include "engines/engine.h"
 #include "graphics/pixelformat.h"
-#include "graphics/wincursor.h"
 #include "graphics/fontman.h"
 #include "graphics/font.h"
 #include "graphics/fonts/ttf.h"
@@ -50,6 +47,10 @@
 
 struct ADGameDescription;
 
+namespace Common {
+class PEResources;
+}
+
 namespace Gnap {
 
 class DatManager;
diff --git a/engines/gob/inter_v7.cpp b/engines/gob/inter_v7.cpp
index 79a843f66e..efc281b10c 100644
--- a/engines/gob/inter_v7.cpp
+++ b/engines/gob/inter_v7.cpp
@@ -22,7 +22,6 @@
 
 #include "common/endian.h"
 #include "common/archive.h"
-#include "common/winexe.h"
 #include "common/winexe_pe.h"
 
 #include "graphics/cursorman.h"
diff --git a/engines/hdb/gfx.cpp b/engines/hdb/gfx.cpp
index 82fdf742be..4816ec9aa6 100644
--- a/engines/hdb/gfx.cpp
+++ b/engines/hdb/gfx.cpp
@@ -25,7 +25,6 @@
 #include "common/random.h"
 #include "common/memstream.h"
 #include "graphics/cursor.h"
-#include "graphics/wincursor.h"
 #include "graphics/cursorman.h"
 
 #include "hdb/hdb.h"
diff --git a/engines/illusions/illusions.h b/engines/illusions/illusions.h
index 8110c686a5..1b367950ed 100644
--- a/engines/illusions/illusions.h
+++ b/engines/illusions/illusions.h
@@ -34,8 +34,6 @@
 #include "common/str.h"
 #include "common/substream.h"
 #include "common/system.h"
-#include "common/winexe.h"
-#include "common/winexe_pe.h"
 #include "engines/engine.h"
 #include "graphics/surface.h"
 
diff --git a/engines/pink/cursor_mgr.h b/engines/pink/cursor_mgr.h
index a08cb8e417..5e336a3e18 100644
--- a/engines/pink/cursor_mgr.h
+++ b/engines/pink/cursor_mgr.h
@@ -25,8 +25,6 @@
 
 #include "common/rect.h"
 
-#include "graphics/wincursor.h"
-
 #include "pink/objects/object.h"
 
 namespace Pink {
diff --git a/engines/pink/pink.cpp b/engines/pink/pink.cpp
index afff44d718..a067d2bddf 100644
--- a/engines/pink/pink.cpp
+++ b/engines/pink/pink.cpp
@@ -30,6 +30,7 @@
 #include "graphics/cursorman.h"
 #include "graphics/thumbnail.h"
 #include "graphics/surface.h"
+#include "graphics/wincursor.h"
 
 #include "pink/pink.h"
 #include "pink/console.h"
diff --git a/engines/pink/pink.h b/engines/pink/pink.h
index 9c32abae08..ce48a900ee 100644
--- a/engines/pink/pink.h
+++ b/engines/pink/pink.h
@@ -29,8 +29,6 @@
 #include "engines/engine.h"
 #include "engines/savestate.h"
 
-#include "graphics/wincursor.h"
-
 #include "gui/debugger.h"
 
 #include "pink/constants.h"
@@ -68,6 +66,7 @@ namespace Common {
 
 namespace Graphics {
 class MacMenu;
+class WinCursorGroup;
 }
 
 namespace Pink {
diff --git a/engines/scumm/he/moonbase/moonbase.cpp b/engines/scumm/he/moonbase/moonbase.cpp
index 9b7ec9970e..890d9e4051 100644
--- a/engines/scumm/he/moonbase/moonbase.cpp
+++ b/engines/scumm/he/moonbase/moonbase.cpp
@@ -20,6 +20,8 @@
  *
  */
 
+#include "common/winexe_pe.h"
+
 #include "scumm/he/intern_he.h"
 #include "scumm/he/moonbase/moonbase.h"
 #include "scumm/he/moonbase/ai_main.h"
diff --git a/engines/scumm/he/moonbase/moonbase.h b/engines/scumm/he/moonbase/moonbase.h
index 97ad6b7095..09eb197cb5 100644
--- a/engines/scumm/he/moonbase/moonbase.h
+++ b/engines/scumm/he/moonbase/moonbase.h
@@ -25,7 +25,9 @@
 
 #ifdef ENABLE_HE
 
-#include "common/winexe_pe.h"
+namespace Common {
+class PEResources;
+}
 
 namespace Scumm {
 
diff --git a/engines/scumm/he/moonbase/moonbase_fow.cpp b/engines/scumm/he/moonbase/moonbase_fow.cpp
index 28d7e0cd55..af58c11310 100644
--- a/engines/scumm/he/moonbase/moonbase_fow.cpp
+++ b/engines/scumm/he/moonbase/moonbase_fow.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "common/config-manager.h"
+#include "common/winexe_pe.h"
 
 #include "scumm/he/intern_he.h"
 #include "scumm/he/moonbase/moonbase.h"
diff --git a/engines/scumm/he/resource_he.cpp b/engines/scumm/he/resource_he.cpp
index 3de890f41b..0d2c6f5365 100644
--- a/engines/scumm/he/resource_he.cpp
+++ b/engines/scumm/he/resource_he.cpp
@@ -35,6 +35,7 @@
 #include "common/archive.h"
 #include "common/memstream.h"
 #include "common/system.h"
+#include "common/winexe_pe.h"
 
 namespace Scumm {
 
diff --git a/engines/scumm/he/resource_he.h b/engines/scumm/he/resource_he.h
index 617ed1f446..c3fca17737 100644
--- a/engines/scumm/he/resource_he.h
+++ b/engines/scumm/he/resource_he.h
@@ -24,7 +24,10 @@
 #define SCUMM_HE_RESOURCE_HE_H
 
 #include "common/macresman.h"
-#include "common/winexe_pe.h"
+
+namespace Common {
+class PEResources;
+}
 
 namespace Scumm {
 
diff --git a/engines/titanic/true_talk/title_engine.h b/engines/titanic/true_talk/title_engine.h
index d9b21af423..83feea1ea5 100644
--- a/engines/titanic/true_talk/title_engine.h
+++ b/engines/titanic/true_talk/title_engine.h
@@ -24,7 +24,6 @@
 #define TITANIC_TITLE_ENGINE_H
 
 #include "common/stream.h"
-#include "common/winexe_pe.h"
 #include "titanic/support/string.h"
 #include "titanic/true_talk/script_handler.h"
 #include "titanic/true_talk/tt_response.h"