diff --git a/src/base/bus.hh b/src/base/bus.hh
index 29335249..dea23ac6 100644
--- a/src/base/bus.hh
+++ b/src/base/bus.hh
@@ -50,8 +50,12 @@ public:
 
     void detach(T* component)
     {
-        auto iter = std::find(
-            this->b_components.begin(), this->b_components.end(), component);
+        auto iter = this->b_components.begin();
+        for (; iter != this->b_components.end(); ++iter) {
+            if (*iter == component) {
+                break;
+            }
+        }
         require(iter != this->b_components.end());
 
         this->b_components.erase(iter);
diff --git a/src/pollable.cc b/src/pollable.cc
index 00d55860..5eaedaea 100644
--- a/src/pollable.cc
+++ b/src/pollable.cc
@@ -27,6 +27,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <algorithm>
+
 #include "pollable.hh"
 
 #include "base/lnav_log.hh"
diff --git a/src/pollable.hh b/src/pollable.hh
index d7617a58..fc9bd77e 100644
--- a/src/pollable.hh
+++ b/src/pollable.hh
@@ -30,6 +30,7 @@
 #ifndef lnav_pollable_hh
 #define lnav_pollable_hh
 
+#include <memory>
 #include <vector>
 
 #include <poll.h>