diff --git a/indra/llcommon/tests/llleap_test.cpp b/indra/llcommon/tests/llleap_test.cpp
index 99fd073dd2c6f1d2bb41249b51a863ac21525ded..0c91db3e241198c0145485e84e598f69f84ea89e 100644
--- a/indra/llcommon/tests/llleap_test.cpp
+++ b/indra/llcommon/tests/llleap_test.cpp
@@ -19,6 +19,7 @@
 // external library headers
 #include <boost/assign/list_of.hpp>
 #include <boost/phoenix/core/argument.hpp>
+#include <boost/phoenix/operator/bitwise.hpp> // operator<<()
 // other Linden headers
 #include "../test/lltut.h"
 #include "../test/namedtempfile.h"
diff --git a/indra/llcommon/tests/llsdserialize_test.cpp b/indra/llcommon/tests/llsdserialize_test.cpp
index d7c11c5021a857a6379de75b8cb1ec7c163f6d96..a0b85195082bf17c8bd8266ea215cd4eb1ad7714 100644
--- a/indra/llcommon/tests/llsdserialize_test.cpp
+++ b/indra/llcommon/tests/llsdserialize_test.cpp
@@ -50,6 +50,7 @@ typedef U32 uint32_t;
 #include "boost/bind.hpp"
 #include "boost/phoenix/bind/bind_function.hpp"
 #include "boost/phoenix/core/argument.hpp"
+#include <boost/phoenix/operator/bitwise.hpp>
 using namespace boost::phoenix;
 
 #include "../llsd.h"
diff --git a/indra/test/namedtempfile.h b/indra/test/namedtempfile.h
index acfc048b7a37d9c09a61fe802b344866d5cafcd8..84b62a094575a7d6ce6ff3546daeb7d134c82a63 100644
--- a/indra/test/namedtempfile.h
+++ b/indra/test/namedtempfile.h
@@ -15,10 +15,10 @@
 #include "llerror.h"
 #include "stringize.h"
 #include <string>
-#include <boost/function.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/filesystem/fstream.hpp>
 #include <boost/noncopyable.hpp>
+#include <functional>
 #include <iostream>
 #include <sstream>
 #include <string_view>
@@ -50,7 +50,7 @@ class NamedTempFile: public boost::noncopyable
     // Function that accepts an ostream ref and (presumably) writes stuff to
     // it, e.g.:
     // (boost::phoenix::placeholders::arg1 << "the value is " << 17 << '\n')
-    typedef boost::function<void(std::ostream&)> Streamer;
+    typedef std::function<void(std::ostream&)> Streamer;
 
     NamedTempFile(const std::string_view& pfx,
                   const Streamer& func,