From: Kees van Reeuwijk <reeuwijk@few.vu.nl>
Date: Tue, 26 Jan 2010 10:59:01 +0000 (+0000)
Subject: Removed a number of useless #includes
X-Git-Tag: v3.1.6~26
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/zlib_tech.html?a=commitdiff_plain;h=b67f788eea4737d63cd7986b79c07e09b182bc18;p=minix.git

Removed a number of useless #includes
---

diff --git a/boot/boot.c b/boot/boot.c
index 24dfb52b4..b33b63483 100644
--- a/boot/boot.c
+++ b/boot/boot.c
@@ -21,14 +21,12 @@ char version[]=		"2.20";
 #include <ibm/bios.h>
 #include <minix/config.h>
 #include <minix/type.h>
-#include <minix/com.h>
 #include <minix/dmap.h>
 #include <minix/const.h>
 #include <minix/minlib.h>
 #include <minix/syslib.h>
 #if BIOS
 #include <kernel/const.h>
-#include <kernel/type.h>
 #include <sys/video.h>
 #endif
 #if UNIX
diff --git a/drivers/audio/framework/audio_fw.c b/drivers/audio/framework/audio_fw.c
index 818383ab3..d70a255f3 100644
--- a/drivers/audio/framework/audio_fw.c
+++ b/drivers/audio/framework/audio_fw.c
@@ -43,10 +43,8 @@
 
 
 #include "audio_fw.h"
-#include <sys/vm.h>
 #include <minix/endpoint.h>
 #include <minix/ds.h>
-#include <sys/vm_i386.h>
 
 
 FORWARD _PROTOTYPE( int msg_open, (int minor_dev_nr) );
diff --git a/drivers/bios_wini/bios_wini.c b/drivers/bios_wini/bios_wini.c
index ff5824b69..4a3afac81 100644
--- a/drivers/bios_wini/bios_wini.c
+++ b/drivers/bios_wini/bios_wini.c
@@ -25,7 +25,6 @@
 #include "../libdriver/drvlib.h"
 #include <minix/sysutil.h>
 #include <minix/safecopies.h>
-#include <minix/keymap.h>
 #include <sys/ioc_disk.h>
 #include <ibm/int86.h>
 #include <assert.h>
diff --git a/drivers/dp8390/dp8390.c b/drivers/dp8390/dp8390.c
index b9a2a8e48..92c18e2bf 100644
--- a/drivers/dp8390/dp8390.c
+++ b/drivers/dp8390/dp8390.c
@@ -61,7 +61,6 @@
 #include <net/gen/ether.h>
 #include <net/gen/eth_io.h>
 #include <sys/vm_i386.h>
-#include <sys/vm.h>
 #include "assert.h"
 
 #include "local.h"
diff --git a/drivers/dpeth/3c501.c b/drivers/dpeth/3c501.c
index bc6628759..97e8104d5 100644
--- a/drivers/dpeth/3c501.c
+++ b/drivers/dpeth/3c501.c
@@ -13,7 +13,6 @@
 
 #include "drivers.h"
 #include <minix/com.h>
-#include <net/hton.h>
 #include <net/gen/ether.h>
 #include <net/gen/eth_io.h>
 #include "dp.h"
diff --git a/drivers/dpeth/3c509.c b/drivers/dpeth/3c509.c
index c170403ea..f9f9549b9 100644
--- a/drivers/dpeth/3c509.c
+++ b/drivers/dpeth/3c509.c
@@ -13,7 +13,6 @@
 
 #include "drivers.h"
 #include <minix/com.h>
-#include <net/hton.h>
 #include <net/gen/ether.h>
 #include <net/gen/eth_io.h>
 
diff --git a/drivers/dpeth/8390.c b/drivers/dpeth/8390.c
index 8f6ecb5e7..9293e5b13 100644
--- a/drivers/dpeth/8390.c
+++ b/drivers/dpeth/8390.c
@@ -15,7 +15,6 @@
 
 #include "drivers.h"
 #include <minix/com.h>
-#include <net/hton.h>
 #include <net/gen/ether.h>
 #include <net/gen/eth_io.h>
 #include "dp.h"
diff --git a/drivers/dpeth/dp.c b/drivers/dpeth/dp.c
index bf8059d5a..77268467a 100644
--- a/drivers/dpeth/dp.c
+++ b/drivers/dpeth/dp.c
@@ -55,9 +55,7 @@
 */
 
 #include "drivers.h"
-#include <minix/keymap.h>
 #include <minix/endpoint.h>
-#include <net/hton.h>
 #include <net/gen/ether.h>
 #include <net/gen/eth_io.h>
 
