more removal of redundant headers

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89519 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_controlplayback.c b/apps/app_controlplayback.c
index f5293633ebaaa5ba284ecf4547292289d0b08e3c..edf10a18202e7fe189104d1afbf084b917b9c349 100644 (file)
--- 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 65625b87fe5a6aa09803b195ebd12e467501c2b0..abd0ec11de3e8c10c148f12d864fe03bdcb63956 100644 (file)
--- 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 233b40495f6f9e828a6557807ad154aa4c55974a..7f2dc4aa5adc318654075ab834e27a8e30dd0e86 100644 (file)
--- 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 a2d6b323ee7b5c8f827ae2b23fa619c6599bb7d8..bc24b4a18956e21ecf5bb77e4d68cb3be5c9cfc4 100644 (file)
--- 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 194cacf47ecb02b6a3b5b0c8a796de2310cd3a2d..21f7950fb457d29d680fa4524bc31c01a92ca26a 100644 (file)
--- 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 baced9868a961728035a37ed6203ed85c8319ccc..3e39736202e6bfbd0078aea10a7f5f48a2a414e0 100644 (file)
--- 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 adceaeb7839a3bb9749ea076547670bb45b70a2b..8d3d7bcc938c2d30155d98d62e71b6efa378c154 100644 (file)
--- 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 7bfb1d00821b9438801ea9f337472bdfc50cdd2d..1591d0ca57d8ee40525b2157bc8fa703b8281d1c 100644 (file)
--- 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 {