This fixes ODR violations of the headers are used in multiple translation units.

Also removed a few unnecessary eos:: namespace qualifiers to have consistent style