Merged more common headers and switched precision to float.