Add macro based upstream library.