diff --git a/src/input/input_event.cc b/src/input/input_event.cc
index 1b6ebcf1..bd623b2a 100644
--- a/src/input/input_event.cc
+++ b/src/input/input_event.cc
@@ -7,13 +7,13 @@
 namespace input {
 
 void
-InputEvent::insert(torrent::Poll* p) {
+InputEvent::insert(torrent::net::Poll* p) {
   p->open(this);
   p->insert_read(this);
 }
 
 void
-InputEvent::remove(torrent::Poll* p) {
+InputEvent::remove(torrent::net::Poll* p) {
   p->remove_read(this);
   p->close(this);
 }
diff --git a/src/input/input_event.h b/src/input/input_event.h
index 935ad7ae..0de78854 100644
--- a/src/input/input_event.h
+++ b/src/input/input_event.h
@@ -4,7 +4,7 @@
 #include <functional>
 
 #include <torrent/event.h>
-#include <torrent/poll.h>
+#include <torrent/net/poll.h>
 
 namespace input {
 
@@ -14,8 +14,8 @@ public:
 
   InputEvent(int fd) { m_fileDesc = fd; }
 
-  void                insert(torrent::Poll* p);
-  void                remove(torrent::Poll* p);
+  void                insert(torrent::net::Poll* p);
+  void                remove(torrent::net::Poll* p);
 
   void                event_read();
   void                event_write();
diff --git a/src/rpc/scgi.cc b/src/rpc/scgi.cc
index eb593dbc..97e48041 100644
--- a/src/rpc/scgi.cc
+++ b/src/rpc/scgi.cc
@@ -3,10 +3,10 @@
 #include <cassert>
 #include <sys/un.h>
 #include <torrent/connection_manager.h>
-#include <torrent/poll.h>
 #include <torrent/torrent.h>
 #include <torrent/exceptions.h>
 #include <torrent/net/fd.h>
+#include <torrent/net/poll.h>
 #include <torrent/net/socket_address.h>
 
 #include "control.h"
diff --git a/src/rpc/scgi_task.cc b/src/rpc/scgi_task.cc
index 92b01060..c151b0e6 100644
--- a/src/rpc/scgi_task.cc
+++ b/src/rpc/scgi_task.cc
@@ -8,8 +8,8 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <torrent/exceptions.h>
-#include <torrent/poll.h>
 #include <torrent/torrent.h>
+#include <torrent/net/poll.h>
 #include <torrent/utils/log.h>
 #include <torrent/utils/thread.h>
 
diff --git a/test/helpers/test_thread.cc b/test/helpers/test_thread.cc
index c1f93798..201be929 100644
--- a/test/helpers/test_thread.cc
+++ b/test/helpers/test_thread.cc
@@ -6,7 +6,7 @@
 
 #include "test/helpers/mock_function.h"
 #include "torrent/exceptions.h"
-#include "torrent/poll.h"
+#include "torrent/net/poll.h"
 
 const int test_thread::test_flag_pre_stop;
 const int test_thread::test_flag_long_timeout;