Corrected missing #define NOMINMAX from earlier header rationalisation