osx build attempt

Modified makefiles and a couple include paths