Change include barrier names due to collision
* Change include barrier name to fix collision.

Approved by Ricardo Salveti, PS Jenkins bot.