Move encoding into contrib file
changed include