Make includes consistent