diff --git a/dom/include/dom/dom_listener.h b/dom/include/dom/dom_listener.h
index 41fefcb70..c5f019581 100644
--- a/dom/include/dom/dom_listener.h
+++ b/dom/include/dom/dom_listener.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <any>
+#include <functional>
 
 namespace hippy {
 inline namespace dom {
diff --git a/dom/include/dom/node_props.h b/dom/include/dom/node_props.h
index 53e0652fc..c3b7c1016 100644
--- a/dom/include/dom/node_props.h
+++ b/dom/include/dom/node_props.h
@@ -12,9 +12,6 @@ constexpr const char* kFlexGrow = "flexGrow";
 constexpr const char* kFlexShrink = "flexShrink";
 constexpr const char* kFlexDirection = "flexDirection";
 constexpr const char* kFlexWrap = "flexWrap";
-constexpr const char* kFlexGrow = "flexGrow";
-constexpr const char* kFlexShrink = "flexShrink";
-constexpr const char* kFlexBasis = "flexBasis";
 constexpr const char* kWidth = "width";
 constexpr const char* kHeight = "height";
 constexpr const char* kMinWidth = "minWidth";
@@ -172,7 +169,6 @@ constexpr const char* kPageMargin = "pageMargin";
 constexpr const char* kOnPageScroll = "onPageScroll";
 constexpr const char* kOnPageSelected = "onPageSelected";
 constexpr const char* kOnPageScrollStateChanged = "onPageScrollStateChanged";
-constexpr const char* kOverflow = "overflow";
 constexpr const char* kDirection = "direction";
 constexpr const char* kVisible = "visible";
 constexpr const char* kHidden = "hidden";
diff --git a/dom/include/dom/render_manager.h b/dom/include/dom/render_manager.h
index 582a943c6..05c09292e 100644
--- a/dom/include/dom/render_manager.h
+++ b/dom/include/dom/render_manager.h
@@ -6,6 +6,7 @@
 
 #include "dom/dom_listener.h"
 #include "dom/dom_value.h"
+#include "dom/dom_node.h"
 
 namespace hippy {
 inline namespace dom {
diff --git a/dom/include/dom/render_manager_proxy.h b/dom/include/dom/render_manager_proxy.h
index 6b1cd94ee..9ba18b758 100644
--- a/dom/include/dom/render_manager_proxy.h
+++ b/dom/include/dom/render_manager_proxy.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "dom/dom_node.h"
 #include "dom/render_manager.h"
 
 namespace hippy {
@@ -28,9 +27,9 @@ class RenderManagerProxy : public RenderManager {
                         DispatchFunctionCallback cb) override;
 
   void AddTouchEventListener(int32_t id,
-                             std::shared_ptr<TouchEvent> event,
+                             TouchEvent event,
                              OnTouchEventListener listener) override;
-  void RemoveTouchEventListener(std::shared_ptr<TouchEvent> event) override;
+  void RemoveTouchEventListener(int32_t id, TouchEvent event) override;
 
  protected:
   bool ComputeIsLayoutOnly(std::shared_ptr<DomNode> node) const;
diff --git a/dom/src/dom/render_manager_proxy.cc b/dom/src/dom/render_manager_proxy.cc
index 4185aa121..01a81d2a6 100644
--- a/dom/src/dom/render_manager_proxy.cc
+++ b/dom/src/dom/render_manager_proxy.cc
@@ -101,13 +101,13 @@ void RenderManagerProxy::DispatchFunction(
 }
 
 void RenderManagerProxy::AddTouchEventListener(int32_t id,
-                                               std::shared_ptr<TouchEvent> event,
+                                               TouchEvent event,
                                                OnTouchEventListener listener) {
   render_manager_->AddTouchEventListener(id, event, listener);
 }
 
-void RenderManagerProxy::RemoveTouchEventListener(std::shared_ptr<TouchEvent> event) {
-  render_manager_->RemoveTouchEventListener(event);
+void RenderManagerProxy::RemoveTouchEventListener(int32_t id, TouchEvent event) {
+  render_manager_->RemoveTouchEventListener(id, event);
 }
 
 bool RenderManagerProxy::ComputeIsLayoutOnly(std::shared_ptr<DomNode> node) const {