From 91ee9a3eb8b23fdfbfa568e309dfa55542f5f248 Mon Sep 17 00:00:00 2001 From: Paweł Kołodziejski Date: Tue, 24 Feb 2009 21:13:32 +0000 Subject: not needed this includes anymore svn-id: r38857 --- engines/sci/gfx/gfx_res_options.cpp | 2 -- engines/sci/gfx/sbtree.h | 4 ---- engines/sci/sci.cpp | 4 ---- engines/sci/sfx/core.cpp | 2 -- engines/sci/sfx/iterator.cpp | 1 - engines/sci/sfx/softseq/opl2.cpp | 1 - engines/sci/sfx/softseq/softsequencers.cpp | 4 ---- engines/sci/sfx/songlib.cpp | 2 -- engines/sci/tools.cpp | 10 ---------- 9 files changed, 30 deletions(-) diff --git a/engines/sci/gfx/gfx_res_options.cpp b/engines/sci/gfx/gfx_res_options.cpp index f665b50141..c07ba96421 100644 --- a/engines/sci/gfx/gfx_res_options.cpp +++ b/engines/sci/gfx/gfx_res_options.cpp @@ -27,8 +27,6 @@ #include "sci/gfx/gfx_options.h" #include "sci/gfx/gfx_resmgr.h" -#include - namespace Sci { //#define DEBUG diff --git a/engines/sci/gfx/sbtree.h b/engines/sci/gfx/sbtree.h index f3c77cf932..c00c543e72 100644 --- a/engines/sci/gfx/sbtree.h +++ b/engines/sci/gfx/sbtree.h @@ -32,10 +32,6 @@ #ifndef SCI_GFX_GFX_SBTREE_H #define SCI_GFX_GFX_SBTREE_H -#ifdef SBTREE_DEBUG -# include -#endif - namespace Sci { struct sbtree_t { diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp index a1df4a2894..88829e3d54 100644 --- a/engines/sci/sci.cpp +++ b/engines/sci/sci.cpp @@ -33,10 +33,6 @@ #include "sci/include/engine.h" #include "sci/engine/kernel.h" -#ifdef WIN32 -# include -#endif - namespace Sci { extern gfx_driver_t gfx_driver_scummvm; diff --git a/engines/sci/sfx/core.cpp b/engines/sci/sfx/core.cpp index 3ccf38115c..54dde65ca5 100644 --- a/engines/sci/sfx/core.cpp +++ b/engines/sci/sfx/core.cpp @@ -25,8 +25,6 @@ /* Sound subsystem core: Event handler, sound player dispatching */ -#include - #include "sci/tools.h" #include "sci/sfx/sfx_timer.h" #include "sci/sfx/sfx_iterator_internal.h" diff --git a/engines/sci/sfx/iterator.cpp b/engines/sci/sfx/iterator.cpp index 092bed9288..8c6f82c62e 100644 --- a/engines/sci/sfx/iterator.cpp +++ b/engines/sci/sfx/iterator.cpp @@ -25,7 +25,6 @@ /* Song iterators */ -#include #include "common/util.h" #include "sci/sfx/sfx_iterator_internal.h" #include "sci/sfx/sfx_player.h" diff --git a/engines/sci/sfx/softseq/opl2.cpp b/engines/sci/sfx/softseq/opl2.cpp index 7dbe423eaa..fa1fc54a0e 100644 --- a/engines/sci/sfx/softseq/opl2.cpp +++ b/engines/sci/sfx/softseq/opl2.cpp @@ -46,7 +46,6 @@ #include "sci/sfx/sfx_iterator.h" #include "../softseq.h" #include "../adlib.h" -#include #include "sound/fmopl.h" diff --git a/engines/sci/sfx/softseq/softsequencers.cpp b/engines/sci/sfx/softseq/softsequencers.cpp index 8ab3aa61ab..f206c8b8ce 100644 --- a/engines/sci/sfx/softseq/softsequencers.cpp +++ b/engines/sci/sfx/softseq/softsequencers.cpp @@ -23,10 +23,6 @@ * */ -#ifdef HAVE_CONFIG_H -# include -#endif - #include "../softseq.h" namespace Sci { diff --git a/engines/sci/sfx/songlib.cpp b/engines/sci/sfx/songlib.cpp index 6b2703b95b..61b564004f 100644 --- a/engines/sci/sfx/songlib.cpp +++ b/engines/sci/sfx/songlib.cpp @@ -23,8 +23,6 @@ * */ -#include - #include "sci/tools.h" #include "sci/sfx/sfx_engine.h" #include "sci/sci_memory.h" diff --git a/engines/sci/tools.cpp b/engines/sci/tools.cpp index 58c86cd73a..b3c2fa7d19 100644 --- a/engines/sci/tools.cpp +++ b/engines/sci/tools.cpp @@ -25,16 +25,6 @@ #include "common/scummsys.h" -#ifdef WIN32 -# include -# include -# include -# include -# include -# include -# undef ARRAYSIZE -#endif - #include "common/util.h" #include "common/str.h" -- cgit v1.2.3