(svn r22021) -Fix (r22019): ofcourse make doesn't notice files are gone, so it doesn't recompile everything that needs to be recompiled...

18 files changed, 5 insertions, 18 deletions

diff --git a/src/aircraft_cmd.cpp b/src/aircraft_cmd.cpp
index 6edc4fff7..098e30c44 100644
--- a/src/aircraft_cmd.cpp
+++ b/src/aircraft_cmd.cpp
@@ -26,7 +26,6 @@
 #include "date_func.h"
 #include "vehicle_func.h"
 #include "sound_func.h"
-#include "functions.h"
 #include "cheat_type.h"
 #include "company_base.h"
 #include "ai/ai.hpp"
diff --git a/src/autoreplace_cmd.cpp b/src/autoreplace_cmd.cpp
index b2360e583..fccab0c0a 100644
--- a/src/autoreplace_cmd.cpp
+++ b/src/autoreplace_cmd.cpp
@@ -15,7 +15,6 @@
 #include "command_func.h"
 #include "engine_func.h"
 #include "vehicle_func.h"
-#include "functions.h"
 #include "autoreplace_func.h"
 #include "autoreplace_gui.h"
 #include "group.h"
diff --git a/src/intro_gui.cpp b/src/intro_gui.cpp
index 8f7098b01..8f8458cbb 100644
--- a/src/intro_gui.cpp
+++ b/src/intro_gui.cpp
@@ -20,7 +20,6 @@
 #include "landscape_type.h"
 #include "strings_func.h"
 #include "fios.h"
-#include "functions.h"
 #include "ai/ai_gui.hpp"
 #include "gfx_func.h"
 #include "core/geometry_func.hpp"
diff --git a/src/misc_cmd.cpp b/src/misc_cmd.cpp
index 6bf93ccad..1a8877a1b 100644
--- a/src/misc_cmd.cpp
+++ b/src/misc_cmd.cpp
@@ -17,7 +17,6 @@
 #include "network/network.h"
 #include "network/network_func.h"
 #include "strings_func.h"
-#include "functions.h"
 #include "company_func.h"
 #include "company_gui.h"
 #include "company_base.h"
diff --git a/src/openttd.cpp b/src/openttd.cpp
index 7d41cfb3f..21eb89f57 100644
--- a/src/openttd.cpp
+++ b/src/openttd.cpp
@@ -47,7 +47,6 @@
 #include "gamelog.h"
 #include "animated_tile_func.h"
 #include "roadstop_base.h"
-#include "functions.h"
 #include "elrail_func.h"
 #include "rev.h"
 #include "highscore.h"
diff --git a/src/order_cmd.cpp b/src/order_cmd.cpp
index fb7053822..3a6f59f20 100644
--- a/src/order_cmd.cpp
+++ b/src/order_cmd.cpp
@@ -17,7 +17,6 @@
 #include "news_func.h"
 #include "vehicle_gui.h"
 #include "strings_func.h"
-#include "functions.h"
 #include "window_func.h"
 #include "timetable.h"
 #include "vehicle_func.h"
diff --git a/src/os/os2/os2.cpp b/src/os/os2/os2.cpp
index 82693bd48..bef44d4f5 100644
--- a/src/os/os2/os2.cpp
+++ b/src/os/os2/os2.cpp
@@ -14,7 +14,7 @@
 #include "../../gui.h"
 #include "../../fileio_func.h"
 #include "../../fios.h"
-#include "../../functions.h"
+#include "../../openttd.h"
 #include "../../core/random_func.hpp"
 #include "../../string_func.h"
 #include "../../textbuf_gui.h"
diff --git a/src/os/unix/unix.cpp b/src/os/unix/unix.cpp
index 61a2b9f39..371beb226 100644
--- a/src/os/unix/unix.cpp
+++ b/src/os/unix/unix.cpp
@@ -11,7 +11,7 @@
 
 #include "../../stdafx.h"
 #include "../../textbuf_gui.h"
-#include "../../functions.h"
+#include "../../openttd.h"
 #include "../../crashlog.h"
 #include "../../core/random_func.hpp"
 
diff --git a/src/os/windows/win32.cpp b/src/os/windows/win32.cpp
index f3ea1b0c1..14f010a76 100644
--- a/src/os/windows/win32.cpp
+++ b/src/os/windows/win32.cpp
@@ -20,7 +20,7 @@
 #include <shlobj.h> /* SHGetFolderPath */
 #include "win32.h"
 #include "../../core/alloc_func.hpp"
-#include "../../functions.h"
+#include "../../openttd.h"
 #include "../../core/random_func.hpp"
 #include "../../string_func.h"
 #include "../../crashlog.h"
