diff --git a/distrib/sets/lists/minix/md.evbarm b/distrib/sets/lists/minix/md.evbarm
index 695d6d465..b99548b03 100644
--- a/distrib/sets/lists/minix/md.evbarm
+++ b/distrib/sets/lists/minix/md.evbarm
@@ -40,7 +40,7 @@
 ./usr/include/arm/bswap.h		minix-sys
 ./usr/include/arm/byte_swap.h		minix-sys
 ./usr/include/arm/cdefs.h		minix-sys
-./usr/include/arm/compat_jmp_buf.h	minix-sys
+./usr/include/arm/compat_jmp_buf.h	minix-sys	obsolete
 ./usr/include/arm/cpuconf.h		minix-sys
 ./usr/include/arm/cpu.h			minix-sys
 ./usr/include/arm/disklabel.h		minix-sys
diff --git a/distrib/sets/lists/minix/md.i386 b/distrib/sets/lists/minix/md.i386
index 8fefd25ea..424a347fe 100644
--- a/distrib/sets/lists/minix/md.i386
+++ b/distrib/sets/lists/minix/md.i386
@@ -69,7 +69,7 @@
 ./usr/include/i386/byte_swap.h		minix-sys
 ./usr/include/i386/cdefs.h		minix-sys
 ./usr/include/i386/cmos.h		minix-sys
-./usr/include/i386/compat_jmp_buf.h	minix-sys
+./usr/include/i386/compat_jmp_buf.h	minix-sys	obsolete
 ./usr/include/i386/cpu.h		minix-sys
 ./usr/include/i386/disklabel.h		minix-sys
 ./usr/include/i386/diskparm.h		minix-sys
diff --git a/distrib/sets/lists/minix/mi b/distrib/sets/lists/minix/mi
index 0668fe6f9..0ef1efb8e 100644
--- a/distrib/sets/lists/minix/mi
+++ b/distrib/sets/lists/minix/mi
@@ -1421,12 +1421,12 @@
 ./usr/include/net/gen/in.h		minix-sys
 ./usr/include/net/gen/ip_hdr.h		minix-sys
 ./usr/include/net/gen/ip_io.h		minix-sys
-./usr/include/net/gen/nameser.h		minix-sys
-./usr/include/net/gen/netdb.h		minix-sys
+./usr/include/net/gen/nameser.h		minix-sys	obsolete
+./usr/include/net/gen/netdb.h		minix-sys	obsolete
 ./usr/include/net/gen/oneCsum.h		minix-sys
 ./usr/include/net/gen/psip_hdr.h	minix-sys
 ./usr/include/net/gen/psip_io.h		minix-sys
-./usr/include/net/gen/resolv.h		minix-sys
+./usr/include/net/gen/resolv.h		minix-sys	obsolete
 ./usr/include/net/gen/rip.h		minix-sys
 ./usr/include/net/gen/route.h		minix-sys
 ./usr/include/net/gen/socket.h		minix-sys
@@ -1633,7 +1633,7 @@
 ./usr/include/sys/ioctl.h		minix-sys
 ./usr/include/sys/iostat.h		minix-sys
 ./usr/include/sys/ipc.h			minix-sys
-./usr/include/sys/jmp_buf.h		minix-sys
+./usr/include/sys/jmp_buf.h		minix-sys	obsolete
 ./usr/include/sys/joystick.h		minix-sys
 ./usr/include/sys/kbdio.h		minix-sys
 ./usr/include/sys/kcore.h		minix-sys
diff --git a/minix/commands/add_route/add_route.c b/minix/commands/add_route/add_route.c
index 4e9787b3b..34f5fdc3e 100644
--- a/minix/commands/add_route/add_route.c
+++ b/minix/commands/add_route/add_route.c
@@ -15,7 +15,7 @@ Created August 7, 1991 by Philip Homburg
 
 #include <net/hton.h>
 #include <net/netlib.h>
-#include <net/gen/netdb.h>
+#include <netdb.h>
 #include <net/gen/in.h>
 #include <net/gen/inet.h>
 #include <net/gen/route.h>
