added macros to string.h
moved some defs into correct header