Index: src/chext/StdAfx.h
===================================================================
diff -u -r2f696d06139af4d0fab14dd1613507b66f5169cb -r88d30ae0b7fdce9c4458ccf9551f0cf9518716e4
--- src/chext/StdAfx.h	(.../StdAfx.h)	(revision 2f696d06139af4d0fab14dd1613507b66f5169cb)
+++ src/chext/StdAfx.h	(.../StdAfx.h)	(revision 88d30ae0b7fdce9c4458ccf9551f0cf9518716e4)
@@ -24,25 +24,15 @@
 
 #include "../common/targetver.h"
 
-#define _ATL_APARTMENT_THREADED
+#include <tchar.h>
 
-#include <comsvcs.h>
-
 #include "resource.h"
-#include <atlbase.h>
-#include <atlcom.h>
-#include <atlctl.h>
 #include <ShlObj.h>
 #include <comdef.h>
 
 #include <vector>
 #include <set>
 
-#pragma warning(push)
-#pragma warning(disable: 4985)
-
 #include <boost/thread/shared_mutex.hpp>
 
-#pragma warning(pop)
-
 #endif