diff --git a/kernel/audit.c b/kernel/audit.c
index 32fa03ad1984da1395386d99deee3b98e073648d..d13ab7d2d8994f38fb9bf422d873152fd4417057 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -267,7 +267,7 @@ static int audit_set_failure(int state, uid_t loginuid)
 	return old;
 }
 
-int kauditd_thread(void *dummy)
+static int kauditd_thread(void *dummy)
 {
 	struct sk_buff *skb;
 
diff --git a/kernel/irq/proc.c b/kernel/irq/proc.c
index 8a64a4844cdeeda11fd2286e17b9d9f977a7fa76..d03b5eef8ce07bee171424abcfec206c6faadcef 100644
--- a/kernel/irq/proc.c
+++ b/kernel/irq/proc.c
@@ -10,6 +10,8 @@
 #include <linux/proc_fs.h>
 #include <linux/interrupt.h>
 
+#include "internals.h"
+
 static struct proc_dir_entry *root_irq_dir, *irq_dir[NR_IRQS];
 
 #ifdef CONFIG_SMP
diff --git a/kernel/rcutorture.c b/kernel/rcutorture.c
index 49fbbeff201ce7c27c72e7077b2555c31f478040..36efe088ad8197a491eda62c3fee90057efed657 100644
--- a/kernel/rcutorture.c
+++ b/kernel/rcutorture.c
@@ -103,7 +103,7 @@ atomic_t n_rcu_torture_error;
 /*
  * Allocate an element from the rcu_tortures pool.
  */
-struct rcu_torture *
+static struct rcu_torture *
 rcu_torture_alloc(void)
 {
 	struct list_head *p;
diff --git a/kernel/timer.c b/kernel/timer.c
index fd74268d8663ca8734814f175c1f0735d020d7a0..074b4bd5cfd8b62a9b92555514455a4a06f0416e 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -33,6 +33,7 @@
 #include <linux/posix-timers.h>
 #include <linux/cpu.h>
 #include <linux/syscalls.h>
+#include <linux/delay.h>
 
 #include <asm/uaccess.h>
 #include <asm/unistd.h>