Make the FilePath module CPP safe
Cope with FilePath adding -<.>