diff --git a/minix/commands/arp/arp.c b/minix/commands/arp/arp.c
index d394c5260..a66d61a1a 100644
--- a/minix/commands/arp/arp.c
+++ b/minix/commands/arp/arp.c
@@ -25,7 +25,7 @@ Manipulate ARP table
 #include <net/gen/in.h>
 #include <net/gen/inet.h>
 #include <net/gen/ip_io.h>
-#include <net/gen/netdb.h>
+#include <netdb.h>
 #include <net/gen/socket.h>
 
 #include <net/gen/arp_io.h>
diff --git a/minix/commands/dhcpd/dhcpd.c b/minix/commands/dhcpd/dhcpd.c
index 00f8e051c..d88cb2314 100644
--- a/minix/commands/dhcpd/dhcpd.c
+++ b/minix/commands/dhcpd/dhcpd.c
@@ -18,7 +18,7 @@
 #include <sys/asynchio.h>
 #include <net/hton.h>
 #include <net/gen/socket.h>
-#include <net/gen/netdb.h>
+#include <netdb.h>
 #include <net/gen/in.h>
 #include <net/gen/inet.h>
 #include <net/gen/ether.h>
diff --git a/minix/commands/dhcpd/tags.c b/minix/commands/dhcpd/tags.c
index e16e2b292..c85b1a835 100644
--- a/minix/commands/dhcpd/tags.c
+++ b/minix/commands/dhcpd/tags.c
@@ -18,7 +18,7 @@
 #include <sys/asynchio.h>
 #include <net/hton.h>
 #include <net/gen/socket.h>
-#include <net/gen/netdb.h>
+#include <netdb.h>
 #include <net/gen/in.h>
 #include <net/gen/inet.h>
 #include <net/gen/ether.h>
diff --git a/minix/commands/hostaddr/hostaddr.c b/minix/commands/hostaddr/hostaddr.c
index 18cc506bd..362a2d512 100644
--- a/minix/commands/hostaddr/hostaddr.c
+++ b/minix/commands/hostaddr/hostaddr.c
@@ -26,10 +26,11 @@ Created:	Jan 27, 1992 by Philip Homburg
 #include <net/gen/in.h>
 #include <net/gen/inet.h>
 #include <net/gen/ip_io.h>
-#include <net/gen/netdb.h>
+#include <netdb.h>
 #include <net/gen/socket.h>
-#include <net/gen/nameser.h>
-#include <net/gen/resolv.h>
+
+#include <arpa/nameser.h>
+#include <resolv.h>
 #include <net/gen/dhcp.h>
 
 #include <minix/paths.h>
diff --git a/minix/commands/irdpd/irdpd.c b/minix/commands/irdpd/irdpd.c
index edbbbaa20..4caf62b9a 100644
--- a/minix/commands/irdpd/irdpd.c
+++ b/minix/commands/irdpd/irdpd.c
@@ -27,7 +27,7 @@
 #include <net/gen/icmp_hdr.h>
 #include <net/gen/ip_io.h>
 #include <net/gen/inet.h>
-#include <net/gen/netdb.h>
+#include <netdb.h>
 #include <net/gen/oneCsum.h>
 #include <net/gen/socket.h>
 #include <net/gen/udp.h>
diff --git a/minix/commands/nonamed/nonamed.c b/minix/commands/nonamed/nonamed.c
index 34362da61..aeeb5803e 100644
--- a/minix/commands/nonamed/nonamed.c
+++ b/minix/commands/nonamed/nonamed.c
@@ -32,9 +32,9 @@ static const char version[] = "2.7";
 #include <net/netlib.h>
 #include <net/gen/in.h>
 #include <net/gen/inet.h>
-#include <net/gen/nameser.h>
-#include <net/gen/resolv.h>
-#include <net/gen/netdb.h>
+#include <arpa/nameser.h>
+#include <resolv.h>
+#include <netdb.h>
 #include <net/gen/socket.h>
 #include <net/gen/tcp.h>
 #include <net/gen/tcp_io.h>
diff --git a/minix/commands/pr_routes/pr_routes.c b/minix/commands/pr_routes/pr_routes.c
index 1e24e3fd7..6826a5325 100644
--- a/minix/commands/pr_routes/pr_routes.c
+++ b/minix/commands/pr_routes/pr_routes.c
@@ -19,7 +19,7 @@ vmd/cmd/simple/pr_routes.c
 #include <net/gen/in.h>
 #include <net/gen/ip_io.h>
 #include <net/gen/route.h>
