Fixed 2 Makefiles and changed include of <string.h> to <string> because it

did not compile on linux. 

https://stackoverflow.com/questions/9257665/difference-between-string-and-string-h