10 files changed, 13 insertions, 13 deletions
diff --git a/src/test/test-timers.c b/src/test/test-timers.c
index a2365a2e38..f9276c25d6 100644
--- a/src/test/test-timers.c
+++ b/src/test/test-timers.c
@@ -7,8 +7,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "common/compat_libevent.h"
-#include "common/timers.h"
+#include "lib/evloop/compat_libevent.h"
+#include "lib/evloop/timers.h"
 #include "lib/crypt_ops/crypto_rand.h"
 #include "lib/log/util_bug.h"
 #include "lib/time/compat_time.h"
diff --git a/src/test/test_bwmgt.c b/src/test/test_bwmgt.c
index 604987e070..4cfca6c776 100644
--- a/src/test/test_bwmgt.c
+++ b/src/test/test_bwmgt.c
@@ -11,7 +11,7 @@
 #include "or/or.h"
 #include "test/test.h"
 
-#include "common/token_bucket.h"
+#include "lib/evloop/token_bucket.h"
 
 // an imaginary time, in timestamp units. Chosen so it will roll over.
 static const uint32_t START_TS = UINT32_MAX-10;
diff --git a/src/test/test_channelpadding.c b/src/test/test_channelpadding.c
index 7e0c33f63b..ff2ab8daab 100644
--- a/src/test/test_channelpadding.c
+++ b/src/test/test_channelpadding.c
@@ -13,14 +13,14 @@
 #include "or/channel.h"
 #include "or/channeltls.h"
 #include "or/channelpadding.h"
-#include "common/compat_libevent.h"
+#include "lib/evloop/compat_libevent.h"
 #include "or/config.h"
 #include "lib/time/compat_time.h"
 #include "or/main.h"
 #include "or/networkstatus.h"
 #include "test/log_test_helpers.h"
 #include "lib/tls/tortls.h"
-#include "common/timers.h"
+#include "lib/evloop/timers.h"
 #include "lib/container/buffers.h"
 
 #include "or/cell_st.h"
diff --git a/src/test/test_compat_libevent.c b/src/test/test_compat_libevent.c
index 8e59137856..1262a3140e 100644
--- a/src/test/test_compat_libevent.c
+++ b/src/test/test_compat_libevent.c
@@ -7,7 +7,7 @@
 
 #include "test/test.h"
 
-#include "common/compat_libevent.h"
+#include "lib/evloop/compat_libevent.h"
 
 #include <event2/event.h>
 
diff --git a/src/test/test_consdiffmgr.c b/src/test/test_consdiffmgr.c
index a0dfe95d35..959075903f 100644
--- a/src/test/test_consdiffmgr.c
+++ b/src/test/test_consdiffmgr.c
@@ -12,7 +12,7 @@
 #include "lib/crypt_ops/crypto_rand.h"
 #include "or/networkstatus.h"
 #include "or/routerparse.h"
-#include "common/workqueue.h"
+#include "lib/evloop/workqueue.h"
 #include "lib/compress/compress.h"
 #include "lib/encoding/confline.h"
 
diff --git a/src/test/test_oom.c b/src/test/test_oom.c
index 2e5989c0d0..6c3ee1a27b 100644
--- a/src/test/test_oom.c
+++ b/src/test/test_oom.c
@@ -10,7 +10,7 @@
 #include "or/or.h"
 #include "lib/container/buffers.h"
 #include "or/circuitlist.h"
-#include "common/compat_libevent.h"
+#include "lib/evloop/compat_libevent.h"
 #include "or/connection.h"
 #include "or/config.h"
 #include "lib/crypt_ops/crypto_rand.h"
diff --git a/src/test/test_procmon.c b/src/test/test_procmon.c
index ae30bd00b6..e2915d0fb4 100644
--- a/src/test/test_procmon.c
+++ b/src/test/test_procmon.c
@@ -6,7 +6,7 @@
 #include "or/or.h"
 #include "test/test.h"
 
-#include "common/procmon.h"
+#include "lib/evloop/procmon.h"
 
 #include "test/log_test_helpers.h"
 
diff --git a/src/test/test_scheduler.c b/src/test/test_scheduler.c
index 1087befa68..555a2a6bfd 100644
--- a/src/test/test_scheduler.c
+++ b/src/test/test_scheduler.c
@@ -10,7 +10,7 @@
 #define CHANNEL_PRIVATE_
 #include "or/or.h"
 #include "or/config.h"
-#include "common/compat_libevent.h"
+#include "lib/evloop/compat_libevent.h"
 #include "or/channel.h"
 #include "or/channeltls.h"
 #include "or/connection.h"
diff --git a/src/test/test_workqueue.c b/src/test/test_workqueue.c
index dda724b78b..2cb42734c4 100644
--- a/src/test/test_workqueue.c
+++ b/src/test/test_workqueue.c
@@ -6,11 +6,11 @@
 #include "or/or.h"
 #include "lib/thread/threads.h"
 #include "or/onion.h"
-#include "common/workqueue.h"
+#include "lib/evloop/workqueue.h"
 #include "lib/crypt_ops/crypto_curve25519.h"
 #include "lib/crypt_ops/crypto_rand.h"
 #include "lib/net/alertsock.h"
-#include "common/compat_libevent.h"
+#include "lib/evloop/compat_libevent.h"
 #include "lib/intmath/weakrng.h"
 
 #include <stdio.h>
diff --git a/src/test/testing_common.c b/src/test/testing_common.c
index ace564d0fe..b0514f85ec 100644
--- a/src/test/testing_common.c
+++ b/src/test/testing_common.c
@@ -22,7 +22,7 @@
 #include "or/channelpadding.h"
 #include "or/main.h"
 #include "lib/compress/compress.h"
-#include "common/compat_libevent.h"
+#include "lib/evloop/compat_libevent.h"
 
 #include <stdio.h>
 #ifdef HAVE_FCNTL_H