-#include <net/gen/netdb.h>
+#include <netdb.h>
 #include <net/gen/inet.h>
 
 #define N_IF	64	/* More than enough? */
diff --git a/minix/commands/rarpd/rarpd.c b/minix/commands/rarpd/rarpd.c
index cf4a6b419..cf4962651 100644
--- a/minix/commands/rarpd/rarpd.c
+++ b/minix/commands/rarpd/rarpd.c
@@ -28,14 +28,14 @@ Changed:	Dec 11, 2000 by Kees J. Bot
 #include <sys/asynchio.h>
 #include <net/hton.h>
 #include <net/gen/socket.h>
-#include <net/gen/netdb.h>
+#include <netdb.h>
 #include <net/gen/in.h>
 #include <net/gen/inet.h>
 #include <net/gen/ether.h>
 #include <net/gen/eth_io.h>
 #include <net/gen/if_ether.h>
 #include <net/gen/ip_io.h>
-#include <net/gen/nameser.h>
+#include <arpa/nameser.h>
 
 #define MAX_RARP_RETRIES	5
 #define RARP_TIMEOUT		5
diff --git a/minix/commands/rcp/rcp.c b/minix/commands/rcp/rcp.c
index 2087a7bef..3b0318e0e 100644
--- a/minix/commands/rcp/rcp.c
+++ b/minix/commands/rcp/rcp.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)rcp.c 1.1 87/12/21 SMI"; /* from UCB 5.3 6/8/85"*/
 #include <signal.h>
 #include <unistd.h>
 
-#include <net/gen/netdb.h>
+#include <netdb.h>
 #include <net/netlib.h>
 
 #if __STDC__
diff --git a/minix/commands/rget/rget.c b/minix/commands/rget/rget.c
index 48777bc12..0c35736b3 100644
--- a/minix/commands/rget/rget.c
+++ b/minix/commands/rget/rget.c
@@ -18,7 +18,7 @@
 #if __minix
 #include <net/gen/in.h>
 #include <net/gen/inet.h>
-#include <net/gen/netdb.h>
+#include <netdb.h>
 #include <net/gen/socket.h>
 #include <net/gen/tcp.h>
 #include <net/gen/tcp_hdr.h>
diff --git a/minix/commands/rlogin/rlogin.c b/minix/commands/rlogin/rlogin.c
index 116287db2..90839c49c 100644
--- a/minix/commands/rlogin/rlogin.c
+++ b/minix/commands/rlogin/rlogin.c
@@ -59,7 +59,7 @@ static char sccsid[] = "@(#)rlogin.c	5.33 (Berkeley) 3/1/91";
 #include <net/netlib.h>
 #include <net/hton.h>
 #include <net/gen/in.h>
-#include <net/gen/netdb.h>
+#include <netdb.h>
 #include <net/gen/tcp.h>
 #include <net/gen/tcp_io.h>
 
diff --git a/minix/commands/rsh/rsh.c b/minix/commands/rsh/rsh.c
index 2c308f8c4..230068c2b 100644
--- a/minix/commands/rsh/rsh.c
+++ b/minix/commands/rsh/rsh.c
@@ -60,7 +60,7 @@ static char sccsid[] = "@(#)rsh.c	5.24 (Berkeley) 7/1/91";
 #include <unistd.h>
 
 #include <net/netlib.h>
-#include <net/gen/netdb.h>
+#include <netdb.h>
 int main( int argc, char *argv[] );
 void usage( void );
 char *copyargs( char **argv );
diff --git a/minix/commands/rshd/rshd.c b/minix/commands/rshd/rshd.c
index ec15f825a..cc2bdde54 100644
--- a/minix/commands/rshd/rshd.c
+++ b/minix/commands/rshd/rshd.c
@@ -30,7 +30,7 @@ in.rshd.c
 #include <sys/ioctl.h>
 #include <net/gen/in.h>
 #include <net/gen/inet.h>
-#include <net/gen/netdb.h>
+#include <netdb.h>
 #include <net/gen/socket.h>
 #include <net/gen/tcp.h>
 #include <net/gen/tcp_io.h>
