diff --git a/apps/app_adsiprog.c b/apps/app_adsiprog.c
index 9997ae9318e0900fcd26eef4afd1819976b120f4..ad0837e6adb5b748392895b07aaa18116c4cd800 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 3da50270908b3170812430caecc25f788902bff0..5a990d9d5fc43c0b2c43b06196f12c9077938111 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 fbf23c9dec372fe5606f91d0e8a5b7d6740f6597..0e1665395084ba3bdaac9e4bca595fbc54e98b43 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 11d699d032bfad7ab7fc2d6ec3e53f30bddaafe5..1a49bf3375b7ded656baa88f98d14eae00f9259a 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 4a8b9bf284eec439fa4454e3eb09e627109e2615..67d29e6eeac1b0fd9b454b30af0b9218e665bc69 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 a092690b5e8ba6d029d4f5fbde4c519b7329e4d9..325c681acba48fa0d95c2e5b652886d2be8f0323 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 e41614343bb823e41523fe965d05a12853b06c24..250820fbcbbef6bc9117511649b77d416073311e 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 626d6b5fcffd7064ad0c1cdb8b5f7fec18823983..f5293633ebaaa5ba284ecf4547292289d0b08e3c 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 faf28c0d20a82974e5771c8ea33542e3364c59b2..0cc5043cea759d610e0b7b45741a6c6ce0aeb736 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 57756e5b0ede550d9e409aac7de311423371b82d..a4d9557785cf8abc99929153d3d1a56857720938 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 b823f58162a6de64d382c53edab350e590a8989f..07d81c869850ea09c467961b233c4944077a4368 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 9ca3ae8670a5ada5d4ab0b568b6d0c3f67f2d6bb..ac74c78a4a28427698d54e1c6588234d64ea68e4 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 1f5425ebb7608e8a4e0d7781bf32d292984dc27c..85f6789ca729e15ca96c27d148f0614526a89cee 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 69eb458e0133f4d8dcc91e18e6f4265e03607448..83755a8f9597bd719dbdee0a3606f58952c47145 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 8ebb60c5f9ff02d6d979d7953ce98b91bfa60830..3de290f321c8e7f87204817dd1a75c5a3a873ddf 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 9e1edbdb87bc096547bf987b4ba12dd5e1aff526..926638e5737fc8a11eac104df629228ed4ac6eac 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 37965fe50101c6a30bdb4c3ca0be9ae8de8b34ea..d57feeb916f6107779e1e19aad7ee829b01ca5a3 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 48677d6bdd69d540c78a3d7c6c1c5d7fd5a5f3e6..d002c26b9c3364057ae4f71cfb9b0cec67c487ee 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 1eaf17a90d706247689870297101583600c7653a..1bab819b7eff8fc55701291aec080d5bb9a0fea4 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 0c00178e059eb9b4e292335f6949b78269b0b866..9397b3c7aae3e8f54c520374dd274fb7f03ffc57 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 28598f5d1a611d63f1867a06a77672d6f9215582..9a36fe759bda87d57718b7927006152bb788e106 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 f35e9e51e91dd67ee939d684c27fe51602d828d6..b087ad36b43a39622317e249a3760e15f9718f3c 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 48250b2dfe1e9dde5f6da12aa0cf9ae5cd6ba829..c5a4a9efb55c167817b8d1b9d7f1e46536c7ea36 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 94fb1f62dcdf365cccf9dba771543495bbbcaef0..20d10699b959052d54251ff78cb680fbbd3abd34 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 1ce333bf98e130244ef6bb0e222229c8c073c273..a2d6b323ee7b5c8f827ae2b23fa619c6599bb7d8 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 e9b7aab22ca4bbd4c8c4a01c23c4adb89ac9d7ba..6c88ed32ca43d3d887bbfe8471b4edf517761e7d 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 6404276b990d78de51903e5af7901ee3d0e20897..1f9be6e77934990a344ffeb75bd378a16292a0ad 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 4c212564f6a63afde20c885c8086ba79ef68abd6..4e7203319ceea59960a1f3767c09d01cd4e43ee2 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 39027f493a96ebe73b0a92469f02bf59dd8e9c62..46618f43ea04706d15bd8f6884fb4b4bc3eab212 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 5702735b3e52e70ff6bc017978b79802fd61516f..2ea367eddee6c95f5943de337d9304baac98bf48 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 fc63772a7a3d5fd97d7fd3014dd8ad3e9eeb0e41..7ad7a6416b9aaec6e7b07b8f9b2710380b365642 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 a970e6c0575a2fc74e5c6fa790270c18cefb718d..a2a4c3d67127288058613a61730320fe55f97600 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 ecae9c15d92ebb09eedffec64a32c04789906f5d..009b9d2a6e90efb5759d509e593f4ec9016db4a4 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 ec18fb457daca83452db0a8cbc864b8b44887a65..382982351cd4d63452b98578372aafeae2ff1624 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 c6a7e45df53ece29a6c4ef8826f5c0cfd9c88c59..0d73878499bdc57d10939562e4ae3c5b28538f7f 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 eda674b337a9d9fa99cb34957512903e8c515519..194cacf47ecb02b6a3b5b0c8a796de2310cd3a2d 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 82ffb3118c8e2e14cd93972e25940acc99407d61..8762ef860cffb38f4ce31ebd93aba9c7c212439b 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 0b698be5a6170e19114c4134b4e53f8e26868b79..9fe2388c82fdee6a7b259e71ea5dfcd8cd33f0b6 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 ad4b15006032fc6e123f17f51149bbceba343466..4bca3e07bc4ab0bdfa633922b4868ea79ad70c5c 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 2d084fc993e6fea7ae37c31788294c385c5a939d..d0e23449ed0e9c78dbe78433f172f6e08b52379b 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 7fd13f9c7a57720d558022ace253aeb89e1e6e17..baced9868a961728035a37ed6203ed85c8319ccc 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 46660e4e46383f2acd621ea4e5881effd9e50ddb..3909b306ee26a701d43da396c49b66bff95b5ba6 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 80fdf9f81e4d63838c5ef22b325c844da4b207ce..3c54d43f17d96a59733f1a9adc8daf2f5707985d 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 a175438a1b7521ddd5d66c4ee62f3c3944cbf272..adceaeb7839a3bb9749ea076547670bb45b70a2b 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 e260baa31b93e747dacb1b03cd59cef06ce70fd5..c887fa7b01f71e4f0d55b059b618d770691b263e 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 d80af7d87fc2be029fb3d48dcf11ea4cf342ae73..0aa5e818b5f727f60bc26451847aa2e2d623e3f1 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 89853cb6b61366a5fcf196f4b10415e40959fc9a..03adc2e829c7077929350de2d93df29514e17f3d 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 b808eb415c78c37435699bcfa7b27264d0265839..96c514eeb1636082aa1d0eca1e888857bf0736b0 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 7d0eb00d76aa3359de4226733bf238e05ef1529b..44c3909fe9f24fba60007ad293d7946778f3dfb7 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 d3719e90108fa1b72793baf67749992d121c5031..74e45c31879f2715b211229a1c77ffb16fe079fa 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 297fd25d2ebd096ad37e531f5000912e7126b721..1ae60eddad6f90c4364fed311842b3984dffabac 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 76717444c93f941640b1d032ae5b1ed1d270148b..b4248fee93bb91f2b6ea9c1980b7ba5d4f8c8bc0 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 1984a5abafb15f643f4622a0a36cddb2580cf543..e45f243445c505d71793e649b0089f60fc10f6ed 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 ed6c0615afc373e8b0f120993d4576ae5ddf99b1..c87af539db40268cddf1e6d6d946ee9edf83f322 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 3732545fa39cb4eea905c198004a5b5c2d0ea38e..9e2ff67fc3cd10b6e3ebbe3668778638bd5bce97 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 4af24231ee537a2d35790a6f5dd90c807dfdecf7..bc3b51dbafc1ee64126f0b499c8669978aa4f84c 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 27f3a3ec7cbd6c2343aef7786d4cfff025a30a09..99f24b8a9d0b9c4efb1d5d0febe859a766f99430 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 f0f85b94294b86fac4a122353992a815c51f13d1..f6086468ae3cbfd12d230982bba97214e88165fe 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 2feda2fd25774c5dae601214a04a674b5ca54792..1c0da16d9bb0b074bd5d65cd1f1fd231f0747920 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 b146856d9676b76d970ee29d0b1284b8e777577b..5d6504181e3684ae25c88d0b516a69feba0a0594 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 4517c70b8089e6a5254d5343159f1c284be3cab4..8078cdf562f7d57e7fd06965c3278eba561aa30b 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 962acc9c73649349e2f0879e3478a74aa5f215ca..3f0b2c9f2ffe813f1a67b81d074fac8519874028 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 11316c59feeb98c22ee82706902cf3a42cbf8312..7eff53d8d0936f200ae4dbc9be085dcb51abe563 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 ef0cce0961b6d9050ecf9ec0880ee610b3dca09e..9d322fd27fab399a03244596437a45315faa39da 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 b5e195c98b736df3d5ee65df54f21d66582da1d8..2964054106351effc77309a46b82f54454860e62 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 484270ec7164ad93012b44def3b9e0be797ecfa5..d9177e53f29fe7f93b06bccade5e9e0e1a71b6ed 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 f16c87a8f83d6f6f3fc8b2b504049b043e3a897e..65146f4635e80f16489022af48c57dd70a4a5a00 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 e28684e1bdefc193fe4ad66860ad2e5a574556a8..1514dc97abaa3e7e8c51448e0efd3fd87b386f3f 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 ad3b4e50423166c04bc99b24e3d4d9db7eed2e02..b17965bdb63465c37485a69d82f7228d5bf8fb9d 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 235dc7cd3853c517679dad8dc3be1c1f161f14aa..6e2a0ab968189795e953d2200c59d02a12c984ed 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 f8072fd540c37bb5dce642dc3aeea1b6a41bcfee..87633978b898cc0bcd182a1a0cefe9100f5fcd96 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 c6b5638ff38138ffcd06abfe7327b5aff9d158af..99b23cdeee8f0ce78a40477c376f1ab07074346f 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 be9b2f0465911afe1a1dcfb1b8a536cad5af32b1..22e23f4c00dbdef258baed8347aab2f42aa5ef14 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 36cf5beba711706b40cda863a367d1a0c49e2abd..e72790332bc2511ae1444a46f2f0b8da0211d694 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 86a042c0e9a0bf9f28be933943ce06c778f6c039..e190a436c449a1cec2c0fdc1b167bd61a8d1fec7 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 8f3e084bbefa63a5c7040257a51f4d246ac48a39..ed2f441d46310b99d9766aa996aa5c532ab8c0af 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 f468a98685eadde47e874994dd1b8ab3f7ebec29..233e5e829453a27fa65fdf990a6cb84c48ab9f75 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 93fc84e05c546444f352e69762457569857c9214..4d651cf8622d287f3703c16c375a74cef3bd63bb 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 4014d742aa5f6bedb7a09aad9d576cef6c3dd72c..7640ef34192a1b1dad4ad48adb49ed4e2c5be208 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 093d03c316fcd2bd9372be38d45cbd6a4ece0395..0be2bfc3e7086f754ed8b7af420942664418c86d 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 dbe2fc32531259d79ae62293fa9fc5d4fbddf912..c1d181e5bde5658928fa849447c3e51bb6c6a00d 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 f7443a8f203e02943e856029e5b7778fbaec50d9..eee797b1841cf2f42d0d525a38776c80f7e645cb 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 970b52cf2145d6b11d5e455748f5fd1168af787d..490c0dee004eab155815eaa6f6b42f18614810db 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 5a06a8f9b74a2e1bd02adbfd584b3e28333ad51d..3ddec3e0609daac234cc74cd515dae4a79311343 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 f66f5e61ec153ac622ffcb8b4f9d152409cadaa0..bf5a7d669bfaadda907eab790fe84281c94d5192 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 4be41d14d0e4b1ef3057a33156415f0c266ac17a..e53097f3b43dfac7e1ed355f3ca290f919df8f14 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 01b13ce8de36966d7303671943df6b3c50a20865..32dbf7686d798a55d787df6eca0c7c0437b50b60 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 9228fd61a90588478e3047be162ab4d8fe8c09cf..142b768d9cf537551e2b790ab2acfe27d4cfe09b 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 0fa17fd6152d11becef3822171161c07858793c2..1c15e5df87533487f1df82d89e3284c46282ac58 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 fbe51def8c25c0a58204184c4ed523e62a10d792..d698819551dc665cdec426a49d6350b8470f0d4b 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 19cd2e54cce531374225f027800589b3f72777a7..f3f49bff726bf845639a3d9ea68a0544dbb34d43 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 3cef46a193e8264d4fe115e77853edd26222fd0d..53b05a3e8885d3308ecf56a3389d03116bc78faf 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 2928ba31cfe9b16791e8e5d11abce4ef04d37660..194a32183152c645f6c4bf965acc69575fde9ee4 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 443a028fdaa47f5a177fd9403f47ee9e544557fb..a3db21d26b0b761d86ae71b33086a7ea9c456f2d 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 08950dad837b76527a5721fcc0c3263b5f30e746..7b269d91cfa503eb02591e1ace569dccba4bb1df 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 8d678fc578fa46bae9d9e9f173165e6b8162e846..8881a1569e66b1176af6ecaa836193475512da82 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 d90281a70d934691dd77bfb7bfd120e54c81de2b..d1efd97e0f31cc0808c9cba069b93fc244e4329f 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 4de7131c320437d4f9646ca5af4c5f68205e33c8..6fed3bfa30493338c71548d1188e90b558691d2b 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 cd558d4358ddda70f4469a2dec48cdb9c58e0e37..24d83140d42538ba231a74feced5ef43195dd0e6 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 442d3e1d533bd6b81cf7186fca8faf33f72cebf6..9ee6c02b495c9b3c492d53fc5b864ae10dd1f1e8 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 3fbc6691e390171efe8d946f98ef4c95152da782..ec3da12d8d01a359294bd5bb6f6ad838bd2b2e02 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 45a951d853ce98a5bf3d63ca8ac99cbcc51a85b9..9017d7459496b2e3f76cef2651c7afcd546cc814 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 febadc1b1a7ed07a70b9efc95fbf6b649843495e..11fe8c3ff0d8b6808e73364c602abc1314077206 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 46f0790f73cfdd5b7c8f764eda5f4d0452b59aef..143bea5e404b0870509495d3ba9b5846464cb506 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 5516162bfdc2cfa2e90754b06cbfbc996a35e125..0b122b04c0e429d0031b394482f7604f0be24338 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 9b64df721a95210577983848d29e22428c6e700a..c4cd739ade8c62565dff07e1226a83ff1cb0655d 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"
 
 /*