just an idle thought, but if you added a -I, you could avoid all the conditional patching of include paths and just #include <validator> and similar