15 files changed, 14 insertions, 8 deletions
diff --git a/apps/app_cdr.c b/apps/app_cdr.c
index 8ef10ba97..86b1db219 100644
--- a/apps/app_cdr.c
+++ b/apps/app_cdr.c
@@ -31,7 +31,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/channel.h"
 #include "asterisk/module.h"
-#include "asterisk/pbx.h"
 
 static char *nocdr_descrip = 
 "  NoCDR(): This application will tell Asterisk not to maintain a CDR for the\n"
diff --git a/apps/app_dumpchan.c b/apps/app_dumpchan.c
index 85f6789ca..48fb6215d 100644
--- a/apps/app_dumpchan.c
+++ b/apps/app_dumpchan.c
@@ -32,12 +32,9 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include "asterisk/file.h"
-#include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
-#include "asterisk/utils.h"
-#include "asterisk/lock.h"
+#include "asterisk/channel.h"
 
 static char *app = "DumpChan";
 static char *synopsis = "Dump Info About The Calling Channel";
diff --git a/apps/app_echo.c b/apps/app_echo.c
index e3cd3b116..b12b08f89 100644
--- a/apps/app_echo.c
+++ b/apps/app_echo.c
@@ -32,6 +32,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/file.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
+#include "asterisk/channel.h"
 
 static char *app = "Echo";
 
diff --git a/apps/app_milliwatt.c b/apps/app_milliwatt.c
index 99a1e160c..315e86ab1 100644
--- a/apps/app_milliwatt.c
+++ b/apps/app_milliwatt.c
@@ -31,6 +31,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
+#include "asterisk/channel.h"
 
 static char *app = "Milliwatt";
 
diff --git a/apps/app_mixmonitor.c b/apps/app_mixmonitor.c
index bc24b4a18..f60d6f05f 100644
--- a/apps/app_mixmonitor.c
+++ b/apps/app_mixmonitor.c
@@ -44,6 +44,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/module.h"
 #include "asterisk/cli.h"
 #include "asterisk/app.h"
+#include "asterisk/channel.h"
 
 #define get_volfactor(x) x ? ((x > 0) ? (1 << x) : ((1 << abs(x)) * -1)) : 0
 
diff --git a/apps/app_read.c b/apps/app_read.c
index 4ddd24de3..a7fdf624b 100644
--- a/apps/app_read.c
+++ b/apps/app_read.c
@@ -31,6 +31,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/file.h"
 #include "asterisk/pbx.h"
+#include "asterisk/channel.h"
 #include "asterisk/app.h"
 #include "asterisk/module.h"
 #include "asterisk/indications.h"
diff --git a/apps/app_readexten.c b/apps/app_readexten.c
index 21f7950fb..cb4fd8c2a 100644
--- a/apps/app_readexten.c
+++ b/apps/app_readexten.c
@@ -34,6 +34,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/app.h"
 #include "asterisk/module.h"
 #include "asterisk/indications.h"
+#include "asterisk/channel.h"
 
 enum {
 	OPT_SKIP = (1 << 0),
diff --git a/apps/app_record.c b/apps/app_record.c
index a41ed5906..7214e1f07 100644
--- a/apps/app_record.c
+++ b/apps/app_record.c
@@ -33,6 +33,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/app.h"
+#include "asterisk/channel.h"
 #include "asterisk/dsp.h"	/* use dsp routines for silence detection */
 
 
diff --git a/apps/app_senddtmf.c b/apps/app_senddtmf.c
index 3e3973620..67bd4feaa 100644
--- a/apps/app_senddtmf.c
+++ b/apps/app_senddtmf.c
@@ -33,6 +33,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/module.h"
 #include "asterisk/app.h"
 #include "asterisk/manager.h"
+#include "asterisk/channel.h"
 
 static char *app = "SendDTMF";
 
diff --git a/apps/app_stack.c b/apps/app_stack.c
index 8d3d7bcc9..341b4c1d9 100644
--- a/apps/app_stack.c
+++ b/apps/app_stack.c
@@ -33,6 +33,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/module.h"
 #include "asterisk/app.h"
 #include "asterisk/manager.h"
+#include "asterisk/channel.h"
 
 static const char *app_gosub = "Gosub";
 static const char *app_gosubif = "GosubIf";
diff --git a/apps/app_system.c b/apps/app_system.c
index 9526965f0..1f39c5a4e 100644
--- a/apps/app_system.c
+++ b/apps/app_system.c
@@ -32,6 +32,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/app.h"
+#include "asterisk/channel.h"	/* autoservice */
 
 static char *app = "System";
 
diff --git a/apps/app_transfer.c b/apps/app_transfer.c
index 96c514eeb..ee6c2c588 100644
--- a/apps/app_transfer.c
+++ b/apps/app_transfer.c
@@ -31,12 +31,10 @@
 
 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"
+#include "asterisk/channel.h"
 
 
 static const char *app = "Transfer";
diff --git a/apps/app_url.c b/apps/app_url.c
index 169511689..f71b32fd0 100644
--- a/apps/app_url.c
+++ b/apps/app_url.c
@@ -32,6 +32,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/app.h"
+#include "asterisk/channel.h"
 
 static char *app = "SendURL";
 
diff --git a/apps/app_verbose.c b/apps/app_verbose.c
index abe73c5c4..0f7145131 100644
--- a/apps/app_verbose.c
+++ b/apps/app_verbose.c
@@ -31,6 +31,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/app.h"
+#include "asterisk/channel.h"
 
 static char *app_verbose = "Verbose";
 static char *verbose_synopsis = "Send arbitrary text to verbose output";
diff --git a/apps/app_while.c b/apps/app_while.c
index 933dd9ba1..1c61d966e 100644
--- a/apps/app_while.c
+++ b/apps/app_while.c
@@ -31,6 +31,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
+#include "asterisk/channel.h"
 
 static char *start_app = "While";
 static char *start_desc =