Index: netinet/ip_ipip.h
===================================================================
RCS file: /cvs/src/sys/netinet/ip_ipip.h,v
retrieving revision 1.10
diff -u -p -r1.10 ip_ipip.h
--- netinet/ip_ipip.h	20 Jun 2017 11:12:13 -0000	1.10
+++ netinet/ip_ipip.h	4 Oct 2019 04:49:47 -0000
@@ -104,6 +104,8 @@ ipipstat_add(enum ipipstat_counters c, u
 	counters_add(ipipcounters, c, v);
 }
 
+struct tdb;
+
 void	ipip_init(void);
 int	ipip_input(struct mbuf **, int *, int, int);
 int	ipip_input_if(struct mbuf **, int *, int, int, struct ifnet *);
Index: netinet/ip_ether.h
===================================================================
RCS file: /cvs/src/sys/netinet/ip_ether.h,v
retrieving revision 1.28
diff -u -p -r1.28 ip_ether.h
--- netinet/ip_ether.h	17 Nov 2017 18:21:33 -0000	1.28
+++ netinet/ip_ether.h	4 Oct 2019 04:49:47 -0000
@@ -107,12 +107,5 @@ etheripstat_pkt(enum etheripstat_counter
 	counters_pkt(etheripcounters, pcounter, bcounter, v);
 }
 
-struct tdb;	/* XXX within #ifdef MPLS? */
-
-#ifdef MPLS
-int	mplsip_output(struct mbuf *, struct tdb *, struct mbuf **, int);
-int	mplsip_input(struct mbuf **, int *, int, int);
-#endif /* MPLS */
-
 #endif /* _KERNEL */
 #endif /* _NETINET_IP_ETHER_H_ */
Index: net/if_gif.c
===================================================================
RCS file: /cvs/src/sys/net/if_gif.c,v
retrieving revision 1.127
diff -u -p -r1.127 if_gif.c
--- net/if_gif.c	19 Apr 2019 07:39:37 -0000	1.127
+++ net/if_gif.c	4 Oct 2019 04:49:47 -0000
@@ -46,7 +46,6 @@
 #include <netinet/in.h>
 #include <netinet/in_var.h>
 #include <netinet/ip.h>
-#include <netinet/ip_ether.h>
 #include <netinet/ip_var.h>
 #include <netinet/ip_ipip.h>
 #include <netinet/ip_ecn.h>