Consecutively number FVs, and move #includes around.