diff --git a/sys/netinet/tcp_timer.h b/sys/netinet/tcp_timer.h
--- a/sys/netinet/tcp_timer.h
+++ b/sys/netinet/tcp_timer.h
@@ -127,11 +127,18 @@
  */
 #define TCP_RTT_INVALIDATE (TCP_MAXRXTSHIFT / 4)
 
-#ifdef	TCPTIMERS
+#ifdef TCPTIMERS
+#include <netinet/tcp_var.h>
 static const char *tcptimers[] =
-    { "REXMT", "PERSIST", "KEEP", "2MSL", "DELACK" };
+{
+	[TT_REXMT] = "REXMT",
+	[TT_PERSIST] = "PERSIST",
+	[TT_KEEP] = "KEEP",
+	[TT_2MSL] = "2MSL",
+	[TT_DELACK] = "DELACK",
+};
+_Static_assert(sizeof(tcptimers)/sizeof(tcptimers[0]) == TT_N);
 #endif
-
 /*
  * Force a time value to be in a certain range.
  */
diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h
--- a/sys/netinet/tcp_var.h
+++ b/sys/netinet/tcp_var.h
@@ -80,6 +80,15 @@
 #define TCP_EI_BITS_RST_IN_FR	0x200	/* a front state reset */
 #define TCP_EI_BITS_2MS_TIMER	0x400	/* 2 MSL timer expired */
 
+typedef enum {
+	TT_REXMT = 0,
+	TT_PERSIST,
+	TT_KEEP,
+	TT_2MSL,
+	TT_DELACK,
+	TT_N,
+} tt_which;
+
 #if defined(_KERNEL) || defined(_WANT_TCPCB)
 #include <netinet/cc/cc.h>
 
@@ -126,15 +135,6 @@
 
 STAILQ_HEAD(tcp_log_stailq, tcp_log_mem);
 
-typedef enum {
-	TT_DELACK = 0,
-	TT_REXMT,
-	TT_PERSIST,
-	TT_KEEP,
-	TT_2MSL,
-	TT_N,
-} tt_which;
-
 /*
  * Tcp control block, one per tcp connection.
  */