index-reorg: fixing embarrassing include issues