Header and code cleanup of debug.cpp
Header cleanup of aggro.cpp