Makefile modification to avoid include conflicts when using the library