diff --git a/apps/app_echo.c b/apps/app_echo.c
index cebd468c680d9455f0d7e98507eaa1ecd49c14a9..e3cd3b116030e2f56ba5c8b4214e09e556ffe9c3 100644
--- a/apps/app_echo.c
+++ b/apps/app_echo.c
@@ -29,9 +29,7 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include "asterisk/lock.h"
 #include "asterisk/file.h"
-#include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 
diff --git a/apps/app_image.c b/apps/app_image.c
index 9a36fe759bda87d57718b7927006152bb788e106..1e5b0c8575623b00ed699411b9917c372dddec93 100644
--- a/apps/app_image.c
+++ b/apps/app_image.c
@@ -29,14 +29,9 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include "asterisk/lock.h"
-#include "asterisk/file.h"
-#include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
-#include "asterisk/translate.h"
 #include "asterisk/image.h"
-#include "asterisk/app.h"
 
 static char *app = "SendImage";
 
diff --git a/apps/app_milliwatt.c b/apps/app_milliwatt.c
index 50b14dbec9db3f3c3b9bd6d5048695cf8b11eb05..99a1e160c1998631c4c7c442a689d5af890f43f8 100644
--- a/apps/app_milliwatt.c
+++ b/apps/app_milliwatt.c
@@ -29,12 +29,8 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include "asterisk/lock.h"
-#include "asterisk/file.h"
-#include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
-#include "asterisk/utils.h"
 
 static char *app = "Milliwatt";
 
diff --git a/apps/app_playback.c b/apps/app_playback.c
index a2a4c3d67127288058613a61730320fe55f97600..b4286d30646226d09b250af0feba40efbf7ddac0 100644
--- a/apps/app_playback.c
+++ b/apps/app_playback.c
@@ -29,17 +29,15 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include "asterisk/lock.h"
 #include "asterisk/file.h"
-#include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
-#include "asterisk/translate.h"
-#include "asterisk/utils.h"
 #include "asterisk/app.h"
+/* This file provides config-file based 'say' functions, and implenents
+ * some CLI commands.
+ */
+#include "asterisk/say.h"	/* provides config-file based 'say' functions */
 #include "asterisk/cli.h"
-#include "asterisk/localtime.h"
-#include "asterisk/say.h"
 
 static char *app = "Playback";
 
diff --git a/apps/app_read.c b/apps/app_read.c
index 0d73878499bdc57d10939562e4ae3c5b28538f7f..4ddd24de31c40f66dfe50eb108af3890a3bb2a33 100644
--- a/apps/app_read.c
+++ b/apps/app_read.c
@@ -29,14 +29,10 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include "asterisk/lock.h"
 #include "asterisk/file.h"
-#include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/app.h"
 #include "asterisk/module.h"
-#include "asterisk/translate.h"
-#include "asterisk/utils.h"
 #include "asterisk/indications.h"
 
 enum {
diff --git a/apps/app_record.c b/apps/app_record.c
index 9fe2388c82fdee6a7b259e71ea5dfcd8cd33f0b6..a41ed5906d0350ec51116dccb34885d77e2c471a 100644
--- a/apps/app_record.c
+++ b/apps/app_record.c
@@ -29,15 +29,11 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include "asterisk/lock.h"
 #include "asterisk/file.h"
-#include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
-#include "asterisk/translate.h"
-#include "asterisk/dsp.h"
-#include "asterisk/utils.h"
 #include "asterisk/app.h"
+#include "asterisk/dsp.h"	/* use dsp routines for silence detection */
 
 
 static char *app = "Record";
diff --git a/apps/app_system.c b/apps/app_system.c
index c887fa7b01f71e4f0d55b059b618d770691b263e..9526965f04e1743a3a2f349b46c574ef8905925f 100644
--- a/apps/app_system.c
+++ b/apps/app_system.c
@@ -29,9 +29,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include "asterisk/lock.h"
-#include "asterisk/file.h"
-#include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/app.h"
diff --git a/apps/app_userevent.c b/apps/app_userevent.c
index 851641f4586728c6855a2bc34d272f1875eb1633..91d067d541c75857f4a0acc7a9f94955c130e448 100644
--- a/apps/app_userevent.c
+++ b/apps/app_userevent.c
@@ -25,9 +25,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include "asterisk/lock.h"
-#include "asterisk/file.h"
-#include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/manager.h"
diff --git a/apps/app_verbose.c b/apps/app_verbose.c
index 74e45c31879f2715b211229a1c77ffb16fe079fa..abe73c5c46bfd3c00c3bcbd17c36dfe62f99750e 100644
--- a/apps/app_verbose.c
+++ b/apps/app_verbose.c
@@ -28,7 +28,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/app.h"
diff --git a/apps/app_while.c b/apps/app_while.c
index c87af539db40268cddf1e6d6d946ee9edf83f322..933dd9ba12e4f02b9c5b8997de5ccd3031b621eb 100644
--- a/apps/app_while.c
+++ b/apps/app_while.c
@@ -29,13 +29,8 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include "asterisk/file.h"
-#include "asterisk/channel.h"
-#include "asterisk/utils.h"
-#include "asterisk/config.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
-#include "asterisk/lock.h"
 
 static char *start_app = "While";
 static char *start_desc =