Index: src/ch/Stdafx.h
===================================================================
diff -u -rd5c3edd0d167db9b5d47d04248820fda49499a5e -r0d5b67ee96b435d63f7bf075dc8e28603793b187
--- src/ch/Stdafx.h	(.../Stdafx.h)	(revision d5c3edd0d167db9b5d47d04248820fda49499a5e)
+++ src/ch/Stdafx.h	(.../Stdafx.h)	(revision 0d5b67ee96b435d63f7bf075dc8e28603793b187)
@@ -20,19 +20,31 @@
 #define __STDAFX_H__
 
 #define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers
+#define NOMINMAX
 
+#include "../common/targetver.h"
+
 #include <afxwin.h>         // MFC core and standard components
 #include <afxext.h>         // MFC extensions
 #ifndef _AFX_NO_AFXCMN_SUPPORT
 #include <afxcmn.h>			// MFC support for Windows Common Controls
 #endif // _AFX_NO_AFXCMN_SUPPORT
-#include "afxmt.h"
+#include <afxmt.h>
+#include <afxdtctl.h>
 
-#pragma warning (disable: 4711) 
+#include <afxinet.h>
+
+#include <boost/numeric/conversion/cast.hpp>
+
+#pragma warning(push)
+#pragma warning(disable: 4985)
+
+#include <boost/thread/shared_mutex.hpp>
+
+#pragma warning(pop)
+
 #include "debug.h"
-#include "../libicpf/file.h"
 #include "../libictranslate/LanguageDialog.h"
-#include <boost/assert.hpp>
 
 #ifdef _UNICODE
 #if defined _M_IX86