--- fbzmq/zmq/Socket.h
+++ fbzmq/zmq/Socket.h
@@ -13,8 +13,8 @@
 
 #include <folly/Expected.h>
 #if FOLLY_HAS_COROUTINES
-#include <folly/experimental/coro/Baton.h>
-#include <folly/experimental/coro/Task.h>
+#include <folly/coro/Baton.h>
+#include <folly/coro/Task.h>
 #endif
 #include <fbzmq/zmq/Common.h>
 #include <fbzmq/zmq/Context.h>
--- fbzmq/zmq/tests/SocketTest.cpp
+++ fbzmq/zmq/tests/SocketTest.cpp
@@ -21,7 +21,7 @@
 #include <folly/io/async/AsyncTimeout.h>
 
 #if FOLLY_HAS_COROUTINES
-#include <folly/experimental/coro/Sleep.h>
+#include <folly/coro/Sleep.h>
 #endif
 
 using namespace std::chrono_literals;
--- fbzmq/examples/server/ZmqServer.cpp
+++ fbzmq/examples/server/ZmqServer.cpp
@@ -10,6 +10,7 @@
 
 #include <fbzmq/examples/common/Constants.h>
 #include <fbzmq/examples/if/gen-cpp2/Example_types.h>
+#include <folly/Format.h>
 
 namespace fbzmq {
 namespace example {