Index: net/if_pfsync.h
===================================================================
--- net/if_pfsync.h	(revision 258990)
+++ net/if_pfsync.h	(working copy)
@@ -205,12 +205,6 @@
 
 #define	PFSYNC_HDRLEN		sizeof(struct pfsync_header)
 
-/*
- * Names for PFSYNC sysctl objects
- */
-#define	PFSYNCCTL_STATS		1	/* PFSYNC stats */
-#define	PFSYNCCTL_MAXID		2
-
 struct pfsyncstats {
 	u_int64_t	pfsyncs_ipackets;	/* total input packets, IPv4 */
 	u_int64_t	pfsyncs_ipackets6;	/* total input packets, IPv6 */
Index: netinet/icmp_var.h
===================================================================
--- netinet/icmp_var.h	(revision 258990)
+++ netinet/icmp_var.h	(working copy)
@@ -78,12 +78,11 @@
 #endif
 
 /*
- * Names for ICMP sysctl objects
+ * Identifiers for ICMP sysctl nodes
  */
 #define	ICMPCTL_MASKREPL	1	/* allow replies to netmask requests */
 #define	ICMPCTL_STATS		2	/* statistics (read-only) */
 #define ICMPCTL_ICMPLIM		3
-#define ICMPCTL_MAXID		4
 
 #ifdef _KERNEL
 SYSCTL_DECL(_net_inet_icmp);
Index: netinet/igmp_var.h
===================================================================
--- netinet/igmp_var.h	(revision 258990)
+++ netinet/igmp_var.h	(working copy)
@@ -213,9 +213,8 @@
 #endif /* _KERNEL */
 
 /*
- * Names for IGMP sysctl objects
+ * Identifiers for IGMP sysctl nodes
  */
 #define IGMPCTL_STATS		1	/* statistics (read-only) */
-#define IGMPCTL_MAXID		2
 
 #endif
Index: netinet/in.h
===================================================================
--- netinet/in.h	(revision 258990)
+++ netinet/in.h	(working copy)
@@ -598,15 +598,8 @@
 #define	IP_PORTRANGE_LOW	2	/* "low" - vouchsafe security */
 
 /*
- * Definitions for inet sysctl operations.
- *
- * Third level is protocol number.
- * Fourth level is desired variable within that protocol.
+ * Identifiers for IP sysctl nodes
  */
-
-/*
- * Names for IP sysctl objects
- */
 #define	IPCTL_FORWARDING	1	/* act as router */
 #define	IPCTL_SENDREDIRECTS	2	/* may send redirects when forwarding */
 #define	IPCTL_DEFTTL		3	/* default TTL */
@@ -625,7 +618,6 @@
 #define	IPCTL_FASTFORWARDING	14	/* use fast IP forwarding code */
 #define	IPCTL_KEEPFAITH		15	/* FAITH IPv4->IPv6 translater ctl */
 #define	IPCTL_GIF_TTL		16	/* default TTL for gif encap packet */
-#define	IPCTL_MAXID		17
 
 #endif /* __BSD_VISIBLE */
 
Index: netinet/pim_var.h
===================================================================
--- netinet/pim_var.h	(revision 258990)
+++ netinet/pim_var.h	(working copy)
@@ -66,10 +66,9 @@
 #endif
 
 /*
- * Names for PIM sysctl objects
+ * Identifiers for PIM sysctl nodes
  */
 #define PIMCTL_STATS		1	/* statistics (read-only) */
-#define PIMCTL_MAXID		2
 
 #ifdef _KERNEL
 
Index: netinet/tcp_var.h
===================================================================
--- netinet/tcp_var.h	(revision 258990)
+++ netinet/tcp_var.h	(working copy)
@@ -576,7 +576,7 @@
 #endif
 
 /*
- * Names for TCP sysctl objects
+ * Identifiers for TCP sysctl nodes
  */
 #define	TCPCTL_DO_RFC1323	1	/* use RFC-1323 extensions */
 #define	TCPCTL_MSSDFLT		3	/* MSS default */
@@ -592,8 +592,6 @@
 #define	TCPCTL_V6MSSDFLT	13	/* MSS default for IPv6 */
 #define	TCPCTL_SACK		14	/* Selective Acknowledgement,rfc 2018 */
 #define	TCPCTL_DROP		15	/* drop tcp connection */
-#define	TCPCTL_MAXID		16
-#define TCPCTL_FINWAIT2_TIMEOUT        17
 
 #ifdef _KERNEL
 #ifdef SYSCTL_DECL
Index: netinet/udp_var.h
===================================================================
--- netinet/udp_var.h	(revision 258990)
+++ netinet/udp_var.h	(working copy)
@@ -115,7 +115,7 @@
 #endif
 
 /*
- * Names for UDP sysctl objects.
+ * Identifiers for UDP sysctl nodes.
  */
 #define	UDPCTL_CHECKSUM		1	/* checksum UDP packets */
 #define	UDPCTL_STATS		2	/* statistics (read-only) */
@@ -122,7 +122,6 @@
 #define	UDPCTL_MAXDGRAM		3	/* max datagram size */
 #define	UDPCTL_RECVSPACE	4	/* default receive buffer space */
 #define	UDPCTL_PCBLIST		5	/* list of PCBs for UDP sockets */
-#define	UDPCTL_MAXID		6
 
 #ifdef _KERNEL
 SYSCTL_DECL(_net_inet_udp);
Index: netinet6/pim6_var.h
===================================================================
--- netinet6/pim6_var.h	(revision 258990)
+++ netinet6/pim6_var.h	(working copy)
@@ -56,9 +56,8 @@
 #endif /* KERNEL */
 
 /*
- * Names for PIM sysctl objects
+ * Identifiers for PIM sysctl nodes
  */
 #define PIM6CTL_STATS		1	/* statistics (read-only) */
-#define PIM6CTL_MAXID		2
 
 #endif /* _NETINET6_PIM6_VAR_H_ */
Index: netipsec/ipsec.h
===================================================================
--- netipsec/ipsec.h	(revision 258990)
+++ netipsec/ipsec.h	(working copy)
@@ -244,9 +244,6 @@
 /*
  * Definitions for IPsec & Key sysctl operations.
  */
-/*
- * Names for IPsec & Key sysctl objects
- */
 #define IPSECCTL_STATS			1	/* stats */
 #define IPSECCTL_DEF_POLICY		2
 #define IPSECCTL_DEF_ESP_TRANSLEV	3	/* int; ESP transport mode */
@@ -262,7 +259,6 @@
 #define	IPSECCTL_ECN			11
 #define	IPSECCTL_DEBUG			12
 #define	IPSECCTL_ESP_RANDPAD		13
-#define IPSECCTL_MAXID			14
 
 #ifdef _KERNEL
 #include <sys/counter.h>
Index: netipsec/key_var.h
===================================================================
--- netipsec/key_var.h	(revision 258990)
+++ netipsec/key_var.h	(working copy)
@@ -46,7 +46,6 @@
 #define KEYCTL_ESP_AUTH			10
 #define KEYCTL_AH_KEYMIN		11
 #define KEYCTL_PREFERED_OLDSA		12
-#define KEYCTL_MAXID			13
 
 #ifdef _KERNEL
 #define _ARRAYLEN(p) (sizeof(p)/sizeof(p[0]))
Index: sys/socket.h
===================================================================
--- sys/socket.h	(revision 258990)
+++ sys/socket.h	(working copy)
@@ -366,9 +366,8 @@
  * Second level is protocol family.
  * Third level is protocol number.
  *
- * Further levels are defined by the individual families below.
+ * Further levels are defined by the individual families.
  */
-#define NET_MAXID	AF_MAX
 
 /*
  * PF_ROUTE - Routing table
@@ -384,8 +383,6 @@
 #define	NET_RT_IFMALIST	4		/* return multicast address list */
 #define	NET_RT_IFLISTL	5		/* Survey interface list, using 'l'en
 					 * versions of msghdr structs. */
-#define	NET_RT_MAXID	6
-
 #endif /* __BSD_VISIBLE */
 
 /*
Index: sys/sysctl.h
===================================================================
--- sys/sysctl.h	(revision 258990)
+++ sys/sysctl.h	(working copy)
@@ -454,7 +454,6 @@
 #define	CTL_MACHDEP	7		/* machine dependent */
 #define	CTL_USER	8		/* user-level */
 #define	CTL_P1003_1B	9		/* POSIX 1003.1B */
-#define	CTL_MAXID	10		/* number of valid top-level ids */
 
 /*
  * CTL_KERN identifiers
@@ -496,7 +495,6 @@
 #define	KERN_IOV_MAX		35	/* int: value of UIO_MAXIOV */
 #define	KERN_HOSTUUID		36	/* string: host UUID identifier */
 #define	KERN_ARND		37	/* int: from arc4rand() */
-#define	KERN_MAXID		38	/* number of valid kern ids */
 /*
  * KERN_PROC subtypes
  */
@@ -558,7 +556,6 @@
 #define	HW_FLOATINGPT	10		/* int: has HW floating point? */
 #define	HW_MACHINE_ARCH	11		/* string: machine architecture */
 #define	HW_REALMEM	12		/* int: 'real' memory */
-#define	HW_MAXID	13		/* number of valid hw ids */
 
 /*
  * CTL_USER definitions
@@ -583,7 +580,6 @@
 #define	USER_POSIX2_UPE		18	/* int: POSIX2_UPE */
 #define	USER_STREAM_MAX		19	/* int: POSIX2_STREAM_MAX */
 #define	USER_TZNAME_MAX		20	/* int: POSIX2_TZNAME_MAX */
-#define	USER_MAXID		21	/* number of valid user ids */
 
 #define	CTL_P1003_1B_ASYNCHRONOUS_IO		1	/* boolean */
 #define	CTL_P1003_1B_MAPPED_FILES		2	/* boolean */