From 7e8835e0d79b129fe07a5f1a67aee35548e616cd Mon Sep 17 00:00:00 2001
From: Luigi Rizzo <rizzo@icir.org>
Date: Wed, 21 Nov 2007 23:24:55 +0000
Subject: [PATCH] remove another set of redundant #include "asterisk/options.h"

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89512 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 apps/app_adsiprog.c        | 1 -
 apps/app_alarmreceiver.c   | 1 -
 apps/app_amd.c             | 1 -
 apps/app_authenticate.c    | 1 -
 apps/app_chanisavail.c     | 1 -
 apps/app_channelredirect.c | 1 -
 apps/app_chanspy.c         | 1 -
 apps/app_controlplayback.c | 1 -
 apps/app_db.c              | 1 -
 apps/app_dial.c            | 1 -
 apps/app_directed_pickup.c | 1 -
 apps/app_disa.c            | 1 -
 apps/app_dumpchan.c        | 1 -
 apps/app_exec.c            | 1 -
 apps/app_externalivr.c     | 1 -
 apps/app_festival.c        | 1 -
 apps/app_flash.c           | 1 -
 apps/app_followme.c        | 1 -
 apps/app_getcpeid.c        | 1 -
 apps/app_ices.c            | 1 -
 apps/app_image.c           | 1 -
 apps/app_macro.c           | 1 -
 apps/app_meetme.c          | 1 -
 apps/app_minivm.c          | 1 -
 apps/app_mixmonitor.c      | 1 -
 apps/app_morsecode.c       | 1 -
 apps/app_mp3.c             | 1 -
 apps/app_nbscat.c          | 1 -
 apps/app_osplookup.c       | 1 -
 apps/app_page.c            | 1 -
 apps/app_parkandannounce.c | 1 -
 apps/app_playback.c        | 1 -
 apps/app_privacy.c         | 1 -
 apps/app_queue.c           | 1 -
 apps/app_read.c            | 1 -
 apps/app_readexten.c       | 1 -
 apps/app_readfile.c        | 1 -
 apps/app_record.c          | 1 -
 apps/app_rpt.c             | 1 -
 apps/app_sayunixtime.c     | 1 -
 apps/app_senddtmf.c        | 1 -
 apps/app_sendtext.c        | 1 -
 apps/app_sms.c             | 1 -
 apps/app_stack.c           | 1 -
 apps/app_system.c          | 1 -
 apps/app_talkdetect.c      | 1 -
 apps/app_test.c            | 1 -
 apps/app_transfer.c        | 1 -
 apps/app_url.c             | 1 -
 apps/app_verbose.c         | 1 -
 apps/app_voicemail.c       | 1 -
 apps/app_waitforring.c     | 1 -
 apps/app_waitforsilence.c  | 1 -
 apps/app_while.c           | 1 -
 apps/app_zapbarge.c        | 1 -
 apps/app_zapras.c          | 1 -
 apps/app_zapscan.c         | 1 -
 cdr/cdr_adaptive_odbc.c    | 1 -
 cdr/cdr_csv.c              | 1 -
 cdr/cdr_odbc.c             | 1 -
 cdr/cdr_pgsql.c            | 1 -
 cdr/cdr_radius.c           | 1 -
 cdr/cdr_sqlite3_custom.c   | 1 -
 cdr/cdr_tds.c              | 1 -
 channels/chan_agent.c      | 1 -
 channels/chan_alsa.c       | 1 -
 channels/chan_features.c   | 1 -
 channels/chan_gtalk.c      | 1 -
 channels/chan_h323.c       | 1 -
 channels/chan_iax2.c       | 1 -
 channels/chan_jingle.c     | 1 -
 channels/chan_local.c      | 1 -
 channels/chan_mgcp.c       | 1 -
 channels/chan_misdn.c      | 1 -
 channels/chan_nbs.c        | 1 -
 channels/chan_oss.c        | 1 -
 channels/chan_phone.c      | 1 -
 channels/chan_sip.c        | 1 -
 channels/chan_skinny.c     | 1 -
 channels/chan_unistim.c    | 1 -
 channels/chan_usbradio.c   | 1 -
 channels/chan_vpb.cc       | 1 -
 channels/chan_zap.c        | 1 -
 channels/iax2-provision.c  | 1 -
 funcs/func_blacklist.c     | 1 -
 funcs/func_callerid.c      | 1 -
 funcs/func_curl.c          | 1 -
 funcs/func_cut.c           | 1 -
 funcs/func_db.c            | 1 -
 funcs/func_enum.c          | 1 -
 funcs/func_iconv.c         | 1 -
 funcs/func_lock.c          | 1 -
 funcs/func_odbc.c          | 1 -
 funcs/func_rand.c          | 1 -
 funcs/func_realtime.c      | 1 -
 funcs/func_strings.c       | 1 -
 funcs/func_timeout.c       | 1 -
 funcs/func_version.c       | 1 -
 funcs/func_vmcount.c       | 1 -
 pbx/pbx_config.c           | 1 -
 pbx/pbx_dundi.c            | 1 -
 pbx/pbx_gtkconsole.c       | 1 -
 pbx/pbx_loopback.c         | 1 -
 pbx/pbx_lua.c              | 1 -
 pbx/pbx_realtime.c         | 1 -
 pbx/pbx_spool.c            | 1 -
 106 files changed, 106 deletions(-)

