diff --git a/formats/format_g726.c b/formats/format_g726.c
index 7005864d6e30c67427c56ac39f77e8197ab2a8df..35b5e9ced4f2ff600ea163371d133ab12fa0a2ff 100644
--- a/formats/format_g726.c
+++ b/formats/format_g726.c
@@ -32,7 +32,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include "asterisk/options.h"
 #include "asterisk/file.h"
 #include "asterisk/module.h"
 #include "asterisk/endian.h"
diff --git a/formats/format_ogg_vorbis.c b/formats/format_ogg_vorbis.c
index 21b511de64e7a6b939580cb764942abb5aa05118..89d31e35cdbf8d64e06a01a5999b4bd47d5e5950 100644
--- a/formats/format_ogg_vorbis.c
+++ b/formats/format_ogg_vorbis.c
@@ -44,7 +44,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/file.h"
 #include "asterisk/module.h"
-#include "asterisk/options.h"
 
 /*
  * this is the number of samples we deal with. Samples are converted
diff --git a/main/abstract_jb.c b/main/abstract_jb.c
index 8bdc8254146d9fcb48e31ac694f6a30b370cd994..734728a167d98e7a187bce266a46be0e5715a9f7 100644
--- a/main/abstract_jb.c
+++ b/main/abstract_jb.c
@@ -34,7 +34,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/frame.h"
 #include "asterisk/channel.h"
 #include "asterisk/term.h"
-#include "asterisk/options.h"
 #include "asterisk/utils.h"
 
 #include "asterisk/abstract_jb.h"
diff --git a/main/acl.c b/main/acl.c
index ae3aa630652bc52923f1bba86716047e8d7c5637..860f2f16a3755281648a6af1aca94d85259bdd66 100644
--- a/main/acl.c
+++ b/main/acl.c
@@ -43,7 +43,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/acl.h"
 #include "asterisk/channel.h"
-#include "asterisk/options.h"
 #include "asterisk/utils.h"
 #include "asterisk/lock.h"
 #include "asterisk/srv.h"
diff --git a/main/adsistub.c b/main/adsistub.c
index c9d8824363ccc803ac2c53764446b8d75097bdf1..8f2908225c16d240bb174aa79d1854d17e61af5b 100644
--- a/main/adsistub.c
+++ b/main/adsistub.c
@@ -20,7 +20,6 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include "asterisk/options.h"
 #include "asterisk/channel.h"
 #include "asterisk/adsi.h"
 
diff --git a/main/app.c b/main/app.c
index 4441932cad9c5d00116f1d35896a29028d7418fc..cc06841d1388bf28d0cd5a14bd79d965cf8ea3d5 100644
--- a/main/app.c
+++ b/main/app.c
@@ -41,7 +41,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/file.h"
 #include "asterisk/app.h"
 #include "asterisk/dsp.h"
-#include "asterisk/options.h"
 #include "asterisk/utils.h"
 #include "asterisk/lock.h"
 #include "asterisk/indications.h"
diff --git a/main/asterisk.c b/main/asterisk.c
index 69e75abdfc1bfd68b93687a1ca56816b8e7a08e0..1a9e366a7a180e193216b90f9ea02d404e9c545c 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -93,7 +93,6 @@ int daemon(int, int);  /* defined in libresolv of all places */
 #endif
 
 #include "asterisk/network.h"
-#include "asterisk/options.h"
 #include "asterisk/cli.h"
 #include "asterisk/channel.h"
 #include "asterisk/ulaw.h"
diff --git a/main/astmm.c b/main/astmm.c
index aaed4e9f0d9bdffb002e417458bd9cba2b99682c..37dbd04d658545a252aac5274350140ce1d1cba5 100644
--- a/main/astmm.c
+++ b/main/astmm.c
@@ -33,7 +33,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <time.h>
 
 #include "asterisk/cli.h"
-#include "asterisk/options.h"
 #include "asterisk/lock.h"
 #include "asterisk/strings.h"
 #include "asterisk/unaligned.h"
diff --git a/main/audiohook.c b/main/audiohook.c
index f9e93220cd15d3b6f4a09bb0b8c27cd774863a4f..f1e5f5809c078245595ca71cee8655753d3d3aae 100644
--- a/main/audiohook.c
+++ b/main/audiohook.c
@@ -30,7 +30,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <signal.h>
 
 #include "asterisk/channel.h"
