merged from trunk

[SVN r45360]

src/usinstances.cpp

@@ -25,6 +25,8 @@
 
 #ifdef _DLL_CPPLIB
 #include <boost/detail/workaround.hpp>
+#include <memory>
+#include <string>
 //
 // This is a horrible workaround, without declaring these symbols extern we get
 // duplicate symbol errors when linking if the application is built without