Adding some control functions to the Makefile, removing some includes from main.c