moved includes out of header
renamed compile unit for templated functions as we only need two explicit instatiations of them, they can be compiled seperately