Reorder includes, stop using reserved names