5 files changed, 30 insertions, 28 deletions
diff --git a/engines/sci/include/sci_memory.h b/engines/sci/include/sci_memory.h
index c39b6c86fe..85a23a1fc6 100644
--- a/engines/sci/include/sci_memory.h
+++ b/engines/sci/include/sci_memory.h
@@ -46,11 +46,6 @@
 #include "common/scummsys.h"
 #include "sci/tools.h"
 
-// FIXME: Get rid of the following #include
-#ifdef _MSC_VER
-#  include <direct.h> // for chdir, rmdir, _gecwd, getcwd, mkdir
-#endif
-
 namespace Sci {
 
 /********** the memory allocation macros **********/
diff --git a/engines/sci/include/scitypes.h b/engines/sci/include/scitypes.h
index cc3728be38..f7bd150d02 100644
--- a/engines/sci/include/scitypes.h
+++ b/engines/sci/include/scitypes.h
@@ -28,14 +28,6 @@
 
 #include "common/scummsys.h"
 
-// TODO: rework sci_dir_t to use common/fs.h and remove these includes
-#include <sys/types.h>
-#ifndef _MSC_VER
-#include <dirent.h>
-#else
-#include <io.h>
-#endif
-
 namespace Sci {
 
 typedef int8 gint8;
@@ -53,21 +45,6 @@ typedef gint8 sbyte;
 typedef guint8 byte;
 typedef guint16 word;
 
-typedef struct {
-	long tv_sec;
-	long tv_usec;
-} GTimeVal;
-
-typedef struct {
-#ifdef WIN32
-	long search;
-	struct _finddata_t fileinfo;
-#else
-	DIR *dir;
-	char *mask_copy;
-#endif
-} sci_dir_t; /* used by sci_find_first and friends */
-
 } // End of namespace Sci
 
 #endif /* !SCI_TYPES */
diff --git a/engines/sci/include/sfx_songlib.h b/engines/sci/include/sfx_songlib.h
index c5cf4ac76a..44523b27d2 100644
--- a/engines/sci/include/sfx_songlib.h
+++ b/engines/sci/include/sfx_songlib.h
@@ -30,6 +30,7 @@
 
 #include "common/scummsys.h"
 
+#include "sci/tools.h"	// For GTimeVal
 #include "sci/include/scitypes.h"
 #include "sci/include/sfx_iterator.h"
 
diff --git a/engines/sci/sfx/sequencer.h b/engines/sci/sfx/sequencer.h
index 2b24c80334..d292a8100d 100644
--- a/engines/sci/sfx/sequencer.h
+++ b/engines/sci/sfx/sequencer.h
@@ -29,6 +29,7 @@
 
 #include "common/scummsys.h"
 
+#include "sci/tools.h"	// For GTimeVal
 #include "sci/include/sfx_core.h"
 #include "sci/sfx/device.h"
 #include "sci/include/scitypes.h"
diff --git a/engines/sci/tools.h b/engines/sci/tools.h
index 478e79f5e2..7f007b5ea3 100644
--- a/engines/sci/tools.h
+++ b/engines/sci/tools.h
@@ -66,6 +66,16 @@
 #  include <fcntl.h>
 #endif
 
+
+// FIXME: rework sci_dir_t to use common/fs.h and remove these includes
+#include <sys/types.h>
+#ifndef _MSC_VER
+#include <dirent.h>
+#else
+#include <io.h>
+#endif
+
+
 #define GUINT16_SWAP_LE_BE_CONSTANT(val) ((((val) & 0x00ff) << 8) | (((val) & 0xff00) >> 8))
 
 #define GUINT32_SWAP_LE_BE_CONSTANT(val)  ( \
@@ -97,6 +107,24 @@
 
 namespace Sci {
 
+
+typedef struct {
+	long tv_sec;
+	long tv_usec;
+} GTimeVal;
+
+typedef struct {
+#ifdef WIN32
+	long search;
+	struct _finddata_t fileinfo;
+#else
+	DIR *dir;
+	char *mask_copy;
+#endif
+} sci_dir_t; /* used by sci_find_first and friends */
+
+
+
 /**** FUNCTION DECLARATIONS ****/
 
 #define getInt16	(int16)READ_UINT16