Fix includes optimization (skip polymorphic associations)