diff --git a/configure.in b/configure.in
index b303b6bfb..baa5d3f64 100644
--- a/configure.in
+++ b/configure.in
@@ -269,8 +269,6 @@ AC_CHECK_HEADERS([\
 	netinet/in6_machtypes.h			\
 	netinet/in6_var.h			\
 	netinet/in_systm.h			\
-	netinet/ip.h				\
-	netinet/tcp.h				\
 	netinet6/in6.h				\
 	netinfo/ni.h				\
 	paths.h					\
@@ -330,6 +328,9 @@ AC_CHECK_HEADERS([\
 	utmpx.h					\
 ])
 
+CHECK_NETINET_IP_AND_TCP
+
+
 AC_ARG_ENABLE(netinfo,
 [  --enable-netinfo      enable netinfo for configuration lookup])