Makefile change only
Change inc guards to avoid potential impl conflict