Modified include and makefile to fix build issues across platforms