diff --git a/minix/commands/swifi/socket.c b/minix/commands/swifi/socket.c
index 324b7f116..bebcc0e82 100644
--- a/minix/commands/swifi/socket.c
+++ b/minix/commands/swifi/socket.c
@@ -24,7 +24,7 @@ Open a TCP connection
 #include <net/netlib.h>
 #include <net/gen/in.h>
 #include <net/gen/inet.h>
-#include <net/gen/netdb.h>
+#include <netdb.h>
 #include <net/gen/socket.h>
 #include <net/gen/tcp.h>
 #include <net/gen/tcp_io.h>
diff --git a/minix/commands/syslogd/syslogd.c b/minix/commands/syslogd/syslogd.c
index 636dcad16..e16ede9cf 100644
--- a/minix/commands/syslogd/syslogd.c
+++ b/minix/commands/syslogd/syslogd.c
@@ -102,7 +102,7 @@
 #include <net/gen/in.h>
 #include <net/gen/udp.h>
 #include <net/gen/udp_io.h>
-#include <net/gen/netdb.h>
+#include <netdb.h>
 
 #define SYSLOG_NAMES
 #include <syslog.h>
diff --git a/minix/commands/tcpd/tcpd.c b/minix/commands/tcpd/tcpd.c
index 419a77781..0d7679cfd 100644
--- a/minix/commands/tcpd/tcpd.c
+++ b/minix/commands/tcpd/tcpd.c
@@ -19,7 +19,7 @@ tcpd.c
 #include <net/netlib.h>
 #include <net/gen/in.h>
 #include <net/gen/inet.h>
-#include <net/gen/netdb.h>
+#include <netdb.h>
 #include <net/gen/tcp.h>
 #include <net/gen/tcp_io.h>
 
diff --git a/minix/commands/tcpdp/tcpd.c b/minix/commands/tcpdp/tcpd.c
index b7ed98276..9d1d32d7f 100644
--- a/minix/commands/tcpdp/tcpd.c
+++ b/minix/commands/tcpdp/tcpd.c
@@ -19,7 +19,7 @@ tcpd.c
 #include <net/netlib.h>
 #include <net/gen/in.h>
 #include <net/gen/inet.h>
-#include <net/gen/netdb.h>
+#include <netdb.h>
 #include <net/gen/tcp.h>
 #include <net/gen/tcp_io.h>
 
diff --git a/minix/commands/tcpstat/tcpstat.c b/minix/commands/tcpstat/tcpstat.c
index 33c44d196..f5200a456 100644
--- a/minix/commands/tcpstat/tcpstat.c
+++ b/minix/commands/tcpstat/tcpstat.c
@@ -21,7 +21,7 @@ Created:	June 1995 by Philip Homburg <philip@f-mnx.phicoh.com>
 #endif
 #include <net/netlib.h>
 #include <net/gen/inet.h>
-#include <net/gen/netdb.h>
+#include <netdb.h>
 #include <net/gen/socket.h>
 #include <minix/queryparam.h>
 #include <minix/com.h>
diff --git a/minix/commands/telnet/ttn.c b/minix/commands/telnet/ttn.c
index ba4f0c716..7ba56590c 100644
--- a/minix/commands/telnet/ttn.c
+++ b/minix/commands/telnet/ttn.c
@@ -18,7 +18,7 @@ ttn.c
 #include <net/netlib.h>
 #include <net/gen/in.h>
 #include <net/gen/inet.h>
-#include <net/gen/netdb.h>
+#include <netdb.h>
 #include <net/gen/tcp.h>
 #include <net/gen/tcp_io.h>
 #include "ttn.h"
diff --git a/minix/commands/telnetd/main.c b/minix/commands/telnetd/main.c
index c2f1f623e..a4ded56aa 100644
--- a/minix/commands/telnetd/main.c
+++ b/minix/commands/telnetd/main.c
@@ -33,7 +33,7 @@
 #include <net/gen/tcp.h>
 #include <net/gen/tcp_io.h>
 #include <net/gen/socket.h>
-#include <net/gen/netdb.h>
+#include <netdb.h>
 #include <net/gen/inet.h>
 #include "telnetd.h"
 
