aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/app_adsiprog.c1
-rw-r--r--apps/app_alarmreceiver.c1
-rw-r--r--apps/app_amd.c1
-rw-r--r--apps/app_authenticate.c1
-rw-r--r--apps/app_chanisavail.c1
-rw-r--r--apps/app_channelredirect.c1
-rw-r--r--apps/app_chanspy.c1
-rw-r--r--apps/app_controlplayback.c1
-rw-r--r--apps/app_db.c1
-rw-r--r--apps/app_dial.c1
-rw-r--r--apps/app_directed_pickup.c1
-rw-r--r--apps/app_disa.c1
-rw-r--r--apps/app_dumpchan.c1
-rw-r--r--apps/app_exec.c1
-rw-r--r--apps/app_externalivr.c1
-rw-r--r--apps/app_festival.c1
-rw-r--r--apps/app_flash.c1
-rw-r--r--apps/app_followme.c1
-rw-r--r--apps/app_getcpeid.c1
-rw-r--r--apps/app_ices.c1
-rw-r--r--apps/app_image.c1
-rw-r--r--apps/app_macro.c1
-rw-r--r--apps/app_meetme.c1
-rw-r--r--apps/app_minivm.c1
-rw-r--r--apps/app_mixmonitor.c1
-rw-r--r--apps/app_morsecode.c1
-rw-r--r--apps/app_mp3.c1
-rw-r--r--apps/app_nbscat.c1
-rw-r--r--apps/app_osplookup.c1
-rw-r--r--apps/app_page.c1
-rw-r--r--apps/app_parkandannounce.c1
-rw-r--r--apps/app_playback.c1
-rw-r--r--apps/app_privacy.c1
-rw-r--r--apps/app_queue.c1
-rw-r--r--apps/app_read.c1
-rw-r--r--apps/app_readexten.c1
-rw-r--r--apps/app_readfile.c1
-rw-r--r--apps/app_record.c1
-rw-r--r--apps/app_rpt.c1
-rw-r--r--apps/app_sayunixtime.c1
-rw-r--r--apps/app_senddtmf.c1
-rw-r--r--apps/app_sendtext.c1
-rw-r--r--apps/app_sms.c1
-rw-r--r--apps/app_stack.c1
-rw-r--r--apps/app_system.c1
-rw-r--r--apps/app_talkdetect.c1
-rw-r--r--apps/app_test.c1
-rw-r--r--apps/app_transfer.c1
-rw-r--r--apps/app_url.c1
-rw-r--r--apps/app_verbose.c1
-rw-r--r--apps/app_voicemail.c1
-rw-r--r--apps/app_waitforring.c1
-rw-r--r--apps/app_waitforsilence.c1
-rw-r--r--apps/app_while.c1
-rw-r--r--apps/app_zapbarge.c1
-rw-r--r--apps/app_zapras.c1
-rw-r--r--apps/app_zapscan.c1
-rw-r--r--cdr/cdr_adaptive_odbc.c1
-rw-r--r--cdr/cdr_csv.c1
-rw-r--r--cdr/cdr_odbc.c1
-rw-r--r--cdr/cdr_pgsql.c1
-rw-r--r--cdr/cdr_radius.c1
-rw-r--r--cdr/cdr_sqlite3_custom.c1
-rw-r--r--cdr/cdr_tds.c1
-rw-r--r--channels/chan_agent.c1
-rw-r--r--channels/chan_alsa.c1
-rw-r--r--channels/chan_features.c1
-rw-r--r--channels/chan_gtalk.c1
-rw-r--r--channels/chan_h323.c1
-rw-r--r--channels/chan_iax2.c1
-rw-r--r--channels/chan_jingle.c1
-rw-r--r--channels/chan_local.c1
-rw-r--r--channels/chan_mgcp.c1
-rw-r--r--channels/chan_misdn.c1
-rw-r--r--channels/chan_nbs.c1
-rw-r--r--channels/chan_oss.c1
-rw-r--r--channels/chan_phone.c1
-rw-r--r--channels/chan_sip.c1
-rw-r--r--channels/chan_skinny.c1
-rw-r--r--channels/chan_unistim.c1
-rw-r--r--channels/chan_usbradio.c1
-rw-r--r--channels/chan_vpb.cc1
-rw-r--r--channels/chan_zap.c1
-rw-r--r--channels/iax2-provision.c1
-rw-r--r--funcs/func_blacklist.c1
-rw-r--r--funcs/func_callerid.c1
-rw-r--r--funcs/func_curl.c1
-rw-r--r--funcs/func_cut.c1
-rw-r--r--funcs/func_db.c1
-rw-r--r--funcs/func_enum.c1
-rw-r--r--funcs/func_iconv.c1
-rw-r--r--funcs/func_lock.c1
-rw-r--r--funcs/func_odbc.c1
-rw-r--r--funcs/func_rand.c1
-rw-r--r--funcs/func_realtime.c1
-rw-r--r--funcs/func_strings.c1
-rw-r--r--funcs/func_timeout.c1
-rw-r--r--funcs/func_version.c1
-rw-r--r--funcs/func_vmcount.c1
-rw-r--r--pbx/pbx_config.c1
-rw-r--r--pbx/pbx_dundi.c1
-rw-r--r--pbx/pbx_gtkconsole.c1
-rw-r--r--pbx/pbx_loopback.c1
-rw-r--r--pbx/pbx_lua.c1
-rw-r--r--pbx/pbx_realtime.c1
-rw-r--r--pbx/pbx_spool.c1
106 files changed, 0 insertions, 106 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"
diff --git a/cdr/cdr_adaptive_odbc.c b/cdr/cdr_adaptive_odbc.c
index f0f85b942..f6086468a 100644
--- a/cdr/cdr_adaptive_odbc.c
+++ b/cdr/cdr_adaptive_odbc.c
@@ -40,7 +40,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include <sqltypes.h>
#include "asterisk/config.h"
-#include "asterisk/options.h"
#include "asterisk/channel.h"
#include "asterisk/lock.h"
#include "asterisk/linkedlists.h"
diff --git a/cdr/cdr_csv.c b/cdr/cdr_csv.c
index 2feda2fd2..1c0da16d9 100644
--- a/cdr/cdr_csv.c
+++ b/cdr/cdr_csv.c
@@ -39,7 +39,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/channel.h"
#include "asterisk/cdr.h"
#include "asterisk/module.h"
-#include "asterisk/options.h"
#include "asterisk/utils.h"
#include "asterisk/lock.h"
diff --git a/cdr/cdr_odbc.c b/cdr/cdr_odbc.c
index b146856d9..5d6504181 100644
--- a/cdr/cdr_odbc.c
+++ b/cdr/cdr_odbc.c
@@ -40,7 +40,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include <time.h>
#include "asterisk/config.h"
-#include "asterisk/options.h"
#include "asterisk/channel.h"
#include "asterisk/cdr.h"
#include "asterisk/module.h"
diff --git a/cdr/cdr_pgsql.c b/cdr/cdr_pgsql.c
index 4517c70b8..8078cdf56 100644
--- a/cdr/cdr_pgsql.c
+++ b/cdr/cdr_pgsql.c
@@ -46,7 +46,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include <libpq-fe.h>
#include "asterisk/config.h"
-#include "asterisk/options.h"
#include "asterisk/channel.h"
#include "asterisk/cdr.h"
#include "asterisk/module.h"
diff --git a/cdr/cdr_radius.c b/cdr/cdr_radius.c
index 962acc9c7..3f0b2c9f2 100644
--- a/cdr/cdr_radius.c
+++ b/cdr/cdr_radius.c
@@ -41,7 +41,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Rev$")
#include "asterisk/cdr.h"
#include "asterisk/module.h"
#include "asterisk/utils.h"
-#include "asterisk/options.h"
/*! ISO 8601 standard format */
#define DATE_FORMAT "%Y-%m-%d %T %z"
diff --git a/cdr/cdr_sqlite3_custom.c b/cdr/cdr_sqlite3_custom.c
index 11316c59f..7eff53d8d 100644
--- a/cdr/cdr_sqlite3_custom.c
+++ b/cdr/cdr_sqlite3_custom.c
@@ -51,7 +51,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/pbx.h"
#include "asterisk/utils.h"
#include "asterisk/cli.h"
-#include "asterisk/options.h"
AST_MUTEX_DEFINE_STATIC(lock);
diff --git a/cdr/cdr_tds.c b/cdr/cdr_tds.c
index ef0cce096..9d322fd27 100644
--- a/cdr/cdr_tds.c
+++ b/cdr/cdr_tds.c
@@ -71,7 +71,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include <ctype.h>
#include "asterisk/config.h"
-#include "asterisk/options.h"
#include "asterisk/channel.h"
#include "asterisk/cdr.h"
#include "asterisk/module.h"
diff --git a/channels/chan_agent.c b/channels/chan_agent.c
index b5e195c98..296405410 100644
--- a/channels/chan_agent.c
+++ b/channels/chan_agent.c
@@ -47,7 +47,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/config.h"
#include "asterisk/module.h"
#include "asterisk/pbx.h"
-#include "asterisk/options.h"
#include "asterisk/sched.h"
#include "asterisk/io.h"
#include "asterisk/rtp.h"
diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c
index 484270ec7..d9177e53f 100644
--- a/channels/chan_alsa.c
+++ b/channels/chan_alsa.c
@@ -46,7 +46,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/frame.h"
#include "asterisk/channel.h"
#include "asterisk/module.h"
-#include "asterisk/options.h"
#include "asterisk/pbx.h"
#include "asterisk/config.h"
#include "asterisk/cli.h"
diff --git a/channels/chan_features.c b/channels/chan_features.c
index f16c87a8f..65146f463 100644
--- a/channels/chan_features.c
+++ b/channels/chan_features.c
@@ -42,7 +42,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/config.h"
#include "asterisk/module.h"
#include "asterisk/pbx.h"
-#include "asterisk/options.h"
#include "asterisk/sched.h"
#include "asterisk/io.h"
#include "asterisk/rtp.h"
diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c
index e28684e1b..1514dc97a 100644
--- a/channels/chan_gtalk.c
+++ b/channels/chan_gtalk.c
@@ -49,7 +49,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/config.h"
#include "asterisk/module.h"
#include "asterisk/pbx.h"
-#include "asterisk/options.h"
#include "asterisk/sched.h"
#include "asterisk/io.h"
#include "asterisk/rtp.h"
diff --git a/channels/chan_h323.c b/channels/chan_h323.c
index ad3b4e504..b17965bdb 100644
--- a/channels/chan_h323.c
+++ b/channels/chan_h323.c
@@ -72,7 +72,6 @@ extern "C" {
#include "asterisk/module.h"
#include "asterisk/musiconhold.h"
#include "asterisk/pbx.h"
-#include "asterisk/options.h"
#include "asterisk/utils.h"
#include "asterisk/sched.h"
#include "asterisk/io.h"
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 235dc7cd3..6e2a0ab96 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -64,7 +64,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/sched.h"
#include "asterisk/io.h"
#include "asterisk/config.h"
-#include "asterisk/options.h"
#include "asterisk/cli.h"
#include "asterisk/translate.h"
#include "asterisk/md5.h"
diff --git a/channels/chan_jingle.c b/channels/chan_jingle.c
index f8072fd54..87633978b 100644
--- a/channels/chan_jingle.c
+++ b/channels/chan_jingle.c
@@ -51,7 +51,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/config.h"
#include "asterisk/module.h"
#include "asterisk/pbx.h"
-#include "asterisk/options.h"
#include "asterisk/sched.h"
#include "asterisk/io.h"
#include "asterisk/rtp.h"
diff --git a/channels/chan_local.c b/channels/chan_local.c
index c6b5638ff..99b23cdee 100644
--- a/channels/chan_local.c
+++ b/channels/chan_local.c
@@ -37,7 +37,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/config.h"
#include "asterisk/module.h"
#include "asterisk/pbx.h"
-#include "asterisk/options.h"
#include "asterisk/sched.h"
#include "asterisk/io.h"
#include "asterisk/rtp.h"
diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c
index be9b2f046..22e23f4c0 100644
--- a/channels/chan_mgcp.c
+++ b/channels/chan_mgcp.c
@@ -50,7 +50,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/config.h"
#include "asterisk/module.h"
#include "asterisk/pbx.h"
-#include "asterisk/options.h"
#include "asterisk/sched.h"
#include "asterisk/io.h"
#include "asterisk/rtp.h"
diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c
index 36cf5beba..e72790332 100644
--- a/channels/chan_misdn.c
+++ b/channels/chan_misdn.c
@@ -52,7 +52,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/config.h"
#include "asterisk/module.h"
#include "asterisk/pbx.h"
-#include "asterisk/options.h"
#include "asterisk/io.h"
#include "asterisk/frame.h"
#include "asterisk/translate.h"
diff --git a/channels/chan_nbs.c b/channels/chan_nbs.c
index 86a042c0e..e190a436c 100644
--- a/channels/chan_nbs.c
+++ b/channels/chan_nbs.c
@@ -45,7 +45,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/config.h"
#include "asterisk/module.h"
#include "asterisk/pbx.h"
-#include "asterisk/options.h"
#include "asterisk/utils.h"
static const char tdesc[] = "Network Broadcast Sound Driver";
diff --git a/channels/chan_oss.c b/channels/chan_oss.c
index 8f3e084bb..ed2f441d4 100644
--- a/channels/chan_oss.c
+++ b/channels/chan_oss.c
@@ -59,7 +59,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/callerid.h"
#include "asterisk/channel.h"
#include "asterisk/module.h"
-#include "asterisk/options.h"
#include "asterisk/pbx.h"
#include "asterisk/config.h"
#include "asterisk/cli.h"
diff --git a/channels/chan_phone.c b/channels/chan_phone.c
index f468a9868..233e5e829 100644
--- a/channels/chan_phone.c
+++ b/channels/chan_phone.c
@@ -53,7 +53,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/config.h"
#include "asterisk/module.h"
#include "asterisk/pbx.h"
-#include "asterisk/options.h"
#include "asterisk/utils.h"
#include "asterisk/callerid.h"
#include "asterisk/causes.h"
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 93fc84e05..4d651cf86 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -102,7 +102,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/config.h"
#include "asterisk/module.h"
#include "asterisk/pbx.h"
-#include "asterisk/options.h"
#include "asterisk/sched.h"
#include "asterisk/io.h"
#include "asterisk/rtp.h"
diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index 4014d742a..7640ef341 100644
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -47,7 +47,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/config.h"
#include "asterisk/module.h"
#include "asterisk/pbx.h"
-#include "asterisk/options.h"
#include "asterisk/sched.h"
#include "asterisk/io.h"
#include "asterisk/rtp.h"
diff --git a/channels/chan_unistim.c b/channels/chan_unistim.c
index 093d03c31..0be2bfc3e 100644
--- a/channels/chan_unistim.c
+++ b/channels/chan_unistim.c
@@ -56,7 +56,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/config.h"
#include "asterisk/module.h"
#include "asterisk/pbx.h"
-#include "asterisk/options.h"
#include "asterisk/sched.h"
#include "asterisk/io.h"
#include "asterisk/rtp.h"
diff --git a/channels/chan_usbradio.c b/channels/chan_usbradio.c
index dbe2fc325..c1d181e5b 100644
--- a/channels/chan_usbradio.c
+++ b/channels/chan_usbradio.c
@@ -103,7 +103,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/callerid.h"
#include "asterisk/channel.h"
#include "asterisk/module.h"
-#include "asterisk/options.h"
#include "asterisk/pbx.h"
#include "asterisk/config.h"
#include "asterisk/cli.h"
diff --git a/channels/chan_vpb.cc b/channels/chan_vpb.cc
index f7443a8f2..eee797b18 100644
--- a/channels/chan_vpb.cc
+++ b/channels/chan_vpb.cc
@@ -45,7 +45,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/config.h"
#include "asterisk/module.h"
#include "asterisk/pbx.h"
-#include "asterisk/options.h"
#include "asterisk/callerid.h"
#include "asterisk/dsp.h"
#include "asterisk/features.h"
diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 970b52cf2..490c0dee0 100644
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -74,7 +74,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/config.h"
#include "asterisk/module.h"
#include "asterisk/pbx.h"
-#include "asterisk/options.h"
#include "asterisk/file.h"
#include "asterisk/ulaw.h"
#include "asterisk/alaw.h"
diff --git a/channels/iax2-provision.c b/channels/iax2-provision.c
index 5a06a8f9b..3ddec3e06 100644
--- a/channels/iax2-provision.c
+++ b/channels/iax2-provision.c
@@ -37,7 +37,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/cli.h"
#include "asterisk/lock.h"
#include "asterisk/frame.h"
-#include "asterisk/options.h"
#include "asterisk/md5.h"
#include "asterisk/astdb.h"
#include "asterisk/utils.h"
diff --git a/funcs/func_blacklist.c b/funcs/func_blacklist.c
index f66f5e61e..bf5a7d669 100644
--- a/funcs/func_blacklist.c
+++ b/funcs/func_blacklist.c
@@ -32,7 +32,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#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/funcs/func_callerid.c b/funcs/func_callerid.c
index 4be41d14d..e53097f3b 100644
--- a/funcs/func_callerid.c
+++ b/funcs/func_callerid.c
@@ -30,7 +30,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/pbx.h"
#include "asterisk/utils.h"
#include "asterisk/app.h"
-#include "asterisk/options.h"
#include "asterisk/callerid.h"
static int callerpres_read(struct ast_channel *chan, const char *cmd, char *data, char *buf, size_t len)
diff --git a/funcs/func_curl.c b/funcs/func_curl.c
index 01b13ce8d..32dbf7686 100644
--- a/funcs/func_curl.c
+++ b/funcs/func_curl.c
@@ -45,7 +45,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/channel.h"
#include "asterisk/pbx.h"
#include "asterisk/cli.h"
-#include "asterisk/options.h"
#include "asterisk/module.h"
#include "asterisk/app.h"
#include "asterisk/utils.h"
diff --git a/funcs/func_cut.c b/funcs/func_cut.c
index 9228fd61a..142b768d9 100644
--- a/funcs/func_cut.c
+++ b/funcs/func_cut.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/funcs/func_db.c b/funcs/func_db.c
index 0fa17fd61..1c15e5df8 100644
--- a/funcs/func_db.c
+++ b/funcs/func_db.c
@@ -36,7 +36,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/module.h"
#include "asterisk/channel.h"
#include "asterisk/pbx.h"
-#include "asterisk/options.h"
#include "asterisk/utils.h"
#include "asterisk/app.h"
#include "asterisk/astdb.h"
diff --git a/funcs/func_enum.c b/funcs/func_enum.c
index fbe51def8..d69881955 100644
--- a/funcs/func_enum.c
+++ b/funcs/func_enum.c
@@ -43,7 +43,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/utils.h"
#include "asterisk/lock.h"
#include "asterisk/file.h"
-#include "asterisk/options.h"
#include "asterisk/enum.h"
#include "asterisk/app.h"
diff --git a/funcs/func_iconv.c b/funcs/func_iconv.c
index 19cd2e54c..f3f49bff7 100644
--- a/funcs/func_iconv.c
+++ b/funcs/func_iconv.c
@@ -39,7 +39,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/pbx.h"
#include "asterisk/utils.h"
#include "asterisk/app.h"
-#include "asterisk/options.h"
/*!
* Some systems define the second arg to iconv() as (const char *),
diff --git a/funcs/func_lock.c b/funcs/func_lock.c
index 3cef46a19..53b05a3e8 100644
--- a/funcs/func_lock.c
+++ b/funcs/func_lock.c
@@ -32,7 +32,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#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/funcs/func_odbc.c b/funcs/func_odbc.c
index 2928ba31c..194a32183 100644
--- a/funcs/func_odbc.c
+++ b/funcs/func_odbc.c
@@ -38,7 +38,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/module.h"
#include "asterisk/file.h"
-#include "asterisk/options.h"
#include "asterisk/channel.h"
#include "asterisk/pbx.h"
#include "asterisk/config.h"
diff --git a/funcs/func_rand.c b/funcs/func_rand.c
index 443a028fd..a3db21d26 100644
--- a/funcs/func_rand.c
+++ b/funcs/func_rand.c
@@ -33,7 +33,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/pbx.h"
#include "asterisk/utils.h"
#include "asterisk/app.h"
-#include "asterisk/options.h"
static int acf_rand_exec(struct ast_channel *chan, const char *cmd,
char *parse, char *buffer, size_t buflen)
diff --git a/funcs/func_realtime.c b/funcs/func_realtime.c
index 08950dad8..7b269d91c 100644
--- a/funcs/func_realtime.c
+++ b/funcs/func_realtime.c
@@ -31,7 +31,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/module.h"
#include "asterisk/lock.h"
diff --git a/funcs/func_strings.c b/funcs/func_strings.c
index 8d678fc57..8881a1569 100644
--- a/funcs/func_strings.c
+++ b/funcs/func_strings.c
@@ -32,7 +32,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include <regex.h>
#include "asterisk/module.h"
-#include "asterisk/options.h"
#include "asterisk/channel.h"
#include "asterisk/pbx.h"
#include "asterisk/utils.h"
diff --git a/funcs/func_timeout.c b/funcs/func_timeout.c
index d90281a70..d1efd97e0 100644
--- a/funcs/func_timeout.c
+++ b/funcs/func_timeout.c
@@ -33,7 +33,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/pbx.h"
#include "asterisk/utils.h"
#include "asterisk/app.h"
-#include "asterisk/options.h"
static int timeout_read(struct ast_channel *chan, const char *cmd, char *data,
char *buf, size_t len)
diff --git a/funcs/func_version.c b/funcs/func_version.c
index 4de7131c3..6fed3bfa3 100644
--- a/funcs/func_version.c
+++ b/funcs/func_version.c
@@ -31,7 +31,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/pbx.h"
#include "asterisk/utils.h"
#include "asterisk/app.h"
-#include "asterisk/options.h"
#include "asterisk/version.h"
#include "asterisk/build.h"
diff --git a/funcs/func_vmcount.c b/funcs/func_vmcount.c
index cd558d435..24d83140d 100644
--- a/funcs/func_vmcount.c
+++ b/funcs/func_vmcount.c
@@ -38,7 +38,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/lock.h"
#include "asterisk/utils.h"
#include "asterisk/app.h"
-#include "asterisk/options.h"
static int acf_vmcount_exec(struct ast_channel *chan, const char *cmd, char *argsstr, char *buf, size_t len)
{
diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c
index 442d3e1d5..9ee6c02b4 100644
--- a/pbx/pbx_config.c
+++ b/pbx/pbx_config.c
@@ -32,7 +32,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/paths.h" /* ast_config_AST_CONFIG_DIR */
#include "asterisk/pbx.h"
#include "asterisk/config.h"
-#include "asterisk/options.h"
#include "asterisk/module.h"
#include "asterisk/logger.h"
#include "asterisk/cli.h"
diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c
index 3fbc6691e..ec3da12d8 100644
--- a/pbx/pbx_dundi.c
+++ b/pbx/pbx_dundi.c
@@ -41,7 +41,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/logger.h"
#include "asterisk/channel.h"
#include "asterisk/config.h"
-#include "asterisk/options.h"
#include "asterisk/pbx.h"
#include "asterisk/module.h"
#include "asterisk/frame.h"
diff --git a/pbx/pbx_gtkconsole.c b/pbx/pbx_gtkconsole.c
index 45a951d85..9017d7459 100644
--- a/pbx/pbx_gtkconsole.c
+++ b/pbx/pbx_gtkconsole.c
@@ -42,7 +42,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/config.h"
#include "asterisk/module.h"
#include "asterisk/logger.h"
-#include "asterisk/options.h"
#include "asterisk/cli.h"
#include "asterisk/utils.h"
diff --git a/pbx/pbx_loopback.c b/pbx/pbx_loopback.c
index febadc1b1..11fe8c3ff 100644
--- a/pbx/pbx_loopback.c
+++ b/pbx/pbx_loopback.c
@@ -30,7 +30,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/logger.h"
#include "asterisk/channel.h"
#include "asterisk/config.h"
-#include "asterisk/options.h"
#include "asterisk/pbx.h"
#include "asterisk/module.h"
#include "asterisk/frame.h"
diff --git a/pbx/pbx_lua.c b/pbx/pbx_lua.c
index 46f0790f7..143bea5e4 100644
--- a/pbx/pbx_lua.c
+++ b/pbx/pbx_lua.c
@@ -32,7 +32,6 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include "asterisk/options.h"
#include "asterisk/logger.h"
#include "asterisk/channel.h"
#include "asterisk/pbx.h"
diff --git a/pbx/pbx_realtime.c b/pbx/pbx_realtime.c
index 5516162bf..0b122b04c 100644
--- a/pbx/pbx_realtime.c
+++ b/pbx/pbx_realtime.c
@@ -31,7 +31,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/logger.h"
#include "asterisk/channel.h"
#include "asterisk/config.h"
-#include "asterisk/options.h"
#include "asterisk/pbx.h"
#include "asterisk/module.h"
#include "asterisk/frame.h"
diff --git a/pbx/pbx_spool.c b/pbx/pbx_spool.c
index 9b64df721..c4cd739ad 100644
--- a/pbx/pbx_spool.c
+++ b/pbx/pbx_spool.c
@@ -39,7 +39,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/callerid.h"
#include "asterisk/pbx.h"
#include "asterisk/module.h"
-#include "asterisk/options.h"
#include "asterisk/utils.h"
/*