- Add a couple of missing #include <algorithm>
- Replace _N by _NN (_N is already defined and used in some system math headers on Windows)
- Add #define __thread __declspec(thread)