diff --git a/thrift/lib/cpp2/transport/core/EnvelopeUtil.h b/thrift/lib/cpp2/transport/core/EnvelopeUtil.h
index a6bdc4238f4..1695b41832f 100644
--- a/thrift/lib/cpp2/transport/core/EnvelopeUtil.h
+++ b/thrift/lib/cpp2/transport/core/EnvelopeUtil.h
@@ -16,6 +16,7 @@
 
 #pragma once
 
+#include <folly/Optional.h>
 #include <folly/Utility.h>
 #include <thrift/lib/cpp2/protocol/BinaryProtocol.h>
 #include <thrift/lib/cpp2/protocol/CompactProtocol.h>
diff --git a/thrift/lib/cpp2/transport/rocket/server/SetupFrameInterceptor.h b/thrift/lib/cpp2/transport/rocket/server/SetupFrameInterceptor.h
index 235578e5c3b..07df39ecb0d 100644
--- a/thrift/lib/cpp2/transport/rocket/server/SetupFrameInterceptor.h
+++ b/thrift/lib/cpp2/transport/rocket/server/SetupFrameInterceptor.h
@@ -18,6 +18,7 @@
 
 #include <optional>
 #include <thrift/lib/cpp2/server/Cpp2ConnContext.h>
+#include <thrift/lib/cpp2/server/LoggingEvent.h>
 
 namespace apache {
 namespace thrift {