Make civ&killers state representation a bit more clear.
Remove unnecessary includes from ts.cpp.