diff --git a/cpp/ycm/ycm_core.cpp b/cpp/ycm/ycm_core.cpp
index 510c23ab..d55599b6 100644
--- a/cpp/ycm/ycm_core.cpp
+++ b/cpp/ycm/ycm_core.cpp
@@ -155,3 +155,10 @@ BOOST_PYTHON_MODULE(ycm_core)
 
 #endif // USE_CLANG_COMPLETER
 }
+
+// Boost.Thread forces us to implement this.
+// We don't use any thread-specific (local) storage so it's fine to implement
+// this as an empty function.
+namespace boost {
+void tss_cleanup_implemented() {}
+};