Removed std from the header files