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.
Indentation borked.