Reduce header dependencies for AGI engine.

svn-id: r46942

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 {
 

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.
  *

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 {
 

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;

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"

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

engines/agi/graphics.h

@@ -26,7 +26,6 @@
 #ifndef AGI_GRAPHICS_H
 #define AGI_GRAPHICS_H
 
-
 #include "agi/font.h"
 
 namespace Agi {

engines/agi/id.cpp

@@ -23,8 +23,6 @@
  *
  */
 
-
-
 #include "agi/agi.h"
 #include "agi/opcodes.h"
 

engines/agi/inv.cpp

@@ -24,7 +24,6 @@
  */
 
 #include "agi/agi.h"
-#include "agi/sprite.h"
 #include "agi/graphics.h"
 #include "agi/keyboard.h"
 

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

engines/agi/loader_v2.cpp

@@ -23,8 +23,6 @@
  *
  */
 
-#include "common/file.h"
-
 #include "agi/agi.h"
 
 namespace Agi {

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 {
 

engines/agi/logic.h

@@ -26,9 +26,6 @@
 #ifndef AGI_LOGIC_H
 #define AGI_LOGIC_H
 
-
-#include "common/scummsys.h"
-
 namespace Agi {
 
 /**

engines/agi/lzw.cpp

@@ -33,8 +33,6 @@
 ** (c) 1997  Lance Ewing
 ***************************************************************************/
 
-
-
 #include "agi/agi.h"
 #include "agi/lzw.h"
 

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 {
 

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

engines/agi/objects.cpp

@@ -23,8 +23,6 @@
  *
  */
 
-
-
 #include "agi/agi.h"
 
 namespace Agi {

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"
 

engines/agi/op_test.cpp

@@ -25,7 +25,6 @@
 
 
 #include "agi/agi.h"
-#include "agi/keyboard.h"
 #include "agi/opcodes.h"
 
 namespace Agi {

engines/agi/opcodes.h

@@ -26,8 +26,6 @@
 #ifndef AGI_OPCODES_H
 #define AGI_OPCODES_H
 
-#include "agi/agi.h"
-
 namespace Agi {
 
 struct AgiLogicnames {

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 {
 

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

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"

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"
 

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"
 

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

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"
 

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

engines/agi/preagi_winnie.cpp

@@ -31,7 +31,6 @@
 
 #include "common/events.h"
 #include "common/savefile.h"
-#include "common/stream.h"
 
 namespace Agi {
 

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

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__

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"

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 {
 

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 {
 

engines/agi/sprite.h

@@ -26,8 +26,6 @@
 #ifndef AGI_SPRITE_H
 #define AGI_SPRITE_H
 
-#include "common/list.h"
-
 namespace Agi {
 
 

engines/agi/view.h

@@ -26,9 +26,6 @@
 #ifndef AGI_VIEW_H
 #define AGI_VIEW_H
 
-
-#include "common/scummsys.h"
-
 namespace Agi {
 
 struct ViewCel {

engines/agi/words.cpp

@@ -28,7 +28,6 @@
 //
 
 #include "agi/agi.h"
-#include "agi/keyboard.h"	// for clean_input()
 
 namespace Agi {