Fixing direct includes of subclasses