@@ -283,6 +281,7 @@ static void do_init(message * mp)
   dpeth_t *dep;
   dp_conf_t *dcp;
   message reply_mess;
+  const char *portname;
 
   port = mp->DL_PORT;
   if (port >= 0 && port < DE_PORT_NR) {
@@ -291,6 +290,7 @@ static void do_init(message * mp)
 	dcp = &dp_conf[port];
 	strcpy(dep->de_name, DevName);
 	dep->de_name[4] = '0' + port;
+	portname = dep->de_name;
 
 	if (dep->de_mode == DEM_DISABLED) {
 
@@ -341,15 +341,17 @@ static void do_init(message * mp)
 	}
 	*(ether_addr_t *) reply_mess.m3_ca1 = dep->de_address;
 
-  } else			/* Port number is out of range */
+  } else {			/* Port number is out of range */
 	port = ENXIO;
+	portname = "(illegal dpeth port)";
+  }
 
   reply_mess.m_type = DL_CONF_REPLY;
   reply_mess.m3_i1 = port;
   reply_mess.m3_i2 = DE_PORT_NR;
   DEBUG(printf("\t reply %d\n", reply_mess.m_type));
   if (send(mp->m_source, &reply_mess) != OK)	/* Can't send */
-	panic(dep->de_name, SendErrMsg, mp->m_source);
+	panic(portname, SendErrMsg, mp->m_source);
 
   return;
 }
diff --git a/drivers/lance/lance.c b/drivers/lance/lance.c
index 4d8b62c98..c2a1c85ff 100644
--- a/drivers/lance/lance.c
+++ b/drivers/lance/lance.c
@@ -55,8 +55,6 @@
 
 #include "lance.h"
 
-#include <sys/ioc_memory.h>
-
 static ether_card_t ec_table[EC_PORT_NR_MAX];
 static int eth_tasknr= ANY;
 static u16_t eth_ign_proto;
diff --git a/drivers/log/diag.c b/drivers/log/diag.c
index 5994d0e1d..27e4cfcf3 100644
--- a/drivers/log/diag.c
+++ b/drivers/log/diag.c
@@ -8,7 +8,6 @@
  */
 
 #include <stdio.h>
-#include <fcntl.h>
 #include <minix/type.h>
 #include <minix/safecopies.h>
 #include <minix/sys_config.h>
diff --git a/kernel/arch/i386/apic.c b/kernel/arch/i386/apic.c
index a47321312..ae169cea0 100644
--- a/kernel/arch/i386/apic.c
+++ b/kernel/arch/i386/apic.c
@@ -4,8 +4,6 @@
 #include "../../kernel.h"
 
 #include <unistd.h>
-#include <ibm/cmos.h>
-#include <ibm/bios.h>
 #include <minix/portio.h>
 
 #include <minix/syslib.h>
diff --git a/kernel/arch/i386/exception.c b/kernel/arch/i386/exception.c
index ba17b6eb4..712457693 100644
--- a/kernel/arch/i386/exception.c
+++ b/kernel/arch/i386/exception.c
@@ -6,11 +6,9 @@
 #include "../../kernel.h"
 #include "proto.h"
 #include <signal.h>
-#include <stdio.h>
 #include <string.h>
 #include "../../proc.h"
 #include "../../proto.h"
-#include "../../vm.h"
 
 extern int vm_copy_in_progress, catch_pagefaults;
 extern struct proc *vm_copy_from, *vm_copy_to;
diff --git a/kernel/arch/i386/i8259.c b/kernel/arch/i386/i8259.c
index b1ccb535b..70c781830 100644
--- a/kernel/arch/i386/i8259.c
+++ b/kernel/arch/i386/i8259.c
@@ -8,7 +8,6 @@
 #include "../../kernel.h"
 #include "../../proc.h"
 #include "proto.h"
-#include <minix/com.h>
 #include <minix/portio.h>
 #include <ibm/cpu.h>
 
diff --git a/kernel/arch/i386/system.c b/kernel/arch/i386/system.c
index 1ec68a1f0..2154624aa 100644
--- a/kernel/arch/i386/system.c
+++ b/kernel/arch/i386/system.c
@@ -8,7 +8,6 @@
 #include <ibm/cmos.h>
 #include <ibm/bios.h>
 #include <minix/portio.h>
-#include <minix/u64.h>
 #include <minix/cpufeature.h>
 #include <a.out.h>
 #include <archconst.h>
diff --git a/kernel/clock.c b/kernel/clock.c
index 44c76ffde..a3f6e4c9b 100644
--- a/kernel/clock.c
+++ b/kernel/clock.c
@@ -31,10 +31,8 @@
 
 #include "kernel.h"
 #include "proc.h"
-#include <signal.h>
 #include <minix/com.h>
 #include <minix/endpoint.h>
