Split index into includes

No actual changes.