Added mpi includes to header files and modified makefile to compile using mpic++