aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/app_controlplayback.c5
-rw-r--r--apps/app_dictate.c2
-rw-r--r--apps/app_directory.c4
-rw-r--r--apps/app_mixmonitor.c4
-rw-r--r--apps/app_readexten.c3
-rw-r--r--apps/app_senddtmf.c5
-rw-r--r--apps/app_stack.c3
-rw-r--r--include/asterisk/audiohook.h4
8 files changed, 4 insertions, 26 deletions
diff --git a/apps/app_controlplayback.c b/apps/app_controlplayback.c
index f5293633e..edf10a182 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 65625b87f..abd0ec11d 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 233b40495..7f2dc4aa5 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 a2d6b323e..bc24b4a18 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 194cacf47..21f7950fb 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 baced9868..3e3973620 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 adceaeb78..8d3d7bcc9 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 7bfb1d008..1591d0ca5 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 {