shat up ARRAYSIZE redefine compiler warnings

svn-id: r38444

4 files changed, 36 insertions, 40 deletions

diff --git a/engines/sci/engine/kernel.cpp b/engines/sci/engine/kernel.cpp
index 17e8210161..503ac29c79 100644
--- a/engines/sci/engine/kernel.cpp
+++ b/engines/sci/engine/kernel.cpp
@@ -23,14 +23,15 @@
  *
  */
 
-#include "sci/engine/gc.h"
-#include "sci/include/sciresource.h"
-#include "sci/include/engine.h"
 #ifdef WIN32
 #	include <windows.h>
 #	include <mmsystem.h>
+#	undef ARRAYSIZE
 #endif
 
+#include "sci/engine/gc.h"
+#include "sci/include/sciresource.h"
+#include "sci/include/engine.h"
 #include "sci/include/gfx_operations.h"
 #include "sci/engine/kernel_types.h"
 
diff --git a/engines/sci/engine/kfile.cpp b/engines/sci/engine/kfile.cpp
index 774c877833..b1ef350b9f 100644
--- a/engines/sci/engine/kfile.cpp
+++ b/engines/sci/engine/kfile.cpp
@@ -23,21 +23,18 @@
  *
  */
 
-#include "common/str.h"
-
-#include "sci/include/engine.h"
-
-#include <errno.h>
-
 #ifdef WIN32
-#  define WIN32_LEAN_AND_MEAN
 #  include <windows.h>
-#  include <sys/types.h>
-#  include <sys/stat.h>
 #elif defined (__DC__)
 #  include <dc.h>
 #endif
 
+#include "common/str.h"
+
+#include "sci/include/engine.h"
+
+#include <errno.h>
+
 #ifndef O_BINARY
 #define O_BINARY 0
 #endif
diff --git a/engines/sci/engine/scriptdebug.cpp b/engines/sci/engine/scriptdebug.cpp
index 4f0ee57560..fd3ddd7a5d 100644
--- a/engines/sci/engine/scriptdebug.cpp
+++ b/engines/sci/engine/scriptdebug.cpp
@@ -25,22 +25,9 @@
 
 /* Script debugger functionality. Absolutely not threadsafe. */
 
-#include "sci/engine/gc.h"
-#include "sci/include/sciresource.h"
-#include "sci/include/engine.h"
-#include "sci/include/console.h"
-#include "sci/include/kdebug.h"
-#include "sci/include/vocabulary.h"
-#include "sci/engine/kernel_types.h"
-#include "sci/include/sci_midi.h"
-#include "sci/include/sci_widgets.h"
-
-#include "common/util.h"
-
 #ifdef WIN32
 #	include <windows.h>
 #	include <mmsystem.h>
-#	include <io.h>
 #	ifdef sleep
 #		undef sleep
 #	endif
@@ -59,6 +46,18 @@
 	} while (0);
 #endif
 
+#include "sci/engine/gc.h"
+#include "sci/include/sciresource.h"
+#include "sci/include/engine.h"
+#include "sci/include/console.h"
+#include "sci/include/kdebug.h"
+#include "sci/include/vocabulary.h"
+#include "sci/engine/kernel_types.h"
+#include "sci/include/sci_midi.h"
+#include "sci/include/sci_widgets.h"
+
+#include "common/util.h"
+
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>
 /* Assume this is a sufficient precondition */
diff --git a/engines/sci/scicore/tools.cpp b/engines/sci/scicore/tools.cpp
index ec9580681e..4436ce2e41 100644
--- a/engines/sci/scicore/tools.cpp
+++ b/engines/sci/scicore/tools.cpp
@@ -24,19 +24,6 @@
  */
 
 
-#include "common/scummsys.h"
-#include "common/str.h"
-
-#ifdef UNIX
-#define _GNU_SOURCE /* For FNM_CASEFOLD in fnmatch.h */
-#include <fnmatch.h>
-#endif
-
-#include "sci/include/engine.h"
-
-#ifdef HAVE_SYS_TIME_H
-#  include <sys/time.h>
-#endif
 #ifdef _MSC_VER
 #  include <sys/timeb.h>
 #  include <windows.h>
@@ -49,8 +36,6 @@
 #  include <errno.h>
 #  include <mmsystem.h>
 
-void usleep(long usec);
-
 #	ifdef sleep
 #		undef sleep
 #	endif
@@ -69,6 +54,20 @@ void usleep(long usec);
 	} while (0);
 #endif
 
+#include "common/scummsys.h"
+#include "common/str.h"
+
+#ifdef UNIX
+#define _GNU_SOURCE /* For FNM_CASEFOLD in fnmatch.h */
+#include <fnmatch.h>
+#endif
+
+#include "sci/include/engine.h"
+
+#ifdef HAVE_SYS_TIME_H
+#  include <sys/time.h>
+#endif
+
 #ifdef __DC__
 #  include <kos/thread.h>
 #endif