--- a/src/ai/api/ai_object.hpp	Thu Apr 24 23:29:01 2008 +0000
+++ b/src/ai/api/ai_object.hpp	Thu Apr 24 23:39:18 2008 +0000
@@ -6,21 +6,9 @@
 #define AI_OBJECT_HPP
 
 #include "../../stdafx.h"
-#include "../../openttd.h"
 #include "../../misc/countedptr.hpp"
-#include "../../signs_type.h"
-#include "../../strings_type.h"
-#include "../../command_type.h"
-#include "../../vehicle_type.h"
-#include "../../tile_type.h"
-#include "../../player_type.h"
 
-#ifndef _SQUIRREL_H_
-/* Life becomes easier when we can tell about a function it needs the VM, but
- *  without really including 'squirrel.h'. */
-typedef void *HSQUIRRELVM;
-typedef int SQInteger;
-#endif
+#include "ai_types.hpp"
 
 /**
  * The type (an alias) for all errors the AI API knows.
@@ -40,18 +28,7 @@
  */
 class AIObject : public SimpleCountedObject {
 private:
-	struct AIDoCommandStruct {
-		AIModeProc *mode;
-		AIObject *mode_instance;
-		uint delay;
-		CommandCost costs;
-		uint last_error;
-		bool last_command_res;
-		VehicleID new_vehicle_id;
-		SignID new_sign_id;
-		void *event_data;
-		void *log_data;
-	};
+	struct AIDoCommandStruct;
 
 	/**
 	 * The current mode of the AI players.