remove another set of redundant #include "asterisk/options.h"

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@89512 f38db490-d61c-443f-a65b-d21fe96a405b

57 files changed, 0 insertions, 57 deletions

diff --git a/apps/app_adsiprog.c b/apps/app_adsiprog.c
index 9997ae931..ad0837e6a 100644
--- a/apps/app_adsiprog.c
+++ b/apps/app_adsiprog.c
@@ -42,7 +42,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/adsi.h"
-#include "asterisk/options.h"
 #include "asterisk/utils.h"
 #include "asterisk/lock.h"
 
diff --git a/apps/app_alarmreceiver.c b/apps/app_alarmreceiver.c
index 3da502709..5a990d9d5 100644
--- a/apps/app_alarmreceiver.c
+++ b/apps/app_alarmreceiver.c
@@ -44,7 +44,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
 #include "asterisk/ulaw.h"
-#include "asterisk/options.h"
 #include "asterisk/app.h"
 #include "asterisk/dsp.h"
 #include "asterisk/config.h"
diff --git a/apps/app_amd.c b/apps/app_amd.c
index fbf23c9de..0e1665395 100644
--- a/apps/app_amd.c
+++ b/apps/app_amd.c
@@ -33,7 +33,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/module.h"
 #include "asterisk/lock.h"
-#include "asterisk/options.h"
 #include "asterisk/channel.h"
 #include "asterisk/dsp.h"
 #include "asterisk/pbx.h"
diff --git a/apps/app_authenticate.c b/apps/app_authenticate.c
index 11d699d03..1a49bf337 100644
--- a/apps/app_authenticate.c
+++ b/apps/app_authenticate.c
@@ -37,7 +37,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/app.h"
 #include "asterisk/astdb.h"
 #include "asterisk/utils.h"
