Make sure there is only one :-)
In theory you could also compile everything with -Ur, but that can cause problems with automated recompilation
I am still trying to figure out how to use -Ur to solve this problem. Can you elaborate a little bit more (If you think it really worth it going through this path.)