From ea2c54859dc5b4473006dc766cbe1d3f7231134b Mon Sep 17 00:00:00 2001
From: Luigi Rizzo <rizzo@icir.org>
Date: Thu, 22 Nov 2007 02:07:33 +0000
Subject: [PATCH] more removal of redundant headers

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89519 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 apps/app_controlplayback.c   | 5 -----
 apps/app_dictate.c           | 2 --
 apps/app_directory.c         | 4 ----
 apps/app_mixmonitor.c        | 4 ----
 apps/app_readexten.c         | 3 ---
 apps/app_senddtmf.c          | 5 -----
 apps/app_stack.c             | 3 ---
 include/asterisk/audiohook.h | 4 ++++
 8 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/apps/app_controlplayback.c b/apps/app_controlplayback.c
index f5293633eb..edf10a1820 100644
--- a/apps/app_controlplayback.c
+++ b/apps/app_controlplayback.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/app.h"
 #include "asterisk/module.h"
-#include "asterisk/translate.h"
-#include "asterisk/utils.h"
 
 static const char *app = "ControlPlayback";
 
diff --git a/apps/app_dictate.c b/apps/app_dictate.c
index 65625b87fe..abd0ec11de 100644
--- a/apps/app_dictate.c
+++ b/apps/app_dictate.c
@@ -35,11 +35,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/paths.h"	/* use ast_config_AST_SPOOL_DIR */
 #include "asterisk/file.h"
-#include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/say.h"
-#include "asterisk/lock.h"
 #include "asterisk/app.h"
 
 static char *app = "Dictate";
diff --git a/apps/app_directory.c b/apps/app_directory.c
index 233b40495f..7f2dc4aa5a 100644
--- a/apps/app_directory.c
+++ b/apps/app_directory.c
@@ -32,14 +32,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <ctype.h>
 
 #include "asterisk/paths.h"	/* use ast_config_AST_SPOOL_DIR */
-#include "asterisk/lock.h"
 #include "asterisk/file.h"
-#include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
-#include "asterisk/config.h"
 #include "asterisk/say.h"
-#include "asterisk/utils.h"
 #include "asterisk/app.h"
 
 #ifdef ODBC_STORAGE
diff --git a/apps/app_mixmonitor.c b/apps/app_mixmonitor.c
index a2d6b323ee..bc24b4a189 100644
--- a/apps/app_mixmonitor.c
+++ b/apps/app_mixmonitor.c
@@ -39,15 +39,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/paths.h"	/* use ast_config_AST_MONITOR_DIR */
 #include "asterisk/file.h"
-#include "asterisk/channel.h"
 #include "asterisk/audiohook.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
-#include "asterisk/lock.h"
 #include "asterisk/cli.h"
 #include "asterisk/app.h"
-#include "asterisk/linkedlists.h"
-#include "asterisk/utils.h"
 
 #define get_volfactor(x) x ? ((x > 0) ? (1 << x) : ((1 << abs(x)) * -1)) : 0
 
diff --git a/apps/app_readexten.c b/apps/app_readexten.c
index 194cacf47e..21f7950fb4 100644
--- a/apps/app_readexten.c
+++ b/apps/app_readexten.c
@@ -29,13 +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/utils.h"
 #include "asterisk/indications.h"
 
 enum {
diff --git a/apps/app_senddtmf.c b/apps/app_senddtmf.c
index baced9868a..3e39736202 100644
--- a/apps/app_senddtmf.c
+++ b/apps/app_senddtmf.c
@@ -29,13 +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/translate.h"
-#include "asterisk/utils.h"
 #include "asterisk/app.h"
 #include "asterisk/manager.h"
 
diff --git a/apps/app_stack.c b/apps/app_stack.c
index adceaeb783..8d3d7bcc93 100644
--- a/apps/app_stack.c
+++ b/apps/app_stack.c
@@ -29,11 +29,8 @@
  
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include "asterisk/channel.h"
-#include "asterisk/chanvars.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
-#include "asterisk/config.h"
 #include "asterisk/app.h"
 #include "asterisk/manager.h"
 
diff --git a/include/asterisk/audiohook.h b/include/asterisk/audiohook.h
index 7bfb1d0082..1591d0ca57 100644
--- a/include/asterisk/audiohook.h
+++ b/include/asterisk/audiohook.h
@@ -27,6 +27,10 @@
 extern "C" {
 #endif
 
+/* these two are used in struct ast_audiohook */
+#include "asterisk/lock.h"
+#include "asterisk/linkedlists.h"
+
 #include "asterisk/slinfactory.h"
 
 enum ast_audiohook_type {