diff --git a/minix/commands/udpstat/udpstat.c b/minix/commands/udpstat/udpstat.c
index 972865b63..54c1c73d1 100644
--- a/minix/commands/udpstat/udpstat.c
+++ b/minix/commands/udpstat/udpstat.c
@@ -22,7 +22,7 @@ Created:	March 2001 by Philip Homburg <philip@f-mnx.phicoh.com>
 #endif
 #include <net/netlib.h>
 #include <net/gen/inet.h>
-#include <net/gen/netdb.h>
+#include <netdb.h>
 #include <net/gen/socket.h>
 #include <minix/queryparam.h>
 
diff --git a/minix/include/Makefile b/minix/include/Makefile
index c11cb7824..510fd5338 100644
--- a/minix/include/Makefile
+++ b/minix/include/Makefile
@@ -2,7 +2,7 @@
 
 NOOBJ=		# defined
 
-INCS+=	env.h fetch.h lib.h libutil.h varargs.h
+INCS+=	env.h fetch.h lib.h libutil.h varargs.h configfile.h
 
 .include <bsd.own.mk>
 
diff --git a/minix/lib/libcompat_minix/include/configfile.h b/minix/include/configfile.h
similarity index 100%
rename from minix/lib/libcompat_minix/include/configfile.h
rename to minix/include/configfile.h
diff --git a/minix/lib/libcompat_minix/Makefile b/minix/lib/libcompat_minix/Makefile
index 391ee3f66..8fdecf41b 100644
--- a/minix/lib/libcompat_minix/Makefile
+++ b/minix/lib/libcompat_minix/Makefile
@@ -20,7 +20,7 @@ SRCS+= configfile.c
 # NetBSD's 'mtab' format.
 SRCS+= mtab.c
 
-SUBDIR+= pkgconfig include
+SUBDIR+= pkgconfig 
 
 .include <bsd.lib.mk>
 .include <bsd.subdir.mk>
