Fix compilation issue and remove useless includes.