diff --git a/examples/chardev.c b/examples/chardev.c
index a337d19..7972304 100644
--- a/examples/chardev.c
+++ b/examples/chardev.c
@@ -3,15 +3,19 @@
  * you have read from the dev file
  */
 
+#include <linux/atomic.h>
 #include <linux/cdev.h>
 #include <linux/delay.h>
 #include <linux/device.h>
 #include <linux/fs.h>
 #include <linux/init.h>
-#include <linux/irq.h>
-#include <linux/kernel.h>
+#include <linux/kernel.h> /* for sprintf() */
 #include <linux/module.h>
-#include <linux/poll.h>
+#include <linux/printk.h>
+#include <linux/types.h>
+#include <linux/uaccess.h> /* for get_user and put_user */
+
+#include <asm/errno.h>
 
 /*  Prototypes - this would normally go in a .h file */
 static int device_open(struct inode *, struct file *);
diff --git a/examples/chardev2.c b/examples/chardev2.c
index 58ed57b..4c8b930 100644
--- a/examples/chardev2.c
+++ b/examples/chardev2.c
@@ -2,15 +2,17 @@
  * chardev2.c - Create an input/output character device
  */
 
+#include <linux/atomic.h>
 #include <linux/cdev.h>
 #include <linux/delay.h>
 #include <linux/device.h>
 #include <linux/fs.h>
 #include <linux/init.h>
-#include <linux/irq.h>
-#include <linux/kernel.h> /* We are doing kernel work */
 #include <linux/module.h> /* Specifically, a module */
-#include <linux/poll.h>
+#include <linux/printk.h>
+#include <linux/types.h>
+
+#include <asm/errno.h>
 
 #include "chardev.h"
 #define SUCCESS 0
diff --git a/examples/completions.c b/examples/completions.c
index dddf5d7..197dea9 100644
--- a/examples/completions.c
+++ b/examples/completions.c
@@ -2,6 +2,7 @@
  * completions.c
  */
 #include <linux/completion.h>
+#include <linux/err.h> /* for IS_ERR() */
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/kthread.h>
diff --git a/examples/example_atomic.c b/examples/example_atomic.c
index 02d770f..4cd4897 100644
--- a/examples/example_atomic.c
+++ b/examples/example_atomic.c
@@ -1,7 +1,8 @@
 /*
  * example_atomic.c
  */
-#include <linux/interrupt.h>
+#include <linux/atomic.h>
+#include <linux/bitops.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 
diff --git a/examples/example_mutex.c b/examples/example_mutex.c
index 4eaf823..3149c23 100644
--- a/examples/example_mutex.c
+++ b/examples/example_mutex.c
@@ -1,7 +1,6 @@
 /*
  * example_mutex.c
  */
-#include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
diff --git a/examples/example_rwlock.c b/examples/example_rwlock.c
index 74a903f..9668e75 100644
--- a/examples/example_rwlock.c
+++ b/examples/example_rwlock.c
@@ -1,9 +1,9 @@
 /*
  * example_rwlock.c
  */
-#include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/rwlock.h>
 
 static DEFINE_RWLOCK(myrwlock);
 
diff --git a/examples/example_spinlock.c b/examples/example_spinlock.c
index 5b69df1..862291b 100644
--- a/examples/example_spinlock.c
+++ b/examples/example_spinlock.c
@@ -2,7 +2,6 @@
  * example_spinlock.c
  */
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>
diff --git a/examples/sleep.c b/examples/sleep.c
index 931ff5d..dff612a 100644
--- a/examples/sleep.c
+++ b/examples/sleep.c
@@ -3,13 +3,19 @@
  * at the same time, put all but one to sleep.
  */
 
+#include <linux/atomic.h>
+#include <linux/fs.h>
 #include <linux/kernel.h> /* We're doing kernel work */
 #include <linux/module.h> /* Specifically, a module */
 #include <linux/proc_fs.h> /* Necessary because we use proc fs */
-#include <linux/sched.h> /* For putting processes to sleep and
-                                   waking them up */
+#include <linux/types.h>
 #include <linux/uaccess.h> /* for get_user and put_user */
 #include <linux/version.h>
+#include <linux/wait.h> /* For putting processes to sleep and
+                                   waking them up */
+
+#include <asm/current.h>
+#include <asm/errno.h>
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0)
 #define HAVE_PROC_OPS