diff --git a/minix/lib/libcompat_minix/include/Makefile b/minix/lib/libcompat_minix/include/Makefile
deleted file mode 100644
index 37c0e9560..000000000
--- a/minix/lib/libcompat_minix/include/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-
-INCSDIR= /usr/include
-
-INCS+= configfile.h
-
-NOOBJ=  # defined
-
-SUBDIR+= ${MACHINE_ARCH}
-SUBDIR+= net sys
-
-.include <bsd.prog.mk>
-.include <bsd.subdir.mk>
diff --git a/minix/lib/libcompat_minix/include/earm/Makefile b/minix/lib/libcompat_minix/include/earm/Makefile
deleted file mode 100644
index 8b52c8c22..000000000
--- a/minix/lib/libcompat_minix/include/earm/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-
-INCSDIR= /usr/include/arm
-
-INCS= compat_jmp_buf.h
-
-NOOBJ=	# defined
-
-.include <bsd.prog.mk>
diff --git a/minix/lib/libcompat_minix/include/earm/compat_jmp_buf.h b/minix/lib/libcompat_minix/include/earm/compat_jmp_buf.h
deleted file mode 100644
index 841f75cda..000000000
--- a/minix/lib/libcompat_minix/include/earm/compat_jmp_buf.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef _COMPAT_MACHINE_JMP_BUF_H
-#define _COMPAT_MACHINE_JMP_BUF_H
-
-/* This file is strictly dependant on the libc's
- * setjmp/longjmp code! Keep it in sync! */
-
-/* This is used only by libddekit's src/thread.c. 
- * Being incredibly fragile (not to mention hardly
- * portable, it would be a good idea to replace 
- * that code. */
-
-#define JB_PC 148
-#define JB_SP 144
-#define JB_BP 136
-
-#endif /* _COMPAT_MACHINE_JMP_BUF_H */
diff --git a/minix/lib/libcompat_minix/include/i386/Makefile b/minix/lib/libcompat_minix/include/i386/Makefile
deleted file mode 100644
index fc4342685..000000000
--- a/minix/lib/libcompat_minix/include/i386/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-
-INCSDIR= /usr/include/${MACHINE_ARCH}
-
-INCS= compat_jmp_buf.h
-
-NOOBJ=  # defined
-
-.include <bsd.prog.mk>
diff --git a/minix/lib/libcompat_minix/include/i386/compat_jmp_buf.h b/minix/lib/libcompat_minix/include/i386/compat_jmp_buf.h
deleted file mode 100644
index bb5526c2c..000000000
--- a/minix/lib/libcompat_minix/include/i386/compat_jmp_buf.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef _COMPAT_MACHINE_JMP_BUF_H
-#define _COMPAT_MACHINE_JMP_BUF_H
-
-/* This file is strictly dependant on the libc's
- * setjmp/longjmp code! Keep it in sync! */
-
-/* This is used only by libddekit's src/thread.c. 
- * Being incredibly fragile (not to mention hardly
- * portable, it would be a good idea to replace 
- * that code. */
-
-#define JB_PC 0
-#define JB_SP 8
-#define JB_BP 12
-
-#endif /* _COMPAT_MACHINE_JMP_BUF_H */
diff --git a/minix/lib/libcompat_minix/include/net/Makefile b/minix/lib/libcompat_minix/include/net/Makefile
deleted file mode 100644
index 22cfa78b0..000000000
--- a/minix/lib/libcompat_minix/include/net/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-
-SUBDIR+= gen
-
-.include <bsd.subdir.mk>
diff --git a/minix/lib/libcompat_minix/include/net/gen/Makefile b/minix/lib/libcompat_minix/include/net/gen/Makefile
deleted file mode 100644
index b7cb02ecc..000000000
--- a/minix/lib/libcompat_minix/include/net/gen/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-
-INCSDIR= /usr/include/net/gen
-
-INCS= netdb.h resolv.h nameser.h
-
-NOOBJ=  # defined
-
-.include <bsd.prog.mk>
diff --git a/minix/lib/libcompat_minix/include/net/gen/nameser.h b/minix/lib/libcompat_minix/include/net/gen/nameser.h
deleted file mode 100644
index 5c23c9b14..000000000
--- a/minix/lib/libcompat_minix/include/net/gen/nameser.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
- * Minix compatibility.
- */
-#include <arpa/nameser.h>
-
diff --git a/minix/lib/libcompat_minix/include/net/gen/netdb.h b/minix/lib/libcompat_minix/include/net/gen/netdb.h
deleted file mode 100644
index 630e5d6cb..000000000
--- a/minix/lib/libcompat_minix/include/net/gen/netdb.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
- * Minix compatibility.
- */
-#include <netdb.h>
-
diff --git a/minix/lib/libcompat_minix/include/net/gen/resolv.h b/minix/lib/libcompat_minix/include/net/gen/resolv.h
deleted file mode 100644
index 9e347aa0d..000000000
--- a/minix/lib/libcompat_minix/include/net/gen/resolv.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
- * Minix compatibility.
- */
-#include <resolv.h>
-
diff --git a/minix/lib/libcompat_minix/include/sys/Makefile b/minix/lib/libcompat_minix/include/sys/Makefile
deleted file mode 100644
index 2f54b88fa..000000000
--- a/minix/lib/libcompat_minix/include/sys/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-
-INCSDIR= /usr/include/sys
-
-INCS= jmp_buf.h
-
-NOOBJ=  # defined
-
-.include <bsd.prog.mk>
diff --git a/minix/lib/libcompat_minix/include/sys/jmp_buf.h b/minix/lib/libcompat_minix/include/sys/jmp_buf.h
deleted file mode 100644
index 28f137454..000000000
--- a/minix/lib/libcompat_minix/include/sys/jmp_buf.h
+++ /dev/null
@@ -1,2 +0,0 @@
-/* Stub for libddekit. Hopefully this will go away soon. */
-#include <machine/compat_jmp_buf.h>
diff --git a/minix/lib/libminlib/servxcheck.c b/minix/lib/libminlib/servxcheck.c
index 3010878ed..47d2caca9 100644
--- a/minix/lib/libminlib/servxcheck.c
+++ b/minix/lib/libminlib/servxcheck.c
@@ -23,7 +23,7 @@
 #include <net/gen/tcp_io.h>
 #include <net/gen/inet.h>
 #include <net/gen/socket.h>
-#include <net/gen/netdb.h>
+#include <netdb.h>
 
 /* Default service access file. */
 static const char *path_servacces = _PATH_SERVACCES;