Fixed makefile and all references to prevent incomplete compilation