-#include <minix/portio.h>
 
 #include "clock.h"
 
diff --git a/kernel/interrupt.c b/kernel/interrupt.c
index 536f49a01..ca4311f46 100644
--- a/kernel/interrupt.c
+++ b/kernel/interrupt.c
@@ -15,7 +15,6 @@
 
 #include "kernel.h"
 #include "proc.h"
-#include <minix/com.h>
 #include <archconst.h>
 
 #include "arch/i386/hw_intr.h"
diff --git a/kernel/main.c b/kernel/main.c
index 4a0b9aaef..9437ebaf0 100644
--- a/kernel/main.c
+++ b/kernel/main.c
@@ -9,14 +9,11 @@
  *   prepare_shutdown:	prepare to take MINIX down
  */
 #include "kernel.h"
-#include <signal.h>
 #include <string.h>
 #include <unistd.h>
 #include <a.out.h>
-#include <minix/callnr.h>
 #include <minix/com.h>
 #include <minix/endpoint.h>
-#include <minix/u64.h>
 #include "proc.h"
 #include "debug.h"
 #include "clock.h"
diff --git a/kernel/proc.c b/kernel/proc.c
index ca86f802d..5096608f8 100644
--- a/kernel/proc.c
+++ b/kernel/proc.c
@@ -34,12 +34,10 @@
  */
 
 #include <minix/com.h>
-#include <minix/callnr.h>
 #include <minix/endpoint.h>
 #include <stddef.h>
 #include <signal.h>
 #include <minix/portio.h>
-#include <minix/u64.h>
 #include <minix/syslib.h>
 
 #include "debug.h"
diff --git a/kernel/start.c b/kernel/start.c
index fff5b0535..b91d5f575 100644
--- a/kernel/start.c
+++ b/kernel/start.c
@@ -5,7 +5,6 @@
 #include "proc.h"
 #include <stdlib.h>
 #include <string.h>
-#include <archconst.h>
 #include "proto.h"
 
 #ifdef CONFIG_WATCHDOG
diff --git a/kernel/system/do_copy.c b/kernel/system/do_copy.c
index 544341f73..e46d33f28 100644
--- a/kernel/system/do_copy.c
+++ b/kernel/system/do_copy.c
@@ -12,7 +12,6 @@
  */
 
 #include "../system.h"
-#include "../vm.h"
 #include <minix/type.h>
 
 #if (USE_VIRCOPY || USE_PHYSCOPY)
diff --git a/kernel/system/do_endksig.c b/kernel/system/do_endksig.c
index 2d8cbd342..73fd61c08 100644
--- a/kernel/system/do_endksig.c
+++ b/kernel/system/do_endksig.c
@@ -7,7 +7,6 @@
 
 #include "../system.h"
 #include <signal.h>
-#include <sys/sigcontext.h>
 
 #if USE_ENDKSIG 
 
diff --git a/kernel/system/do_exec.c b/kernel/system/do_exec.c
index d4fb7c67c..9f3dda409 100644
--- a/kernel/system/do_exec.c
+++ b/kernel/system/do_exec.c
@@ -9,7 +9,6 @@
  */
 #include "../system.h"
 #include <string.h>
-#include <signal.h>
 #include <minix/endpoint.h>
 
 #if USE_EXEC
diff --git a/kernel/system/do_getinfo.c b/kernel/system/do_getinfo.c
index a33f2105b..01290792a 100644
--- a/kernel/system/do_getinfo.c
+++ b/kernel/system/do_getinfo.c
@@ -13,7 +13,6 @@
 #include <minix/endpoint.h>
 
 #include "../system.h"
-#include "../vm.h"
 
 
 #if USE_GETINFO
diff --git a/kernel/system/do_getksig.c b/kernel/system/do_getksig.c
index 51e1d7c30..13d2c8d93 100644
--- a/kernel/system/do_getksig.c
+++ b/kernel/system/do_getksig.c
@@ -8,7 +8,6 @@
 
 #include "../system.h"
 #include <signal.h>
-#include <sys/sigcontext.h>
 #include <minix/endpoint.h>
 
 #if USE_GETKSIG
diff --git a/kernel/system/do_kill.c b/kernel/system/do_kill.c
index 118a53773..dacf43d42 100644
--- a/kernel/system/do_kill.c
+++ b/kernel/system/do_kill.c
@@ -8,7 +8,6 @@
 
 #include "../system.h"
 #include <signal.h>
-#include <sys/sigcontext.h>
 
 #if USE_KILL
 
diff --git a/kernel/system/do_memset.c b/kernel/system/do_memset.c
index 1359112b6..bf5d0b473 100644
--- a/kernel/system/do_memset.c
+++ b/kernel/system/do_memset.c
@@ -8,7 +8,6 @@
  */
 
 #include "../system.h"
