Index: sys/kern/uipc_ktls.c
===================================================================
--- sys/kern/uipc_ktls.c
+++ sys/kern/uipc_ktls.c
@@ -299,11 +299,11 @@
 }
 
 #if defined(INET) || defined(INET6)
-static uint16_t
+static u_int
 ktls_get_cpu(struct socket *so)
 {
 	struct inpcb *inp;
-	uint16_t cpuid;
+	u_int cpuid;
 
 	inp = sotoinpcb(so);
 #ifdef RSS
Index: sys/netinet/tcp_hpts.c
===================================================================
--- sys/netinet/tcp_hpts.c
+++ sys/netinet/tcp_hpts.c
@@ -28,7 +28,9 @@
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
+#include "opt_rss.h"
 #include "opt_tcpdebug.h"
+
 /**
  * Some notes about usage.
  *
@@ -151,6 +153,11 @@
 #include <net/route.h>
 #include <net/vnet.h>
 
+#ifdef RSS
+#include <net/netisr.h>
+#include <net/rss_config.h>
+#endif
+
 #define TCPSTATES		/* for logging */
 
 #include <netinet/in.h>
@@ -180,7 +187,6 @@
 #include <netinet/tcp_offload.h>
 #endif
 
-#include "opt_rss.h"
 
 MALLOC_DEFINE(M_TCPHPTS, "tcp_hpts", "TCP hpts");
 #ifdef RSS
@@ -1150,9 +1156,10 @@
 }
 
 static uint16_t
-hpts_cpuid(struct inpcb *inp){
+hpts_cpuid(struct inpcb *inp)
+{
 	u_int cpuid;
-#ifdef NUMA
+#if !defined(RSS) && defined(NUMA)
 	struct hpts_domain_info *di;
 #endif
 
@@ -1166,7 +1173,7 @@
 		return (inp->inp_hpts_cpu);
 	}
 	/* If one is set the other must be the same */
-#ifdef	RSS
+#ifdef RSS
 	cpuid = rss_hash2cpuid(inp->inp_flowid, inp->inp_flowtype);
 	if (cpuid == NETISR_CPUID_NONE)
 		return (hpts_random_cpu(inp));