aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--formats/format_g726.c1
-rw-r--r--formats/format_ogg_vorbis.c1
-rw-r--r--main/abstract_jb.c1
-rw-r--r--main/acl.c1
-rw-r--r--main/adsistub.c1
-rw-r--r--main/app.c1
-rw-r--r--main/asterisk.c1
-rw-r--r--main/astmm.c1
-rw-r--r--main/audiohook.c1
-rw-r--r--main/autoservice.c1
-rw-r--r--main/callerid.c1
-rw-r--r--main/cdr.c1
-rw-r--r--main/channel.c1
-rw-r--r--main/cli.c1
-rw-r--r--main/config.c1
-rw-r--r--main/db.c1
-rw-r--r--main/devicestate.c1
-rw-r--r--main/dial.c1
-rw-r--r--main/dns.c1
-rw-r--r--main/dnsmgr.c1
-rw-r--r--main/dsp.c1
-rw-r--r--main/enum.c1
-rw-r--r--main/file.c1
-rw-r--r--main/frame.c1
-rw-r--r--main/hashtab.c1
-rw-r--r--main/http.c1
-rw-r--r--main/image.c1
-rw-r--r--main/indications.c1
-rw-r--r--main/io.c1
-rw-r--r--main/jitterbuf.c1
-rw-r--r--main/loader.c1
-rw-r--r--main/logger.c1
-rw-r--r--main/manager.c1
-rw-r--r--main/netsock.c1
-rw-r--r--main/pbx.c1
-rw-r--r--main/privacy.c1
-rw-r--r--main/rtp.c1
-rw-r--r--main/say.c1
-rw-r--r--main/sched.c1
-rw-r--r--main/srv.c1
-rw-r--r--main/term.c1
-rw-r--r--main/translate.c1
-rw-r--r--main/udptl.c1
-rw-r--r--main/utils.c1
-rw-r--r--res/res_adsi.c1
-rw-r--r--res/res_ael_share.c1
-rw-r--r--res/res_agi.c1
-rw-r--r--res/res_config_odbc.c1
-rw-r--r--res/res_config_pgsql.c1
-rw-r--r--res/res_config_sqlite.c1
-rw-r--r--res/res_crypto.c1
-rw-r--r--res/res_features.c1
-rw-r--r--res/res_jabber.c1
-rw-r--r--res/res_monitor.c1
-rw-r--r--res/res_musiconhold.c1
-rw-r--r--res/res_odbc.c1
-rw-r--r--res/res_realtime.c1
-rw-r--r--res/res_smdi.c1
-rw-r--r--res/res_snmp.c1
-rw-r--r--res/res_speech.c1
60 files changed, 0 insertions, 60 deletions
diff --git a/formats/format_g726.c b/formats/format_g726.c
index 7005864d6..35b5e9ced 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 21b511de6..89d31e35c 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 8bdc82541..734728a16 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 ae3aa6306..860f2f16a 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 c9d882436..8f2908225 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 4441932ca..cc06841d1 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 69e75abdf..1a9e366a7 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 aaed4e9f0..37dbd04d6 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 f9e93220c..f1e5f5809 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 9e5c173ea..39bad2f7c 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 4662915ae..04b45ab4f 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 62f2ee677..5578fe20a 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 d8524f5e9..8e16b733e 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 c53fcbe18..f2f7da499 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 b07c809d5..fc020c1b7 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 ab4bddac9..36ba9ae83 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 7f00425fe..88b095b05 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 e6f926905..e48805ced 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 21a8e967a..34212fdf1 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 c6e3adffc..5d42cd560 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 c98ee7f6c..01cac4798 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 011dfa561..15728a7ca 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 42879819c..145932e6c 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 13d81d4b4..755e8031e 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 c69eb969a..4c36bc19b 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 c552bce35..c996a6ccd 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 1e763ed5e..7096311a2 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 e2e13d17d..e555d0357 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 3f35b5fee..3ed2e0242 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 81e60cc8a..27b93a659 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 dcf8854f2..0d042675a 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 3f7634b2a..cf994a549 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 26cb9e7de..f0650457d 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 1ff433bf0..f6ac83b11 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 48f56fba0..a8059a441 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 40e5b3bf6..dfb197f38 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 f52d5751a..afaf42836 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 17f3a57d1..51c9ce3e7 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 ad32a1d1e..3aeeb9d82 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 4394b3903..644bf757b 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 825a710da..ea005aa31 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 aa656cf5c..0d04a9966 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 0e0e98d3d..8ae65b9e6 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 83ab65ac1..97abe80ae 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 5a1cf14db..664157c51 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 92d2d5d4f..805dfd9a8 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 cbb8d9823..3d6b60d5c 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 129c3cbe9..08adeb443 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 f40d34186..f0f1673bb 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 69db445c8..473622b8b 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 6903c388c..593d2f218 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 9dfdb8829..8bb8e5f38 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 57f3a25ab..716c68f35 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 33906ef01..0db821e22 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 d82a65770..4270f5708 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 fcde0f7cf..00a07ef10 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 7d42dda2f..14ad28c40 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 376ccc052..af20fbefd 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 eafc53c91..71a79f209 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 958bd8171..902955da1 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"