31 files changed, 33 insertions, 33 deletions
diff --git a/lib/bfd.c b/lib/bfd.c
index c1e0fff7f5..c430b1d7ef 100644
--- a/lib/bfd.c
+++ b/lib/bfd.c
@@ -10,7 +10,7 @@
 #include "command.h"
 #include "memory.h"
 #include "prefix.h"
-#include "thread.h"
+#include "event.h"
 #include "stream.h"
 #include "vrf.h"
 #include "zclient.h"
diff --git a/lib/command.c b/lib/command.c
index 196d73d46a..e2de6f322b 100644
--- a/lib/command.c
+++ b/lib/command.c
@@ -17,7 +17,7 @@
 #include "memory.h"
 #include "log.h"
 #include "log_vty.h"
-#include "thread.h"
+#include "event.h"
 #include "vector.h"
 #include "linklist.h"
 #include "vty.h"
diff --git a/lib/thread.c b/lib/event.c
index 87ad3d8823..b0f901ab0e 100644
--- a/lib/thread.c
+++ b/lib/event.c
@@ -8,7 +8,7 @@
 #include <zebra.h>
 #include <sys/resource.h>
 
-#include "thread.h"
+#include "event.h"
 #include "memory.h"
 #include "frrcu.h"
 #include "log.h"
@@ -87,7 +87,7 @@ unsigned long cputime_threshold = CONSUMED_TIME_CHECK;
 unsigned long walltime_threshold = CONSUMED_TIME_CHECK;
 
 /* CLI start ---------------------------------------------------------------- */
