--- a/src/aircraft_gui.cpp	Mon Dec 03 23:39:38 2007 +0000
+++ b/src/aircraft_gui.cpp	Tue Jan 22 21:00:30 2008 +0000
@@ -6,22 +6,17 @@
 #include "openttd.h"
 #include "aircraft.h"
 #include "debug.h"
-#include "functions.h"
-#include "table/sprites.h"
-#include "table/strings.h"
-#include "strings.h"
-#include "map.h"
-#include "window.h"
 #include "gui.h"
-#include "vehicle.h"
-#include "gfx.h"
-#include "command.h"
 #include "engine.h"
-#include "viewport.h"
-#include "player.h"
 #include "depot.h"
 #include "vehicle_gui.h"
 #include "newgrf_engine.h"
+#include "strings_func.h"
+#include "vehicle_func.h"
+#include "gfx_func.h"
+
+#include "table/sprites.h"
+#include "table/strings.h"
 
 /**
 * Draw the details for the given vehicle at the position (x,y)