Uniformise remaining includes, formatting.