I'll mention your suggestions to my team. Hopefully we can find an automated way of massaging the doxygen diagrams into something acceptable, but the person who informed us of this new requirement ...