Use the PIMPL idiom and do some code cleaning

[embeddedmz]

Reducing the differences between the code for Linux and Windows (yes that's possible).
Removing commented code.