Fix build with master

- fixed identifiers, now after the renames in master passed
- fixed windows build
- fixed config.m4 with possible libstdc++ linkage bug

So far tests past on master/windows.
That's okay for now I guess ... Liz intends to write a native windows api backend, when we have that we can tidy config.m4/w32, and this include I guess ..