fix cpplint warning.
rearrange headers