Unless it specifically states that all figures your using have the extra applied then do it IMHO, for example the C310 I fly has the original charts then right at the back it has CASA charts that specifically state in the bottom left hand corner they have had the safety factor applied.