Moved sci_ffs() inside iterator.cpp, the only place where it's actually used, and removed tools.*. Also, removed all the unused includes to tools.h from several places

svn-id: r45176

11 files changed, 0 insertions, 11 deletions

diff --git a/engines/sci/gui/gui.cpp b/engines/sci/gui/gui.cpp
index f8e083b2ca..5728ffd2d1 100644
--- a/engines/sci/gui/gui.cpp
+++ b/engines/sci/gui/gui.cpp
@@ -29,7 +29,6 @@
 #include "sci/sci.h"
 #include "sci/debug.h"	// for g_debug_sleeptime_factor
 #include "sci/engine/state.h"
-#include "sci/tools.h"
 #include "sci/gui/gui.h"
 #include "sci/gui/gui_screen.h"
 #include "sci/gui/gui_palette.h"
diff --git a/engines/sci/gui/gui_animate.cpp b/engines/sci/gui/gui_animate.cpp
index 19bcc418a0..8f26cfd971 100644
--- a/engines/sci/gui/gui_animate.cpp
+++ b/engines/sci/gui/gui_animate.cpp
@@ -29,7 +29,6 @@
 
 #include "sci/sci.h"
 #include "sci/engine/state.h"
-#include "sci/tools.h"
 #include "sci/gui/gui_gfx.h"
 #include "sci/gui/gui_view.h"
 #include "sci/gui/gui_screen.h"
diff --git a/engines/sci/gui/gui_cursor.cpp b/engines/sci/gui/gui_cursor.cpp
index ba55fe75e2..81b390e3b6 100644
--- a/engines/sci/gui/gui_cursor.cpp
+++ b/engines/sci/gui/gui_cursor.cpp
@@ -29,7 +29,6 @@
 
 #include "sci/sci.h"
 #include "sci/engine/state.h"
-#include "sci/tools.h"
 #include "sci/gui/gui_palette.h"
 #include "sci/gui/gui_view.h"
 #include "sci/gui/gui_cursor.h"
diff --git a/engines/sci/gui/gui_font.cpp b/engines/sci/gui/gui_font.cpp
index a341bb9dec..d903d18f4c 100644
--- a/engines/sci/gui/gui_font.cpp
+++ b/engines/sci/gui/gui_font.cpp
@@ -25,7 +25,6 @@
 
 #include "sci/sci.h"
 #include "sci/engine/state.h"
-#include "sci/tools.h"
 #include "sci/gui/gui_screen.h"
 #include "sci/gui/gui_font.h"
 
diff --git a/engines/sci/gui/gui_gfx.cpp b/engines/sci/gui/gui_gfx.cpp
index 1bdb1bbd8f..b4f2e224b0 100644
--- a/engines/sci/gui/gui_gfx.cpp
+++ b/engines/sci/gui/gui_gfx.cpp
@@ -29,7 +29,6 @@
 
 #include "sci/sci.h"
 #include "sci/engine/state.h"
-#include "sci/tools.h"
 #include "sci/gui/gui_gfx.h"
 #include "sci/gui/gui_animate.h"
 #include "sci/gui/gui_font.h"
diff --git a/engines/sci/gui/gui_palette.cpp b/engines/sci/gui/gui_palette.cpp
index bc02f2332e..e5a81406b9 100644
--- a/engines/sci/gui/gui_palette.cpp
+++ b/engines/sci/gui/gui_palette.cpp
@@ -28,7 +28,6 @@
 
 #include "sci/sci.h"
 #include "sci/engine/state.h"
-#include "sci/tools.h"
 #include "sci/gui/gui_screen.h"
 #include "sci/gui/gui_palette.h"
 
diff --git a/engines/sci/gui/gui_picture.cpp b/engines/sci/gui/gui_picture.cpp
index 7f4d19555b..6fca4d6542 100644
--- a/engines/sci/gui/gui_picture.cpp
+++ b/engines/sci/gui/gui_picture.cpp
@@ -26,7 +26,6 @@
 #include "common/stack.h"
 #include "sci/sci.h"
 #include "sci/engine/state.h"
-#include "sci/tools.h"
 #include "sci/gui/gui_screen.h"
 #include "sci/gui/gui_palette.h"
 #include "sci/gui/gui_gfx.h"
diff --git a/engines/sci/gui/gui_screen.cpp b/engines/sci/gui/gui_screen.cpp
index df5b9831d3..90f7875a9f 100644
--- a/engines/sci/gui/gui_screen.cpp
+++ b/engines/sci/gui/gui_screen.cpp
@@ -29,7 +29,6 @@
 
 #include "sci/sci.h"
 #include "sci/engine/state.h"
-#include "sci/tools.h"
 #include "sci/gui/gui_screen.h"
 
 namespace Sci {
diff --git a/engines/sci/gui/gui_transitions.cpp b/engines/sci/gui/gui_transitions.cpp
index da260deb84..09e58e0e71 100644
--- a/engines/sci/gui/gui_transitions.cpp
+++ b/engines/sci/gui/gui_transitions.cpp
@@ -29,7 +29,6 @@
 
 #include "sci/sci.h"
 #include "sci/engine/state.h"
-#include "sci/tools.h"
 #include "sci/gui/gui.h"
 #include "sci/gui/gui_screen.h"
 #include "sci/gui/gui_palette.h"
diff --git a/engines/sci/gui/gui_view.cpp b/engines/sci/gui/gui_view.cpp
index bff2e38e3b..83c80d5f59 100644
--- a/engines/sci/gui/gui_view.cpp
+++ b/engines/sci/gui/gui_view.cpp
@@ -25,7 +25,6 @@
 
 #include "sci/sci.h"
 #include "sci/engine/state.h"
-#include "sci/tools.h"
 #include "sci/gui/gui_gfx.h"
 #include "sci/gui/gui_screen.h"
 #include "sci/gui/gui_palette.h"
diff --git a/engines/sci/gui/gui_windowmgr.cpp b/engines/sci/gui/gui_windowmgr.cpp
index 2909a31845..d58d2d677c 100644
--- a/engines/sci/gui/gui_windowmgr.cpp
+++ b/engines/sci/gui/gui_windowmgr.cpp
@@ -27,7 +27,6 @@
 
 #include "sci/sci.h"
 #include "sci/engine/state.h"
-#include "sci/tools.h"
 #include "sci/gui/gui_screen.h"
 #include "sci/gui/gui_gfx.h"
 #include "sci/gui/gui_animate.h"