convert some raw-mode redefinitions into include-raws