fix include headers and pass cpplint