Cleaned up makefile linking and include
Makefile updates...
Updated Makefile