3 files changed, 3 insertions, 14 deletions
diff --git a/host/lib/utils/log.cpp b/host/lib/utils/log.cpp
index 8d42af9c4..4e58ce894 100644
--- a/host/lib/utils/log.cpp
+++ b/host/lib/utils/log.cpp
@@ -1,5 +1,5 @@
 //
-// Copyright 2012,2014 Ettus Research LLC
+// Copyright 2012,2014,2016 Ettus Research LLC
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -24,19 +24,7 @@
 #include <boost/thread/mutex.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/thread/locks.hpp>
-#ifdef BOOST_MSVC
-//whoops! https://svn.boost.org/trac/boost/ticket/5287
-//enjoy this useless dummy class instead
-namespace boost{ namespace interprocess{
-    struct file_lock{
-        file_lock(const char * = NULL){}
-        void lock(void){}
-        void unlock(void){}
-    };
-}} //namespace
-#else
 #include <boost/interprocess/sync/file_lock.hpp>
-#endif
 #include <fstream>
 #include <cctype>
 
diff --git a/host/lib/utils/msg.cpp b/host/lib/utils/msg.cpp
index de98ada64..95879a116 100644
--- a/host/lib/utils/msg.cpp
+++ b/host/lib/utils/msg.cpp
@@ -79,6 +79,8 @@ void uhd::msg::register_handler(const handler_t &handler){
 }
 
 static void default_msg_handler(uhd::msg::type_t type, const std::string &msg){
+    static boost::mutex msg_mutex;
+    boost::mutex::scoped_lock lock(msg_mutex);
     switch(type){
     case uhd::msg::fastpath:
         std::cerr << msg << std::flush;
diff --git a/host/lib/utils/paths.cpp b/host/lib/utils/paths.cpp
index 9cbc83062..38839c8d4 100644
--- a/host/lib/utils/paths.cpp
+++ b/host/lib/utils/paths.cpp
@@ -17,7 +17,6 @@
 
 #include <uhd/config.hpp>
 #include <uhd/exception.hpp>
-#include <uhd/transport/nirio/nifpga_lvbitx.h>
 #include <uhd/utils/paths.hpp>
 
 #include <boost/algorithm/string.hpp>