-#include "../vm.h"
 
 #if USE_MEMSET
 
diff --git a/kernel/system/do_nice.c b/kernel/system/do_nice.c
index 41d6caad0..b1d243580 100644
--- a/kernel/system/do_nice.c
+++ b/kernel/system/do_nice.c
@@ -7,7 +7,6 @@
  */
 
 #include "../system.h"
-#include <minix/type.h>
 #include <sys/resource.h>
 
 #if USE_NICE
diff --git a/kernel/system/do_runctl.c b/kernel/system/do_runctl.c
index 8381228cc..d5592b236 100644
--- a/kernel/system/do_runctl.c
+++ b/kernel/system/do_runctl.c
@@ -8,7 +8,6 @@
  */
 
 #include "../system.h"
-#include <minix/type.h>
 
 #if USE_RUNCTL
 
diff --git a/kernel/system/do_safecopy.c b/kernel/system/do_safecopy.c
index 9306cd650..c13d963ef 100644
--- a/kernel/system/do_safecopy.c
+++ b/kernel/system/do_safecopy.c
@@ -18,7 +18,6 @@
 #include <minix/safecopies.h>
 
 #include "../system.h"
-#include "../vm.h"
 
 #define MAX_INDIRECT_DEPTH 5	/* up to how many indirect grants to follow? */
 
diff --git a/kernel/system/do_safemap.c b/kernel/system/do_safemap.c
index 95b448ca5..b76c52876 100644
--- a/kernel/system/do_safemap.c
+++ b/kernel/system/do_safemap.c
@@ -15,7 +15,6 @@
 #include <minix/safecopies.h>
 
 #include "../system.h"
