Added includes in main.c; Improved makefile