diff --git a/src/roadveh_cmd.cpp b/src/roadveh_cmd.cpp
index b3d196c11..29e47bd92 100644
--- a/src/roadveh_cmd.cpp
+++ b/src/roadveh_cmd.cpp
@@ -22,7 +22,6 @@
 #include "pathfinder/yapf/yapf.h"
 #include "strings_func.h"
 #include "tunnelbridge_map.h"
-#include "functions.h"
 #include "window_func.h"
 #include "date_func.h"
 #include "vehicle_func.h"
diff --git a/src/ship_cmd.cpp b/src/ship_cmd.cpp
index 972cf9961..6eb03ebbf 100644
--- a/src/ship_cmd.cpp
+++ b/src/ship_cmd.cpp
@@ -24,7 +24,6 @@
 #include "newgrf_sound.h"
 #include "spritecache.h"
 #include "strings_func.h"
-#include "functions.h"
 #include "window_func.h"
 #include "date_func.h"
 #include "vehicle_func.h"
diff --git a/src/vehicle_cmd.cpp b/src/vehicle_cmd.cpp
index f1acadd56..eb9860d39 100644
--- a/src/vehicle_cmd.cpp
+++ b/src/vehicle_cmd.cpp
@@ -20,7 +20,6 @@
 #include "train.h"
 #include "aircraft.h"
 #include "newgrf_text.h"
-#include "functions.h"
 #include "window_func.h"
 #include "vehicle_func.h"
 #include "string_func.h"
diff --git a/src/video/allegro_v.cpp b/src/video/allegro_v.cpp
index bcec85333..68bc6880f 100644
--- a/src/video/allegro_v.cpp
+++ b/src/video/allegro_v.cpp
@@ -23,7 +23,7 @@
 #include "../blitter/factory.hpp"
 #include "../network/network.h"
 #include "../core/random_func.hpp"
-#include "../functions.h"
+#include "../core/math_func.hpp"
 #include "allegro_v.h"
 #include <allegro.h>
 
diff --git a/src/video/cocoa/cocoa_v.mm b/src/video/cocoa/cocoa_v.mm
index 8a063973e..b55e6ee02 100644
--- a/src/video/cocoa/cocoa_v.mm
+++ b/src/video/cocoa/cocoa_v.mm
@@ -31,7 +31,6 @@
 #include "../../blitter/factory.hpp"
 #include "../../fileio_func.h"
 #include "../../gfx_func.h"
-#include "../../functions.h"
 
 #import <sys/param.h> /* for MAXPATHLEN */
 
diff --git a/src/video/cocoa/wnd_quartz.mm b/src/video/cocoa/wnd_quartz.mm
index 3370c560d..0f2b4b0ad 100644
--- a/src/video/cocoa/wnd_quartz.mm
+++ b/src/video/cocoa/wnd_quartz.mm
@@ -33,7 +33,6 @@
 #include "cocoa_v.h"
 #include "../../core/math_func.hpp"
 #include "../../gfx_func.h"
-#include "../../functions.h"
 
 /**
  * Important notice regarding all modifications!!!!!!!
diff --git a/src/video/cocoa/wnd_quickdraw.mm b/src/video/cocoa/wnd_quickdraw.mm
index be07646ce..849aae1bb 100644
--- a/src/video/cocoa/wnd_quickdraw.mm
+++ b/src/video/cocoa/wnd_quickdraw.mm
@@ -32,7 +32,6 @@
 #include "cocoa_v.h"
 #include "../../core/math_func.hpp"
 #include "../../gfx_func.h"
-#include "../../functions.h"
 
 /**
  * Important notice regarding all modifications!!!!!!!
diff --git a/src/video/sdl_v.cpp b/src/video/sdl_v.cpp
index f16ca69d7..d53ebc5b3 100644
--- a/src/video/sdl_v.cpp
+++ b/src/video/sdl_v.cpp
@@ -18,10 +18,10 @@
 #include "../rev.h"
 #include "../blitter/factory.hpp"
 #include "../network/network.h"
-#include "../functions.h"
 #include "../thread/thread.h"
 #include "../genworld.h"
 #include "../core/random_func.hpp"
+#include "../core/math_func.hpp"
 #include "sdl_v.h"
 #include <SDL.h>
 
diff --git a/src/video/win32_v.cpp b/src/video/win32_v.cpp
index f411dcdce..1230eeea2 100644
--- a/src/video/win32_v.cpp
+++ b/src/video/win32_v.cpp
@@ -18,7 +18,6 @@
 #include "../network/network.h"
 #include "../core/math_func.hpp"
 #include "../core/random_func.hpp"
-#include "../functions.h"
 #include "../texteff.hpp"
 #include "win32_v.h"
 #include <windows.h>