diff --git a/contrib/bsnmp/snmp_target/target_tree.def b/contrib/bsnmp/snmp_target/target_tree.def
index 6c77b3f1cbf9..990bfac0b06e 100755
--- a/contrib/bsnmp/snmp_target/target_tree.def
+++ b/contrib/bsnmp/snmp_target/target_tree.def
@@ -29,7 +29,16 @@
 # $FreeBSD$
 #
 
-include "tc.def"
+#include "tc.def"
+
+typedef RowStatus ENUM (
+	1 active
+	2 notInService
+	3 notReady
+	4 createAndGo
+	5 createAndWait
+	6 destroy
+)
 
 typedef StorageType ENUM (
 	1 other
diff --git a/contrib/bsnmp/snmp_usm/usm_tree.def b/contrib/bsnmp/snmp_usm/usm_tree.def
index 41eb557b4016..72c446e4cc55 100755
--- a/contrib/bsnmp/snmp_usm/usm_tree.def
+++ b/contrib/bsnmp/snmp_usm/usm_tree.def
@@ -29,7 +29,16 @@
 # $FreeBSD$
 #
 
-include "tc.def"
+#include "tc.def"
+
+typedef RowStatus ENUM (
+	1 active
+	2 notInService
+	3 notReady
+	4 createAndGo
+	5 createAndWait
+	6 destroy
+)
 
 typedef StorageType ENUM (
 	1 other
diff --git a/contrib/bsnmp/snmp_vacm/vacm_tree.def b/contrib/bsnmp/snmp_vacm/vacm_tree.def
index bd7f70a4fad3..45b3c335991c 100755
--- a/contrib/bsnmp/snmp_vacm/vacm_tree.def
+++ b/contrib/bsnmp/snmp_vacm/vacm_tree.def
@@ -29,7 +29,16 @@
 # $FreeBSD$
 #
 
-include "tc.def"
+#include "tc.def"
+
+typedef RowStatus ENUM (
+	1 active
+	2 notInService
+	3 notReady
+	4 createAndGo
+	5 createAndWait
+	6 destroy
+)
 
 typedef StorageType ENUM (
 	1 other
diff --git a/contrib/bsnmp/snmpd/tree.def b/contrib/bsnmp/snmpd/tree.def
index f4d8579b4a29..b45817f73ff1 100644
--- a/contrib/bsnmp/snmpd/tree.def
+++ b/contrib/bsnmp/snmpd/tree.def
@@ -31,7 +31,16 @@
 # System group and private Begemot SNMPd MIB.
 #
 
-include "tc.def"
+#include "tc.def"
+
+typedef RowStatus ENUM (
+	1 active
+	2 notInService
+	3 notReady
+	4 createAndGo
+	5 createAndWait
+	6 destroy
+)
 
 (1 internet
   (2 mgmt
diff --git a/lib/libbsnmp/libbsnmp/Makefile b/lib/libbsnmp/libbsnmp/Makefile
index 7057816bc917..d33808da692e 100644
--- a/lib/libbsnmp/libbsnmp/Makefile
+++ b/lib/libbsnmp/libbsnmp/Makefile
@@ -10,10 +10,6 @@ CONTRIB= ${.CURDIR}/../../../contrib/bsnmp/lib
 LIB=	bsnmp
 SHLIBDIR?= /lib
 
-FILESGROUPS+=   DEFS
-DEFSDIR?=	${SHAREDIR}/snmp/defs
-DEFS=		tc.def
-
 CFLAGS+= -I${CONTRIB} -DHAVE_ERR_H -DHAVE_GETADDRINFO -DHAVE_STRLCPY
 CFLAGS+= -DHAVE_STDINT_H -DHAVE_INTTYPES_H -DQUADFMT='"llu"' -DQUADXFMT='"llx"'
 
diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_tree.def b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_tree.def
index a8f30c866798..2e88e5ed54fb 100644
--- a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_tree.def
+++ b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_tree.def
@@ -26,7 +26,16 @@
 # $FreeBSD$
 #
 
-include "tc.def"
+#include "tc.def"
+
+typedef RowStatus ENUM (
+	1 active
+	2 notInService
+	3 notReady
+	4 createAndGo
+	5 createAndWait
+	6 destroy
+)
 
 typedef TruthValue ENUM (
 	1 true
diff --git a/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_tree.def b/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_tree.def
index bc89d56e4af5..7c695c447d27 100644
--- a/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_tree.def
+++ b/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_tree.def
@@ -29,7 +29,16 @@
 # $FreeBSD$
 #
 
-include "tc.def"
+#include "tc.def"
+
+typedef RowStatus ENUM (
+	1 active
+	2 notInService
+	3 notReady
+	4 createAndGo
+	5 createAndWait
+	6 destroy
+)
 
 typedef TruthValue ENUM (
 	1 true