Cleanup of includes (Ivana)