Re-organise system includes so shortest is last