diff --git a/src/core/iomgr/ev_posix.h b/src/core/iomgr/ev_posix.h
index c1e09dae1f6a26ebb811eb98be2bd61d90ba5a18..4df1331f1f2947f4e04b2b8c451bd1e34b315f17 100644
--- a/src/core/iomgr/ev_posix.h
+++ b/src/core/iomgr/ev_posix.h
@@ -34,18 +34,22 @@
 #ifndef GRPC_INTERNAL_CORE_IOMGR_EV_POSIX_H
 #define GRPC_INTERNAL_CORE_IOMGR_EV_POSIX_H
 
+#include "src/core/iomgr/exec_ctx.h"
+
 typedef struct grpc_fd grpc_fd;
+typedef struct grpc_pollset grpc_pollset;
+typedef struct grpc_pollset_worker grpc_pollset_worker;
 
 typedef struct grpc_event_engine_vtable {
   grpc_fd *(*fd_create)(int fd, const char *name);
   int (*fd_wrapped_fd)(grpc_fd *fd);
   void (*fd_orphan)(grpc_exec_ctx *exec_ctx, grpc_fd *fd, grpc_closure *on_done,
-                      int *release_fd, const char *reason);
+                    int *release_fd, const char *reason);
   void (*fd_shutdown)(grpc_exec_ctx *exec_ctx, grpc_fd *fd);
   void (*fd_notify_on_read)(grpc_exec_ctx *exec_ctx, grpc_fd *fd,
-                              grpc_closure *closure);
+                            grpc_closure *closure);
   void (*fd_notify_on_write)(grpc_exec_ctx *exec_ctx, grpc_fd *fd,
-                               grpc_closure *closure);
+                             grpc_closure *closure);
 } grpc_event_engine_vtable;
 
 extern const grpc_event_engine_vtable *grpc_event_engine;
@@ -94,4 +98,4 @@ void grpc_fd_notify_on_read(grpc_exec_ctx *exec_ctx, grpc_fd *fd,
 void grpc_fd_notify_on_write(grpc_exec_ctx *exec_ctx, grpc_fd *fd,
                              grpc_closure *closure);
 
-#endif // GRPC_INTERNAL_CORE_IOMGR_EV_POSIX_H
+#endif  // GRPC_INTERNAL_CORE_IOMGR_EV_POSIX_H
diff --git a/src/core/iomgr/pollset.h b/src/core/iomgr/pollset.h
index c6b0214dea2cb1e460c4cc6c8386087ac1db1451..7eee0b8780b771f8c118d1ad071844647612a539 100644
--- a/src/core/iomgr/pollset.h
+++ b/src/core/iomgr/pollset.h
@@ -47,7 +47,7 @@
       that is servicing a call that it's tracking */
 
 #ifdef GPR_POSIX_SOCKET
-#include "src/core/iomgr/pollset_posix.h"
+#include "src/core/iomgr/ev_posix.h"
 #endif
 
 #ifdef GPR_WIN32
diff --git a/src/core/iomgr/pollset_posix.h b/src/core/iomgr/pollset_posix.h
index b34bb094268229b92bdbf8b09ad431133564b0ce..a9e184187a1548eaeb6dce6ca3567b53128a5e56 100644
--- a/src/core/iomgr/pollset_posix.h
+++ b/src/core/iomgr/pollset_posix.h
@@ -34,6 +34,7 @@
 #ifndef GRPC_INTERNAL_CORE_IOMGR_POLLSET_POSIX_H
 #define GRPC_INTERNAL_CORE_IOMGR_POLLSET_POSIX_H
 
+#if 0
 #include <poll.h>
 
 #include <grpc/support/sync.h>
@@ -145,5 +146,6 @@ void grpc_remove_fd_from_all_epoll_sets(int fd);
 typedef int (*grpc_poll_function_type)(struct pollfd *, nfds_t, int);
 extern grpc_poll_function_type grpc_poll_function;
 extern grpc_wakeup_fd grpc_global_wakeup_fd;
+#endif
 
 #endif /* GRPC_INTERNAL_CORE_IOMGR_POLLSET_POSIX_H */
diff --git a/src/core/iomgr/pollset_set_posix.h b/src/core/iomgr/pollset_set_posix.h
index 803e58d12cf339f4db4559f7adfa34639a34eab9..598b2a360af14a2815de835c15630443ac32e4f3 100644
--- a/src/core/iomgr/pollset_set_posix.h
+++ b/src/core/iomgr/pollset_set_posix.h
@@ -34,8 +34,8 @@
 #ifndef GRPC_INTERNAL_CORE_IOMGR_POLLSET_SET_POSIX_H
 #define GRPC_INTERNAL_CORE_IOMGR_POLLSET_SET_POSIX_H
 
+#include <grpc/support/sync.h>
 #include "src/core/iomgr/ev_posix.h"
-#include "src/core/iomgr/pollset_posix.h"
 
 typedef struct grpc_pollset_set {
   gpr_mu mu;