SCI: cleanup

svn-id: r38335

12 files changed, 4 insertions, 24 deletions

diff --git a/engines/sci/scicore/aatree.cpp b/engines/sci/scicore/aatree.cpp
index 7f2829686e..624dcf9d8e 100644
--- a/engines/sci/scicore/aatree.cpp
+++ b/engines/sci/scicore/aatree.cpp
@@ -25,7 +25,6 @@
 
 ***************************************************************************/
 
-#include <stdlib.h>
 #include "sci/include/aatree.h"
 
 #include "sci/include/sci_memory.h"
diff --git a/engines/sci/scicore/exe_lzexe.cpp b/engines/sci/scicore/exe_lzexe.cpp
index 30b0671f5e..fafc6d6c4d 100644
--- a/engines/sci/scicore/exe_lzexe.cpp
+++ b/engines/sci/scicore/exe_lzexe.cpp
@@ -27,7 +27,6 @@
 
 /* Based on public domain code by Mitugu Kurizono. */
 
-#include <stdio.h>
 #include "sci/include/sci_memory.h"
 #include "sci/scicore/exe_dec.h"
 
diff --git a/engines/sci/scicore/exe_raw.cpp b/engines/sci/scicore/exe_raw.cpp
index e2fbfb328f..016c280ddd 100644
--- a/engines/sci/scicore/exe_raw.cpp
+++ b/engines/sci/scicore/exe_raw.cpp
@@ -25,7 +25,6 @@
 
 ***************************************************************************/
 
-#include <stdio.h>
 #include "sci/include/sci_memory.h"
 
 struct _exe_handle {
diff --git a/engines/sci/scicore/hashmap.cpp b/engines/sci/scicore/hashmap.cpp
index bb3bc7a670..429d6ef743 100644
--- a/engines/sci/scicore/hashmap.cpp
+++ b/engines/sci/scicore/hashmap.cpp
@@ -30,9 +30,6 @@
 ** HASH_MAX: Maximum hash value
 ** HASH(x): Hashes a value of type TYPE to an int from 0 to HASH_MAX
 */
-#include <stdio.h>
-#include <stdlib.h>
-
 #ifdef MUST_FREE
 #  define CLEAR_NODE(n) free(n->name); n->name = NULL
 #  define FREE_PARAM(n) free(n)
diff --git a/engines/sci/scicore/resource.cpp b/engines/sci/scicore/resource.cpp
index 8f8fe52b4e..039bf79890 100644
--- a/engines/sci/scicore/resource.cpp
+++ b/engines/sci/scicore/resource.cpp
@@ -34,12 +34,6 @@
 #include "sci/include/sciresource.h"
 #include "sci/include/vocabulary.h" /* For SCI version auto-detection */
 
-#include <ctype.h>
-
-#ifdef WIN32
-#include <direct.h>
-#endif
-
 #undef SCI_REQUIRE_RESOURCE_FILES
 /* #define SCI_VERBOSE_RESMGR 1 */
 
diff --git a/engines/sci/scicore/resource_patch.cpp b/engines/sci/scicore/resource_patch.cpp
index a663735443..322c390819 100644
--- a/engines/sci/scicore/resource_patch.cpp
+++ b/engines/sci/scicore/resource_patch.cpp
@@ -29,10 +29,6 @@
 #include "sci/include/sciresource.h"
 #include "sci/include/sci_memory.h"
 
-#ifdef WIN32
-#include <direct.h>
-#endif
-
 void
 sci0_sprintf_patch_file_name(char *string, resource_t *res) {
 	sprintf(string, "%s.%03i", sci_resource_types[res->type], res->number);
diff --git a/engines/sci/scicore/sci_memory.cpp b/engines/sci/scicore/sci_memory.cpp
index b80d48bcbe..d8dec068cb 100644
--- a/engines/sci/scicore/sci_memory.cpp
+++ b/engines/sci/scicore/sci_memory.cpp
@@ -34,6 +34,7 @@
 ***************************************************************************/
 
 #include "sci/include/sci_memory.h"
+#include "common/util.h"
 
 /*#define POISON_MEMORY*/
 
diff --git a/engines/sci/scicore/script.cpp b/engines/sci/scicore/script.cpp
index 3c2b576eb6..80e64a6229 100644
--- a/engines/sci/scicore/script.cpp
+++ b/engines/sci/scicore/script.cpp
@@ -29,6 +29,7 @@
 
 #include "sci/include/sciresource.h"
 #include "sci/include/engine.h"
+#include "common/util.h"
 
 /* #define SCRIPT_DEBUG */
 
diff --git a/engines/sci/scicore/tools.cpp b/engines/sci/scicore/tools.cpp
index 7cb4831c0a..7a56f4c75f 100644
--- a/engines/sci/scicore/tools.cpp
+++ b/engines/sci/scicore/tools.cpp
@@ -25,16 +25,14 @@
 ***************************************************************************/
 
 
-#include <stdlib.h>
+#include "common/scummsys.h"
+#include "common/str.h"
 
 #ifdef UNIX
 #define _GNU_SOURCE /* For FNM_CASEFOLD in fnmatch.h */
 #include <fnmatch.h>
 #endif
 
-#include "common/scummsys.h"
-#include "common/str.h"
-
 #include "sci/include/engine.h"
 
 #ifdef HAVE_SYS_TIME_H
diff --git a/engines/sci/scicore/versions.cpp b/engines/sci/scicore/versions.cpp
index d1b81603a2..3e8948a5ea 100644
--- a/engines/sci/scicore/versions.cpp
+++ b/engines/sci/scicore/versions.cpp
@@ -22,7 +22,6 @@
 #include "sci/include/versions.h"
 #include "sci/include/engine.h"
 #include "sci/include/resource.h"
-#include <ctype.h>
 #include "sci/scicore/games.h"
 #include "sci/scicore/exe.h"
 
diff --git a/engines/sci/scicore/vocab.cpp b/engines/sci/scicore/vocab.cpp
index d2f97df1d7..87ee3cb434 100644
--- a/engines/sci/scicore/vocab.cpp
+++ b/engines/sci/scicore/vocab.cpp
@@ -31,8 +31,6 @@
 #include "sci/include/engine.h"
 #include "sci/include/kernel.h"
 
-#include <ctype.h>
-
 int vocab_version;
 
 #define VOCAB_RESOURCE_PARSE_TREE_BRANCHES vocab_version==1 ? \
diff --git a/engines/sci/scicore/vocab_debug.cpp b/engines/sci/scicore/vocab_debug.cpp
index 490664da6a..8e3b1afc8d 100644
--- a/engines/sci/scicore/vocab_debug.cpp
+++ b/engines/sci/scicore/vocab_debug.cpp
@@ -3,7 +3,6 @@
 */
 
 
-#include <string.h>
 #include "sci/include/engine.h"
 #include "sci/include/sciresource.h"