diff --git a/src/common/libremoteio.h b/src/common/libremoteio.h
--- a/src/common/libremoteio.h
+++ b/src/common/libremoteio.h
@@ -21,7 +21,9 @@
 #define _DISTREN_LIBREMOTEIO_H
 
 #include "remoteio.h"
+
 #include <confuse.h>
+#include <list.h>
 
 /**
   private declarations for remoteio, to be included by options.c and remoteio.c
@@ -40,7 +42,6 @@ enum remoteio_method
 
 struct remoteio_server
 {
-  struct remoteio_server *next;
   char *name; /*< The friendly named passed to remoteio_open() */
   char *hostname;
   char *username;
@@ -51,7 +52,7 @@ struct remoteio_server
 struct remoteio_opts
 {
   char *ssh_command;
-  struct remoteio_server *servers;
+  list_t servers;  /* type: (struct remoteio_server *) */
 };
 
 struct remoteio {