HOPKINS: Reorder includes