Backported away from the C++11 requirement.
Fixed several WAT issues with headers and pointers.
Tried to fix an issue in the ohter/Makefile, but somehting is still wrong.