Header cleanup of aggro.cpp