Success! After my makefile change above, I had to add "this->" in about 10 places...
I got further by removing "-Werror" from build/cdefs-g++.mk But I'm getting other...