diff --git a/engines/agi/agi.cpp b/engines/agi/agi.cpp
index ca76d911690..d9dce1e9913 100644
--- a/engines/agi/agi.cpp
+++ b/engines/agi/agi.cpp
@@ -41,10 +41,8 @@
 #include "agi/agi.h"
 #include "agi/graphics.h"
 #include "agi/sprite.h"
-#include "agi/opcodes.h"
 #include "agi/keyboard.h"
 #include "agi/menu.h"
-#include "agi/sound.h"
 
 namespace Agi {
 
diff --git a/engines/agi/agi.h b/engines/agi/agi.h
index 4f7ba886586..48eb6b86937 100644
--- a/engines/agi/agi.h
+++ b/engines/agi/agi.h
@@ -26,18 +26,17 @@
 #ifndef AGI_H
 #define AGI_H
 
-
 #include "common/scummsys.h"
 #include "common/endian.h"
 #include "common/util.h"
 #include "common/file.h"
-#include "common/savefile.h"
-#include "common/system.h"
-#include "common/hash-str.h"
 #include "common/stack.h"
+#include "common/system.h"
 
 #include "engines/engine.h"
 
+#include "gui/debugger.h"
+
 /**
  * This is the namespace of the AGI engine.
  *
diff --git a/engines/agi/console.cpp b/engines/agi/console.cpp
index d14a4a13bf5..e093445087d 100644
--- a/engines/agi/console.cpp
+++ b/engines/agi/console.cpp
@@ -23,14 +23,11 @@
  *
  */
 
-
-
 #include "agi/agi.h"
-#include "agi/graphics.h"
-#include "agi/sprite.h"
-#include "agi/keyboard.h"
 #include "agi/opcodes.h"
-#include "agi/console.h"
+
+#include "agi/preagi_mickey.h"
+#include "agi/preagi_winnie.h"
 
 namespace Agi {
 
diff --git a/engines/agi/console.h b/engines/agi/console.h
index 270f4e86bd3..e8eccbe50a9 100644
--- a/engines/agi/console.h
+++ b/engines/agi/console.h
@@ -26,15 +26,12 @@
 #ifndef AGI_CONSOLE_H
 #define AGI_CONSOLE_H
 
-#include "gui/debugger.h"
-
-#include "agi/preagi_mickey.h"
-#include "agi/preagi_winnie.h"
-
 namespace Agi {
 
 class AgiEngine;
 class PreAgiEngine;
+class Winnie;
+class Mickey;
 
 struct AgiDebug {
 	int enabled;
diff --git a/engines/agi/detection.cpp b/engines/agi/detection.cpp
index b8b2940b2c2..8269c85793f 100644
--- a/engines/agi/detection.cpp
+++ b/engines/agi/detection.cpp
@@ -28,6 +28,7 @@
 #include "engines/advancedDetector.h"
 #include "common/config-manager.h"
 #include "common/file.h"
+#include "common/savefile.h"
 #include "graphics/thumbnail.h"
 
 #include "agi/agi.h"
diff --git a/engines/agi/font.h b/engines/agi/font.h
index e24db80bbfa..171106145c5 100644
--- a/engines/agi/font.h
+++ b/engines/agi/font.h
@@ -26,8 +26,6 @@
 #ifndef AGI_FONT_H
 #define AGI_FONT_H
 
-#include "agi/agi.h"
-
 namespace Agi {
 
 // 8x8 font patterns
diff --git a/engines/agi/graphics.h b/engines/agi/graphics.h
index 05e59c88517..18f323d5962 100644
--- a/engines/agi/graphics.h
+++ b/engines/agi/graphics.h
@@ -26,7 +26,6 @@
 #ifndef AGI_GRAPHICS_H
 #define AGI_GRAPHICS_H
 
-
 #include "agi/font.h"
 
 namespace Agi {
diff --git a/engines/agi/id.cpp b/engines/agi/id.cpp
index a3ab3354418..77c527444bd 100644
--- a/engines/agi/id.cpp
+++ b/engines/agi/id.cpp
@@ -23,8 +23,6 @@
  *
  */
 
-
-
 #include "agi/agi.h"
 #include "agi/opcodes.h"
 
diff --git a/engines/agi/inv.cpp b/engines/agi/inv.cpp
index ffb41bd2669..da56449fda7 100644
--- a/engines/agi/inv.cpp
+++ b/engines/agi/inv.cpp
@@ -24,7 +24,6 @@
  */
 
 #include "agi/agi.h"
-#include "agi/sprite.h"
 #include "agi/graphics.h"
 #include "agi/keyboard.h"
 
diff --git a/engines/agi/keyboard.cpp b/engines/agi/keyboard.cpp
index d5ef590961b..2bea49a807f 100644
--- a/engines/agi/keyboard.cpp
+++ b/engines/agi/keyboard.cpp
@@ -23,12 +23,9 @@
  *
  */
 
-
-
 #include "agi/agi.h"
 #include "agi/graphics.h"
 #include "agi/keyboard.h"
-#include "agi/menu.h"
 #ifdef __DS__
 #include "wordcompletion.h"
 #endif
diff --git a/engines/agi/loader_v2.cpp b/engines/agi/loader_v2.cpp
index 4ad1c6bf931..3d1c4fa2cf2 100644
--- a/engines/agi/loader_v2.cpp
+++ b/engines/agi/loader_v2.cpp
@@ -23,8 +23,6 @@
  *
  */
 
-#include "common/file.h"
-
 #include "agi/agi.h"
 
 namespace Agi {
diff --git a/engines/agi/loader_v3.cpp b/engines/agi/loader_v3.cpp
index cd97c44521e..3aea4656b21 100644
--- a/engines/agi/loader_v3.cpp
+++ b/engines/agi/loader_v3.cpp
@@ -27,7 +27,7 @@
 #include "agi/lzw.h"
 
 #include "common/config-manager.h"
-#include "common/fs.h"
+//#include "common/fs.h"
 
 namespace Agi {
 
diff --git a/engines/agi/logic.h b/engines/agi/logic.h
index 825ad554e5c..d285aa1dfb8 100644
--- a/engines/agi/logic.h
+++ b/engines/agi/logic.h
@@ -26,9 +26,6 @@
 #ifndef AGI_LOGIC_H
 #define AGI_LOGIC_H
 
-
-#include "common/scummsys.h"
-
 namespace Agi {
 
 /**
diff --git a/engines/agi/lzw.cpp b/engines/agi/lzw.cpp
index bca4f749d13..60bd8f4fca7 100644
--- a/engines/agi/lzw.cpp
+++ b/engines/agi/lzw.cpp
@@ -33,8 +33,6 @@
 ** (c) 1997  Lance Ewing
 ***************************************************************************/
 
-
-
 #include "agi/agi.h"
 #include "agi/lzw.h"
 
diff --git a/engines/agi/menu.cpp b/engines/agi/menu.cpp
index 6d23ebc14cd..5ec4908e4ac 100644
--- a/engines/agi/menu.cpp
+++ b/engines/agi/menu.cpp
@@ -24,11 +24,9 @@
  */
 
 #include "agi/agi.h"
-#include "agi/sprite.h"
 #include "agi/graphics.h"
 #include "agi/keyboard.h"
 #include "agi/menu.h"
-#include "common/list.h"
 
 namespace Agi {
 
diff --git a/engines/agi/menu.h b/engines/agi/menu.h
index 43f6dd2bbd1..724ec3877c3 100644
--- a/engines/agi/menu.h
+++ b/engines/agi/menu.h
@@ -26,8 +26,6 @@
 #ifndef AGI_MENU_H
 #define AGI_MENU_H
 
-#include "common/list.h"
-
 namespace Agi {
 
 #define MENU_BG		0x0f	// White
diff --git a/engines/agi/objects.cpp b/engines/agi/objects.cpp
index 6897c4d4d36..5d1866bea4a 100644
--- a/engines/agi/objects.cpp
+++ b/engines/agi/objects.cpp
@@ -23,8 +23,6 @@
  *
  */
 
-
-
 #include "agi/agi.h"
 
 namespace Agi {
diff --git a/engines/agi/op_cmd.cpp b/engines/agi/op_cmd.cpp
index 1baf40fe987..c5ef4abc0f9 100644
--- a/engines/agi/op_cmd.cpp
+++ b/engines/agi/op_cmd.cpp
@@ -28,7 +28,6 @@
 #include "agi/agi.h"
 #include "agi/sprite.h"
 #include "agi/graphics.h"
-#include "agi/keyboard.h"
 #include "agi/opcodes.h"
 #include "agi/menu.h"
 
diff --git a/engines/agi/op_test.cpp b/engines/agi/op_test.cpp
index 16ceb2ef72e..f810eb85030 100644
--- a/engines/agi/op_test.cpp
+++ b/engines/agi/op_test.cpp
@@ -25,7 +25,6 @@
 
 
 #include "agi/agi.h"
-#include "agi/keyboard.h"
 #include "agi/opcodes.h"
 
 namespace Agi {
diff --git a/engines/agi/opcodes.h b/engines/agi/opcodes.h
index 0267a63ea9d..6b62f9ee99b 100644
--- a/engines/agi/opcodes.h
+++ b/engines/agi/opcodes.h
@@ -26,8 +26,6 @@
 #ifndef AGI_OPCODES_H
 #define AGI_OPCODES_H
 
-#include "agi/agi.h"
-
 namespace Agi {
 
 struct AgiLogicnames {
diff --git a/engines/agi/picture.cpp b/engines/agi/picture.cpp
index d6801d7cea5..60877de4308 100644
--- a/engines/agi/picture.cpp
+++ b/engines/agi/picture.cpp
@@ -25,9 +25,6 @@
 
 #include "agi/agi.h"
 #include "agi/graphics.h"
-#include "common/stack.h"
-
-#include "graphics/primitives.h"
 
 namespace Agi {
 
diff --git a/engines/agi/picture.h b/engines/agi/picture.h
index fa77e87bb61..31f8605cde6 100644
--- a/engines/agi/picture.h
+++ b/engines/agi/picture.h
@@ -26,8 +26,6 @@
 #ifndef AGI_PICTURE_H
 #define AGI_PICTURE_H
 
-#include "agi/agi.h"
-
 namespace Agi {
 
 #define _DEFAULT_WIDTH		160
diff --git a/engines/agi/preagi.cpp b/engines/agi/preagi.cpp
index a5c4d352591..19ae08ab32b 100644
--- a/engines/agi/preagi.cpp
+++ b/engines/agi/preagi.cpp
@@ -23,23 +23,12 @@
  *
  */
 
-#include "common/file.h"
-#include "common/savefile.h"
 #include "common/config-manager.h"
 
-#include "base/plugins.h"
-#include "base/version.h"
-
 #include "sound/mididrv.h"
-#include "sound/mixer.h"
 
 #include "agi/preagi.h"
 #include "agi/graphics.h"
-#include "agi/sprite.h"
-#include "agi/opcodes.h"
-#include "agi/keyboard.h"
-#include "agi/menu.h"
-#include "agi/sound.h"
 
 // preagi engines
 #include "agi/preagi_mickey.h"
diff --git a/engines/agi/preagi_common.cpp b/engines/agi/preagi_common.cpp
index e84bf0d1ba5..5bc0c92ab88 100644
--- a/engines/agi/preagi_common.cpp
+++ b/engines/agi/preagi_common.cpp
@@ -24,7 +24,6 @@
  */
 
 #include "agi/preagi.h"
-#include "agi/font.h"
 #include "agi/graphics.h"
 #include "agi/keyboard.h"
 
diff --git a/engines/agi/preagi_mickey.cpp b/engines/agi/preagi_mickey.cpp
index 58a73f20c35..ec8a1f48781 100644
--- a/engines/agi/preagi_mickey.cpp
+++ b/engines/agi/preagi_mickey.cpp
@@ -25,12 +25,10 @@
 
 #include "common/events.h"
 #include "common/savefile.h"
-#include "common/stream.h"
 
 #include "graphics/cursorman.h"
 
 #include "agi/preagi.h"
-#include "agi/preagi_common.h"
 #include "agi/preagi_mickey.h"
 #include "agi/graphics.h"
 
diff --git a/engines/agi/preagi_mickey.h b/engines/agi/preagi_mickey.h
index fd8f14b2d2c..5ef12bfad23 100644
--- a/engines/agi/preagi_mickey.h
+++ b/engines/agi/preagi_mickey.h
@@ -26,8 +26,6 @@
 #ifndef AGI_PREAGI_MICKEY_H
 #define AGI_PREAGI_MICKEY_H
 
-#include "agi/agi.h"
-
 namespace Agi {
 
 #define MSA_SAVEGAME_VERSION			2
diff --git a/engines/agi/preagi_troll.cpp b/engines/agi/preagi_troll.cpp
index bee11057275..619c0c0cc6c 100644
--- a/engines/agi/preagi_troll.cpp
+++ b/engines/agi/preagi_troll.cpp
@@ -24,7 +24,6 @@
  */
 
 #include "agi/preagi.h"
-#include "agi/preagi_common.h"
 #include "agi/preagi_troll.h"
 #include "agi/graphics.h"
 
diff --git a/engines/agi/preagi_troll.h b/engines/agi/preagi_troll.h
index b2764bcdb3c..f460758b2c8 100644
--- a/engines/agi/preagi_troll.h
+++ b/engines/agi/preagi_troll.h
@@ -26,8 +26,6 @@
 #ifndef AGI_PREAGI_TROLL_H
 #define AGI_PREAGI_TROLL_H
 
-#include "agi/agi.h"
-
 namespace Agi {
 
 // strings
diff --git a/engines/agi/preagi_winnie.cpp b/engines/agi/preagi_winnie.cpp
index 2004fc227ff..14d90f32114 100644
--- a/engines/agi/preagi_winnie.cpp
+++ b/engines/agi/preagi_winnie.cpp
@@ -31,7 +31,6 @@
 
 #include "common/events.h"
 #include "common/savefile.h"
-#include "common/stream.h"
 
 namespace Agi {
 
diff --git a/engines/agi/preagi_winnie.h b/engines/agi/preagi_winnie.h
index 2c701678aea..5a5472feb04 100644
--- a/engines/agi/preagi_winnie.h
+++ b/engines/agi/preagi_winnie.h
@@ -26,8 +26,6 @@
 #ifndef AGI_PREAGI_WINNIE_H
 #define AGI_PREAGI_WINNIE_H
 
-#include "agi/agi.h"
-
 namespace Agi {
 
 #define WTP_SAVEGAME_VERSION	1
diff --git a/engines/agi/predictive.cpp b/engines/agi/predictive.cpp
index ea674272e6a..a3725249e63 100644
--- a/engines/agi/predictive.cpp
+++ b/engines/agi/predictive.cpp
@@ -27,7 +27,6 @@
 #include "agi/graphics.h"
 #include "agi/keyboard.h"
 
-#include "common/func.h"
 #include "common/config-manager.h"
 
 #ifdef __DS__
diff --git a/engines/agi/saveload.cpp b/engines/agi/saveload.cpp
index 431c190a8fc..11c84aff12e 100644
--- a/engines/agi/saveload.cpp
+++ b/engines/agi/saveload.cpp
@@ -31,6 +31,7 @@
 #include "common/file.h"
 #include "graphics/thumbnail.h"
 #include "common/config-manager.h"
+#include "common/savefile.h"
 
 #include "agi/agi.h"
 #include "agi/graphics.h"
diff --git a/engines/agi/sound.cpp b/engines/agi/sound.cpp
index 7c0e895219a..26455e39a62 100644
--- a/engines/agi/sound.cpp
+++ b/engines/agi/sound.cpp
@@ -25,12 +25,8 @@
 
 #include "common/md5.h"
 #include "common/config-manager.h"
-#include "common/fs.h"
-#include "common/algorithm.h"
-#include "sound/mixer.h"
 
 #include "agi/agi.h"
-#include "agi/sound.h"
 
 namespace Agi {
 
diff --git a/engines/agi/sound.h b/engines/agi/sound.h
index f873e043c39..881e3efd565 100644
--- a/engines/agi/sound.h
+++ b/engines/agi/sound.h
@@ -26,12 +26,9 @@
 #ifndef AGI_SOUND_H
 #define AGI_SOUND_H
 
-#include "agi/agi.h"
 #include "sound/audiostream.h"
 #include "sound/mixer.h"
 #include "common/frac.h"
-#include "common/array.h"
-#include "common/ptr.h"
 
 namespace Agi {
 
diff --git a/engines/agi/sprite.h b/engines/agi/sprite.h
index 407871ebbd8..7d6d7bb97ed 100644
--- a/engines/agi/sprite.h
+++ b/engines/agi/sprite.h
@@ -26,8 +26,6 @@
 #ifndef AGI_SPRITE_H
 #define AGI_SPRITE_H
 
-#include "common/list.h"
-
 namespace Agi {
 
 
diff --git a/engines/agi/view.h b/engines/agi/view.h
index e71db6c97d2..f9017ec4ae0 100644
--- a/engines/agi/view.h
+++ b/engines/agi/view.h
@@ -26,9 +26,6 @@
 #ifndef AGI_VIEW_H
 #define AGI_VIEW_H
 
-
-#include "common/scummsys.h"
-
 namespace Agi {
 
 struct ViewCel {
diff --git a/engines/agi/words.cpp b/engines/agi/words.cpp
index 4396797e6ba..c8b22956f40 100644
--- a/engines/agi/words.cpp
+++ b/engines/agi/words.cpp
@@ -28,7 +28,6 @@
 //
 
 #include "agi/agi.h"
-#include "agi/keyboard.h"	// for clean_input()
 
 namespace Agi {