Clean-up for eclipse/mingw32
Revert "Clean-up for eclipse/mingw32"

This reverts commit 268caf7aeb9a50b2e3d830cb4cb802769796e365.
Revert "Revert "Clean-up for eclipse/mingw32""

This reverts commit 3a87e92ee6d809db5fdbd5421c56ffe53328ad8e.