-#include "asterisk/options.h"
 #include "asterisk/utils.h"
 #include "asterisk/lock.h"
 #include "asterisk/linkedlists.h"
diff --git a/main/autoservice.c b/main/autoservice.c
index 9e5c173ea6a2edaebb981c14212d944a528bf7d6..39bad2f7c73406578f45386848d1f50c39d9030e 100644
--- a/main/autoservice.c
+++ b/main/autoservice.c
@@ -33,7 +33,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/pbx.h"
 #include "asterisk/frame.h"
 #include "asterisk/sched.h"
-#include "asterisk/options.h"
 #include "asterisk/channel.h"
 #include "asterisk/file.h"
 #include "asterisk/translate.h"
diff --git a/main/callerid.c b/main/callerid.c
index 4662915aefc4b7aa9c91e2609ad63a84d6abcb64..04b45ab4f3ed33bec616945fe9f17a2bed17fa0c 100644
--- a/main/callerid.c
+++ b/main/callerid.c
@@ -37,7 +37,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/channel.h"
 #include "asterisk/callerid.h"
 #include "asterisk/fskmodem.h"
-#include "asterisk/options.h"
 #include "asterisk/utils.h"
 
 struct callerid_state {
diff --git a/main/cdr.c b/main/cdr.c
index 62f2ee677757b6db13912813b260e7360bcbcde8..5578fe20a2742a5d0744179faaef480baf0c9cf2 100644
--- a/main/cdr.c
+++ b/main/cdr.c
@@ -42,7 +42,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/cdr.h"
 #include "asterisk/callerid.h"
 #include "asterisk/causes.h"
-#include "asterisk/options.h"
 #include "asterisk/linkedlists.h"
 #include "asterisk/utils.h"
 #include "asterisk/sched.h"
diff --git a/main/channel.c b/main/channel.c
index d8524f5e9b61e2bc737525a05f8758e29ef6d045..8e16b733eb0139dd2cd7b8b13576c41c308c956a 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -39,7 +39,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/pbx.h"
 #include "asterisk/frame.h"
 #include "asterisk/sched.h"
-#include "asterisk/options.h"
 #include "asterisk/channel.h"
 #include "asterisk/musiconhold.h"
 #include "asterisk/say.h"
diff --git a/main/cli.c b/main/cli.c
index c53fcbe1883dde127390c989e0fde74710a8165e..f2f7da499cb2747773d78c2c12f14b6c87b8a77e 100644
--- a/main/cli.c
+++ b/main/cli.c
@@ -34,7 +34,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <ctype.h>
 #include <regex.h>
 
-#include "asterisk/options.h"
 #include "asterisk/cli.h"
 #include "asterisk/linkedlists.h"
 #include "asterisk/module.h"
diff --git a/main/config.c b/main/config.c
index b07c809d5021100fdcc58f6ce5ecddbb7c050fa0..fc020c1b7f5da26b916bdd41fcfa413849c73457 100644
--- a/main/config.c
+++ b/main/config.c
@@ -45,7 +45,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/config.h"
 #include "asterisk/cli.h"
 #include "asterisk/lock.h"
-#include "asterisk/options.h"
 #include "asterisk/utils.h"
 #include "asterisk/channel.h"
 #include "asterisk/app.h"
diff --git a/main/db.c b/main/db.c
index ab4bddac91f02e5ffb1f0f216808ff5546ec219b..36ba9ae83c59adb5be207f7724b45bbabeb58aaa 100644
--- a/main/db.c
+++ b/main/db.c
@@ -41,7 +41,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/file.h"
 #include "asterisk/app.h"
 #include "asterisk/dsp.h"
-#include "asterisk/options.h"
 #include "asterisk/astdb.h"
 #include "asterisk/cli.h"
 #include "asterisk/utils.h"
diff --git a/main/devicestate.c b/main/devicestate.c
index 7f00425fea510469f89128df0d9a01b5af794ed9..88b095b05d98fcd34cd9e1517400fe12219e3f90 100644
--- a/main/devicestate.c
+++ b/main/devicestate.c
@@ -120,7 +120,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/devicestate.h"
 #include "asterisk/pbx.h"
 #include "asterisk/app.h"
-#include "asterisk/options.h"
 #include "asterisk/event.h"
 
 /*! \brief Device state strings for printing */
diff --git a/main/dial.c b/main/dial.c
index e6f926905f51d9291e0f8bd09948a90b4b440434..e48805ced48f60c041876121556eb2e3cf37a4fa 100644
--- a/main/dial.c
+++ b/main/dial.c
@@ -31,7 +31,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <signal.h>
 
 #include "asterisk/channel.h"
-#include "asterisk/options.h"
 #include "asterisk/utils.h"
 #include "asterisk/lock.h"
 #include "asterisk/linkedlists.h"
diff --git a/main/dns.c b/main/dns.c
index 21a8e967aa96213ebb49ed392fe1560df30ee8e0..34212fdf1af052a1d5fbca12d910dda999f7c992 100644
--- a/main/dns.c
+++ b/main/dns.c
@@ -40,7 +40,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/channel.h"
 #include "asterisk/dns.h"
 #include "asterisk/endian.h"
-#include "asterisk/options.h"
 
 #define MAX_SIZE 4096
 
diff --git a/main/dnsmgr.c b/main/dnsmgr.c
index c6e3adffc5c3542f5cc6f2e5fc466f2e02dda356..5d42cd56023c36d64c9245bd28922f6fd167b1fb 100644
--- a/main/dnsmgr.c
+++ b/main/dnsmgr.c
@@ -36,7 +36,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/utils.h"
 #include "asterisk/config.h"
 #include "asterisk/sched.h"
-#include "asterisk/options.h"
 #include "asterisk/cli.h"
 
 static struct sched_context *sched;
diff --git a/main/dsp.c b/main/dsp.c
index c98ee7f6c0054f0bcfac2559389712f84fe7d99a..01cac47983bd2954ba4ea6c7ed6b4c884301d5ab 100644
--- a/main/dsp.c
+++ b/main/dsp.c
@@ -52,7 +52,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/ulaw.h"
 #include "asterisk/alaw.h"
 #include "asterisk/utils.h"
-#include "asterisk/options.h"
 
 /*! Number of goertzels for progress detect */
 enum gsamp_size {
diff --git a/main/enum.c b/main/enum.c
index 011dfa56102bdcb98db1f261a33e065a2a326c70..15728a7ca8931a98dc86d5a28c97d81bad022888 100644
--- a/main/enum.c
+++ b/main/enum.c
@@ -56,7 +56,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <ctype.h>
 #include <regex.h>
 
-#include "asterisk/options.h"
 #include "asterisk/enum.h"
 #include "asterisk/dns.h"
 #include "asterisk/channel.h"
diff --git a/main/file.c b/main/file.c
index 42879819c47ba95038be3f9c2c4c6b3fff390ef2..145932e6cb7cd8f4a91a2b711e065325f2dbcefa 100644
--- a/main/file.c
+++ b/main/file.c
@@ -37,7 +37,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/cli.h"
 #include "asterisk/channel.h"
 #include "asterisk/sched.h"
-#include "asterisk/options.h"
 #include "asterisk/translate.h"
 #include "asterisk/utils.h"
 #include "asterisk/lock.h"
diff --git a/main/frame.c b/main/frame.c
index 13d81d4b4ac823c22961d2b718fc332b56a84d07..755e8031e18e893c66eb32aaf90ec1f8b0e2590c 100644
--- a/main/frame.c
+++ b/main/frame.c
@@ -30,7 +30,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/_private.h"
 #include "asterisk/lock.h"
 #include "asterisk/frame.h"
-#include "asterisk/options.h"
 #include "asterisk/channel.h"
 #include "asterisk/cli.h"
 #include "asterisk/term.h"
diff --git a/main/hashtab.c b/main/hashtab.c
index c69eb969adfdf5eac3698b459d6d067fbddf84ce..4c36bc19bc46e20989c0a974a6bc3100f16c3f57 100644
--- a/main/hashtab.c
+++ b/main/hashtab.c
@@ -30,7 +30,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision")
 
 #include "asterisk/lock.h"
 #include "asterisk/frame.h"
-#include "asterisk/options.h"
 #include "asterisk/channel.h"
 #include "asterisk/cli.h"
 #include "asterisk/term.h"
diff --git a/main/http.c b/main/http.c
index c552bce3595568f207cd28845c962357ee35e16f..c996a6ccdf444291da2160da0bfe8c1dc407be53 100644
--- a/main/http.c
+++ b/main/http.c
@@ -47,7 +47,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/http.h"
 #include "asterisk/utils.h"
 #include "asterisk/strings.h"
-#include "asterisk/options.h"
 #include "asterisk/config.h"
 #include "asterisk/stringfields.h"
 #include "asterisk/version.h"
diff --git a/main/image.c b/main/image.c
index 1e763ed5e8758326dbe4460a789d48235a2f1e92..7096311a2ed8bd51d6135416bf16189081e5c728 100644
--- a/main/image.c
+++ b/main/image.c
@@ -33,7 +33,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/paths.h"	/* use ast_config_AST_DATA_DIR */
 #include "asterisk/sched.h"
-#include "asterisk/options.h"
 #include "asterisk/channel.h"
 #include "asterisk/file.h"
 #include "asterisk/image.h"
diff --git a/main/indications.c b/main/indications.c
index e2e13d17d3f8ee353f10b8e03d0f523451b50ba0..e555d0357db15869d494f66cb51fffaa5e747b6b 100644
--- a/main/indications.c
+++ b/main/indications.c
@@ -38,7 +38,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/linkedlists.h"
 #include "asterisk/indications.h"
 #include "asterisk/frame.h"
-#include "asterisk/options.h"
 #include "asterisk/channel.h"
 #include "asterisk/utils.h"
 
diff --git a/main/io.c b/main/io.c
index 3f35b5feea299959fdcab3c13a1c791ff5eee87f..3ed2e02422a829511e62ae46a661402bd003058a 100644
--- a/main/io.c
+++ b/main/io.c
@@ -32,7 +32,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/io.h"
 #include "asterisk/utils.h"
-#include "asterisk/options.h"
 
 #ifdef DEBUG_IO
 #define DEBUG DEBUG_M
diff --git a/main/jitterbuf.c b/main/jitterbuf.c
index 81e60cc8a4aad22e5de512a050e4adfa9dfbab53..27b93a6599cc8810a177983973eca0309dcab785 100644
--- a/main/jitterbuf.c
+++ b/main/jitterbuf.c
@@ -33,7 +33,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "jitterbuf.h"
 #include "asterisk/utils.h"
-#include "asterisk/options.h"
 
 /*! define these here, just for ancient compiler systems */
 #define JB_LONGMAX 2147483647L
diff --git a/main/loader.c b/main/loader.c
index dcf8854f29c4b3a2e482d751d0ae0b8441db1455..0d042675ae0a299c0d874065dab365674386d7c4 100644
--- a/main/loader.c
+++ b/main/loader.c
@@ -37,7 +37,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/linkedlists.h"
 #include "asterisk/module.h"
-#include "asterisk/options.h"
 #include "asterisk/config.h"
 #include "asterisk/channel.h"
 #include "asterisk/term.h"
diff --git a/main/logger.c b/main/logger.c
index 3f7634b2adc51346e13bfeaff59698382fb52982..cf994a5497bd9e8da2aee66a64ec9ed4dd566a0d 100644
--- a/main/logger.c
+++ b/main/logger.c
@@ -65,7 +65,6 @@ static int syslog_level_map[] = {
 #undef _ASTERISK_LOGGER_H	/* now include logger.h */
 #include "asterisk/logger.h"
 #include "asterisk/lock.h"
-#include "asterisk/options.h"
 #include "asterisk/channel.h"
 #include "asterisk/config.h"
 #include "asterisk/term.h"
diff --git a/main/manager.c b/main/manager.c
index 26cb9e7deadaa972dc8e7a1f3c9439fa370ca728..f0650457d9c5c25c2d37689dbb037c2906f76502 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -58,7 +58,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/config.h"
 #include "asterisk/callerid.h"
 #include "asterisk/lock.h"
-#include "asterisk/options.h"
 #include "asterisk/cli.h"
 #include "asterisk/app.h"
 #include "asterisk/pbx.h"
diff --git a/main/netsock.c b/main/netsock.c
index 1ff433bf07fe0215b8b4b4462a095f1b4b2d985f..f6ac83b1121981870f505a3d30fb5f56be32df49 100644
--- a/main/netsock.c
+++ b/main/netsock.c
@@ -43,7 +43,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/netsock.h"
 #include "asterisk/channel.h"
-#include "asterisk/options.h"
 #include "asterisk/utils.h"
 #include "asterisk/lock.h"
 #include "asterisk/srv.h"
diff --git a/main/pbx.c b/main/pbx.c
index 48f56fba0ae90e1f0d96aaf5e4b1cdc2058529e7..a8059a4415a7b87214c3c6b346b31efae83dddfe 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -43,7 +43,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/cli.h"
 #include "asterisk/pbx.h"
 #include "asterisk/channel.h"
-#include "asterisk/options.h"
 #include "asterisk/file.h"
 #include "asterisk/callerid.h"
 #include "asterisk/cdr.h"
diff --git a/main/privacy.c b/main/privacy.c
index 40e5b3bf6b08004541d2912b5913306b659185d5..dfb197f38e45fcf9e396d740e8158327b4fa3352 100644
--- a/main/privacy.c
+++ b/main/privacy.c
@@ -35,7 +35,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/file.h"
 #include "asterisk/app.h"
 #include "asterisk/dsp.h"
-#include "asterisk/options.h"
 #include "asterisk/astdb.h"
 #include "asterisk/callerid.h"
 #include "asterisk/privacy.h"
diff --git a/main/rtp.c b/main/rtp.c
index f52d5751ad05dab08db36f16aca21a8cb00cd9d3..afaf42836b5c52d9fe14b51b8bd0cafb608ceaff 100644
--- a/main/rtp.c
+++ b/main/rtp.c
@@ -36,7 +36,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/rtp.h"
 #include "asterisk/frame.h"
-#include "asterisk/options.h"
 #include "asterisk/channel.h"
 #include "asterisk/acl.h"
 #include "asterisk/config.h"
diff --git a/main/say.c b/main/say.c
index 17f3a57d1d71afa60cec9953af68d0026b2210c7..51c9ce3e78edf2afc49421386bceade2c1a4903a 100644
--- a/main/say.c
+++ b/main/say.c
@@ -46,7 +46,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
-#include "asterisk/options.h"
 #include "asterisk/say.h"
 #include "asterisk/lock.h"
 #include "asterisk/localtime.h"
diff --git a/main/sched.c b/main/sched.c
index ad32a1d1e51fcc00db0035d6a8db2a7523e9a61c..3aeeb9d828d383ee4ec9ef89be0efd187cca0ff9 100644
--- a/main/sched.c
+++ b/main/sched.c
@@ -43,7 +43,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/lock.h"
 #include "asterisk/utils.h"
 #include "asterisk/linkedlists.h"
-#include "asterisk/options.h"
 
 struct sched {
 	AST_LIST_ENTRY(sched) list;
diff --git a/main/srv.c b/main/srv.c
index 4394b3903443502f6ca75f07b7d84aca3238c892..644bf757be340fb3b8a5fd781616d20e0da5ce5b 100644
--- a/main/srv.c
+++ b/main/srv.c
@@ -45,7 +45,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/channel.h"
 #include "asterisk/srv.h"
 #include "asterisk/dns.h"
-#include "asterisk/options.h"
 #include "asterisk/utils.h"
 #include "asterisk/linkedlists.h"
 
diff --git a/main/term.c b/main/term.c
index 825a710da3a79dbb1fd6511fc283ec5000112bd3..ea005aa31dabfdbe881cbe94f6377f0e4ad13839 100644
--- a/main/term.c
+++ b/main/term.c
@@ -34,7 +34,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <fcntl.h>
 
 #include "asterisk/term.h"
-#include "asterisk/options.h"
 #include "asterisk/lock.h"
 #include "asterisk/utils.h"
 
diff --git a/main/translate.c b/main/translate.c
index aa656cf5c1c028377e2b385108cb5a5e2538eb76..0d04a996628f598d0f04065d60eaf9ce80e19c61 100644
--- a/main/translate.c
+++ b/main/translate.c
@@ -34,7 +34,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/channel.h"
 #include "asterisk/translate.h"
 #include "asterisk/module.h"
-#include "asterisk/options.h"
 #include "asterisk/frame.h"
 #include "asterisk/sched.h"
 #include "asterisk/cli.h"
diff --git a/main/udptl.c b/main/udptl.c
index 0e0e98d3da67d3ea76fc40e90bb624ed60dd24c7..8ae65b9e6d287645313e3a39eac44644d1e9150a 100644
--- a/main/udptl.c
+++ b/main/udptl.c
@@ -56,7 +56,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/udptl.h"
 #include "asterisk/frame.h"
-#include "asterisk/options.h"
 #include "asterisk/channel.h"
 #include "asterisk/acl.h"
 #include "asterisk/config.h"
diff --git a/main/utils.c b/main/utils.c
index 83ab65ac1e183d165bfa82fbd7327bb24e11c382..97abe80ae4bb3d3a03a80280a5c95a441509c88a 100644
--- a/main/utils.c
+++ b/main/utils.c
@@ -41,7 +41,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/io.h"
 #include "asterisk/md5.h"
 #include "asterisk/sha1.h"
-#include "asterisk/options.h"
 #include "asterisk/cli.h"
 #include "asterisk/linkedlists.h"
 
diff --git a/res/res_adsi.c b/res/res_adsi.c
index 5a1cf14db9bd68e769507253cf40f01fb527641d..664157c5118ae8bc941509c6e7f9b8011bec5ef7 100644
--- a/res/res_adsi.c
+++ b/res/res_adsi.c
@@ -46,7 +46,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/module.h"
 #include "asterisk/config.h"
 #include "asterisk/file.h"
-#include "asterisk/options.h"
 
 #define DEFAULT_ADSI_MAX_RETRIES 3
 
diff --git a/res/res_ael_share.c b/res/res_ael_share.c
index 92d2d5d4f0f34694949dd658ac7eec23a77ece70..805dfd9a83df70dcbb7dd79eff640bf394838e8a 100644
--- a/res/res_ael_share.c
+++ b/res/res_ael_share.c
@@ -31,7 +31,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
-#include "asterisk/options.h"
 #include "asterisk/pbx.h"
 #include "asterisk/config.h"
 #include "asterisk/module.h"
diff --git a/res/res_agi.c b/res/res_agi.c
index cbb8d982339516f7492ef2bd73a23033437738c7..3d6b60d5c48662a3dc796fb6b94ae7af63566e60 100644
--- a/res/res_agi.c
+++ b/res/res_agi.c
@@ -43,7 +43,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/astdb.h"
 #include "asterisk/callerid.h"
 #include "asterisk/cli.h"
-#include "asterisk/options.h"
 #include "asterisk/image.h"
 #include "asterisk/say.h"
 #include "asterisk/app.h"
diff --git a/res/res_config_odbc.c b/res/res_config_odbc.c
index 129c3cbe99103bbe7fde64f8a06d671036db5bfe..08adeb443aeacccb830599d469908832c3821fd2 100644
--- a/res/res_config_odbc.c
+++ b/res/res_config_odbc.c
@@ -44,7 +44,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/config.h"
 #include "asterisk/module.h"
 #include "asterisk/lock.h"
-#include "asterisk/options.h"
 #include "asterisk/res_odbc.h"
 #include "asterisk/utils.h"
 
diff --git a/res/res_config_pgsql.c b/res/res_config_pgsql.c
index f40d34186b56dc45cbf522a822e36162d69304a9..f0f1673bb6f8bc3d457e041c97b28d52009dbea5 100644
--- a/res/res_config_pgsql.c
+++ b/res/res_config_pgsql.c
@@ -38,7 +38,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/config.h"
 #include "asterisk/module.h"
 #include "asterisk/lock.h"
-#include "asterisk/options.h"
 #include "asterisk/utils.h"
 #include "asterisk/cli.h"
 
diff --git a/res/res_config_sqlite.c b/res/res_config_sqlite.c
index 69db445c8b309ac94e3694ffa9f2e4a1c4de76f3..473622b8b7a92bf3ca652331cc6853c6d900f7c9 100644
--- a/res/res_config_sqlite.c
+++ b/res/res_config_sqlite.c
@@ -92,7 +92,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/lock.h"
 #include "asterisk/config.h"
 #include "asterisk/module.h"
-#include "asterisk/options.h"
 #include "asterisk/linkedlists.h"
 
 #define MACRO_BEGIN	do {
diff --git a/res/res_crypto.c b/res/res_crypto.c
index 6903c388c7c1dd1689a998fea1fbdafaeeef20b6..593d2f218b8f1293e2b0f97a47cc1f29c84d523e 100644
--- a/res/res_crypto.c
+++ b/res/res_crypto.c
@@ -44,7 +44,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/channel.h"
 #include "asterisk/say.h"
 #include "asterisk/module.h"
-#include "asterisk/options.h"
 #include "asterisk/crypto.h"
 #include "asterisk/md5.h"
 #include "asterisk/cli.h"
diff --git a/res/res_features.c b/res/res_features.c
index 9dfdb88299f5c847bd9566a3f4848c6dc735eec2..8bb8e5f381f2a03da3a2891395e21418d1c8b1c2 100644
--- a/res/res_features.c
+++ b/res/res_features.c
@@ -36,7 +36,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
-#include "asterisk/options.h"
 #include "asterisk/causes.h"
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
diff --git a/res/res_jabber.c b/res/res_jabber.c
index 57f3a25aba3dcc76b0fde2ab159ceab02f4ffa96..716c68f354a5ebdb5ed5ed8087c63bb4d8bb9801 100644
--- a/res/res_jabber.c
+++ b/res/res_jabber.c
@@ -43,7 +43,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/config.h"
 #include "asterisk/callerid.h"
 #include "asterisk/lock.h"
-#include "asterisk/options.h"
 #include "asterisk/cli.h"
 #include "asterisk/app.h"
 #include "asterisk/pbx.h"
diff --git a/res/res_monitor.c b/res/res_monitor.c
index 33906ef010d0122275633d54f9b2c4a29552e8b7..0db821e22f77fd50339b491d6fc7332af3dd7a07 100644
--- a/res/res_monitor.c
+++ b/res/res_monitor.c
@@ -42,7 +42,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/app.h"
 #include "asterisk/utils.h"
 #include "asterisk/config.h"
-#include "asterisk/options.h"
 
 AST_MUTEX_DEFINE_STATIC(monitorlock);
 
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index d82a65770aa648af8bcd7b0a6956d79b2ab68cc5..4270f5708f3104100ce0fb6e9b982b05b3b29595 100644
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -52,7 +52,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/res/res_odbc.c b/res/res_odbc.c
index fcde0f7cfd86f2502dcf3d2ff27bb614bdaba027..00a07ef10df8849b912f3cd63a1bf47673fbb971 100644
--- a/res/res_odbc.c
+++ b/res/res_odbc.c
@@ -41,7 +41,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
 #include "asterisk/config.h"
-#include "asterisk/options.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/cli.h"
diff --git a/res/res_realtime.c b/res/res_realtime.c
index 7d42dda2f1e2808c7f8ab449a1d0687b1eeac8c0..14ad28c407d981909db57ed0c76ffafd5a48bb78 100644
--- a/res/res_realtime.c
+++ b/res/res_realtime.c
@@ -33,7 +33,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/file.h"
 #include "asterisk/channel.h"
-#include "asterisk/options.h"
 #include "asterisk/pbx.h"
 #include "asterisk/config.h"
 #include "asterisk/module.h"
diff --git a/res/res_smdi.c b/res/res_smdi.c
index 376ccc052bc24b31e2af3c2e5b2f5a48377a10ef..af20fbefdefe2c779356eaa646585acb0fc98bcd 100644
--- a/res/res_smdi.c
+++ b/res/res_smdi.c
@@ -38,7 +38,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/config.h"
 #include "asterisk/astobj.h"
 #include "asterisk/io.h"
-#include "asterisk/options.h"
 
 /* Message expiry time in milliseconds */
 #define SMDI_MSG_EXPIRY_TIME	30000 /* 30 seconds */
diff --git a/res/res_snmp.c b/res/res_snmp.c
index eafc53c9185d96b04447ca441b9cad3e1f4d0347..71a79f2096905f88136b83d144adcc1e643642fc 100644
--- a/res/res_snmp.c
+++ b/res/res_snmp.c
@@ -27,7 +27,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/channel.h"
 #include "asterisk/module.h"
-#include "asterisk/options.h"
 
 #include "snmp/agent.h"
 
diff --git a/res/res_speech.c b/res/res_speech.c
index 958bd8171f1ff3cdb114a29d730972ff8c618804..902955da19cb10be37e723d4f80f66ee3fe38e97 100644
--- a/res/res_speech.c
+++ b/res/res_speech.c
@@ -33,7 +33,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$");
 #include "asterisk/linkedlists.h"
 #include "asterisk/cli.h"
 #include "asterisk/term.h"
-#include "asterisk/options.h"
 #include "asterisk/speech.h"