diff --git a/include/net/tcp_states.h b/include/net/tcp_states.h
index 81357aa885da51a07f3adc775febfd3dcce0623e..68e500f8e6815ce95d28d9540c7da496006ae69d 100644
--- a/include/net/tcp_states.h
+++ b/include/net/tcp_states.h
@@ -26,7 +26,11 @@ enum {
 	TCP_LISTEN,
 	TCP_CLOSING,	/* Now a valid state */
 	TCP_NEW_SYN_RECV,
-#if defined(CONFIG_BCM_KF_MPTCP) && defined(CONFIG_BCM_MPTCP)
+/* HACK: Enable this unconditionally (it is enabled in BCM's build system).
+ *       There are static asserts failing if the enums do not match (see comment above).
+ */
+/* #if defined(CONFIG_BCM_KF_MPTCP) && defined(CONFIG_BCM_MPTCP) */
+#if 1
 	TCP_RST_WAIT,
 #endif
 
diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index 39335a9a74f8a55559c6b79053c96bc7d4a1127d..a529f324a923759defaae7ddfb4d45f3190a2c8f 100644
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -2674,7 +2674,11 @@ enum {
 	BPF_TCP_LISTEN,
 	BPF_TCP_CLOSING,	/* Now a valid state */
 	BPF_TCP_NEW_SYN_RECV,
-#if ((defined(CONFIG_BCM_KF_MPTCP) && defined(CONFIG_BCM_MPTCP)) || !defined(CONFIG_BCM_IN_KERNEL))
+/* HACK: Enable this unconditionally (it is enabled in BCM's build system).
+ *       There are static asserts failing if the enums do not match (see comment above).
+ */
+/* #if ((defined(CONFIG_BCM_KF_MPTCP) && defined(CONFIG_BCM_MPTCP)) || !defined(CONFIG_BCM_IN_KERNEL)) */
+#if 1
 	BPF_TCP_RST_WAIT,
 #endif
 
diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h
index eb85adb26f7cd9cc516d877243286ceddaff74b0..227b9b0e9f78effffd8c1ee32c77d3b29fac6e2b 100644
--- a/tools/include/uapi/linux/bpf.h
+++ b/tools/include/uapi/linux/bpf.h
@@ -2672,7 +2672,11 @@ enum {
 	BPF_TCP_LISTEN,
 	BPF_TCP_CLOSING,	/* Now a valid state */
 	BPF_TCP_NEW_SYN_RECV,
-#if ((defined(CONFIG_BCM_KF_MPTCP) && defined(CONFIG_BCM_MPTCP)) || !defined(CONFIG_BCM_IN_KERNEL))
+/* HACK: Enable this unconditionally (it is enabled in BCM's build system).
+ *       There are static asserts failing if the enums do not match (see comment above).
+ */
+/* #if ((defined(CONFIG_BCM_KF_MPTCP) && defined(CONFIG_BCM_MPTCP)) || !defined(CONFIG_BCM_IN_KERNEL)) */
+#if 1
 	BPF_TCP_RST_WAIT,
 #endif