::CPP namespace clash in 4.15

Hi all, i have a plugin with a link to a third party library. this library has a


::CPP

namespace, and will not compile in UE out of the box, as it clashes with the:


#define CPP

in coredefines.

In 4.13, i got around this by adding:


#define PCPP CPP
#undef CPP

#include Header

.....

#define CPP PCPP


in 4.15 though, for some reason, this no longer helps, and i cannot compile. Ug. Any thoughts would be much appreciated.