Assets 2
compat: removed redundant includes