diff -up mkvtoolnix-7.9.0/src/common/utf8_codecvt_facet.cpp.boost mkvtoolnix-7.9.0/src/common/utf8_codecvt_facet.cpp
--- mkvtoolnix-7.9.0/src/common/utf8_codecvt_facet.cpp.boost	2015-05-10 11:04:26.000000000 +0200
+++ mkvtoolnix-7.9.0/src/common/utf8_codecvt_facet.cpp	2015-06-11 15:38:40.419855025 +0200
@@ -16,7 +16,7 @@
 #define BOOST_UTF8_END_NAMESPACE }
 #define BOOST_UTF8_DECL
 
-#include "../../lib/boost/utf8_codecvt_facet/utf8_codecvt_facet.cpp"
+#include <boost/detail/utf8_codecvt_facet.ipp>
 
 #undef BOOST_UTF8_BEGIN_NAMESPACE
 #undef BOOST_UTF8_END_NAMESPACE
diff -up mkvtoolnix-7.9.0/src/common/utf8_codecvt_facet.h.boost mkvtoolnix-7.9.0/src/common/utf8_codecvt_facet.h
--- mkvtoolnix-7.9.0/src/common/utf8_codecvt_facet.h.boost	2015-05-10 11:04:26.000000000 +0200
+++ mkvtoolnix-7.9.0/src/common/utf8_codecvt_facet.h	2015-06-11 15:42:49.356845435 +0200
@@ -12,7 +12,7 @@
 #define BOOST_UTF8_END_NAMESPACE }
 #define BOOST_UTF8_DECL
 
-#include "../../lib/boost/utf8_codecvt_facet/utf8_codecvt_facet.hpp"
+#include <boost/detail/utf8_codecvt_facet.hpp>
 
 #undef BOOST_UTF8_BEGIN_NAMESPACE
 #undef BOOST_UTF8_END_NAMESPACE