Remove non-move dependencies from headers to speed up compilations and avoid too many dependencies