Smallfix track prod

pure technical changes to reduce dependencies

I completely agree with Slava. In fact, I was going to write the exact same thing. The only way Vincenzo's change to guarantee to be safe would be to add a new phase in the build system to check that all headers have unique guards.