16 files changed, 12 insertions, 8 deletions

diff --git a/arch/i386/kernel/cpu/cyrix.c b/arch/i386/kernel/cpu/cyrix.c
index 572889eed255..cf5519c7e449 100644
--- a/arch/i386/kernel/cpu/cyrix.c
+++ b/arch/i386/kernel/cpu/cyrix.c
@@ -2,8 +2,6 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/pci.h>
-#include <linux/pci_ids.h>
-
 #include <asm/dma.h>
 #include <asm/io.h>
 #include <asm/processor.h>
diff --git a/drivers/block/umem.c b/drivers/block/umem.c
index c45967b3811a..53dfd2a7c624 100644
--- a/drivers/block/umem.c
+++ b/drivers/block/umem.c
@@ -48,6 +48,7 @@
 #include <linux/smp_lock.h>
 #include <linux/timer.h>
 #include <linux/pci.h>
+#include <linux/slab.h>
 
 #include <linux/fcntl.h>        /* O_ACCMODE */
 #include <linux/hdreg.h>  /* HDIO_GETGEO */
@@ -55,6 +56,7 @@
 #include <linux/umem.h>
 
 #include <asm/uaccess.h>
+#include <asm/io.h>
 
 #define PRINTK(x...) do {} while (0)
 #define dprintk(x...) do {} while (0)
diff --git a/drivers/net/gt96100eth.h b/drivers/net/gt96100eth.h
index bdd6e0fb3b6b..2f4bfd4dacbe 100644
--- a/drivers/net/gt96100eth.h
+++ b/drivers/net/gt96100eth.h
@@ -27,6 +27,7 @@
 #ifndef _GT96100ETH_H
 #define _GT96100ETH_H
 
+#include <linux/config.h>
 #include <asm/galileo-boards/gt96100.h>
 
 #define dbg(lvl, format, arg...) \
diff --git a/drivers/net/ioc3-eth.c b/drivers/net/ioc3-eth.c
index 072e1977ccc7..b70ff8ecdfff 100644
--- a/drivers/net/ioc3-eth.c
+++ b/drivers/net/ioc3-eth.c
@@ -26,6 +26,7 @@
  *    which workarounds are required for them?  Do we ever have Lucent's?
  *  o For the 2.5 branch kill the mii-tool ioctls.
  */
+#include <linux/config.h>
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 9124683e9d8c..544718eb3e43 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -47,7 +47,6 @@
 #include <linux/smp.h>
 
 #include <asm/uaccess.h>
-#include <asm/system.h>
 #include <asm/io.h>
 
 #define MAJOR_NR SCSI_DISK0_MAJOR
diff --git a/drivers/scsi/wd33c93.h b/drivers/scsi/wd33c93.h
index bc23471572be..7d55ed8bd47f 100644
--- a/drivers/scsi/wd33c93.h
+++ b/drivers/scsi/wd33c93.h
@@ -19,12 +19,9 @@
  * GNU General Public License for more details.
  *
  */
-
 #ifndef WD33C93_H
 #define WD33C93_H
 
-#include <linux/config.h>
-
 #define PROC_INTERFACE     /* add code for /proc/scsi/wd33c93/xxx interface */
 #ifdef  PROC_INTERFACE
 #define PROC_STATISTICS    /* add code for keeping various real time stats */
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index c4ff92f90e67..66807c12f50b 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -31,6 +31,7 @@
 #include <linux/console.h>
 #include <linux/sysrq.h>
 #include <linux/serial_reg.h>
+#include <linux/serial.h>
 #include <linux/serialP.h>
 #include <linux/serial.h>
 #include <linux/delay.h>
diff --git a/fs/buffer.c b/fs/buffer.c
index a4472cfdbc68..0c0de8ad3b19 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -29,6 +29,7 @@
 #include <linux/file.h>
 #include <linux/quotaops.h>
 #include <linux/iobuf.h>
+#include <linux/highmem.h>
 #include <linux/module.h>
 #include <linux/writeback.h>
 #include <linux/mempool.h>
diff --git a/fs/mpage.c b/fs/mpage.c
index 2cbd183dfd7c..0b40f810949b 100644
--- a/fs/mpage.c
+++ b/fs/mpage.c
@@ -14,6 +14,7 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/kdev_t.h>
 #include <linux/bio.h>
 #include <linux/fs.h>
 #include <linux/buffer_head.h>
diff --git a/fs/partitions/ldm.c b/fs/partitions/ldm.c
index 570d858ad1ac..e26a81168871 100644
--- a/fs/partitions/ldm.c
+++ b/fs/partitions/ldm.c
@@ -24,6 +24,7 @@
  */
 
 #include <linux/slab.h>
+#include <linux/pagemap.h>
 #include <linux/stringify.h>
 #include "ldm.h"
 #include "check.h"
diff --git a/fs/reiserfs/resize.c b/fs/reiserfs/resize.c
index c357fa53001e..7651be142ebf 100644
--- a/fs/reiserfs/resize.c
+++ b/fs/reiserfs/resize.c
@@ -9,6 +9,7 @@
  */
 
 #include <linux/kernel.h>
+#include <linux/mm.h>
 #include <linux/vmalloc.h>
 #include <linux/string.h>
 #include <linux/errno.h>
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index a93abb3df305..9ea7b652237b 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -7,6 +7,7 @@
 #include <linux/list.h>
 #include <linux/pagemap.h>
 #include <linux/backing-dev.h>
+#include <linux/wait.h>
 
 #include <asm/scatterlist.h>
 
diff --git a/sound/isa/als100.c b/sound/isa/als100.c
index 44a3c735dd00..e2a3b230c3ff 100644
--- a/sound/isa/als100.c
+++ b/sound/isa/als100.c
@@ -23,7 +23,6 @@
 #include <sound/driver.h>
 #include <linux/init.h>
 #include <linux/wait.h>
-#include <linux/sched.h>
 #include <linux/time.h>
 #ifndef LINUX_ISAPNP_H
 #include <linux/isapnp.h>
diff --git a/sound/isa/opl3sa2.c b/sound/isa/opl3sa2.c
index b8a342f6a736..4a35d722a13a 100644
--- a/sound/isa/opl3sa2.c
+++ b/sound/isa/opl3sa2.c
@@ -22,6 +22,7 @@
 #include <sound/driver.h>
 #include <asm/io.h>
 #include <linux/init.h>
+#include <linux/isapnp.h>
 #include <linux/pm.h>
 #include <linux/slab.h>
 #ifndef LINUX_ISAPNP_H
diff --git a/sound/oss/bin2hex.c b/sound/oss/bin2hex.c
index 3b546b93c42e..b59109eb0db4 100644
--- a/sound/oss/bin2hex.c
+++ b/sound/oss/bin2hex.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
 
 int main( int argc, const char * argv [] )
 {
diff --git a/sound/oss/os.h b/sound/oss/os.h
index 1a66e3a8441d..57a9ebce44fb 100644
--- a/sound/oss/os.h
+++ b/sound/oss/os.h
@@ -18,7 +18,6 @@
 #include <asm/dma.h>
 #include <asm/io.h>
 #include <asm/param.h>
-#include <linux/ptrace.h>
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/ioport.h>