-#include "lib/thread_clippy.c"
+#include "lib/event_clippy.c"
 
 static unsigned int cpu_record_hash_key(const struct cpu_thread_history *a)
 {
diff --git a/lib/thread.h b/lib/event.h
index 128d11b6eb..128d11b6eb 100644
--- a/lib/thread.h
+++ b/lib/event.h
diff --git a/lib/frr_pthread.h b/lib/frr_pthread.h
index b1d08717fb..c14ba77922 100644
--- a/lib/frr_pthread.h
+++ b/lib/frr_pthread.h
@@ -11,7 +11,7 @@
 #include "frratomic.h"
 #include "memory.h"
 #include "frrcu.h"
-#include "thread.h"
+#include "event.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/frr_zmq.c b/lib/frr_zmq.c
index 2673d57605..525e49942c 100644
--- a/lib/frr_zmq.c
+++ b/lib/frr_zmq.c
@@ -15,7 +15,7 @@
 #include <zebra.h>
 #include <zmq.h>
 
-#include "thread.h"
+#include "event.h"
 #include "memory.h"
 #include "frr_zmq.h"
 #include "log.h"
diff --git a/lib/frr_zmq.h b/lib/frr_zmq.h
index f12291d602..bfc1e93b16 100644
--- a/lib/frr_zmq.h
+++ b/lib/frr_zmq.h
@@ -7,7 +7,7 @@
 #ifndef _FRRZMQ_H
 #define _FRRZMQ_H
 
-#include "thread.h"
+#include "event.h"
 #include <zmq.h>
 
 #ifdef __cplusplus
diff --git a/lib/ldp_sync.c b/lib/ldp_sync.c
index b01cf87287..3ecbfcabf9 100644
--- a/lib/ldp_sync.c
+++ b/lib/ldp_sync.c
@@ -10,7 +10,7 @@
 #include "memory.h"
 #include "prefix.h"
 #include "log.h"
-#include "thread.h"
+#include "event.h"
 #include "stream.h"
 #include "zclient.h"
 #include "table.h"
diff --git a/lib/libfrr.h b/lib/libfrr.h
index 97e9b93c10..3657346507 100644
--- a/lib/libfrr.h
+++ b/lib/libfrr.h
@@ -11,7 +11,7 @@
 #include "typesafe.h"
 #include "sigevent.h"
 #include "privs.h"
-#include "thread.h"
+#include "event.h"
 #include "log.h"
 #include "getopt.h"
 #include "module.h"
diff --git a/lib/libfrr_trace.h b/lib/libfrr_trace.h
index 92c469706a..d13cdc20b1 100644
--- a/lib/libfrr_trace.h
+++ b/lib/libfrr_trace.h
@@ -21,7 +21,7 @@
 #include <lttng/tracepoint.h>
 
 #include "hash.h"
-#include "thread.h"
+#include "event.h"
 #include "memory.h"
 #include "linklist.h"
 #include "table.h"
diff --git a/lib/mgmt_fe_client.h b/lib/mgmt_fe_client.h
index ac29b8f27c..10712964bd 100644
--- a/lib/mgmt_fe_client.h
+++ b/lib/mgmt_fe_client.h
@@ -13,7 +13,7 @@ extern "C" {
 #endif
 
 #include "mgmt_pb.h"
-#include "thread.h"
+#include "event.h"
 #include "mgmtd/mgmt_defines.h"
 
 /***************************************************************
diff --git a/lib/mgmt_msg.c b/lib/mgmt_msg.c
index 2fab03bc54..e7564f2688 100644
--- a/lib/mgmt_msg.c
+++ b/lib/mgmt_msg.c
@@ -10,7 +10,7 @@
 #include "network.h"
 #include "sockopt.h"
 #include "stream.h"
-#include "thread.h"
+#include "event.h"
 #include "mgmt_msg.h"
 
 
diff --git a/lib/mgmt_msg.h b/lib/mgmt_msg.h
index 854875170b..90dab8da76 100644
--- a/lib/mgmt_msg.h
+++ b/lib/mgmt_msg.h
@@ -8,7 +8,7 @@
 #define _MGMT_MSG_H
 
 #include "stream.h"
-#include "thread.h"
+#include "event.h"
 
 #define MGMT_MSG_MARKER (0x4D724B21u) /* ASCII - "MrK!"*/
 
diff --git a/lib/northbound.h b/lib/northbound.h
index 4b5028c87e..6820a59cc6 100644
--- a/lib/northbound.h
+++ b/lib/northbound.h
@@ -7,7 +7,7 @@
 #ifndef _FRR_NORTHBOUND_H_
 #define _FRR_NORTHBOUND_H_
 
-#include "thread.h"
+#include "event.h"
 #include "hook.h"
 #include "linklist.h"
 #include "openbsd-tree.h"
diff --git a/lib/northbound_grpc.cpp b/lib/northbound_grpc.cpp
index 274a0ca45a..d68e22368c 100644
--- a/lib/northbound_grpc.cpp
+++ b/lib/northbound_grpc.cpp
@@ -12,7 +12,7 @@
 #include "log.h"
 #include "libfrr.h"
 #include "lib/version.h"
-#include "lib/thread.h"
+#include "event.h"
 #include "command.h"
 #include "lib_errors.h"
 #include "northbound.h"
diff --git a/lib/pullwr.h b/lib/pullwr.h
index 77ecf855b4..8a028b9096 100644
--- a/lib/pullwr.h
+++ b/lib/pullwr.h
@@ -10,7 +10,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include "thread.h"
+#include "event.h"
 #include "stream.h"
 
 #ifdef __cplusplus
diff --git a/lib/qobj.c b/lib/qobj.c
index 09b156ba39..6ebdcbf9cb 100644
--- a/lib/qobj.c
+++ b/lib/qobj.c
@@ -7,7 +7,7 @@
 
 #include <zebra.h>
 
-#include "thread.h"
+#include "event.h"
 #include "memory.h"
 #include "hash.h"
 #include "log.h"
diff --git a/lib/resolver.c b/lib/resolver.c
index 2918576c03..ffc84e5fe8 100644
--- a/lib/resolver.c
+++ b/lib/resolver.c
@@ -12,7 +12,7 @@
 
 #include "typesafe.h"
 #include "jhash.h"
-#include "thread.h"
+#include "event.h"
 #include "lib_errors.h"
 #include "resolver.h"
 #include "command.h"
diff --git a/lib/resolver.h b/lib/resolver.h
index d3f38f742d..764e3e72ae 100644
--- a/lib/resolver.h
+++ b/lib/resolver.h
@@ -6,7 +6,7 @@
 #ifndef _FRR_RESOLVER_H
 #define _FRR_RESOLVER_H
 
-#include "thread.h"
+#include "event.h"
 #include "sockunion.h"
 
 #ifdef __cplusplus
diff --git a/lib/sigevent.h b/lib/sigevent.h
index e58b9a70c0..69b3f54aa7 100644
--- a/lib/sigevent.h
+++ b/lib/sigevent.h
@@ -8,7 +8,7 @@
 #ifndef _FRR_SIGNAL_H
 #define _FRR_SIGNAL_H
 
-#include <thread.h>
+#include <event.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/smux.h b/lib/smux.h
index 28a303cf72..dd1689f731 100644
--- a/lib/smux.h
+++ b/lib/smux.h
@@ -9,7 +9,7 @@
 #include <net-snmp/agent/net-snmp-agent-includes.h>
 #include <net-snmp/agent/snmp_vars.h>
 
-#include "thread.h"
+#include "event.h"
 #include "hook.h"
 
 #ifdef __cplusplus
diff --git a/lib/spf_backoff.c b/lib/spf_backoff.c
index 1e80b5ec2d..36b059a990 100644
--- a/lib/spf_backoff.c
+++ b/lib/spf_backoff.c
@@ -17,7 +17,7 @@
 
 #include "command.h"
 #include "memory.h"
-#include "thread.h"
+#include "event.h"
 #include "vty.h"
 
 DEFINE_MTYPE_STATIC(LIB, SPF_BACKOFF, "SPF backoff");
diff --git a/lib/subdir.am b/lib/subdir.am
index d456629bbd..9f2f4033fc 100644
--- a/lib/subdir.am
+++ b/lib/subdir.am
@@ -108,7 +108,7 @@ lib_libfrr_la_SOURCES = \
 	lib/systemd.c \
 	lib/table.c \
 	lib/termtable.c \
-	lib/thread.c \
+	lib/event.c \
 	lib/typerb.c \
 	lib/typesafe.c \
 	lib/vector.c \
@@ -181,7 +181,7 @@ clippy_scan += \
 	lib/plist.c \
 	lib/routemap.c \
 	lib/routemap_cli.c \
-	lib/thread.c \
+	lib/event.c \
 	lib/vty.c \
 	lib/zlog_5424_cli.c \
 	# end
@@ -288,7 +288,7 @@ pkginclude_HEADERS += \
 	lib/systemd.h \
 	lib/table.h \
 	lib/termtable.h \
-	lib/thread.h \
+	lib/event.h \
 	lib/trace.h \
 	lib/typerb.h \
 	lib/typesafe.h \
diff --git a/lib/systemd.c b/lib/systemd.c
index 0106e88b93..458bea5144 100644
--- a/lib/systemd.c
+++ b/lib/systemd.c
@@ -7,7 +7,7 @@
 #include <zebra.h>
 #include <sys/un.h>
 
-#include "thread.h"
+#include "event.h"
 #include "systemd.h"
 #include "lib_errors.h"
 
diff --git a/lib/vty.c b/lib/vty.c
index 3dcae0282f..c6bc29d968 100644
--- a/lib/vty.c
+++ b/lib/vty.c
@@ -22,7 +22,7 @@
 #include <stdio.h>
 
 #include "linklist.h"
-#include "thread.h"
+#include "event.h"
 #include "buffer.h"
 #include "command.h"
 #include "sockunion.h"
diff --git a/lib/vty.h b/lib/vty.h
index b302c14913..52453d0daa 100644
--- a/lib/vty.h
+++ b/lib/vty.h
@@ -18,7 +18,7 @@
 #include <regex.h>
 #endif /* HAVE_LIBPCRE2_POSIX */
 
-#include "thread.h"
+#include "event.h"
 #include "log.h"
 #include "sockunion.h"
 #include "qobj.h"
diff --git a/lib/wheel.c b/lib/wheel.c
index 4aca23481b..bd12105a3f 100644
--- a/lib/wheel.c
+++ b/lib/wheel.c
@@ -6,7 +6,7 @@
  */
 #include "zebra.h"
 #include "linklist.h"
-#include "thread.h"
+#include "event.h"
 #include "memory.h"
 #include "wheel.h"
 #include "log.h"
diff --git a/lib/workqueue.c b/lib/workqueue.c
index 5477aadd65..e1ab4c48d1 100644
--- a/lib/workqueue.c
+++ b/lib/workqueue.c
@@ -6,7 +6,7 @@
  */
 
 #include <zebra.h>
-#include "thread.h"
+#include "event.h"
 #include "memory.h"
 #include "workqueue.h"
 #include "linklist.h"
diff --git a/lib/zclient.c b/lib/zclient.c
index 0e49d65528..2cd80cc585 100644
--- a/lib/zclient.c
+++ b/lib/zclient.c
@@ -14,7 +14,7 @@
 #include "vrf_int.h"
 #include "if.h"
 #include "log.h"
-#include "thread.h"
+#include "event.h"
 #include "zclient.h"
 #include "memory.h"
 #include "table.h"
diff --git a/lib/zlog.c b/lib/zlog.c
index e05720fd9e..d379ff8d3d 100644
--- a/lib/zlog.c
+++ b/lib/zlog.c
@@ -48,7 +48,7 @@
 #include "frrcu.h"
 #include "zlog.h"
 #include "libfrr_trace.h"
-#include "thread.h"
+#include "event.h"
 
 DEFINE_MTYPE_STATIC(LIB, LOG_MESSAGE,  "log message");
 DEFINE_MTYPE_STATIC(LIB, LOG_TLSBUF,   "log thread-local buffer");
diff --git a/lib/zlog_5424.c b/lib/zlog_5424.c
index 5264dda0f8..23cad00344 100644
--- a/lib/zlog_5424.c
+++ b/lib/zlog_5424.c
@@ -26,7 +26,7 @@
 #include "frr_pthread.h"
 #include "command.h"
 #include "monotime.h"
-#include "thread.h"
+#include "event.h"
 
 #include "lib/version.h"
 #include "lib/lib_errors.h"