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.
Well ... I am well and truly confused ... I just opened my eyes ... maybe it's that ...