[CLEANUP] Avoid double parsing of includes