Moved the timeout code to where it belongs, along with the network backend code.

GNUmakefile

@@ -136,6 +136,7 @@ libuhub_SOURCES := \
 		src/network/epoll.c \
 		src/network/network.c \
 		src/network/select.c \
+		src/network/timeout.c \
 		src/network/timer.c \
 		src/util/ipcalc.c \
 		src/util/list.c \
@@ -143,7 +144,6 @@ libuhub_SOURCES := \
 		src/util/memory.c \
 		src/util/misc.c \
 		src/util/rbtree.c \
-		src/util/timeout.c \
 		src/util/tiger.c
 
 libadc_common_SOURCES := \

src/network/timeout.c

@@ -18,7 +18,6 @@
  */
 
 #include "uhub.h"
-#include "util/timeout.h"
 
 void timeout_evt_initialize(struct timeout_evt* t, timeout_evt_cb cb, void* ptr)
 {

src/uhub.h

@@ -62,13 +62,13 @@ extern "C" {
 #include "util/log.h"
 #include "util/memory.h"
 #include "util/misc.h"
-#include "util/timeout.h"
 #include "util/tiger.h"
 
 #include "adc/sid.h"
 #include "adc/message.h"
 #include "network/network.h"
 #include "network/connection.h"
+#include "network/timeout.h"
 
 #include "core/auth.h"
 #include "core/config.h"