From e0ff5fef5ccd127f1c12e351a6ae11683e408458 Mon Sep 17 00:00:00 2001
From: Luigi Rizzo <rizzo@icir.org>
Date: Wed, 21 Nov 2007 23:09:02 +0000
Subject: [PATCH] remove a bunch of useless #include "options.h"

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89511 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 formats/format_g726.c       | 1 -
 formats/format_ogg_vorbis.c | 1 -
 main/abstract_jb.c          | 1 -
 main/acl.c                  | 1 -
 main/adsistub.c             | 1 -
 main/app.c                  | 1 -
 main/asterisk.c             | 1 -
 main/astmm.c                | 1 -
 main/audiohook.c            | 1 -
 main/autoservice.c          | 1 -
 main/callerid.c             | 1 -
 main/cdr.c                  | 1 -
 main/channel.c              | 1 -
 main/cli.c                  | 1 -
 main/config.c               | 1 -
 main/db.c                   | 1 -
 main/devicestate.c          | 1 -
 main/dial.c                 | 1 -
 main/dns.c                  | 1 -
 main/dnsmgr.c               | 1 -
 main/dsp.c                  | 1 -
 main/enum.c                 | 1 -
 main/file.c                 | 1 -
 main/frame.c                | 1 -
 main/hashtab.c              | 1 -
 main/http.c                 | 1 -
 main/image.c                | 1 -
 main/indications.c          | 1 -
 main/io.c                   | 1 -
 main/jitterbuf.c            | 1 -
 main/loader.c               | 1 -
 main/logger.c               | 1 -
 main/manager.c              | 1 -
 main/netsock.c              | 1 -
 main/pbx.c                  | 1 -
 main/privacy.c              | 1 -
 main/rtp.c                  | 1 -
 main/say.c                  | 1 -
 main/sched.c                | 1 -
 main/srv.c                  | 1 -
 main/term.c                 | 1 -
 main/translate.c            | 1 -
 main/udptl.c                | 1 -
 main/utils.c                | 1 -
 res/res_adsi.c              | 1 -
 res/res_ael_share.c         | 1 -
 res/res_agi.c               | 1 -
 res/res_config_odbc.c       | 1 -
 res/res_config_pgsql.c      | 1 -
 res/res_config_sqlite.c     | 1 -
 res/res_crypto.c            | 1 -
 res/res_features.c          | 1 -
 res/res_jabber.c            | 1 -
 res/res_monitor.c           | 1 -
 res/res_musiconhold.c       | 1 -
 res/res_odbc.c              | 1 -
 res/res_realtime.c          | 1 -
 res/res_smdi.c              | 1 -
 res/res_snmp.c              | 1 -
 res/res_speech.c            | 1 -
 60 files changed, 60 deletions(-)

diff --git a/formats/format_g726.c b/formats/format_g726.c
index 7005864d6e..35b5e9ced4 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 21b511de64..89d31e35cd 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 8bdc825414..734728a167 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 ae3aa63065..860f2f16a3 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 c9d8824363..8f2908225c 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 4441932cad..cc06841d13 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 69e75abdfc..1a9e366a7a 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 aaed4e9f0d..37dbd04d65 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 f9e93220cd..f1e5f5809c 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 9e5c173ea6..39bad2f7c7 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 4662915aef..04b45ab4f3 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 62f2ee6777..5578fe20a2 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 d8524f5e9b..8e16b733eb 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 c53fcbe188..f2f7da499c 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 b07c809d50..fc020c1b7f 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 ab4bddac91..36ba9ae83c 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 7f00425fea..88b095b05d 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 e6f926905f..e48805ced4 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 21a8e967aa..34212fdf1a 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 c6e3adffc5..5d42cd5602 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 c98ee7f6c0..01cac47983 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 011dfa5610..15728a7ca8 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 42879819c4..145932e6cb 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 13d81d4b4a..755e8031e1 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 c69eb969ad..4c36bc19bc 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 c552bce359..c996a6ccdf 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 1e763ed5e8..7096311a2e 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 e2e13d17d3..e555d0357d 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 3f35b5feea..3ed2e02422 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 81e60cc8a4..27b93a6599 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 dcf8854f29..0d042675ae 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 3f7634b2ad..cf994a5497 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 26cb9e7dea..f0650457d9 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 1ff433bf07..f6ac83b112 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 48f56fba0a..a8059a4415 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 40e5b3bf6b..dfb197f38e 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 f52d5751ad..afaf42836b 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 17f3a57d1d..51c9ce3e78 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 ad32a1d1e5..3aeeb9d828 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 4394b39034..644bf757be 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 825a710da3..ea005aa31d 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 aa656cf5c1..0d04a99662 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 0e0e98d3da..8ae65b9e6d 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 83ab65ac1e..97abe80ae4 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 5a1cf14db9..664157c511 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 92d2d5d4f0..805dfd9a83 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 cbb8d98233..3d6b60d5c4 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 129c3cbe99..08adeb443a 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 f40d34186b..f0f1673bb6 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 69db445c8b..473622b8b7 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 6903c388c7..593d2f218b 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 9dfdb88299..8bb8e5f381 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 57f3a25aba..716c68f354 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 33906ef010..0db821e22f 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 d82a65770a..4270f5708f 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 fcde0f7cfd..00a07ef10d 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 7d42dda2f1..14ad28c407 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 376ccc052b..af20fbefde 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 eafc53c918..71a79f2096 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 958bd8171f..902955da19 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"
 
 
-- 
GitLab