-#include "../vm.h"
 
 
 struct map_info_s {
diff --git a/kernel/system/do_sigreturn.c b/kernel/system/do_sigreturn.c
index 537a45990..93bf1f450 100644
--- a/kernel/system/do_sigreturn.c
+++ b/kernel/system/do_sigreturn.c
@@ -9,7 +9,6 @@
 
 #include "../system.h"
 #include <string.h>
-#include <signal.h>
 #include <ibm/cpu.h>
 #include <sys/sigcontext.h>
 
diff --git a/kernel/system/do_sigsend.c b/kernel/system/do_sigsend.c
index 7d5c6cef5..8b1feda63 100644
--- a/kernel/system/do_sigsend.c
+++ b/kernel/system/do_sigsend.c
@@ -9,7 +9,6 @@
  */
 
 #include "../system.h"
-#include "../vm.h"
 #include <signal.h>
 #include <string.h>
 #include <sys/sigcontext.h>
diff --git a/kernel/system/do_umap.c b/kernel/system/do_umap.c
index b48453415..5bad38250 100644
--- a/kernel/system/do_umap.c
+++ b/kernel/system/do_umap.c
@@ -10,7 +10,6 @@
  */
 
 #include "../system.h"
-#include "../vm.h"
 
 #if USE_UMAP
 
diff --git a/kernel/utility.c b/kernel/utility.c
index bc70c1419..228f3afc4 100644
--- a/kernel/utility.c
+++ b/kernel/utility.c
@@ -9,7 +9,6 @@
 
 #include <unistd.h>
 #include <signal.h>
-#include <string.h>
 
 #include <minix/sys_config.h>
 
diff --git a/lib/ack/libp/ini.c b/lib/ack/libp/ini.c
index 149bbe444..7614eb1ce 100644
--- a/lib/ack/libp/ini.c
+++ b/lib/ack/libp/ini.c
@@ -19,7 +19,6 @@
 /* Author: J.W. Stevenson */
 
 #include        <pc_file.h>
-#include        <pc_err.h>
 
 extern          (*_sig())();
 extern          _catch();
diff --git a/lib/ack/libp/sqt.c b/lib/ack/libp/sqt.c
index 5f6f1b9d7..12bdfa30e 100644
--- a/lib/ack/libp/sqt.c
+++ b/lib/ack/libp/sqt.c
@@ -7,7 +7,6 @@
 
 /* $Header$ */
 #define __NO_DEFS
-#include <math.h>
 #include <pc_err.h>
 extern	_trp();
 
diff --git a/lib/ansi/errlist.c b/lib/ansi/errlist.c
index bdd03002a..605a2f7ca 100644
--- a/lib/ansi/errlist.c
+++ b/lib/ansi/errlist.c
@@ -4,8 +4,6 @@
  */
 /* $Header$ */
 
-#include	<errno.h>
-
 static const char unknown[] = "Unknown error";
 
 const char *_sys_errlist[] = {
diff --git a/lib/ansi/mblen.c b/lib/ansi/mblen.c
index 53b7dc20d..93b146a56 100644
--- a/lib/ansi/mblen.c
+++ b/lib/ansi/mblen.c
@@ -5,7 +5,6 @@
 /* $Header$ */
 
 #include	<stdlib.h>
-#include	<limits.h>
 
 #define	CHAR_SHIFT	8
 
diff --git a/lib/ansi/mbtowc.c b/lib/ansi/mbtowc.c
index 3e6dd051d..47c1483db 100644
--- a/lib/ansi/mbtowc.c
+++ b/lib/ansi/mbtowc.c
@@ -5,7 +5,6 @@
 /* $Header$ */
 
 #include	<stdlib.h>
-#include	<limits.h>
 
 int
 mbtowc(wchar_t *pwc, register const char *s, size_t n)
diff --git a/lib/ansi/strcoll.c b/lib/ansi/strcoll.c
index 0d2ddda96..1d0a23810 100644
--- a/lib/ansi/strcoll.c
+++ b/lib/ansi/strcoll.c
@@ -5,7 +5,6 @@
 /* $Header$ */
 
 #include	<string.h>
-#include	<locale.h>
 
 int
 strcoll(register const char *s1, register const char *s2)
diff --git a/lib/ansi/wcstombs.c b/lib/ansi/wcstombs.c
index 91a14624d..97e5f8fa6 100644
--- a/lib/ansi/wcstombs.c
+++ b/lib/ansi/wcstombs.c
@@ -6,7 +6,6 @@
 
 #include	<stdlib.h>
 #include	<locale.h>
-#include	<limits.h>
 
 size_t
 wcstombs(register char *s, register const wchar_t *pwcs, size_t n)
diff --git a/lib/ansi/wctomb.c b/lib/ansi/wctomb.c
index 9f273c13e..1afc0c562 100644
--- a/lib/ansi/wctomb.c
+++ b/lib/ansi/wctomb.c
@@ -5,7 +5,6 @@
 /* $Header$ */
 
 #include	<stdlib.h>
-#include	<limits.h>
 
 int
 /* was: wctomb(char *s, wchar_t wchar) 
diff --git a/lib/gnu/ieee_float/isnan.c b/lib/gnu/ieee_float/isnan.c
index b941bb9e8..9d6951069 100644
--- a/lib/gnu/ieee_float/isnan.c
+++ b/lib/gnu/ieee_float/isnan.c
@@ -9,7 +9,6 @@ Implementation of isnan that directly tests the bits in an ieee float
 #define _MINIX_SOURCE
 
 #include <sys/types.h>
-#include <math.h>
 
 #include "ieee_float.h"
 
diff --git a/lib/i386/math/feholdexcept.c b/lib/i386/math/feholdexcept.c
index 22184a44d..70a49374a 100644
--- a/lib/i386/math/feholdexcept.c
+++ b/lib/i386/math/feholdexcept.c
@@ -1,4 +1,3 @@
-#include <errno.h>
 #include <fenv.h>
 
 #include "fpu_cw.h"
diff --git a/lib/ip/accept.c b/lib/ip/accept.c
index c6fe2ee06..8f1085ce7 100644
--- a/lib/ip/accept.c
+++ b/lib/ip/accept.c
@@ -5,7 +5,6 @@
 #include <string.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
-#include <netinet/in.h>
 
 #include <net/netlib.h>
 #include <net/gen/in.h>
diff --git a/lib/ip/domainname.c b/lib/ip/domainname.c
index cae29d778..6ff13bb91 100644
--- a/lib/ip/domainname.c
+++ b/lib/ip/domainname.c
@@ -5,7 +5,6 @@ domainname.c
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
-#include <net/netlib.h>
 
 int getdomainname(domain, size)
 char *domain;
diff --git a/lib/ip/ethera2n.c b/lib/ip/ethera2n.c
index 35f25d41f..601999d46 100644
--- a/lib/ip/ethera2n.c
+++ b/lib/ip/ethera2n.c
@@ -8,7 +8,6 @@ Created:	Nov 17, 1992 by Philip Homburg
 
 #include <sys/types.h>
 #include <stdlib.h>
-#include <net/netlib.h>
 #include <net/gen/ether.h>
 #include <net/gen/if_ether.h>
 
diff --git a/lib/ip/getdomain.c b/lib/ip/getdomain.c
index 190d88277..8da6942ba 100644
--- a/lib/ip/getdomain.c
+++ b/lib/ip/getdomain.c
@@ -3,7 +3,6 @@
  */
 #define nil 0
 #include <sys/types.h>
-#include <sys/utsname.h>
 #include <unistd.h>
 #include <string.h>
 
diff --git a/lib/ip/gethnmadr.c b/lib/ip/gethnmadr.c
index b592a9e5b..e7368eb04 100644
--- a/lib/ip/gethnmadr.c
+++ b/lib/ip/gethnmadr.c
@@ -24,7 +24,6 @@ static char sccsid[] = "@(#)gethostnamadr.c	6.41 (Berkeley) 6/1/90";
 #ifdef _MINIX
 #include <sys/types.h>
 #include <ctype.h>
-#include <errno.h>
 #include <stdio.h>
 #include <string.h>
 
@@ -42,7 +41,6 @@ static char sccsid[] = "@(#)gethostnamadr.c	6.41 (Berkeley) 6/1/90";
 #include <ctype.h>
 #include <netdb.h>
 #include <stdio.h>
-#include <errno.h>
 #include <arpa/inet.h>
 #include <arpa/nameser.h>
 #include <resolv.h>
diff --git a/lib/ip/getifaddrs.c b/lib/ip/getifaddrs.c
index 15dd13b54..748ae97eb 100644
--- a/lib/ip/getifaddrs.c
+++ b/lib/ip/getifaddrs.c
@@ -1,4 +1,3 @@
-#include <errno.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -12,9 +11,7 @@
 #include <net/gen/in.h>
 #include <net/gen/ip_io.h>
 #include <net/gen/tcp.h>
-#include <net/gen/tcp_io.h>
 #include <net/gen/udp.h>
-#include <net/gen/udp_io.h>
 
 int
 getifaddrs(struct ifaddrs **ifap)
diff --git a/lib/ip/getpeername.c b/lib/ip/getpeername.c
index 39804ff41..bf6dacabb 100644
--- a/lib/ip/getpeername.c
+++ b/lib/ip/getpeername.c
@@ -9,7 +9,6 @@
 #include <net/gen/tcp.h>
 #include <net/gen/tcp_io.h>
 #include <net/gen/udp.h>
-#include <net/gen/udp_io.h>
 
 #define DEBUG 0
 
diff --git a/lib/ip/getservent.c b/lib/ip/getservent.c
index 9a8ce398f..9e89c3823 100644
--- a/lib/ip/getservent.c
+++ b/lib/ip/getservent.c
@@ -22,7 +22,6 @@ static char sccsid[] = "@(#)getservent.c	5.8 (Berkeley) 6/1/90";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
-#include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/lib/ip/getsockname.c b/lib/ip/getsockname.c
index 5928e6399..d3c9d7d71 100644
--- a/lib/ip/getsockname.c
+++ b/lib/ip/getsockname.c
@@ -18,7 +18,6 @@
 #include <net/gen/tcp.h>
 #include <net/gen/tcp_io.h>
 #include <net/gen/udp.h>
-#include <net/gen/udp_io.h>
 
 
 /*
diff --git a/lib/posix/_nanosleep.c b/lib/posix/_nanosleep.c
index 18319e67d..0bd33c866 100644
--- a/lib/posix/_nanosleep.c
+++ b/lib/posix/_nanosleep.c
@@ -4,7 +4,6 @@
 
 #include <lib.h>
 #define nanosleep _nanosleep
-#include <signal.h>
 #include <unistd.h>
 #include <errno.h>
 #include <time.h>
diff --git a/lib/posix/_readdir.c b/lib/posix/_readdir.c
index fa5ef9cf0..48b71604d 100644
--- a/lib/posix/_readdir.c
+++ b/lib/posix/_readdir.c
@@ -5,13 +5,10 @@
 #define readdir _readdir
 #define getdents _getdents
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <dirent.h>
 #include <unistd.h>
 #include <stddef.h>
 #include <stdlib.h>
-#include <fcntl.h>
-#include <limits.h>
 #include <errno.h>
 #include <string.h>
 
diff --git a/lib/posix/_sigaction.c b/lib/posix/_sigaction.c
index 472301700..bbd19b182 100644
--- a/lib/posix/_sigaction.c
+++ b/lib/posix/_sigaction.c
@@ -1,6 +1,5 @@
 #include <lib.h>
 #define sigaction _sigaction
-#include <sys/sigcontext.h>
 #include <signal.h>
 
 _PROTOTYPE(int __sigreturn, (void));
diff --git a/lib/posix/_sleep.c b/lib/posix/_sleep.c
index 67a328ef1..fe904292d 100644
--- a/lib/posix/_sleep.c
+++ b/lib/posix/_sleep.c
@@ -5,7 +5,6 @@
 
 #include <lib.h>
 #define sleep _sleep
-#include <signal.h>
 #include <unistd.h>
 #include <errno.h>
 #include <time.h>
diff --git a/lib/posix/_stime.c b/lib/posix/_stime.c
index 7158019d5..abcdc02e5 100644
--- a/lib/posix/_stime.c
+++ b/lib/posix/_stime.c
@@ -1,6 +1,5 @@
 #include <lib.h>
 #define stime	_stime
-#include <minix/minlib.h>
 #include <time.h>
 
 PUBLIC int stime(top)
diff --git a/lib/posix/_tcsetattr.c b/lib/posix/_tcsetattr.c
index b8c90d57c..d43088f7f 100644
--- a/lib/posix/_tcsetattr.c
+++ b/lib/posix/_tcsetattr.c
@@ -9,7 +9,6 @@ Created:	June 11, 1993 by Philip Homburg
 #include <errno.h>
 #include <termios.h>
 #include <sys/ioctl.h>
-#include <sys/types.h>
 
 int tcsetattr(fd, opt_actions, termios_p)
 int fd;
diff --git a/lib/posix/_times.c b/lib/posix/_times.c
index d3cb3b8c9..4504e1208 100644
--- a/lib/posix/_times.c
+++ b/lib/posix/_times.c
@@ -1,7 +1,6 @@
 #include <lib.h>
 #define times	_times
 #include <sys/times.h>
-#include <time.h>
 
 PUBLIC clock_t times(buf)
 struct tms *buf;
diff --git a/lib/posix/gettimeofday.c b/lib/posix/gettimeofday.c
index f05ab5c86..4089c8938 100644
--- a/lib/posix/gettimeofday.c
+++ b/lib/posix/gettimeofday.c
@@ -4,7 +4,6 @@ gettimeofday.c
 
 #include <sys/time.h>
 #include <lib.h>
-#include <time.h>
 
 int gettimeofday(struct timeval *_RESTRICT tp, void *_RESTRICT tzp)
 {
diff --git a/lib/posix/glob.c b/lib/posix/glob.c
index 89725f795..5cb0b1a11 100644
--- a/lib/posix/glob.c
+++ b/lib/posix/glob.c
@@ -55,10 +55,8 @@
  *	Number of matches in the current invocation of glob.
  */
 
-#include <sys/param.h>
 #include <sys/stat.h>
 
-#include <ctype.h>
 #include <dirent.h>
 #include <errno.h>
 #include <glob.h>
diff --git a/lib/regex/regerror.c b/lib/regex/regerror.c
index aacdf66d5..76f7f8d9c 100644
--- a/lib/regex/regerror.c
+++ b/lib/regex/regerror.c
@@ -49,7 +49,6 @@ static char sccsid[] = "@(#)regerror.c	8.4 (Berkeley) 3/20/94";
 #else
 #include <ctype.h>
 #endif
-#include <limits.h>
 #include <stdlib.h>
 #include <regex.h>
 
diff --git a/lib/syslib/pci_init.c b/lib/syslib/pci_init.c
index 626afe45b..068df00ad 100644
--- a/lib/syslib/pci_init.c
+++ b/lib/syslib/pci_init.c
@@ -3,7 +3,6 @@ pci_init.c
 */
 
 #include "syslib.h"
-#include <minix/sysutil.h>
 
 /*===========================================================================*
  *				pci_init				     *
diff --git a/lib/syslib/sys_profbuf.c b/lib/syslib/sys_profbuf.c
index a301aa713..4b5b0fd53 100644
--- a/lib/syslib/sys_profbuf.c
+++ b/lib/syslib/sys_profbuf.c
@@ -1,7 +1,5 @@
 #include "syslib.h"
 
-#include <minix/config.h>
-
 /*===========================================================================*
  *                                sys_profbuf				     *
  *===========================================================================*/
diff --git a/lib/sysutil/asynsend.c b/lib/sysutil/asynsend.c
index 19bab8160..86def12ab 100644
--- a/lib/sysutil/asynsend.c
+++ b/lib/sysutil/asynsend.c
@@ -9,7 +9,6 @@
 #include <minix/const.h>
 #include <minix/type.h>
 
-#include <fcntl.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <minix/syslib.h>
diff --git a/lib/sysutil/env_get_prm.c b/lib/sysutil/env_get_prm.c
index a67694956..12bc7c741 100644
--- a/lib/sysutil/env_get_prm.c
+++ b/lib/sysutil/env_get_prm.c
@@ -1,5 +1,4 @@
 #include "sysutil.h"
-#include <minix/config.h>
 #include <string.h>
 
 PUBLIC int env_argc = 0;
diff --git a/lib/sysutil/get_randomness.c b/lib/sysutil/get_randomness.c
index a52a1e267..d603735b9 100644
--- a/lib/sysutil/get_randomness.c
+++ b/lib/sysutil/get_randomness.c
@@ -1,6 +1,5 @@
 #include <lib.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <minix/profile.h>
diff --git a/lib/sysutil/ser_putc.c b/lib/sysutil/ser_putc.c
index 57e4fe64e..e4f38598e 100644
--- a/lib/sysutil/ser_putc.c
+++ b/lib/sysutil/ser_putc.c
@@ -1,5 +1,4 @@
 #include "sysutil.h"
-#include <timers.h>
 
 #define COM1_BASE       0x3F8
 #define COM1_THR        (COM1_BASE + 0)
diff --git a/lib/sysutil/sys_hz.c b/lib/sysutil/sys_hz.c
index ad6463121..af6f0346a 100644
--- a/lib/sysutil/sys_hz.c
+++ b/lib/sysutil/sys_hz.c
@@ -1,8 +1,6 @@
 
 #include <stdio.h>
-#include <time.h>
 #include <sys/time.h>
-#include <sys/times.h>
 #include <sys/types.h>
 #include <minix/u64.h>
 #include <minix/config.h>
diff --git a/lib/sysutil/tsc_util.c b/lib/sysutil/tsc_util.c
index b21bfdf06..6a5060f07 100644
--- a/lib/sysutil/tsc_util.c
+++ b/lib/sysutil/tsc_util.c
@@ -1,7 +1,6 @@
 
 #include <stdio.h>
 #include <time.h>
-#include <sys/time.h>
 #include <sys/times.h>
 #include <sys/types.h>
 #include <minix/u64.h>
diff --git a/lib/sysvipc/sem.c b/lib/sysvipc/sem.c
index b0e87722f..5481029d7 100644
--- a/lib/sysvipc/sem.c
+++ b/lib/sysvipc/sem.c
@@ -15,8 +15,6 @@
 #include <sys/types.h>
 #include <sys/ipc.h>
 #include <sys/sem.h>
-#include <time.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <errno.h>
diff --git a/lib/sysvipc/shm.c b/lib/sysvipc/shm.c
index 50146005b..69f088371 100644
--- a/lib/sysvipc/shm.c
+++ b/lib/sysvipc/shm.c
@@ -1,7 +1,6 @@
 #define _SYSTEM	1
 #define _MINIX 1
 
-#include <minix/callnr.h>
 #include <minix/com.h>
 #include <minix/config.h>
 #include <minix/ipc.h>
@@ -15,8 +14,6 @@
 #include <sys/types.h>
 #include <sys/ipc.h>
 #include <sys/shm.h>
-#include <time.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
 
diff --git a/servers/ipc/inc.h b/servers/ipc/inc.h
index fc15751a3..f47202e41 100644
--- a/servers/ipc/inc.h
+++ b/servers/ipc/inc.h
@@ -31,7 +31,6 @@ _PROTOTYPE( int do_shmat, (message *)                                    );
 _PROTOTYPE( int do_shmdt, (message *)                                    );
 _PROTOTYPE( int do_shmctl, (message *)                                   );
 _PROTOTYPE( int check_perm, (struct ipc_perm *, endpoint_t, int)         );
-_PROTOTYPE( void list_shm_ds, (void)                                     );
 _PROTOTYPE( void update_refcount_and_destroy, (void)                     );
 _PROTOTYPE( int do_semget, (message *)                                   );
 _PROTOTYPE( int do_semctl, (message *)                                   );
diff --git a/servers/ipc/main.c b/servers/ipc/main.c
index d5f4c02a5..2800a74c9 100644
--- a/servers/ipc/main.c
+++ b/servers/ipc/main.c
@@ -5,7 +5,7 @@ PUBLIC endpoint_t who_e;
 PUBLIC int call_type;
 PUBLIC endpoint_t SELF_E;
 
-struct {
+PRIVATE struct {
 	int type;
 	int (*func)(message *);
 	int reply;	/* whether the reply action is passed through */
@@ -21,7 +21,7 @@ struct {
 
 #define SIZE(a) (sizeof(a)/sizeof(a[0]))
 
-int verbose = 0;
+PRIVATE int verbose = 0;
 
 /* SEF functions and variables. */
 FORWARD _PROTOTYPE( void sef_local_startup, (void) );
diff --git a/servers/ipc/shm.c b/servers/ipc/shm.c
index 70585f7c8..7c08c7f11 100644
--- a/servers/ipc/shm.c
+++ b/servers/ipc/shm.c
@@ -328,7 +328,7 @@ PUBLIC int do_shmctl(message *m)
 	return OK;
 }
 
-PUBLIC void list_shm_ds(void)
+PRIVATE void list_shm_ds(void)
 {
 	int i;
 	printf("key\tid\tpage\n");