fix header include order build regression