@delucia, this MR fixes the problem with identically named symbolic constants that we discussed via email.
(As long as only our library headers are included)