trinity.h inclusion cleanup