diff --git a/ReactCommon/react/renderer/attributedstring/AttributedString.h b/ReactCommon/react/renderer/attributedstring/AttributedString.h
index f3ed7922383..a1058c510bb 100644
--- a/ReactCommon/react/renderer/attributedstring/AttributedString.h
+++ b/ReactCommon/react/renderer/attributedstring/AttributedString.h
@@ -11,7 +11,6 @@
 #include <memory>
 
 #include <folly/Hash.h>
-#include <folly/Optional.h>
 #include <react/renderer/attributedstring/TextAttributes.h>
 #include <react/renderer/core/Sealable.h>
 #include <react/renderer/core/ShadowNode.h>
diff --git a/ReactCommon/react/renderer/attributedstring/TextAttributes.h b/ReactCommon/react/renderer/attributedstring/TextAttributes.h
index 87bbffc30e2..b7f07b962da 100644
--- a/ReactCommon/react/renderer/attributedstring/TextAttributes.h
+++ b/ReactCommon/react/renderer/attributedstring/TextAttributes.h
@@ -10,8 +10,8 @@
 #include <functional>
 #include <limits>
 
+#include <better/optional.h>
 #include <folly/Hash.h>
-#include <folly/Optional.h>
 #include <react/renderer/attributedstring/primitives.h>
 #include <react/renderer/core/LayoutPrimitives.h>
 #include <react/renderer/core/ReactPrimitives.h>
diff --git a/ReactCommon/react/renderer/core/ConcreteShadowNode.h b/ReactCommon/react/renderer/core/ConcreteShadowNode.h
index d441f326a0b..8ad8820f59e 100644
--- a/ReactCommon/react/renderer/core/ConcreteShadowNode.h
+++ b/ReactCommon/react/renderer/core/ConcreteShadowNode.h
@@ -11,6 +11,7 @@
 #include <react/renderer/core/ConcreteState.h>
 #include <react/renderer/core/Props.h>
 #include <react/renderer/core/PropsParserContext.h>
+#include <react/renderer/core/RawProps.h>
 #include <react/renderer/core/ShadowNode.h>
 #include <react/renderer/core/StateData.h>
 
diff --git a/ReactCommon/react/renderer/core/Props.h b/ReactCommon/react/renderer/core/Props.h
index 3321310b433..5d99a0139a1 100644
--- a/ReactCommon/react/renderer/core/Props.h
+++ b/ReactCommon/react/renderer/core/Props.h
@@ -10,6 +10,7 @@
 #include <folly/dynamic.h>
 
 #include <react/renderer/core/PropsParserContext.h>
+#include <react/renderer/core/RawProps.h>
 #include <react/renderer/core/ReactPrimitives.h>
 #include <react/renderer/core/Sealable.h>
 #include <react/renderer/debug/DebugStringConvertible.h>
diff --git a/ReactCommon/react/renderer/core/PropsParserContext.h b/ReactCommon/react/renderer/core/PropsParserContext.h
index 9b9d10d2dcb..df4b16d70a5 100644
--- a/ReactCommon/react/renderer/core/PropsParserContext.h
+++ b/ReactCommon/react/renderer/core/PropsParserContext.h
@@ -7,6 +7,7 @@
 
 #pragma once
 
+#include <react/renderer/core/ReactPrimitives.h>
 #include <react/utils/ContextContainer.h>
 
 namespace facebook {
@@ -20,8 +21,8 @@ struct PropsParserContext {
   PropsParserContext(const PropsParserContext &) = delete;
   PropsParserContext &operator=(const PropsParserContext &) = delete;
 
-  int surfaceId; // TODO: use SurfaceId type
-  const ContextContainer &contextContainer;
+  SurfaceId const surfaceId;
+  ContextContainer const &contextContainer;
 };
 
 } // namespace react
diff --git a/ReactCommon/react/renderer/core/ReactPrimitives.h b/ReactCommon/react/renderer/core/ReactPrimitives.h
index 4954fcfff9b..28738394bf9 100644
--- a/ReactCommon/react/renderer/core/ReactPrimitives.h
+++ b/ReactCommon/react/renderer/core/ReactPrimitives.h
@@ -8,8 +8,6 @@
 #pragma once
 
 #include <folly/dynamic.h>
-#include <react/renderer/core/RawProps.h>
-#include <react/renderer/core/RawValue.h>
 #include <memory>
 #include <string>
 
diff --git a/ReactCommon/react/renderer/core/ShadowNodeFamily.h b/ReactCommon/react/renderer/core/ShadowNodeFamily.h
index 2f57666c179..07746e35501 100644
--- a/ReactCommon/react/renderer/core/ShadowNodeFamily.h
+++ b/ReactCommon/react/renderer/core/ShadowNodeFamily.h
@@ -10,6 +10,7 @@
 #include <memory>
 
 #include <better/mutex.h>
+#include <better/small_vector.h>
 
 #include <react/renderer/core/EventEmitter.h>
 #include <react/renderer/core/ReactPrimitives.h>