fixing up building
proper header fixes for the libraries