This moves the macro definitions back to __config, but keeps the improved documentation. 346ef5e5 had broken the MinGW build.