diff --git a/apps/app_adsiprog.c b/apps/app_adsiprog.c
index 9997ae9318..ad0837e6ad 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 3da5027090..5a990d9d5f 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 fbf23c9dec..0e16653950 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 11d699d032..1a49bf3375 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 4a8b9bf284..67d29e6eea 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 a092690b5e..325c681acb 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 e41614343b..250820fbcb 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 626d6b5fcf..f5293633eb 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 faf28c0d20..0cc5043cea 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 57756e5b0e..a4d9557785 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 b823f58162..07d81c8698 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 9ca3ae8670..ac74c78a4a 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 1f5425ebb7..85f6789ca7 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 69eb458e01..83755a8f95 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 8ebb60c5f9..3de290f321 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 9e1edbdb87..926638e573 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 37965fe501..d57feeb916 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 48677d6bdd..d002c26b9c 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 1eaf17a90d..1bab819b7e 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 0c00178e05..9397b3c7aa 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 28598f5d1a..9a36fe759b 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 f35e9e51e9..b087ad36b4 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 48250b2dfe..c5a4a9efb5 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 94fb1f62dc..20d10699b9 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 1ce333bf98..a2d6b323ee 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 e9b7aab22c..6c88ed32ca 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 6404276b99..1f9be6e779 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 4c212564f6..4e7203319c 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 39027f493a..46618f43ea 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 5702735b3e..2ea367edde 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 fc63772a7a..7ad7a6416b 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 a970e6c057..a2a4c3d671 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 ecae9c15d9..009b9d2a6e 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 ec18fb457d..382982351c 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 c6a7e45df5..0d73878499 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 eda674b337..194cacf47e 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 82ffb3118c..8762ef860c 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 0b698be5a6..9fe2388c82 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 ad4b150060..4bca3e07bc 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 2d084fc993..d0e23449ed 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 7fd13f9c7a..baced9868a 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 46660e4e46..3909b306ee 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 80fdf9f81e..3c54d43f17 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 a175438a1b..adceaeb783 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 e260baa31b..c887fa7b01 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 d80af7d87f..0aa5e818b5 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 89853cb6b6..03adc2e829 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 b808eb415c..96c514eeb1 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 7d0eb00d76..44c3909fe9 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 d3719e9010..74e45c3187 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 297fd25d2e..1ae60eddad 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 76717444c9..b4248fee93 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 1984a5abaf..e45f243445 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 ed6c0615af..c87af539db 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 3732545fa3..9e2ff67fc3 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 4af24231ee..bc3b51dbaf 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 27f3a3ec7c..99f24b8a9d 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 f0f85b9429..f6086468ae 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 2feda2fd25..1c0da16d9b 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 b146856d96..5d6504181e 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 4517c70b80..8078cdf562 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 962acc9c73..3f0b2c9f2f 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 11316c59fe..7eff53d8d0 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 ef0cce0961..9d322fd27f 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 b5e195c98b..2964054106 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 484270ec71..d9177e53f2 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 f16c87a8f8..65146f4635 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 e28684e1bd..1514dc97ab 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 ad3b4e5042..b17965bdb6 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 235dc7cd38..6e2a0ab968 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 f8072fd540..87633978b8 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 c6b5638ff3..99b23cdeee 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 be9b2f0465..22e23f4c00 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 36cf5beba7..e72790332b 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 86a042c0e9..e190a436c4 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 8f3e084bbe..ed2f441d46 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 f468a98685..233e5e8294 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 93fc84e05c..4d651cf862 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 4014d742aa..7640ef3419 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 093d03c316..0be2bfc3e7 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 dbe2fc3253..c1d181e5bd 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 f7443a8f20..eee797b184 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 970b52cf21..490c0dee00 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 5a06a8f9b7..3ddec3e060 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 f66f5e61ec..bf5a7d669b 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 4be41d14d0..e53097f3b4 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 01b13ce8de..32dbf7686d 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 9228fd61a9..142b768d9c 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 0fa17fd615..1c15e5df87 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 fbe51def8c..d698819551 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 19cd2e54cc..f3f49bff72 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 3cef46a193..53b05a3e88 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 2928ba31cf..194a321831 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 443a028fda..a3db21d26b 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 08950dad83..7b269d91cf 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 8d678fc578..8881a1569e 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 d90281a70d..d1efd97e0f 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 4de7131c32..6fed3bfa30 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 cd558d4358..24d83140d4 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 442d3e1d53..9ee6c02b49 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 3fbc6691e3..ec3da12d8d 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 45a951d853..9017d74594 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 febadc1b1a..11fe8c3ff0 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 46f0790f73..143bea5e40 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 5516162bfd..0b122b04c0 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 9b64df721a..c4cd739ade 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"
 
 /*
-- 
GitLab