Fix include order, again