diff --git a/apps/app_echo.c b/apps/app_echo.c
index cebd468c68..e3cd3b1160 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 9a36fe759b..1e5b0c8575 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 50b14dbec9..99a1e160c1 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 a2a4c3d671..b4286d3064 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 0d73878499..4ddd24de31 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 9fe2388c82..a41ed5906d 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 c887fa7b01..9526965f04 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 851641f458..91d067d541 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 74e45c3187..abe73c5c46 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 c87af539db..933dd9ba12 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 =