diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index d9f55da347..0c0034b272 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,11 @@
+2013-09-05  Pedro Alves  <palves@redhat.com>
+
+	* server.h (gdb_client_data, handler_func, callback_handler_func)
+	(delete_file_handler, add_file_handler, append_callback_event)
+	(delete_callback_event, start_event_loop, initialize_event_loop):
+	Move to event-loop.h and include it.
+	* event-loop.h: New file.
+
 2013-09-05  Pedro Alves  <palves@redhat.com>
 
 	* dll.c, inferiors.c, remote-utils.c, server.c: Include "dll.h".
diff --git a/gdb/gdbserver/server.h b/gdb/gdbserver/server.h
index ab527386f1..53127bf95a 100644
--- a/gdb/gdbserver/server.h
+++ b/gdb/gdbserver/server.h
@@ -138,20 +138,7 @@ typedef SOCKET gdb_fildes_t;
 typedef int gdb_fildes_t;
 #endif
 
-/* Functions from event-loop.c.  */
-typedef void *gdb_client_data;
-typedef int (handler_func) (int, gdb_client_data);
-typedef int (callback_handler_func) (gdb_client_data);
-
-extern void delete_file_handler (gdb_fildes_t fd);
-extern void add_file_handler (gdb_fildes_t fd, handler_func *proc,
-			      gdb_client_data client_data);
-extern int append_callback_event (callback_handler_func *proc,
-				   gdb_client_data client_data);
-extern void delete_callback_event (int id);
-
-extern void start_event_loop (void);
-extern void initialize_event_loop (void);
+#include "event-loop.h"
 
 /* Functions from server.c.  */
 extern int handle_serial_event (int err, gdb_client_data client_data);