-#include "asterisk/options.h"
 
 enum {
 	OPT_ACCOUNT = (1 << 0),
diff --git a/apps/app_chanisavail.c b/apps/app_chanisavail.c
index 4a8b9bf28..67d29e6ee 100644
--- a/apps/app_chanisavail.c
+++ b/apps/app_chanisavail.c
@@ -40,7 +40,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/module.h"
 #include "asterisk/app.h"
 #include "asterisk/devicestate.h"
-#include "asterisk/options.h"
 
 static char *app = "ChanIsAvail";
 
diff --git a/apps/app_channelredirect.c b/apps/app_channelredirect.c
index a092690b5..325c681ac 100644
--- a/apps/app_channelredirect.c
+++ b/apps/app_channelredirect.c
@@ -34,7 +34,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/lock.h"
 #include "asterisk/app.h"
 #include "asterisk/features.h"
-#include "asterisk/options.h"
 
 static char *app = "ChannelRedirect";
 static char *synopsis = "Redirects given channel to a dialplan target.";
diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c
index e41614343..250820fbc 100644
--- a/apps/app_chanspy.c
+++ b/apps/app_chanspy.c
@@ -38,7 +38,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/channel.h"
 #include "asterisk/audiohook.h"
 #include "asterisk/features.h"
-#include "asterisk/options.h"
 #include "asterisk/app.h"
 #include "asterisk/utils.h"
 #include "asterisk/say.h"
diff --git a/apps/app_controlplayback.c b/apps/app_controlplayback.c
index 626d6b5fc..f5293633e 100644
--- a/apps/app_controlplayback.c
+++ b/apps/app_controlplayback.c
@@ -37,7 +37,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
 #include "asterisk/utils.h"
-#include "asterisk/options.h"
 
 static const char *app = "ControlPlayback";
 
diff --git a/apps/app_db.c b/apps/app_db.c
index faf28c0d2..0cc5043ce 100644
--- a/apps/app_db.c
+++ b/apps/app_db.c
@@ -32,7 +32,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include "asterisk/options.h"
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
diff --git a/apps/app_dial.c b/apps/app_dial.c
index 57756e5b0..a4d955778 100644
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -39,7 +39,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
-#include "asterisk/options.h"
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
 #include "asterisk/say.h"
diff --git a/apps/app_directed_pickup.c b/apps/app_directed_pickup.c
index b823f5816..07d81c869 100644
--- a/apps/app_directed_pickup.c
+++ b/apps/app_directed_pickup.c
@@ -35,7 +35,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/module.h"
 #include "asterisk/lock.h"
 #include "asterisk/app.h"
-#include "asterisk/options.h"
 #include "asterisk/features.h"
 
 #define PICKUPMARK "PICKUPMARK"
diff --git a/apps/app_disa.c b/apps/app_disa.c
index 9ca3ae867..ac74c78a4 100644
--- a/apps/app_disa.c
+++ b/apps/app_disa.c
@@ -44,7 +44,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/ulaw.h"
 #include "asterisk/callerid.h"
 #include "asterisk/stringfields.h"
-#include "asterisk/options.h"
 
 static char *app = "DISA";
 
diff --git a/apps/app_dumpchan.c b/apps/app_dumpchan.c
index 1f5425ebb..85f6789ca 100644
--- a/apps/app_dumpchan.c
+++ b/apps/app_dumpchan.c
@@ -36,7 +36,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
-#include "asterisk/options.h"
 #include "asterisk/utils.h"
 #include "asterisk/lock.h"
 
diff --git a/apps/app_exec.c b/apps/app_exec.c
index 69eb458e0..83755a8f9 100644
--- a/apps/app_exec.c
+++ b/apps/app_exec.c
@@ -31,7 +31,6 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/file.h"
-#include "asterisk/options.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
diff --git a/apps/app_externalivr.c b/apps/app_externalivr.c
index 8ebb60c5f..3de290f32 100644
--- a/apps/app_externalivr.c
+++ b/apps/app_externalivr.c
@@ -45,7 +45,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/linkedlists.h"
 #include "asterisk/app.h"
 #include "asterisk/utils.h"
-#include "asterisk/options.h"
 
 static const char *app = "ExternalIVR";
 
diff --git a/apps/app_festival.c b/apps/app_festival.c
index 9e1edbdb8..926638e57 100644
--- a/apps/app_festival.c
+++ b/apps/app_festival.c
@@ -47,7 +47,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/config.h"
 #include "asterisk/utils.h"
 #include "asterisk/lock.h"
-#include "asterisk/options.h"
 #include "asterisk/app.h"
 
 #define FESTIVAL_CONFIG "festival.conf"
diff --git a/apps/app_flash.c b/apps/app_flash.c
index 37965fe50..d57feeb91 100644
--- a/apps/app_flash.c
+++ b/apps/app_flash.c
@@ -42,7 +42,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
 #include "asterisk/image.h"
-#include "asterisk/options.h"
 
 static char *app = "Flash";
 
diff --git a/apps/app_followme.c b/apps/app_followme.c
index 48677d6bd..d002c26b9 100644
--- a/apps/app_followme.c
+++ b/apps/app_followme.c
@@ -39,7 +39,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
-#include "asterisk/options.h"
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
 #include "asterisk/say.h"
diff --git a/apps/app_getcpeid.c b/apps/app_getcpeid.c
index 1eaf17a90..1bab819b7 100644
--- a/apps/app_getcpeid.c
+++ b/apps/app_getcpeid.c
@@ -35,7 +35,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/adsi.h"
-#include "asterisk/options.h"
 
 static char *app = "GetCPEID";
 
diff --git a/apps/app_ices.c b/apps/app_ices.c
index 0c00178e0..9397b3c7a 100644
--- a/apps/app_ices.c
+++ b/apps/app_ices.c
@@ -43,7 +43,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
-#include "asterisk/options.h"
 
 #define ICES "/usr/bin/ices"
 #define LOCAL_ICES "/usr/local/bin/ices"
diff --git a/apps/app_image.c b/apps/app_image.c
index 28598f5d1..9a36fe759 100644
--- a/apps/app_image.c
+++ b/apps/app_image.c
@@ -37,7 +37,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/translate.h"
 #include "asterisk/image.h"
 #include "asterisk/app.h"
-#include "asterisk/options.h"
 
 static char *app = "SendImage";
 
diff --git a/apps/app_macro.c b/apps/app_macro.c
index f35e9e51e..b087ad36b 100644
--- a/apps/app_macro.c
+++ b/apps/app_macro.c
@@ -33,7 +33,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
-#include "asterisk/options.h"
 #include "asterisk/config.h"
 #include "asterisk/utils.h"
 #include "asterisk/lock.h"
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 48250b2df..c5a4a9efb 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -49,7 +49,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/dsp.h"
 #include "asterisk/musiconhold.h"
 #include "asterisk/manager.h"
-#include "asterisk/options.h"
 #include "asterisk/cli.h"
 #include "asterisk/say.h"
 #include "asterisk/utils.h"
diff --git a/apps/app_minivm.c b/apps/app_minivm.c
index 94fb1f62d..20d10699b 100644
--- a/apps/app_minivm.c
+++ b/apps/app_minivm.c
@@ -160,7 +160,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
-#include "asterisk/options.h"
 #include "asterisk/config.h"
 #include "asterisk/say.h"
 #include "asterisk/module.h"
diff --git a/apps/app_mixmonitor.c b/apps/app_mixmonitor.c
index 1ce333bf9..a2d6b323e 100644
--- a/apps/app_mixmonitor.c
+++ b/apps/app_mixmonitor.c
@@ -45,7 +45,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/module.h"
 #include "asterisk/lock.h"
 #include "asterisk/cli.h"
-#include "asterisk/options.h"
 #include "asterisk/app.h"
 #include "asterisk/linkedlists.h"
 #include "asterisk/utils.h"
diff --git a/apps/app_morsecode.c b/apps/app_morsecode.c
index e9b7aab22..6c88ed32c 100644
--- a/apps/app_morsecode.c
+++ b/apps/app_morsecode.c
@@ -29,7 +29,6 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/file.h"
-#include "asterisk/options.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
diff --git a/apps/app_mp3.c b/apps/app_mp3.c
index 6404276b9..1f9be6e77 100644
--- a/apps/app_mp3.c
+++ b/apps/app_mp3.c
@@ -40,7 +40,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
-#include "asterisk/options.h"
 
 #define LOCAL_MPG_123 "/usr/local/bin/mpg123"
 #define MPG_123 "/usr/bin/mpg123"
diff --git a/apps/app_nbscat.c b/apps/app_nbscat.c
index 4c212564f..4e7203319 100644
--- a/apps/app_nbscat.c
+++ b/apps/app_nbscat.c
@@ -41,7 +41,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
-#include "asterisk/options.h"
 
 #define LOCAL_NBSCAT "/usr/local/bin/nbscat8k"
 #define NBSCAT "/usr/bin/nbscat8k"
diff --git a/apps/app_osplookup.c b/apps/app_osplookup.c
index 39027f493..46618f43e 100644
--- a/apps/app_osplookup.c
+++ b/apps/app_osplookup.c
@@ -48,7 +48,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/app.h"
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
-#include "asterisk/options.h"
 #include "asterisk/cli.h"
 #include "asterisk/astosp.h"
 
diff --git a/apps/app_page.c b/apps/app_page.c
index 5702735b3..2ea367edd 100644
--- a/apps/app_page.c
+++ b/apps/app_page.c
@@ -34,7 +34,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include "asterisk/options.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
diff --git a/apps/app_parkandannounce.c b/apps/app_parkandannounce.c
index fc63772a7..7ad7a6416 100644
--- a/apps/app_parkandannounce.c
+++ b/apps/app_parkandannounce.c
@@ -38,7 +38,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/features.h"
-#include "asterisk/options.h"
 #include "asterisk/say.h"
 #include "asterisk/lock.h"
 #include "asterisk/utils.h"
diff --git a/apps/app_playback.c b/apps/app_playback.c
index a970e6c05..a2a4c3d67 100644
--- a/apps/app_playback.c
+++ b/apps/app_playback.c
@@ -36,7 +36,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
 #include "asterisk/utils.h"
-#include "asterisk/options.h"
 #include "asterisk/app.h"
 #include "asterisk/cli.h"
 #include "asterisk/localtime.h"
diff --git a/apps/app_privacy.c b/apps/app_privacy.c
index ecae9c15d..009b9d2a6 100644
--- a/apps/app_privacy.c
+++ b/apps/app_privacy.c
@@ -32,7 +32,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/utils.h"
-#include "asterisk/options.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
diff --git a/apps/app_queue.c b/apps/app_queue.c
index ec18fb457..382982351 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -68,7 +68,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
-#include "asterisk/options.h"
 #include "asterisk/app.h"
 #include "asterisk/linkedlists.h"
 #include "asterisk/module.h"
diff --git a/apps/app_read.c b/apps/app_read.c
index c6a7e45df..0d7387849 100644
--- a/apps/app_read.c
+++ b/apps/app_read.c
@@ -36,7 +36,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/app.h"
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
-#include "asterisk/options.h"
 #include "asterisk/utils.h"
 #include "asterisk/indications.h"
 
diff --git a/apps/app_readexten.c b/apps/app_readexten.c
index eda674b33..194cacf47 100644
--- a/apps/app_readexten.c
+++ b/apps/app_readexten.c
@@ -35,7 +35,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/pbx.h"
 #include "asterisk/app.h"
 #include "asterisk/module.h"
-#include "asterisk/options.h"
 #include "asterisk/utils.h"
 #include "asterisk/indications.h"
 
diff --git a/apps/app_readfile.c b/apps/app_readfile.c
index 82ffb3118..8762ef860 100644
--- a/apps/app_readfile.c
+++ b/apps/app_readfile.c
@@ -30,7 +30,6 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/file.h"
-#include "asterisk/options.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/app.h"
diff --git a/apps/app_record.c b/apps/app_record.c
index 0b698be5a..9fe2388c8 100644
--- a/apps/app_record.c
+++ b/apps/app_record.c
@@ -37,7 +37,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/translate.h"
 #include "asterisk/dsp.h"
 #include "asterisk/utils.h"
-#include "asterisk/options.h"
 #include "asterisk/app.h"
 
 
diff --git a/apps/app_rpt.c b/apps/app_rpt.c
index ad4b15006..4bca3e07b 100644
--- a/apps/app_rpt.c
+++ b/apps/app_rpt.c
@@ -230,7 +230,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
 #include "asterisk/features.h"
-#include "asterisk/options.h"
 #include "asterisk/cli.h"
 #include "asterisk/config.h"
 #include "asterisk/say.h"
diff --git a/apps/app_sayunixtime.c b/apps/app_sayunixtime.c
index 2d084fc99..d0e23449e 100644
--- a/apps/app_sayunixtime.c
+++ b/apps/app_sayunixtime.c
@@ -30,7 +30,6 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/file.h"
-#include "asterisk/options.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
diff --git a/apps/app_senddtmf.c b/apps/app_senddtmf.c
index 7fd13f9c7..baced9868 100644
--- a/apps/app_senddtmf.c
+++ b/apps/app_senddtmf.c
@@ -35,7 +35,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
-#include "asterisk/options.h"
 #include "asterisk/utils.h"
 #include "asterisk/app.h"
 #include "asterisk/manager.h"
diff --git a/apps/app_sendtext.c b/apps/app_sendtext.c
index 46660e4e4..3909b306e 100644
--- a/apps/app_sendtext.c
+++ b/apps/app_sendtext.c
@@ -38,7 +38,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
 #include "asterisk/image.h"
-#include "asterisk/options.h"
 #include "asterisk/app.h"
 
 static const char *app = "SendText";
diff --git a/apps/app_sms.c b/apps/app_sms.c
index 80fdf9f81..3c54d43f1 100644
--- a/apps/app_sms.c
+++ b/apps/app_sms.c
@@ -45,7 +45,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/paths.h"	/* use ast_config_AST_SPOOL_DIR and LOG_DIR */
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
-#include "asterisk/options.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
diff --git a/apps/app_stack.c b/apps/app_stack.c
index a175438a1..adceaeb78 100644
--- a/apps/app_stack.c
+++ b/apps/app_stack.c
@@ -29,7 +29,6 @@
  
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include "asterisk/options.h"
 #include "asterisk/channel.h"
 #include "asterisk/chanvars.h"
 #include "asterisk/pbx.h"
diff --git a/apps/app_system.c b/apps/app_system.c
index e260baa31..c887fa7b0 100644
--- a/apps/app_system.c
+++ b/apps/app_system.c
@@ -35,7 +35,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/app.h"
-#include "asterisk/options.h"
 
 static char *app = "System";
 
diff --git a/apps/app_talkdetect.c b/apps/app_talkdetect.c
index d80af7d87..0aa5e818b 100644
--- a/apps/app_talkdetect.c
+++ b/apps/app_talkdetect.c
@@ -37,7 +37,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/translate.h"
 #include "asterisk/utils.h"
 #include "asterisk/dsp.h"
-#include "asterisk/options.h"
 #include "asterisk/app.h"
 
 static char *app = "BackgroundDetect";
diff --git a/apps/app_test.c b/apps/app_test.c
index 89853cb6b..03adc2e82 100644
--- a/apps/app_test.c
+++ b/apps/app_test.c
@@ -36,7 +36,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/paths.h"	/* use ast_config_AST_LOG_DIR */
 #include "asterisk/channel.h"
-#include "asterisk/options.h"
 #include "asterisk/module.h"
 #include "asterisk/lock.h"
 #include "asterisk/app.h"
diff --git a/apps/app_transfer.c b/apps/app_transfer.c
index b808eb415..96c514eeb 100644
--- a/apps/app_transfer.c
+++ b/apps/app_transfer.c
@@ -36,7 +36,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
-#include "asterisk/options.h"
 #include "asterisk/app.h"
 
 
diff --git a/apps/app_url.c b/apps/app_url.c
index 7d0eb00d7..44c3909fe 100644
--- a/apps/app_url.c
+++ b/apps/app_url.c
@@ -36,7 +36,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
 #include "asterisk/image.h"
-#include "asterisk/options.h"
 #include "asterisk/app.h"
 
 static char *app = "SendURL";
diff --git a/apps/app_verbose.c b/apps/app_verbose.c
index d3719e901..74e45c318 100644
--- a/apps/app_verbose.c
+++ b/apps/app_verbose.c
@@ -28,7 +28,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include "asterisk/options.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 297fd25d2..1ae60edda 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -91,7 +91,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
-#include "asterisk/options.h"
 #include "asterisk/config.h"
 #include "asterisk/say.h"
 #include "asterisk/module.h"
diff --git a/apps/app_waitforring.c b/apps/app_waitforring.c
index 76717444c..b4248fee9 100644
--- a/apps/app_waitforring.c
+++ b/apps/app_waitforring.c
@@ -33,7 +33,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
-#include "asterisk/options.h"
 #include "asterisk/lock.h"
 
 static char *synopsis = "Wait for Ring Application";
diff --git a/apps/app_waitforsilence.c b/apps/app_waitforsilence.c
index 1984a5aba..e45f24344 100644
--- a/apps/app_waitforsilence.c
+++ b/apps/app_waitforsilence.c
@@ -41,7 +41,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/pbx.h"
 #include "asterisk/dsp.h"
 #include "asterisk/module.h"
-#include "asterisk/options.h"
 
 static char *app = "WaitForSilence";
 static char *synopsis = "Waits for a specified amount of silence";
diff --git a/apps/app_while.c b/apps/app_while.c
index ed6c0615a..c87af539d 100644
--- a/apps/app_while.c
+++ b/apps/app_while.c
@@ -36,7 +36,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/lock.h"
-#include "asterisk/options.h"
 
 static char *start_app = "While";
 static char *start_desc = 
diff --git a/apps/app_zapbarge.c b/apps/app_zapbarge.c
index 3732545fa..9e2ff67fc 100644
--- a/apps/app_zapbarge.c
+++ b/apps/app_zapbarge.c
@@ -48,7 +48,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/module.h"
 #include "asterisk/config.h"
 #include "asterisk/app.h"
-#include "asterisk/options.h"
 #include "asterisk/cli.h"
 #include "asterisk/say.h"
 #include "asterisk/utils.h"
diff --git a/apps/app_zapras.c b/apps/app_zapras.c
index 4af24231e..bc3b51dba 100644
--- a/apps/app_zapras.c
+++ b/apps/app_zapras.c
@@ -50,7 +50,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
-#include "asterisk/options.h"
 
 static char *app = "ZapRAS";
 
diff --git a/apps/app_zapscan.c b/apps/app_zapscan.c
index 27f3a3ec7..99f24b8a9 100644
--- a/apps/app_zapscan.c
+++ b/apps/app_zapscan.c
@@ -47,7 +47,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/module.h"
 #include "asterisk/config.h"
 #include "asterisk/app.h"
-#include "asterisk/options.h"
 #include "asterisk/utils.h"
 #include "asterisk/cli.h"
 #include "asterisk/say.h"