Fixed includes for ImagMagick for mac and Makefile