diff --git a/libs/canvas/canvas/types.h b/libs/canvas/canvas/types.h
index 21f97d1a8a..57e3c3278f 100644
--- a/libs/canvas/canvas/types.h
+++ b/libs/canvas/canvas/types.h
@@ -25,7 +25,7 @@
 #include <vector>
 #include <stdint.h>
 #include <algorithm>
-#include <boost/optional.hpp>
+#include <optional>
 
 #include <cairomm/refptr.h>
 
diff --git a/libs/surfaces/websockets/feedback.h b/libs/surfaces/websockets/feedback.h
index 1a7a66704a..72daa2fe35 100644
--- a/libs/surfaces/websockets/feedback.h
+++ b/libs/surfaces/websockets/feedback.h
@@ -21,7 +21,6 @@
 
 #include <memory>
 
-#include <boost/unordered_map.hpp>
 #include <glibmm/threads.h>
 
 #include "pbd/abstract_ui.h"