new config.h - build is successful.
More progress, but still not enough.
more fixes.