Index: src/ch/Stdafx.h
===================================================================
diff -u -N -r0d5b67ee96b435d63f7bf075dc8e28603793b187 -r547f865c69434c14c6f16e4b529d4198f6fe2040
--- src/ch/Stdafx.h	(.../Stdafx.h)	(revision 0d5b67ee96b435d63f7bf075dc8e28603793b187)
+++ src/ch/Stdafx.h	(.../Stdafx.h)	(revision 547f865c69434c14c6f16e4b529d4198f6fe2040)
@@ -31,7 +31,16 @@
 #endif // _AFX_NO_AFXCMN_SUPPORT
 #include <afxmt.h>
 #include <afxdtctl.h>
+#include <algorithm>
 
+#define min std::min
+#define max std::max
+
+#include <afxcontrolbars.h>     // MFC support for ribbons and control bars
+
+#undef min
+#undef max
+
 #include <afxinet.h>
 
 #include <boost/numeric/conversion/cast.hpp>