fixup includes
fixup includes
remove some unneeded AI headers from scripting/lua.?pp
Merge branch 'master' of git://github.com/wesnoth/wesnoth

Conflicts:
	src/unit.cpp

Header conflict