diff --git a/Headers/gnustep/base/TcpPort.h b/Headers/gnustep/base/TcpPort.h
index 8c98bea08..35e4b7de6 100644
--- a/Headers/gnustep/base/TcpPort.h
+++ b/Headers/gnustep/base/TcpPort.h
@@ -26,6 +26,7 @@
 
 #include <objects/stdobjects.h>
 #include <objects/Port.h>
+#include <objects/RunLoop.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netdb.h>
@@ -41,6 +42,9 @@
   fd_set active_fd_set;
   NSMapTable *client_sock_2_out_port;
   NSMapTable *client_sock_2_packet;
+  /* The RunLoop with which our file descriptors are registered. */
+  id _run_loop;
+  id _run_loop_mode;
 }
 
 + newForReceivingFromPortNumber: (unsigned short)n;
diff --git a/Source/objects/TcpPort.h b/Source/objects/TcpPort.h
index 8c98bea08..35e4b7de6 100644
--- a/Source/objects/TcpPort.h
+++ b/Source/objects/TcpPort.h
@@ -26,6 +26,7 @@
 
 #include <objects/stdobjects.h>
 #include <objects/Port.h>
+#include <objects/RunLoop.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netdb.h>
@@ -41,6 +42,9 @@
   fd_set active_fd_set;
   NSMapTable *client_sock_2_out_port;
   NSMapTable *client_sock_2_packet;
+  /* The RunLoop with which our file descriptors are registered. */
+  id _run_loop;
+  id _run_loop_mode;
 }
 
 + newForReceivingFromPortNumber: (unsigned short)n;