diff --git a/src/captiveportal/index.php b/src/captiveportal/index.php
index e0360cd7b..80741aaae 100644
--- a/src/captiveportal/index.php
+++ b/src/captiveportal/index.php
@@ -29,7 +29,7 @@
 
 require_once("config.inc");
 require_once("auth.inc");
-require_once("functions.inc");
+require_once("interfaces.inc");
 require_once("captiveportal.inc");
 require_once("util.inc");
 
diff --git a/src/etc/inc/captiveportal.inc b/src/etc/inc/captiveportal.inc
index 3f7b764da..623588c98 100644
--- a/src/etc/inc/captiveportal.inc
+++ b/src/etc/inc/captiveportal.inc
@@ -36,7 +36,6 @@
 
 /* include all configuration functions */
 require_once("config.inc");
-require_once("functions.inc");
 require_once("radius.inc");
 require_once("captiveportal.radius_accounting.inc");
 require_once("captiveportal.radius_authentication.inc");
diff --git a/src/etc/inc/miniupnpd.inc b/src/etc/inc/miniupnpd.inc
index fff91f08d..94b5c5c97 100644
--- a/src/etc/inc/miniupnpd.inc
+++ b/src/etc/inc/miniupnpd.inc
@@ -1,6 +1,5 @@
 <?php
 
-require_once("functions.inc");
 
 /* MiniUPnPd */
 
diff --git a/src/etc/inc/unbound.inc b/src/etc/inc/unbound.inc
index cc516f7a2..0e8305521 100644
--- a/src/etc/inc/unbound.inc
+++ b/src/etc/inc/unbound.inc
@@ -26,9 +26,6 @@
     POSSIBILITY OF SUCH DAMAGE.
 */
 
-/* include all configuration functions */
-require_once("functions.inc");
-
 /* Optimize Unbound for environment */
 function unbound_optimization() {
     global $config;
diff --git a/src/etc/rc.backup_captiveportal b/src/etc/rc.backup_captiveportal
index c8caa1895..901d3b763 100755
--- a/src/etc/rc.backup_captiveportal
+++ b/src/etc/rc.backup_captiveportal
@@ -28,7 +28,7 @@
 */
 
 require_once("config.inc");
-require_once("functions.inc");
+require_once("interfaces.inc");
 require_once("util.inc");
 require_once("filter.inc");
 require_once("captiveportal.inc");
diff --git a/src/etc/rc.carpbackup b/src/etc/rc.carpbackup
index a0419aee4..9b279c703 100755
--- a/src/etc/rc.carpbackup
+++ b/src/etc/rc.carpbackup
@@ -27,7 +27,6 @@
     POSSIBILITY OF SUCH DAMAGE.
 */
 
-require_once("functions.inc");
 require_once("config.inc");
 require_once("openvpn.inc");
 require_once("interfaces.inc");
diff --git a/src/etc/rc.carpmaster b/src/etc/rc.carpmaster
index 0e94fd7e6..038eb08a1 100755
--- a/src/etc/rc.carpmaster
+++ b/src/etc/rc.carpmaster
@@ -27,7 +27,6 @@
     POSSIBILITY OF SUCH DAMAGE.
 */
 
-require_once("functions.inc");
 require_once("config.inc");
 require_once("openvpn.inc");
 require_once("interfaces.inc");
diff --git a/src/etc/rc.dyndns.update b/src/etc/rc.dyndns.update
index 3d922d6ec..316688ad5 100755
--- a/src/etc/rc.dyndns.update
+++ b/src/etc/rc.dyndns.update
@@ -29,7 +29,7 @@
 
 require_once("config.inc");
 require_once("gwlb.inc");
-require_once("functions.inc");
+require_once("interfaces.inc");
 require_once("util.inc");
 require_once("filter.inc");
 
diff --git a/src/etc/rc.expireaccounts b/src/etc/rc.expireaccounts
index 6b1262c8f..8324637a8 100755
--- a/src/etc/rc.expireaccounts
+++ b/src/etc/rc.expireaccounts
@@ -28,7 +28,6 @@
 */
 
 require_once("config.inc");
-require_once("functions.inc");
 
 $removed = 0;
 
diff --git a/src/etc/rc.filter_configure_sync b/src/etc/rc.filter_configure_sync
index 9ab6345a3..0c5e54906 100755
--- a/src/etc/rc.filter_configure_sync
+++ b/src/etc/rc.filter_configure_sync
@@ -28,13 +28,12 @@
 */
 
 require_once("config.inc");
-require_once("functions.inc");
 require_once("util.inc");
 require_once("filter.inc");
 require_once("ipsec.inc");
 require_once("vpn.inc");
 require_once("system.inc");
 require_once("pfsense-utils.inc");
-
+require_once("interfaces.inc");
 
 filter_configure_sync();
diff --git a/src/etc/rc.filter_configure_xmlrpc b/src/etc/rc.filter_configure_xmlrpc
index 1e9c27461..c9253cc8f 100755
--- a/src/etc/rc.filter_configure_xmlrpc
+++ b/src/etc/rc.filter_configure_xmlrpc
@@ -33,7 +33,6 @@
 */
 
 require_once("config.inc");
-require_once("functions.inc");
 require_once("filter.inc");
 require_once("util.inc");
 require_once("xmlrpc.inc");
diff --git a/src/etc/rc.filter_synchronize b/src/etc/rc.filter_synchronize
index 9ad83a7f1..20a017235 100755
--- a/src/etc/rc.filter_synchronize
+++ b/src/etc/rc.filter_synchronize
@@ -32,7 +32,6 @@
 */
 
 require_once("config.inc");
-require_once("functions.inc");
 require_once("filter.inc");
 require_once("util.inc");
 require_once("interfaces.inc");
diff --git a/src/etc/rc.initial.defaults b/src/etc/rc.initial.defaults
index 715b73c22..97a7f477a 100755
--- a/src/etc/rc.initial.defaults
+++ b/src/etc/rc.initial.defaults
@@ -30,7 +30,6 @@
 /* parse the configuration and include all functions used below */
 require_once("util.inc");
 require_once("config.lib.inc");
-require_once("functions.inc");
 require_once("pfsense-utils.inc");
 
 $fp = fopen('php://stdin', 'r');
diff --git a/src/etc/rc.initial.password b/src/etc/rc.initial.password
index 2d11cc3fc..5ec6ae91a 100755
--- a/src/etc/rc.initial.password
+++ b/src/etc/rc.initial.password
@@ -29,7 +29,6 @@
 
 require_once('config.inc');
 require_once('auth.inc');
-require_once('functions.inc');
 
 $fp = fopen('php://stdin', 'r');
 
diff --git a/src/etc/rc.initial.ping b/src/etc/rc.initial.ping
index 122956472..ca2029714 100755
--- a/src/etc/rc.initial.ping
+++ b/src/etc/rc.initial.ping
@@ -29,7 +29,6 @@
 
 /* parse the configuration and include all functions used below */
 require_once("config.inc");
-require_once("functions.inc");
 require_once("util.inc");
 
 $fp = fopen('php://stdin', 'r');
diff --git a/src/etc/rc.initial.setlanip b/src/etc/rc.initial.setlanip
index 28c80dffc..2a3d58dea 100755
--- a/src/etc/rc.initial.setlanip
+++ b/src/etc/rc.initial.setlanip
@@ -29,7 +29,7 @@
 
 /* parse the configuration and include all functions used below */
 require_once("config.inc");
-require_once("functions.inc");
+require_once("interfaces.inc");
 require_once("util.inc");
 require_once("filter.inc");
 require_once("rrd.inc");
diff --git a/src/etc/rc.initial.setports b/src/etc/rc.initial.setports
index 3205472f4..03554b61f 100755
--- a/src/etc/rc.initial.setports
+++ b/src/etc/rc.initial.setports
@@ -30,7 +30,6 @@
 /* parse the configuration and include all functions used below */
 require_once("config.inc");
 require_once("config.console.inc");
-require_once("functions.inc");
 require_once("filter.inc");
 require_once("util.inc");
 require_once("ipsec.inc");
diff --git a/src/etc/rc.interfaces_wan_configure b/src/etc/rc.interfaces_wan_configure
index 34e17b8ef..44236b6df 100755
--- a/src/etc/rc.interfaces_wan_configure
+++ b/src/etc/rc.interfaces_wan_configure
@@ -28,7 +28,6 @@
 */
 
 require_once("config.inc");
-require_once("functions.inc");
 require_once("util.inc");
 require_once("filter.inc");
 require_once("system.inc");
diff --git a/src/etc/rc.newipsecdns b/src/etc/rc.newipsecdns
index 6d8f6e11a..f73b44ba0 100755
--- a/src/etc/rc.newipsecdns
+++ b/src/etc/rc.newipsecdns
@@ -32,11 +32,11 @@
 require_once("util.inc");
 require_once("config.inc");
 require_once("gwlb.inc");
-require_once("functions.inc");
 require_once("filter.inc");
 require_once("ipsec.inc");
 require_once("vpn.inc");
 require_once("pfsense-utils.inc");
+require_once("interfaces.inc");
 
 /* make sure to wait until the boot scripts have finished */
 if (file_exists('/var/run/booting')) {
diff --git a/src/etc/rc.newroutedns b/src/etc/rc.newroutedns
index d9102cff8..e4b5f5bca 100755
--- a/src/etc/rc.newroutedns
+++ b/src/etc/rc.newroutedns
@@ -30,7 +30,6 @@
 /* parse the configuration and include all functions used below */
 require_once("util.inc");
 require_once("config.inc");
-require_once("functions.inc");
 require_once("system.inc");
 require_once("pfsense-utils.inc");
 
diff --git a/src/etc/rc.newwanip b/src/etc/rc.newwanip
index c96e1e54d..d91b27b5a 100755
--- a/src/etc/rc.newwanip
+++ b/src/etc/rc.newwanip
@@ -30,7 +30,6 @@
 
 /* parse the configuration and include all functions used below */
 require_once("config.inc");
-require_once("functions.inc");
 require_once("filter.inc");
 require_once("ipsec.inc");
 require_once("vpn.inc");
diff --git a/src/etc/rc.newwanipv6 b/src/etc/rc.newwanipv6
index 471b0cc77..854faaa32 100755
--- a/src/etc/rc.newwanipv6
+++ b/src/etc/rc.newwanipv6
@@ -30,7 +30,7 @@
 
 /* parse the configuration and include all functions used below */
 require_once("config.inc");
-require_once("functions.inc");
+require_once("interfaces.inc");
 require_once("filter.inc");
 require_once("ipsec.inc");
 require_once("vpn.inc");
diff --git a/src/etc/rc.notify_message b/src/etc/rc.notify_message
index 4164a5001..bce846b26 100755
--- a/src/etc/rc.notify_message
+++ b/src/etc/rc.notify_message
@@ -28,7 +28,6 @@
 */
 
 require_once("config.inc");
-require_once("functions.inc");
 
 $arguments = getopt("egm:");
 
diff --git a/src/etc/rc.openvpn b/src/etc/rc.openvpn
index 50a1af3fe..10053532a 100755
--- a/src/etc/rc.openvpn
+++ b/src/etc/rc.openvpn
@@ -31,7 +31,7 @@
 /* parse the configuration and include all functions used below */
 require_once("util.inc");
 require_once("config.inc");
-require_once("functions.inc");
+require_once("interfaces.inc");
 require_once("filter.inc");
 require_once("gwlb.inc");
 require_once("openvpn.inc");
diff --git a/src/etc/rc.php_test_run b/src/etc/rc.php_test_run
index 6a404c042..01eed3ca9 100755
--- a/src/etc/rc.php_test_run
+++ b/src/etc/rc.php_test_run
@@ -10,7 +10,6 @@
 require_once('util.inc');
 require_once('xmlparse.inc');
 require_once('config.lib.inc');
-require_once('functions.inc');
 
 $config = parse_config();
 
diff --git a/src/etc/rc.prunecaptiveportal b/src/etc/rc.prunecaptiveportal
index 05d85858c..06efd7375 100755
--- a/src/etc/rc.prunecaptiveportal
+++ b/src/etc/rc.prunecaptiveportal
@@ -28,7 +28,7 @@
 */
 
 require_once("config.inc");
-require_once("functions.inc");
+require_once("interfaces.inc");
 require_once("filter.inc");
 require_once("captiveportal.inc");
 require_once("util.inc");
diff --git a/src/etc/rc.reload_all b/src/etc/rc.reload_all
index 08cd26768..a50739651 100755
--- a/src/etc/rc.reload_all
+++ b/src/etc/rc.reload_all
@@ -28,7 +28,7 @@
 */
 
 require_once("config.inc");
-require_once("functions.inc");
+require_once("interfaces.inc");
 require_once("filter.inc");
 require_once("ipsec.inc");
 require_once("vpn.inc");
diff --git a/src/etc/rc.reload_interfaces b/src/etc/rc.reload_interfaces
index 96744d381..1d5e2d4b8 100755
--- a/src/etc/rc.reload_interfaces
+++ b/src/etc/rc.reload_interfaces
@@ -28,7 +28,6 @@
 */
 
 require_once("config.inc");
-require_once("functions.inc");
 require_once("filter.inc");
 require_once("util.inc");
 require_once("openvpn.inc");
diff --git a/src/etc/rc.resolv_conf_generate b/src/etc/rc.resolv_conf_generate
index d468ed8db..1b05f49c0 100755
--- a/src/etc/rc.resolv_conf_generate
+++ b/src/etc/rc.resolv_conf_generate
@@ -28,7 +28,6 @@
 */
 
 require_once("config.inc");
-require_once("functions.inc");
 require_once("system.inc");
 require_once("pfsense-utils.inc");
 
diff --git a/src/etc/rc.restart_webgui b/src/etc/rc.restart_webgui
index 35bade658..b9d15df8c 100755
--- a/src/etc/rc.restart_webgui
+++ b/src/etc/rc.restart_webgui
@@ -2,7 +2,7 @@
 <?php
 
 require_once('config.inc');
-require_once('functions.inc');
+require_once('interfaces.inc');
 require_once('captiveportal.inc');
 require_once('rrd.inc');
 require_once("util.inc");
diff --git a/src/etc/rc.sshd b/src/etc/rc.sshd
index 042ad2c70..07430b3ef 100755
--- a/src/etc/rc.sshd
+++ b/src/etc/rc.sshd
@@ -30,7 +30,6 @@
 */
 
 require_once('config.inc');
-require_once('functions.inc');
 require_once("util.inc");
 
 $bin_ssh_keygen = '/usr/local/bin/ssh-keygen';
diff --git a/src/etc/rc.update_alias_url_data b/src/etc/rc.update_alias_url_data
index a29aa7d06..bde7995c9 100755
--- a/src/etc/rc.update_alias_url_data
+++ b/src/etc/rc.update_alias_url_data
@@ -28,7 +28,6 @@
 */
 
 require_once("config.inc");
-require_once("functions.inc");
 require_once("util.inc");
 require_once("pfsense-utils.inc");
 
diff --git a/src/sbin/captiveportal_gather_stats.php b/src/sbin/captiveportal_gather_stats.php
index 2eb3de080..e77da6fa5 100644
--- a/src/sbin/captiveportal_gather_stats.php
+++ b/src/sbin/captiveportal_gather_stats.php
@@ -27,7 +27,7 @@
         POSSIBILITY OF SUCH DAMAGE.
 */
 
-require_once("functions.inc");
+require_once("interfaces.inc");
 require_once("config.inc");
 require_once("captiveportal.inc");
 require_once("util.inc");
diff --git a/src/www/carp_status.php b/src/www/carp_status.php
index 928bfdce6..87ae9e580 100644
--- a/src/www/carp_status.php
+++ b/src/www/carp_status.php
@@ -29,6 +29,7 @@
 
 require_once("guiconfig.inc");
 require_once("pfsense-utils.inc");
+require_once("interfaces.inc");
 
 function interfaces_carp_set_maintenancemode($carp_maintenancemode){
 	global $config;
diff --git a/src/www/crash_reporter.php b/src/www/crash_reporter.php
index bcb6121ab..be9766a87 100644
--- a/src/www/crash_reporter.php
+++ b/src/www/crash_reporter.php
@@ -29,7 +29,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("functions.inc");
 require_once("captiveportal.inc");
 
 define("FILE_SIZE", 450000);
diff --git a/src/www/diag_arp.php b/src/www/diag_arp.php
index b1ec7111d..2ee1626f8 100644
--- a/src/www/diag_arp.php
+++ b/src/www/diag_arp.php
@@ -32,6 +32,7 @@
 
 require_once("guiconfig.inc");
 require_once("pfsense-utils.inc");
+require_once("interfaces.inc");
 
 function leasecmp($a, $b) {
 	return strcmp($a[$_GET['order']], $b[$_GET['order']]);
diff --git a/src/www/diag_backup.php b/src/www/diag_backup.php
index a28dbbbf3..cd2de41b5 100644
--- a/src/www/diag_backup.php
+++ b/src/www/diag_backup.php
@@ -37,7 +37,7 @@ $omit_nocacheheaders = true;
 $nocsrf = true;
 
 require_once("guiconfig.inc");
-require_once("functions.inc");
+require_once("interfaces.inc");
 require_once("filter.inc");
 require_once("services.inc");
 require_once("rrd.inc");
diff --git a/src/www/diag_ipsec.php b/src/www/diag_ipsec.php
index d72e22c57..c12518b26 100644
--- a/src/www/diag_ipsec.php
+++ b/src/www/diag_ipsec.php
@@ -37,6 +37,7 @@ $shortcut_section = "ipsec";
 require_once("guiconfig.inc");
 require_once("ipsec.inc");
 require_once("services.inc");
+require_once("interfaces.inc");
 include("head.inc");
 
 function ipsec_get_descr($ikeid) {
diff --git a/src/www/diag_ipsec_leases.php b/src/www/diag_ipsec_leases.php
index bf6408a45..d64fac533 100644
--- a/src/www/diag_ipsec_leases.php
+++ b/src/www/diag_ipsec_leases.php
@@ -29,6 +29,7 @@
 require_once("guiconfig.inc");
 require_once("ipsec.inc");
 require_once("services.inc");
+require_once("interfaces.inc");
 
 
 $pgtitle = array(gettext("Status"),gettext("IPsec"),gettext("Leases"));
diff --git a/src/www/diag_ipsec_sad.php b/src/www/diag_ipsec_sad.php
index dd41011d5..8da9a066c 100644
--- a/src/www/diag_ipsec_sad.php
+++ b/src/www/diag_ipsec_sad.php
@@ -30,6 +30,7 @@
 require_once("guiconfig.inc");
 require_once("ipsec.inc");
 require_once("services.inc");
+require_once("interfaces.inc");
 
 
 $pgtitle = array(gettext("Status"),gettext("IPsec"),gettext("SAD"));
diff --git a/src/www/diag_ipsec_spd.php b/src/www/diag_ipsec_spd.php
index 2e7091133..a3f1267c0 100644
--- a/src/www/diag_ipsec_spd.php
+++ b/src/www/diag_ipsec_spd.php
@@ -30,6 +30,7 @@
 require_once("guiconfig.inc");
 require_once("ipsec.inc");
 require_once("services.inc");
+require_once("interfaces.inc");
 
 $pgtitle = array(gettext("Status"),gettext("IPsec"),gettext("SPD"));
 $shortcut_section = "ipsec";
diff --git a/src/www/diag_ipsec_xml.php b/src/www/diag_ipsec_xml.php
index b47bf09f2..b091f855b 100644
--- a/src/www/diag_ipsec_xml.php
+++ b/src/www/diag_ipsec_xml.php
@@ -32,6 +32,7 @@ global $g;
 
 require_once("guiconfig.inc");
 require_once("ipsec.inc");
+require_once("interfaces.inc");
 
 if (!is_array($config['ipsec'])) {
     $config['ipsec'] = array();
diff --git a/src/www/diag_logs.php b/src/www/diag_logs.php
index da8b8cbbe..6b71c55b3 100644
--- a/src/www/diag_logs.php
+++ b/src/www/diag_logs.php
@@ -30,6 +30,7 @@
 
 require_once("guiconfig.inc");
 require_once("system.inc");
+require_once("interfaces.inc");
 
 $system_logfile = '/var/log/system.log';
 
diff --git a/src/www/diag_logs_auth.php b/src/www/diag_logs_auth.php
index f731c108f..1650f1cb8 100644
--- a/src/www/diag_logs_auth.php
+++ b/src/www/diag_logs_auth.php
@@ -30,6 +30,7 @@
 require_once("guiconfig.inc");
 require_once("services.inc");
 require_once("system.inc");
+require_once("interfaces.inc");
 
 $portal_logfile = '/var/log/portalauth.log';
 
diff --git a/src/www/diag_logs_dhcp.php b/src/www/diag_logs_dhcp.php
index 8dda73630..0d88ace2b 100644
--- a/src/www/diag_logs_dhcp.php
+++ b/src/www/diag_logs_dhcp.php
@@ -31,6 +31,7 @@
 require_once("guiconfig.inc");
 require_once("services.inc");
 require_once("system.inc");
+require_once("interfaces.inc");
 
 $dhcpd_logfile = '/var/log/dhcpd.log';
 
diff --git a/src/www/diag_logs_filter.php b/src/www/diag_logs_filter.php
index 656fdeb43..1a024d56f 100644
--- a/src/www/diag_logs_filter.php
+++ b/src/www/diag_logs_filter.php
@@ -36,11 +36,11 @@ require_once("filter.inc");
 require_once("filter_log.inc");
 require_once("system.inc");
 require_once("pfsense-utils.inc");
+require_once("interfaces.inc");
 
 /********************************************************************************************************************
  * imported from easyrule.inc/php
  ********************************************************************************************************************/
-require_once("functions.inc");
 
 function easyrule_find_rule_interface($int) {
 	global $config;
diff --git a/src/www/diag_logs_filter_dynamic.php b/src/www/diag_logs_filter_dynamic.php
index 73d33a9b2..ef347cb7f 100644
--- a/src/www/diag_logs_filter_dynamic.php
+++ b/src/www/diag_logs_filter_dynamic.php
@@ -31,6 +31,7 @@
 require_once("guiconfig.inc");
 require_once("filter_log.inc");
 require_once("system.inc");
+require_once("interfaces.inc");
 
 $filter_logfile = '/var/log/filter.log';
 
diff --git a/src/www/diag_logs_filter_summary.php b/src/www/diag_logs_filter_summary.php
index 5c0b5f584..547eda8c8 100644
--- a/src/www/diag_logs_filter_summary.php
+++ b/src/www/diag_logs_filter_summary.php
@@ -31,6 +31,7 @@ $pgtitle = gettext("Status").": ".gettext("System logs").": ".gettext("Firewall
 $shortcut_section = "firewall";
 require_once("guiconfig.inc");
 require_once("filter_log.inc");
+require_once("interfaces.inc");
 
 $filter_logfile = '/var/log/filter.log';
 $lines = 5000;
diff --git a/src/www/diag_logs_gateways.php b/src/www/diag_logs_gateways.php
index 703799bed..7e7e94f1d 100644
--- a/src/www/diag_logs_gateways.php
+++ b/src/www/diag_logs_gateways.php
@@ -32,6 +32,7 @@
 require_once("guiconfig.inc");
 require_once("services.inc");
 require_once("system.inc");
+require_once("interfaces.inc");
 
 $system_logfile = '/var/log/gateways.log';
 
diff --git a/src/www/diag_logs_ipsec.php b/src/www/diag_logs_ipsec.php
index 2d427e03a..69c414fa0 100644
--- a/src/www/diag_logs_ipsec.php
+++ b/src/www/diag_logs_ipsec.php
@@ -32,6 +32,7 @@ require_once("guiconfig.inc");
 require_once("ipsec.inc");
 require_once("services.inc");
 require_once("system.inc");
+require_once("interfaces.inc");
 
 
 function return_clog($logfile, $tail, $withorig = true, $grepfor = "", $grepinvert = "", $grepreverse = false) {
diff --git a/src/www/diag_logs_ntpd.php b/src/www/diag_logs_ntpd.php
index f2f758687..9479bc436 100644
--- a/src/www/diag_logs_ntpd.php
+++ b/src/www/diag_logs_ntpd.php
@@ -31,6 +31,7 @@
 require_once("guiconfig.inc");
 require_once("services.inc");
 require_once("system.inc");
+require_once("interfaces.inc");
 
 
 $ntpd_logfile = '/var/log/ntpd.log';
diff --git a/src/www/diag_logs_openvpn.php b/src/www/diag_logs_openvpn.php
index c0ad1d35f..d3b719cb5 100644
--- a/src/www/diag_logs_openvpn.php
+++ b/src/www/diag_logs_openvpn.php
@@ -32,6 +32,7 @@ require_once("guiconfig.inc");
 require_once("vpn.inc");
 require_once("services.inc");
 require_once("system.inc");
+require_once("interfaces.inc");
 
 $pgtitle = array(gettext("Status"),gettext("System logs"),gettext("OpenVPN"));
 $shortcut_section = "openvpn";
diff --git a/src/www/diag_logs_ppp.php b/src/www/diag_logs_ppp.php
index 221ee6ca2..b7ec3323c 100644
--- a/src/www/diag_logs_ppp.php
+++ b/src/www/diag_logs_ppp.php
@@ -30,6 +30,7 @@
 
 require_once("guiconfig.inc");
 require_once("system.inc");
+require_once("interfaces.inc");
 
 $ppps_logfile = '/var/log/ppps.log';
 
diff --git a/src/www/diag_logs_relayd.php b/src/www/diag_logs_relayd.php
index f74681713..3e696e8b3 100644
--- a/src/www/diag_logs_relayd.php
+++ b/src/www/diag_logs_relayd.php
@@ -31,6 +31,7 @@
 require_once("guiconfig.inc");
 require_once("services.inc");
 require_once("system.inc");
+require_once("interfaces.inc");
 
 $relayd_logfile = '/var/log/relayd.log';
 
diff --git a/src/www/diag_logs_resolver.php b/src/www/diag_logs_resolver.php
index fadabfbd0..e720c8c8d 100644
--- a/src/www/diag_logs_resolver.php
+++ b/src/www/diag_logs_resolver.php
@@ -32,6 +32,7 @@
 require_once("guiconfig.inc");
 require_once("services.inc");
 require_once("system.inc");
+require_once("interfaces.inc");
 
 $system_logfile = '/var/log/resolver.log';
 
diff --git a/src/www/diag_logs_routing.php b/src/www/diag_logs_routing.php
index 416d65f5f..6bc18c75d 100644
--- a/src/www/diag_logs_routing.php
+++ b/src/www/diag_logs_routing.php
@@ -29,6 +29,7 @@
 
 require_once("guiconfig.inc");
 require_once("system.inc");
+require_once("interfaces.inc");
 
 $routing_logfile = '/var/log/routing.log';
 
diff --git a/src/www/diag_logs_settings.php b/src/www/diag_logs_settings.php
index 31e0dc24c..ad613c58e 100644
--- a/src/www/diag_logs_settings.php
+++ b/src/www/diag_logs_settings.php
@@ -28,7 +28,7 @@
 */
 
 require_once("guiconfig.inc");
-require_once("functions.inc");
+require_once("interfaces.inc");
 require_once("filter.inc");
 require_once("system.inc");
 require_once("pfsense-utils.inc");
diff --git a/src/www/diag_logs_vpn.php b/src/www/diag_logs_vpn.php
index e5e72bd66..c6ca73680 100644
--- a/src/www/diag_logs_vpn.php
+++ b/src/www/diag_logs_vpn.php
@@ -31,6 +31,7 @@ $pgtitle = array(gettext("Status"), gettext("System logs"), gettext("VPN"));
 require_once("guiconfig.inc");
 require_once("vpn.inc");
 require_once("system.inc");
+require_once("interfaces.inc");
 
 $nentries = $config['syslog']['nentries'];
 if (!$nentries)
diff --git a/src/www/diag_logs_wireless.php b/src/www/diag_logs_wireless.php
index 50f27483c..8f34b1639 100644
--- a/src/www/diag_logs_wireless.php
+++ b/src/www/diag_logs_wireless.php
@@ -31,6 +31,7 @@
 
 require_once("guiconfig.inc");
 require_once("system.inc");
+require_once("interfaces.inc");
 
 $wireless_logfile = '/var/log/wireless.log';
 
diff --git a/src/www/diag_packet_capture.php b/src/www/diag_packet_capture.php
index cb8171cd6..7b06db518 100644
--- a/src/www/diag_packet_capture.php
+++ b/src/www/diag_packet_capture.php
@@ -73,6 +73,7 @@ if ($_POST['downloadbtn'] == gettext("Download Capture"))
 $pgtitle = array(gettext("Diagnostics"), gettext("Packet Capture"));
 require_once("guiconfig.inc");
 require_once("pfsense-utils.inc");
+require_once("interfaces.inc");
 
 $fp = "/root/";
 $fn = "packetcapture.cap";
diff --git a/src/www/diag_ping.php b/src/www/diag_ping.php
index 4902d9a80..984995152 100644
--- a/src/www/diag_ping.php
+++ b/src/www/diag_ping.php
@@ -29,6 +29,7 @@
 $pgtitle = array(gettext("Diagnostics"), gettext("Ping"));
 require_once("guiconfig.inc");
 require_once("system.inc");
+require_once("interfaces.inc");
 
 define('MAX_COUNT', 10);
 define('DEFAULT_COUNT', 3);
diff --git a/src/www/diag_testport.php b/src/www/diag_testport.php
index 8d2f48a68..9fa95fc06 100644
--- a/src/www/diag_testport.php
+++ b/src/www/diag_testport.php
@@ -30,6 +30,7 @@
 $pgtitle = array(gettext("Diagnostics"), gettext("Test Port"));
 require_once("guiconfig.inc");
 require_once("system.inc");
+require_once("interfaces.inc");
 
 define('NC_TIMEOUT', 10);
 $do_testport = false;
diff --git a/src/www/diag_traceroute.php b/src/www/diag_traceroute.php
index acc591d58..9d4deb94e 100644
--- a/src/www/diag_traceroute.php
+++ b/src/www/diag_traceroute.php
@@ -28,6 +28,7 @@
 
 require_once("guiconfig.inc");
 require_once("system.inc");
+require_once("interfaces.inc");
 
 $pgtitle = array(gettext("Diagnostics"),gettext("Traceroute"));
 include("head.inc");
diff --git a/src/www/fbegin.inc b/src/www/fbegin.inc
index 667d9cea1..c6f25cba5 100644
--- a/src/www/fbegin.inc
+++ b/src/www/fbegin.inc
@@ -28,7 +28,6 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
-require_once("functions.inc");
 require_once("shortcuts.inc");
 
 function find_service_by_name($name) {
diff --git a/src/www/firewall_aliases.php b/src/www/firewall_aliases.php
index 7991a9ad0..57a653b1b 100644
--- a/src/www/firewall_aliases.php
+++ b/src/www/firewall_aliases.php
@@ -29,7 +29,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("functions.inc");
 require_once("filter.inc");
 
 if (!is_array($config['aliases'])) {
diff --git a/src/www/firewall_aliases_edit.php b/src/www/firewall_aliases_edit.php
index 9984774c7..a6bbb2a7e 100644
--- a/src/www/firewall_aliases_edit.php
+++ b/src/www/firewall_aliases_edit.php
@@ -31,7 +31,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("functions.inc");
 require_once("pfsense-utils.inc");
 
 /* returns an array consisting of every element of $haystack that is not equal to $needle. */
diff --git a/src/www/firewall_nat.php b/src/www/firewall_nat.php
index ac0283043..c05564128 100644
--- a/src/www/firewall_nat.php
+++ b/src/www/firewall_nat.php
@@ -29,7 +29,7 @@
 */
 
 require_once("guiconfig.inc");
-require_once("functions.inc");
+require_once("interfaces.inc");
 require_once("filter.inc");
 
 /****f* legacy/have_natpfruleint_access
diff --git a/src/www/firewall_nat_1to1.php b/src/www/firewall_nat_1to1.php
index 72aab0fde..114a09257 100644
--- a/src/www/firewall_nat_1to1.php
+++ b/src/www/firewall_nat_1to1.php
@@ -27,7 +27,7 @@
 */
 
 require_once("guiconfig.inc");
-require_once("functions.inc");
+require_once("interfaces.inc");
 require_once("filter.inc");
 
 if (!is_array($config['nat']['onetoone']))
diff --git a/src/www/firewall_nat_npt.php b/src/www/firewall_nat_npt.php
index 0a3537c93..f1d7c05c9 100644
--- a/src/www/firewall_nat_npt.php
+++ b/src/www/firewall_nat_npt.php
@@ -27,8 +27,8 @@
 */
 
 require_once("guiconfig.inc");
-require_once("functions.inc");
 require_once("filter.inc");
+require_once("interfaces.inc");
 
 if (!is_array($config['nat']['npt'])) {
 	$config['nat']['npt'] = array();
diff --git a/src/www/firewall_nat_out.php b/src/www/firewall_nat_out.php
index 9ee399455..32807a4a3 100644
--- a/src/www/firewall_nat_out.php
+++ b/src/www/firewall_nat_out.php
@@ -28,9 +28,9 @@
 */
 
 require_once("guiconfig.inc");
-require_once("functions.inc");
 require_once("filter.inc");
 require_once("pfsense-utils.inc");
+require_once("interfaces.inc");
 
 global $GatewaysList;
 
diff --git a/src/www/firewall_rules.php b/src/www/firewall_rules.php
index b4895f7b4..b64c98bb4 100644
--- a/src/www/firewall_rules.php
+++ b/src/www/firewall_rules.php
@@ -29,7 +29,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("functions.inc");
 require_once("filter.inc");
 require_once("pfsense-utils.inc");
 
diff --git a/src/www/firewall_schedule_edit.php b/src/www/firewall_schedule_edit.php
index 6b0bcf162..d4451877e 100644
--- a/src/www/firewall_schedule_edit.php
+++ b/src/www/firewall_schedule_edit.php
@@ -28,7 +28,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("functions.inc");
 require_once("filter.inc");
 
 
diff --git a/src/www/firewall_virtual_ip.php b/src/www/firewall_virtual_ip.php
index a0b882c04..c3dc3d2ed 100644
--- a/src/www/firewall_virtual_ip.php
+++ b/src/www/firewall_virtual_ip.php
@@ -30,7 +30,7 @@
 */
 
 require_once("guiconfig.inc");
-require_once("functions.inc");
+require_once("interfaces.inc");
 require_once("filter.inc");
 
 if (!is_array($config['virtualip']['vip'])) {
diff --git a/src/www/firewall_virtual_ip_edit.php b/src/www/firewall_virtual_ip_edit.php
index 9084172e4..50463fe3d 100644
--- a/src/www/firewall_virtual_ip_edit.php
+++ b/src/www/firewall_virtual_ip_edit.php
@@ -30,6 +30,7 @@
 */
 
 require_once("guiconfig.inc");
+require_once("interfaces.inc");
 require_once("pfsense-utils.inc");
 
 $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/firewall_virtual_ip.php');
diff --git a/src/www/graph.php b/src/www/graph.php
index b93dbea94..5e202af51 100644
--- a/src/www/graph.php
+++ b/src/www/graph.php
@@ -29,6 +29,7 @@
 */
 
 require_once("guiconfig.inc");
+require_once("interfaces.inc");
 
 header("Last-Modified: " . gmdate( "D, j M Y H:i:s" ) . " GMT" );
 header("Expires: " . gmdate( "D, j M Y H:i:s", time() ) . " GMT" );
diff --git a/src/www/includes/functions.inc.php b/src/www/includes/functions.inc.php
index d810a5946..83a8351b5 100644
--- a/src/www/includes/functions.inc.php
+++ b/src/www/includes/functions.inc.php
@@ -7,6 +7,7 @@ if(Connection_Aborted()) {
 require_once("config.inc");
 require_once("filter.inc");
 require_once("pfsense-utils.inc");
+require_once("interfaces.inc");
 
 function get_uptime_sec() {
         $boottime = "";
diff --git a/src/www/interfaces_assign.php b/src/www/interfaces_assign.php
index ef4c6f596..2c9eb059b 100644
--- a/src/www/interfaces_assign.php
+++ b/src/www/interfaces_assign.php
@@ -32,7 +32,6 @@ $pgtitle = array(gettext("Interfaces"),gettext("Assign network ports"));
 $shortcut_section = "interfaces";
 
 require_once("guiconfig.inc");
-require_once("functions.inc");
 require_once("filter.inc");
 require_once("ipsec.inc");
 require_once("vpn.inc");
diff --git a/src/www/interfaces_bridge.php b/src/www/interfaces_bridge.php
index 286018bf3..1c3a3ff9f 100644
--- a/src/www/interfaces_bridge.php
+++ b/src/www/interfaces_bridge.php
@@ -28,6 +28,7 @@
 */
 
 require_once("guiconfig.inc");
+require_once("interfaces.inc");
 
 if (!is_array($config['bridges'])) {
 	$config['bridges'] = array();
diff --git a/src/www/interfaces_gif.php b/src/www/interfaces_gif.php
index fb4c10b97..48588bd12 100644
--- a/src/www/interfaces_gif.php
+++ b/src/www/interfaces_gif.php
@@ -27,6 +27,7 @@
 */
 
 require_once("guiconfig.inc");
+require_once("interfaces.inc");
 
 if (!is_array($config['gifs']['gif']))
 	$config['gifs']['gif'] = array();
diff --git a/src/www/interfaces_gre.php b/src/www/interfaces_gre.php
index 0d6bfc9b2..b380e35d1 100644
--- a/src/www/interfaces_gre.php
+++ b/src/www/interfaces_gre.php
@@ -27,7 +27,7 @@
 */
 
 require_once("guiconfig.inc");
-require_once("functions.inc");
+require_once("interfaces.inc");
 
 if (!is_array($config['gres']['gre']))
 	$config['gres']['gre'] = array();
diff --git a/src/www/interfaces_gre_edit.php b/src/www/interfaces_gre_edit.php
index 7460f54cd..2c42e9a2a 100644
--- a/src/www/interfaces_gre_edit.php
+++ b/src/www/interfaces_gre_edit.php
@@ -27,7 +27,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("functions.inc");
 require_once("system.inc");
 require_once("interfaces.inc");
 require_once("pfsense-utils.inc");
diff --git a/src/www/interfaces_groups.php b/src/www/interfaces_groups.php
index 1de6960d6..d841a170a 100644
--- a/src/www/interfaces_groups.php
+++ b/src/www/interfaces_groups.php
@@ -28,7 +28,7 @@
 */
 
 require_once("guiconfig.inc");
-require_once("functions.inc");
+require_once("interfaces.inc");
 
 if (!is_array($config['ifgroups']['ifgroupentry']))
 	$config['ifgroups']['ifgroupentry'] = array();
diff --git a/src/www/interfaces_groups_edit.php b/src/www/interfaces_groups_edit.php
index eb4d48cce..ad03bc60b 100644
--- a/src/www/interfaces_groups_edit.php
+++ b/src/www/interfaces_groups_edit.php
@@ -28,7 +28,7 @@
 */
 
 require_once("guiconfig.inc");
-require_once("functions.inc");
+require_once("interfaces.inc");
 
 $pgtitle = array(gettext("Interfaces"),gettext("Groups"),gettext("Edit"));
 $shortcut_section = "interfaces";
diff --git a/src/www/interfaces_ppps.php b/src/www/interfaces_ppps.php
index 88a8b573f..f0081aaf1 100644
--- a/src/www/interfaces_ppps.php
+++ b/src/www/interfaces_ppps.php
@@ -27,7 +27,7 @@
 */
 
 require_once("guiconfig.inc");
-require_once("functions.inc");
+require_once("interfaces.inc");
 
 function ppp_inuse($num) {
 	global $config, $g;
diff --git a/src/www/interfaces_ppps_edit.php b/src/www/interfaces_ppps_edit.php
index 2b232a5fd..4ef75889a 100644
--- a/src/www/interfaces_ppps_edit.php
+++ b/src/www/interfaces_ppps_edit.php
@@ -29,7 +29,7 @@
 */
 
 require_once("guiconfig.inc");
-require_once("functions.inc");
+require_once("interfaces.inc");
 
 $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/interfaces_ppps.php');
 
diff --git a/src/www/interfaces_qinq.php b/src/www/interfaces_qinq.php
index 20acb64fb..b6038be2d 100644
--- a/src/www/interfaces_qinq.php
+++ b/src/www/interfaces_qinq.php
@@ -27,7 +27,7 @@
 */
 
 require_once("guiconfig.inc");
-require_once("functions.inc");
+require_once("interfaces.inc");
 
 if (!is_array($config['qinqs']['qinqentry']))
 	$config['qinqs']['qinqentry'] = array();
diff --git a/src/www/interfaces_qinq_edit.php b/src/www/interfaces_qinq_edit.php
index 24eff3983..fb55e5acb 100644
--- a/src/www/interfaces_qinq_edit.php
+++ b/src/www/interfaces_qinq_edit.php
@@ -31,6 +31,7 @@ $pgtitle = array(gettext("Interfaces"),gettext("QinQ"), gettext("Edit"));
 $shortcut_section = "interfaces";
 
 require_once("guiconfig.inc");
+require_once("interfaces.inc");
 
 if (!is_array($config['qinqs']['qinqentry']))
 	$config['qinqs']['qinqentry'] = array();
diff --git a/src/www/interfaces_vlan.php b/src/www/interfaces_vlan.php
index 8fba2ce7d..0253d1f40 100644
--- a/src/www/interfaces_vlan.php
+++ b/src/www/interfaces_vlan.php
@@ -28,6 +28,7 @@
 */
 
 require_once("guiconfig.inc");
+require_once("interfaces.inc");
 
 if (!is_array($config['vlans'])) {
 	$config['vlans'] = array();
diff --git a/src/www/interfaces_wireless_edit.php b/src/www/interfaces_wireless_edit.php
index c3584c1f5..1dce32673 100644
--- a/src/www/interfaces_wireless_edit.php
+++ b/src/www/interfaces_wireless_edit.php
@@ -28,6 +28,7 @@
 */
 
 require_once("guiconfig.inc");
+require_once("interfaces.inc");
 
 $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/interfaces_wireless.php');
 
diff --git a/src/www/load_balancer_monitor.php b/src/www/load_balancer_monitor.php
index e625d1f26..14200f7aa 100644
--- a/src/www/load_balancer_monitor.php
+++ b/src/www/load_balancer_monitor.php
@@ -28,7 +28,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("functions.inc");
 require_once("filter.inc");
 require_once("load_balancer_maintable.inc");
 require_once("services.inc");
diff --git a/src/www/load_balancer_pool.php b/src/www/load_balancer_pool.php
index 47b2a9dbc..365117410 100644
--- a/src/www/load_balancer_pool.php
+++ b/src/www/load_balancer_pool.php
@@ -28,7 +28,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("functions.inc");
 require_once("filter.inc");
 require_once("load_balancer_maintable.inc");
 require_once("services.inc");
diff --git a/src/www/load_balancer_relay_action.php b/src/www/load_balancer_relay_action.php
index d44e4d594..df2d9743e 100644
--- a/src/www/load_balancer_relay_action.php
+++ b/src/www/load_balancer_relay_action.php
@@ -28,7 +28,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("functions.inc");
 require_once("filter.inc");
 require_once("load_balancer_maintable.inc");
 require_once("services.inc");
diff --git a/src/www/load_balancer_relay_protocol.php b/src/www/load_balancer_relay_protocol.php
index 03ea69fc3..4f8598d19 100644
--- a/src/www/load_balancer_relay_protocol.php
+++ b/src/www/load_balancer_relay_protocol.php
@@ -28,7 +28,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("functions.inc");
 require_once("filter.inc");
 require_once("load_balancer_maintable.inc");
 require_once("services.inc");
diff --git a/src/www/load_balancer_setting.php b/src/www/load_balancer_setting.php
index 6afa29a50..50850e743 100644
--- a/src/www/load_balancer_setting.php
+++ b/src/www/load_balancer_setting.php
@@ -28,7 +28,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("functions.inc");
 require_once("filter.inc");
 require_once("services.inc");
 require_once("vslb.inc");
diff --git a/src/www/load_balancer_virtual_server.php b/src/www/load_balancer_virtual_server.php
index 3e610a70b..ccd3c4c54 100644
--- a/src/www/load_balancer_virtual_server.php
+++ b/src/www/load_balancer_virtual_server.php
@@ -28,7 +28,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("functions.inc");
 require_once("filter.inc");
 require_once("vslb.inc");
 require_once("load_balancer_maintable.inc");
diff --git a/src/www/reboot.php b/src/www/reboot.php
index d79d7f649..c2e9678c4 100644
--- a/src/www/reboot.php
+++ b/src/www/reboot.php
@@ -27,7 +27,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("functions.inc");
 require_once("captiveportal.inc");
 require_once("system.inc");
 
diff --git a/src/www/services_captiveportal.php b/src/www/services_captiveportal.php
index fc551887d..800631722 100644
--- a/src/www/services_captiveportal.php
+++ b/src/www/services_captiveportal.php
@@ -28,7 +28,7 @@
 */
 
 require_once("guiconfig.inc");
-require_once("functions.inc");
+require_once("interfaces.inc");
 require_once("captiveportal.inc");
 require_once("filter.inc");
 require_once("services.inc");
diff --git a/src/www/services_captiveportal_filemanager.php b/src/www/services_captiveportal_filemanager.php
index e778fdc9b..67b8471b2 100644
--- a/src/www/services_captiveportal_filemanager.php
+++ b/src/www/services_captiveportal_filemanager.php
@@ -28,7 +28,6 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 require_once("guiconfig.inc");
-require_once("functions.inc");
 require_once("captiveportal.inc");
 require_once("services.inc");
 
diff --git a/src/www/services_captiveportal_ip.php b/src/www/services_captiveportal_ip.php
index bf7bc19d9..672511ca5 100644
--- a/src/www/services_captiveportal_ip.php
+++ b/src/www/services_captiveportal_ip.php
@@ -27,7 +27,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("functions.inc");
 require_once("captiveportal.inc");
 require_once("services.inc");
 
diff --git a/src/www/services_captiveportal_ip_edit.php b/src/www/services_captiveportal_ip_edit.php
index 042848cc5..352c1b74b 100644
--- a/src/www/services_captiveportal_ip_edit.php
+++ b/src/www/services_captiveportal_ip_edit.php
@@ -29,7 +29,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("functions.inc");
 require_once("captiveportal.inc");
 require_once("services.inc");
 
diff --git a/src/www/services_captiveportal_mac.php b/src/www/services_captiveportal_mac.php
index 1fdf9f3df..dabb0e32c 100644
--- a/src/www/services_captiveportal_mac.php
+++ b/src/www/services_captiveportal_mac.php
@@ -28,7 +28,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("functions.inc");
 require_once("captiveportal.inc");
 require_once("services.inc");
 
diff --git a/src/www/services_captiveportal_mac_edit.php b/src/www/services_captiveportal_mac_edit.php
index ce6e75157..5bb940664 100644
--- a/src/www/services_captiveportal_mac_edit.php
+++ b/src/www/services_captiveportal_mac_edit.php
@@ -27,7 +27,6 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 require_once("guiconfig.inc");
-require_once("functions.inc");
 require_once("captiveportal.inc");
 require_once("services.inc");
 
diff --git a/src/www/services_captiveportal_vouchers.php b/src/www/services_captiveportal_vouchers.php
index 150db463d..574158462 100644
--- a/src/www/services_captiveportal_vouchers.php
+++ b/src/www/services_captiveportal_vouchers.php
@@ -32,7 +32,7 @@ if ($_POST['postafterlogin']) {
 }
 
 require_once('guiconfig.inc');
-require_once('functions.inc');
+require_once('interfaces.inc');
 require_once('captiveportal.inc');
 require_once('voucher.inc');
 require_once("services.inc");
diff --git a/src/www/services_captiveportal_vouchers_edit.php b/src/www/services_captiveportal_vouchers_edit.php
index 3b547e67b..e27f6271e 100644
--- a/src/www/services_captiveportal_vouchers_edit.php
+++ b/src/www/services_captiveportal_vouchers_edit.php
@@ -27,7 +27,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("functions.inc");
 require_once("captiveportal.inc");
 require_once("voucher.inc");
 require_once("services.inc");
diff --git a/src/www/services_captiveportal_zones.php b/src/www/services_captiveportal_zones.php
index e47579990..a7d269aaa 100644
--- a/src/www/services_captiveportal_zones.php
+++ b/src/www/services_captiveportal_zones.php
@@ -26,10 +26,10 @@
 */
 
 require_once("guiconfig.inc");
-require_once("functions.inc");
 require_once("captiveportal.inc");
 require_once("services.inc");
 require_once("system.inc");
+require_once("interfaces.inc");
 
 global $cpzone;
 global $cpzoneid;
diff --git a/src/www/services_captiveportal_zones_edit.php b/src/www/services_captiveportal_zones_edit.php
index 53a4f1636..51584cf6c 100644
--- a/src/www/services_captiveportal_zones_edit.php
+++ b/src/www/services_captiveportal_zones_edit.php
@@ -27,7 +27,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("functions.inc");
 require_once("captiveportal.inc");
 require_once("services.inc");
 
diff --git a/src/www/services_dhcp.php b/src/www/services_dhcp.php
index 21e70e0aa..e7d78629f 100644
--- a/src/www/services_dhcp.php
+++ b/src/www/services_dhcp.php
@@ -33,6 +33,7 @@ require_once("services.inc");
 require_once("system.inc");
 require_once("unbound.inc");
 require_once("pfsense-utils.inc");
+require_once("interfaces.inc");
 
 /* This function will remove entries from dhcpd.leases that would otherwise
  * overlap with static DHCP reservations. If we don't clean these out,
diff --git a/src/www/services_dhcp_edit.php b/src/www/services_dhcp_edit.php
index 2e56022b4..095ebb48e 100644
--- a/src/www/services_dhcp_edit.php
+++ b/src/www/services_dhcp_edit.php
@@ -29,6 +29,7 @@
 
 require_once("guiconfig.inc");
 require_once("services.inc");
+require_once("interfaces.inc");
 
 function staticmapcmp($a, $b) {
 	return ipcmp($a['ipaddr'], $b['ipaddr']);
diff --git a/src/www/services_dhcp_relay.php b/src/www/services_dhcp_relay.php
index c174b2993..df89389ed 100644
--- a/src/www/services_dhcp_relay.php
+++ b/src/www/services_dhcp_relay.php
@@ -30,6 +30,7 @@
 require_once("guiconfig.inc");
 require_once("services.inc");
 require_once("pfsense-utils.inc");
+require_once("interfaces.inc");
 
 $pconfig['enable'] = isset($config['dhcrelay']['enable']);
 if (empty($config['dhcrelay']['interface']))
diff --git a/src/www/services_dhcpv6.php b/src/www/services_dhcpv6.php
index 5d16ab7c7..81d01ff91 100644
--- a/src/www/services_dhcpv6.php
+++ b/src/www/services_dhcpv6.php
@@ -33,6 +33,7 @@ require_once("filter.inc");
 require_once("system.inc");
 require_once("unbound.inc");
 require_once("pfsense-utils.inc");
+require_once("interfaces.inc");
 
 /*  Fix failover DHCP problem
  *  http://article.gmane.org/gmane.comp.security.firewalls.pfsense.support/18749
diff --git a/src/www/services_dhcpv6_edit.php b/src/www/services_dhcpv6_edit.php
index efda2d15c..dcd3746ca 100644
--- a/src/www/services_dhcpv6_edit.php
+++ b/src/www/services_dhcpv6_edit.php
@@ -28,6 +28,7 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 require_once("guiconfig.inc");
+require_once("interfaces.inc");
 
 function staticmapcmp($a, $b) {
         return ipcmp($a['ipaddrv6'], $b['ipaddrv6']);
diff --git a/src/www/services_dhcpv6_relay.php b/src/www/services_dhcpv6_relay.php
index d3f595704..0f7b0b340 100644
--- a/src/www/services_dhcpv6_relay.php
+++ b/src/www/services_dhcpv6_relay.php
@@ -29,6 +29,7 @@
 */
 
 require_once("guiconfig.inc");
+require_once("interfaces.inc");
 
 $pconfig['enable'] = isset($config['dhcrelay6']['enable']);
 if (empty($config['dhcrelay6']['interface']))
diff --git a/src/www/services_dnsmasq.php b/src/www/services_dnsmasq.php
index d297d24b0..2d01612b7 100644
--- a/src/www/services_dnsmasq.php
+++ b/src/www/services_dnsmasq.php
@@ -28,7 +28,7 @@
 */
 
 require_once("guiconfig.inc");
-require_once("functions.inc");
+require_once("interfaces.inc");
 require_once("filter.inc");
 require_once("services.inc");
 require_once("system.inc");
diff --git a/src/www/services_dnsmasq_domainoverride_edit.php b/src/www/services_dnsmasq_domainoverride_edit.php
index 6a34f5b15..6c3637481 100644
--- a/src/www/services_dnsmasq_domainoverride_edit.php
+++ b/src/www/services_dnsmasq_domainoverride_edit.php
@@ -28,6 +28,7 @@
 
 require_once("guiconfig.inc");
 require_once("services.inc");
+require_once("interfaces.inc");
 
 $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/services_dnsmasq.php');
 
diff --git a/src/www/services_dyndns.php b/src/www/services_dyndns.php
index 6f358ec80..e49fc6fae 100644
--- a/src/www/services_dyndns.php
+++ b/src/www/services_dyndns.php
@@ -28,6 +28,7 @@
 */
 
 require_once("guiconfig.inc");
+require_once("interfaces.inc");
 
 if (!is_array($config['dyndnses']['dyndns']))
 	$config['dyndnses']['dyndns'] = array();
diff --git a/src/www/services_igmpproxy.php b/src/www/services_igmpproxy.php
index 26adf0eef..87004a328 100644
--- a/src/www/services_igmpproxy.php
+++ b/src/www/services_igmpproxy.php
@@ -29,6 +29,7 @@
 */
 
 require_once("guiconfig.inc");
+require_once("interfaces.inc");
 
 if (!is_array($config['igmpproxy']['igmpentry']))
 	$config['igmpproxy']['igmpentry'] = array();
diff --git a/src/www/services_ntpd.php b/src/www/services_ntpd.php
index 2dcc1d6c4..e8a49cae8 100644
--- a/src/www/services_ntpd.php
+++ b/src/www/services_ntpd.php
@@ -28,9 +28,10 @@
 */
 
 require_once("guiconfig.inc");
-require_once('rrd.inc');
+require_once("rrd.inc");
 require_once("services.inc");
 require_once("system.inc");
+require_once("interfaces.inc");
 
 if (!is_array($config['ntpd']))
 	$config['ntpd'] = array();
diff --git a/src/www/services_rfc2136.php b/src/www/services_rfc2136.php
index dc9cc03d5..6e8a15854 100644
--- a/src/www/services_rfc2136.php
+++ b/src/www/services_rfc2136.php
@@ -28,6 +28,7 @@
 */
 
 require_once("guiconfig.inc");
+require_once("interfaces.inc");
 
 if (!is_array($config['dnsupdates']['dnsupdate']))
 	$config['dnsupdates']['dnsupdate'] = array();
diff --git a/src/www/services_snmp.php b/src/www/services_snmp.php
index ccf180f23..ae8e6a8c1 100644
--- a/src/www/services_snmp.php
+++ b/src/www/services_snmp.php
@@ -28,7 +28,7 @@
 */
 
 require_once("guiconfig.inc");
-require_once("functions.inc");
+require_once("interfaces.inc");
 require_once("services.inc");
 require_once("system.inc");
 
diff --git a/src/www/services_unbound.php b/src/www/services_unbound.php
index 4c58904fa..cd0b1a900 100644
--- a/src/www/services_unbound.php
+++ b/src/www/services_unbound.php
@@ -32,6 +32,7 @@ require_once("unbound.inc");
 require_once("services.inc");
 require_once("system.inc");
 require_once("pfsense-utils.inc");
+require_once("interfaces.inc");
 
 if (!is_array($config['unbound']))
 	$config['unbound'] = array();
diff --git a/src/www/services_upnp.php b/src/www/services_upnp.php
index 6b851dea8..fcf3cf3d8 100644
--- a/src/www/services_upnp.php
+++ b/src/www/services_upnp.php
@@ -32,9 +32,9 @@ ini_set('max_execution_time', '0');
 $shortcut_section = "upnp";
 
 require_once("guiconfig.inc");
-require_once("functions.inc");
 require_once('miniupnpd.inc');
 require_once("services.inc");
+require_once("interfaces.inc");
 
 function upnp_validate_ip($ip, $check_cdir) {
 	/* validate cidr */
diff --git a/src/www/services_wol.php b/src/www/services_wol.php
index 0f447ce2e..8e6eaac48 100644
--- a/src/www/services_wol.php
+++ b/src/www/services_wol.php
@@ -27,6 +27,7 @@
 */
 
 require_once("guiconfig.inc");
+require_once("interfaces.inc");
 
 if (!is_array($config['wol'])) {
   $config['wol'] = array();
diff --git a/src/www/services_wol_edit.php b/src/www/services_wol_edit.php
index f5f634bf5..514b49aa2 100644
--- a/src/www/services_wol_edit.php
+++ b/src/www/services_wol_edit.php
@@ -37,6 +37,7 @@ function wol_sort() {
 }
 
 require_once("guiconfig.inc");
+require_once("interfaces.inc");
 
 $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/services_wol.php');
 
diff --git a/src/www/status.php b/src/www/status.php
index f05735d5d..ff481b8f4 100644
--- a/src/www/status.php
+++ b/src/www/status.php
@@ -29,7 +29,6 @@
 
 /* include all configuration functions */
 require_once("guiconfig.inc");
-require_once("functions.inc");
 
 function doCmdT($title, $command) {
 	$rubbish = array('|', '-', '/', '.', ' ');  /* fixes the <a> tag to be W3C compliant */
diff --git a/src/www/status_captiveportal.php b/src/www/status_captiveportal.php
index 50e0cb1ae..f4245e66f 100644
--- a/src/www/status_captiveportal.php
+++ b/src/www/status_captiveportal.php
@@ -27,7 +27,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("functions.inc");
 require_once("captiveportal.inc");
 require_once("services.inc");
 require_once("pfsense-utils.inc");
diff --git a/src/www/status_captiveportal_expire.php b/src/www/status_captiveportal_expire.php
index 7dedba691..692f62096 100644
--- a/src/www/status_captiveportal_expire.php
+++ b/src/www/status_captiveportal_expire.php
@@ -28,7 +28,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("functions.inc");
 require_once("captiveportal.inc");
 require_once("voucher.inc");
 
diff --git a/src/www/status_captiveportal_test.php b/src/www/status_captiveportal_test.php
index dbced5c42..f6ffd43ff 100644
--- a/src/www/status_captiveportal_test.php
+++ b/src/www/status_captiveportal_test.php
@@ -28,7 +28,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("functions.inc");
 require_once("captiveportal.inc");
 require_once("voucher.inc");
 require_once("services.inc");
diff --git a/src/www/status_captiveportal_voucher_rolls.php b/src/www/status_captiveportal_voucher_rolls.php
index 558fd0c90..ec08b3f92 100644
--- a/src/www/status_captiveportal_voucher_rolls.php
+++ b/src/www/status_captiveportal_voucher_rolls.php
@@ -28,7 +28,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("functions.inc");
 require_once("captiveportal.inc");
 require_once("voucher.inc");
 require_once("services.inc");
diff --git a/src/www/status_captiveportal_vouchers.php b/src/www/status_captiveportal_vouchers.php
index cbaca92a0..cb53d65d9 100644
--- a/src/www/status_captiveportal_vouchers.php
+++ b/src/www/status_captiveportal_vouchers.php
@@ -28,7 +28,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("functions.inc");
 require_once("captiveportal.inc");
 require_once("voucher.inc");
 require_once("services.inc");
diff --git a/src/www/status_dhcp_leases.php b/src/www/status_dhcp_leases.php
index 1908c7252..2223cfdc7 100644
--- a/src/www/status_dhcp_leases.php
+++ b/src/www/status_dhcp_leases.php
@@ -31,6 +31,7 @@ require_once("guiconfig.inc");
 require_once("config.inc");
 require_once("services.inc");
 require_once("pfsense-utils.inc");
+require_once("interfaces.inc");
 
 $pgtitle = array(gettext("Status"),gettext("DHCP leases"));
 $shortcut_section = "dhcp";
diff --git a/src/www/status_dhcpv6_leases.php b/src/www/status_dhcpv6_leases.php
index 99778a4ff..b4b602ffd 100644
--- a/src/www/status_dhcpv6_leases.php
+++ b/src/www/status_dhcpv6_leases.php
@@ -30,6 +30,7 @@
 
 require_once("guiconfig.inc");
 require_once("pfsense-utils.inc");
+require_once("interfaces.inc");
 
 $pgtitle = array(gettext("Status"),gettext("DHCPv6 leases"));
 $shortcut_section = "dhcp6";
diff --git a/src/www/status_filter_reload.php b/src/www/status_filter_reload.php
index 245000d48..9a0f34347 100644
--- a/src/www/status_filter_reload.php
+++ b/src/www/status_filter_reload.php
@@ -27,7 +27,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("functions.inc");
 
 $pgtitle = array(gettext("Status"),gettext("Filter Reload Status"));
 $shortcut_section = "firewall";
diff --git a/src/www/status_lb_pool.php b/src/www/status_lb_pool.php
index 3c396d492..bd56efa52 100644
--- a/src/www/status_lb_pool.php
+++ b/src/www/status_lb_pool.php
@@ -28,7 +28,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("functions.inc");
 require_once("filter.inc");
 require_once("vslb.inc");
 require_once("services.inc");
diff --git a/src/www/status_rrd_graph.php b/src/www/status_rrd_graph.php
index 9478bdb8f..997dc8035 100644
--- a/src/www/status_rrd_graph.php
+++ b/src/www/status_rrd_graph.php
@@ -28,6 +28,7 @@
 
 require_once("guiconfig.inc");
 require_once("rrd.inc");
+require_once("interfaces.inc");
 
 unset($input_errors);
 
diff --git a/src/www/status_rrd_graph_img.php b/src/www/status_rrd_graph_img.php
index ad493e98c..51e3bbf35 100644
--- a/src/www/status_rrd_graph_img.php
+++ b/src/www/status_rrd_graph_img.php
@@ -29,6 +29,7 @@
 
 require_once("guiconfig.inc");
 require_once("rrd.inc");
+require_once("interfaces.inc");
 
 global $g;
 
diff --git a/src/www/status_rrd_graph_settings.php b/src/www/status_rrd_graph_settings.php
index e77ca47cf..893977c74 100644
--- a/src/www/status_rrd_graph_settings.php
+++ b/src/www/status_rrd_graph_settings.php
@@ -28,6 +28,7 @@
 
 require_once("guiconfig.inc");
 require_once("rrd.inc");
+require_once("interfaces.inc");
 
 $pconfig['enable'] = isset($config['rrd']['enable']);
 $pconfig['category'] = $config['rrd']['category'];
diff --git a/src/www/status_wireless.php b/src/www/status_wireless.php
index 511b0d3ed..09f970dfb 100644
--- a/src/www/status_wireless.php
+++ b/src/www/status_wireless.php
@@ -27,6 +27,7 @@
 */
 
 require_once("guiconfig.inc");
+require_once("interfaces.inc");
 
 $pgtitle = array(gettext("Status"),gettext("Wireless"));
 $shortcut_section = "wireless";
diff --git a/src/www/system_advanced_admin.php b/src/www/system_advanced_admin.php
index 80d8551e3..4cd461796 100644
--- a/src/www/system_advanced_admin.php
+++ b/src/www/system_advanced_admin.php
@@ -30,7 +30,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("functions.inc");
 require_once("filter.inc");
 require_once("system.inc");
 require_once("unbound.inc");
diff --git a/src/www/system_advanced_firewall.php b/src/www/system_advanced_firewall.php
index 531b10805..56661c928 100644
--- a/src/www/system_advanced_firewall.php
+++ b/src/www/system_advanced_firewall.php
@@ -30,7 +30,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("functions.inc");
 require_once("filter.inc");
 
 function default_table_entries_size()
diff --git a/src/www/system_advanced_misc.php b/src/www/system_advanced_misc.php
index e13f801d9..b02c7de18 100644
--- a/src/www/system_advanced_misc.php
+++ b/src/www/system_advanced_misc.php
@@ -30,7 +30,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("functions.inc");
 require_once("filter.inc");
 require_once("vpn.inc");
 require_once("vslb.inc");
diff --git a/src/www/system_advanced_network.php b/src/www/system_advanced_network.php
index b4a74e73c..512aaceac 100644
--- a/src/www/system_advanced_network.php
+++ b/src/www/system_advanced_network.php
@@ -30,7 +30,7 @@
 */
 
 require_once("guiconfig.inc");
-require_once("functions.inc");
+require_once("interfaces.inc");
 require_once("filter.inc");
 require_once("system.inc");
 require_once("pfsense-utils.inc");
diff --git a/src/www/system_gateway_groups.php b/src/www/system_gateway_groups.php
index a3b1b93d0..f2b381a63 100644
--- a/src/www/system_gateway_groups.php
+++ b/src/www/system_gateway_groups.php
@@ -28,7 +28,7 @@
 */
 
 require_once("guiconfig.inc");
-require_once("functions.inc");
+require_once("interfaces.inc");
 require_once("openvpn.inc");
 require_once("system.inc");
 require_once("pfsense-utils.inc");
diff --git a/src/www/system_gateway_groups_edit.php b/src/www/system_gateway_groups_edit.php
index 777d941a3..88f963f71 100644
--- a/src/www/system_gateway_groups_edit.php
+++ b/src/www/system_gateway_groups_edit.php
@@ -29,6 +29,7 @@
 require_once("guiconfig.inc");
 require_once("ipsec.inc");
 require_once("vpn.inc");
+require_once("interfaces.inc");
 
 $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/system_gateway_groups.php');
 
diff --git a/src/www/system_gateways.php b/src/www/system_gateways.php
index 83e38d2f6..2935254e7 100644
--- a/src/www/system_gateways.php
+++ b/src/www/system_gateways.php
@@ -28,7 +28,7 @@
 */
 
 require_once("guiconfig.inc");
-require_once("functions.inc");
+require_once("interfaces.inc");
 require_once("filter.inc");
 require_once("services.inc");
 require_once("system.inc");
diff --git a/src/www/system_gateways_edit.php b/src/www/system_gateways_edit.php
index d44884bc9..1966c00cc 100644
--- a/src/www/system_gateways_edit.php
+++ b/src/www/system_gateways_edit.php
@@ -29,6 +29,7 @@
 require_once("guiconfig.inc");
 require_once("gwlb.inc");
 require_once("services.inc");
+require_once("interfaces.inc");
 
 $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/system_gateways.php');
 
diff --git a/src/www/system_general.php b/src/www/system_general.php
index 827c70b8f..1ee0cca09 100644
--- a/src/www/system_general.php
+++ b/src/www/system_general.php
@@ -28,11 +28,11 @@
 */
 
 require_once("guiconfig.inc");
-require_once("functions.inc");
 require_once("filter.inc");
 require_once("system.inc");
 require_once("unbound.inc");
 require_once("pfsense-utils.inc");
+require_once("interfaces.inc");
 
 function get_locale_list()
 {
diff --git a/src/www/system_hasync.php b/src/www/system_hasync.php
index 788e42f82..aab766c40 100644
--- a/src/www/system_hasync.php
+++ b/src/www/system_hasync.php
@@ -28,6 +28,7 @@
 */
 
 require_once("guiconfig.inc");
+require_once("interfaces.inc");
 
 $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/system_hasync.php');
 
diff --git a/src/www/system_routes.php b/src/www/system_routes.php
index 919088630..61a1ee97e 100644
--- a/src/www/system_routes.php
+++ b/src/www/system_routes.php
@@ -28,7 +28,7 @@
 */
 
 require_once("guiconfig.inc");
-require_once("functions.inc");
+require_once("interfaces.inc");
 require_once("filter.inc");
 require_once("system.inc");
 require_once("pfsense-utils.inc");
diff --git a/src/www/system_routes_edit.php b/src/www/system_routes_edit.php
index 637dbd1c0..800f52c25 100644
--- a/src/www/system_routes_edit.php
+++ b/src/www/system_routes_edit.php
@@ -31,6 +31,7 @@
 require_once("guiconfig.inc");
 require_once("filter.inc");
 require_once("gwlb.inc");
+require_once("interfaces.inc");
 require_once("pfsense-utils.inc");
 
 $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/system_routes.php');
diff --git a/src/www/vpn_ipsec.php b/src/www/vpn_ipsec.php
index 8cc6b2d63..1ac6c422e 100644
--- a/src/www/vpn_ipsec.php
+++ b/src/www/vpn_ipsec.php
@@ -28,12 +28,12 @@
 */
 
 require_once("guiconfig.inc");
-require_once("functions.inc");
 require_once("filter.inc");
 require_once("ipsec.inc");
 require_once("vpn.inc");
 require_once("services.inc");
 require_once("pfsense-utils.inc");
+require_once("interfaces.inc");
 
 if (!is_array($config['ipsec'])) {
     $config['ipsec'] = array();
diff --git a/src/www/vpn_ipsec_keys.php b/src/www/vpn_ipsec_keys.php
index a5668b4c2..4ff04ef8f 100644
--- a/src/www/vpn_ipsec_keys.php
+++ b/src/www/vpn_ipsec_keys.php
@@ -26,13 +26,13 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
-require_once("functions.inc");
 require_once("guiconfig.inc");
 require_once("ipsec.inc");
 require_once("vpn.inc");
 require_once("filter.inc");
 require_once("services.inc");
 require_once("pfsense-utils.inc");
+require_once("interfaces.inc");
 
 if (!is_array($config['ipsec'])) {
         $config['ipsec'] = array();
diff --git a/src/www/vpn_ipsec_keys_edit.php b/src/www/vpn_ipsec_keys_edit.php
index feb680923..3cbd1f578 100644
--- a/src/www/vpn_ipsec_keys_edit.php
+++ b/src/www/vpn_ipsec_keys_edit.php
@@ -26,7 +26,7 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
-require_once("functions.inc");
+require_once("interfaces.inc");
 require_once("guiconfig.inc");
 require_once("ipsec.inc");
 require_once("vpn.inc");
diff --git a/src/www/vpn_ipsec_mobile.php b/src/www/vpn_ipsec_mobile.php
index c168cd931..769e605b9 100644
--- a/src/www/vpn_ipsec_mobile.php
+++ b/src/www/vpn_ipsec_mobile.php
@@ -27,7 +27,7 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
-require_once("functions.inc");
+require_once("interfaces.inc");
 require_once("guiconfig.inc");
 require_once("ipsec.inc");
 require_once("vpn.inc");
diff --git a/src/www/vpn_ipsec_phase1.php b/src/www/vpn_ipsec_phase1.php
index b6879c8e3..cc415b364 100644
--- a/src/www/vpn_ipsec_phase1.php
+++ b/src/www/vpn_ipsec_phase1.php
@@ -29,12 +29,12 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
-require_once("functions.inc");
 require_once("guiconfig.inc");
 require_once("ipsec.inc");
 require_once("vpn.inc");
 require_once("services.inc");
 require_once("pfsense-utils.inc");
+require_once("interfaces.inc");
 
 $my_identifier_list = array(
 	'myaddress' => array( 'desc' => gettext('My IP address'), 'mobile' => true ),
diff --git a/src/www/vpn_ipsec_phase2.php b/src/www/vpn_ipsec_phase2.php
index 395af9610..297c664ff 100644
--- a/src/www/vpn_ipsec_phase2.php
+++ b/src/www/vpn_ipsec_phase2.php
@@ -27,8 +27,8 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
-require_once("functions.inc");
 require_once("guiconfig.inc");
+require_once("interfaces.inc");
 require_once("ipsec.inc");
 require_once("vpn.inc");
 require_once("services.inc");
diff --git a/src/www/vpn_ipsec_settings.php b/src/www/vpn_ipsec_settings.php
index 7b2eec150..46a5832c4 100644
--- a/src/www/vpn_ipsec_settings.php
+++ b/src/www/vpn_ipsec_settings.php
@@ -26,13 +26,13 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
-require_once("functions.inc");
 require_once("guiconfig.inc");
 require_once("filter.inc");
 require_once("ipsec.inc");
 require_once("vpn.inc");
 require_once("services.inc");
 require_once("pfsense-utils.inc");
+require_once("interfaces.inc");
 
 if (!is_array($config['ipsec'])) {
         $config['ipsec'] = array();
diff --git a/src/www/vpn_l2tp.php b/src/www/vpn_l2tp.php
index d001437da..cb45b4c43 100644
--- a/src/www/vpn_l2tp.php
+++ b/src/www/vpn_l2tp.php
@@ -32,6 +32,7 @@ $shortcut_section = "l2tps";
 require_once("guiconfig.inc");
 require_once("vpn.inc");
 require_once("pfsense-utils.inc");
+require_once("interfaces.inc");
 
 if (!is_array($config['l2tp']['radius'])) {
     $config['l2tp']['radius'] = array();
diff --git a/src/www/vpn_openvpn_client.php b/src/www/vpn_openvpn_client.php
index bb7c3e3a3..7c80d9aa0 100644
--- a/src/www/vpn_openvpn_client.php
+++ b/src/www/vpn_openvpn_client.php
@@ -30,6 +30,7 @@
 require_once("guiconfig.inc");
 require_once("openvpn.inc");
 require_once("services.inc");
+require_once("interfaces.inc");
 
 function openvpn_validate_host($value, $name) {
 	$value = trim($value);
diff --git a/src/www/vpn_openvpn_export.php b/src/www/vpn_openvpn_export.php
index b888602bd..a97cd0b88 100644
--- a/src/www/vpn_openvpn_export.php
+++ b/src/www/vpn_openvpn_export.php
@@ -35,6 +35,7 @@ require_once("openvpn.inc");
 require_once("filter.inc");
 require_once("util.inc");
 require_once("pfsense-utils.inc");
+require_once("interfaces.inc");
 require("openvpn-client-export.inc");
 
 global $current_openvpn_version, $current_openvpn_version_rev;
diff --git a/src/www/vpn_openvpn_export_shared.php b/src/www/vpn_openvpn_export_shared.php
index 08ec1c6fc..c09e70d49 100644
--- a/src/www/vpn_openvpn_export_shared.php
+++ b/src/www/vpn_openvpn_export_shared.php
@@ -32,6 +32,7 @@ require_once("openvpn.inc");
 require_once("filter.inc");
 require_once("util.inc");
 require_once("pfsense-utils.inc");
+require_once("interfaces.inc");
 require_once("openvpn-client-export.inc");
 
 $pgtitle = array("OpenVPN", "Client Export Utility");
diff --git a/src/www/vpn_openvpn_server.php b/src/www/vpn_openvpn_server.php
index be9b14a39..aca0fd4ec 100644
--- a/src/www/vpn_openvpn_server.php
+++ b/src/www/vpn_openvpn_server.php
@@ -30,6 +30,7 @@
 require_once("guiconfig.inc");
 require_once("openvpn.inc");
 require_once("services.inc");
+require_once("interfaces.inc");
 
 $openvpn_dh_lengths = array(1024, 2048, 4096 );
 $openvpn_cert_depths = array(
diff --git a/src/www/vpn_pppoe_edit.php b/src/www/vpn_pppoe_edit.php
index 4fb424367..f547e6af3 100644
--- a/src/www/vpn_pppoe_edit.php
+++ b/src/www/vpn_pppoe_edit.php
@@ -30,6 +30,7 @@
 
 require_once("guiconfig.inc");
 require_once("vpn.inc");
+require_once("interfaces.inc");
 
 function vpn_pppoe_get_id()
 {
diff --git a/src/www/vpn_pptp.php b/src/www/vpn_pptp.php
index 8fb87ac3f..5507248d2 100644
--- a/src/www/vpn_pptp.php
+++ b/src/www/vpn_pptp.php
@@ -28,7 +28,7 @@
 */
 
 require_once('guiconfig.inc');
-require_once('functions.inc');
+require_once('interfaces.inc');
 require_once('filter.inc');
 require_once('vpn.inc');
 require_once("pfsense-utils.inc");
diff --git a/src/www/widgets/widgets/captive_portal_status.widget.php b/src/www/widgets/widgets/captive_portal_status.widget.php
index 6699fb027..8c368d5f2 100644
--- a/src/www/widgets/widgets/captive_portal_status.widget.php
+++ b/src/www/widgets/widgets/captive_portal_status.widget.php
@@ -32,7 +32,6 @@ $nocsrf = true;
 
 require_once("guiconfig.inc");
 require_once("pfsense-utils.inc");
-require_once("functions.inc");
 require_once("captiveportal.inc");
 
 if (($_GET['act'] == "del") && (!empty($_GET['zone']))) {
diff --git a/src/www/widgets/widgets/carp_status.widget.php b/src/www/widgets/widgets/carp_status.widget.php
index 96f207734..15e2d31bc 100644
--- a/src/www/widgets/widgets/carp_status.widget.php
+++ b/src/www/widgets/widgets/carp_status.widget.php
@@ -31,7 +31,7 @@ $nocsrf = true;
 
 require_once("guiconfig.inc");
 require_once("pfsense-utils.inc");
-require_once("functions.inc");
+require_once("interfaces.inc");
 require_once("widgets/include/carp_status.inc");
 
 $carp_enabled = get_carp_status();
diff --git a/src/www/widgets/widgets/dyn_dns_status.widget.php b/src/www/widgets/widgets/dyn_dns_status.widget.php
index fff8ec242..9c02149bf 100644
--- a/src/www/widgets/widgets/dyn_dns_status.widget.php
+++ b/src/www/widgets/widgets/dyn_dns_status.widget.php
@@ -32,7 +32,6 @@ $nocsrf = true;
 
 require_once("guiconfig.inc");
 require_once("pfsense-utils.inc");
-require_once("functions.inc");
 require_once("widgets/include/dyn_dns_status.inc");
 
 if (!is_array($config['dyndnses']['dyndns'])) {
diff --git a/src/www/widgets/widgets/gateways.widget.php b/src/www/widgets/widgets/gateways.widget.php
index f320ade7f..8d7612a95 100644
--- a/src/www/widgets/widgets/gateways.widget.php
+++ b/src/www/widgets/widgets/gateways.widget.php
@@ -30,7 +30,6 @@ $nocsrf = true;
 
 require_once("guiconfig.inc");
 require_once("pfsense-utils.inc");
-require_once("functions.inc");
 require_once("widgets/include/gateways.inc");
 
 $a_gateways = return_gateways_array();
diff --git a/src/www/widgets/widgets/interface_list.widget.php b/src/www/widgets/widgets/interface_list.widget.php
index aad907263..0e3af5231 100644
--- a/src/www/widgets/widgets/interface_list.widget.php
+++ b/src/www/widgets/widgets/interface_list.widget.php
@@ -33,8 +33,8 @@ $nocsrf = true;
 
 require_once("guiconfig.inc");
 require_once("pfsense-utils.inc");
-require_once("functions.inc");
 require_once("widgets/include/interfaces.inc");
+require_once("interfaces.inc");
 
         $i = 0;
 	$iswireless=false;
diff --git a/src/www/widgets/widgets/interface_statistics.widget.php b/src/www/widgets/widgets/interface_statistics.widget.php
index 4c4bbef91..2e484cbf1 100644
--- a/src/www/widgets/widgets/interface_statistics.widget.php
+++ b/src/www/widgets/widgets/interface_statistics.widget.php
@@ -33,7 +33,7 @@ $nocsrf = true;
 
 require_once("guiconfig.inc");
 require_once("pfsense-utils.inc");
-require_once("functions.inc");
+require_once("interfaces.inc");
 require_once("widgets/include/interface_statistics.inc");
 
 $ifdescrs = get_configured_interface_with_descr();
diff --git a/src/www/widgets/widgets/ipsec.widget.php b/src/www/widgets/widgets/ipsec.widget.php
index 0c056161d..d33f00a73 100644
--- a/src/www/widgets/widgets/ipsec.widget.php
+++ b/src/www/widgets/widgets/ipsec.widget.php
@@ -31,7 +31,7 @@
 $nocsrf = true;
 
 require_once("guiconfig.inc");
-require_once("functions.inc");
+require_once("interfaces.inc");
 require_once("ipsec.inc");
 
 //function to create widget tabs when called
diff --git a/src/www/widgets/widgets/load_balancer_status.widget.php b/src/www/widgets/widgets/load_balancer_status.widget.php
index bcda71e0e..57a2588ad 100644
--- a/src/www/widgets/widgets/load_balancer_status.widget.php
+++ b/src/www/widgets/widgets/load_balancer_status.widget.php
@@ -35,7 +35,6 @@ $nocsrf = true;
 
 require_once("guiconfig.inc");
 require_once("pfsense-utils.inc");
-require_once("functions.inc");
 require_once("filter.inc");
 require_once("vslb.inc");
 
diff --git a/src/www/widgets/widgets/log.widget.php b/src/www/widgets/widgets/log.widget.php
index 994abd268..579091a38 100644
--- a/src/www/widgets/widgets/log.widget.php
+++ b/src/www/widgets/widgets/log.widget.php
@@ -33,7 +33,7 @@ $nocsrf = true;
 
 require_once("guiconfig.inc");
 require_once("pfsense-utils.inc");
-require_once("functions.inc");
+require_once("interfaces.inc");
 require_once("filter_log.inc");
 
 function find_action_image($action)
diff --git a/src/www/widgets/widgets/ntp_status.widget.php b/src/www/widgets/widgets/ntp_status.widget.php
index fee063954..7b76caae5 100644
--- a/src/www/widgets/widgets/ntp_status.widget.php
+++ b/src/www/widgets/widgets/ntp_status.widget.php
@@ -33,7 +33,6 @@ $nocsrf = true;
 
 require_once("guiconfig.inc");
 require_once("pfsense-utils.inc");
-require_once("functions.inc");
 require_once("widgets/include/ntp_status.inc");
 
 if ($_REQUEST['updateme']) {
diff --git a/src/www/widgets/widgets/picture.widget.php b/src/www/widgets/widgets/picture.widget.php
index 7c6978dc8..28ed7453c 100644
--- a/src/www/widgets/widgets/picture.widget.php
+++ b/src/www/widgets/widgets/picture.widget.php
@@ -30,7 +30,6 @@ $nocsrf = true;
 
 require_once("guiconfig.inc");
 require_once("pfsense-utils.inc");
-require_once("functions.inc");
 
 if ($_GET['getpic']=="true") {
     $pic_type_s = explode(".", $config['widgets']['picturewidget_filename']);
diff --git a/src/www/widgets/widgets/rss.widget.php b/src/www/widgets/widgets/rss.widget.php
index 5c1f7a94a..c09108136 100644
--- a/src/www/widgets/widgets/rss.widget.php
+++ b/src/www/widgets/widgets/rss.widget.php
@@ -30,7 +30,6 @@ $nocsrf = true;
 
 require_once("guiconfig.inc");
 require_once("pfsense-utils.inc");
-require_once("functions.inc");
 
 if ($_POST['rssfeed']) {
     $config['widgets']['rssfeed'] = str_replace("\n", ",", htmlspecialchars($_POST['rssfeed'], ENT_QUOTES | ENT_HTML401));
diff --git a/src/www/widgets/widgets/services_status.widget.php b/src/www/widgets/widgets/services_status.widget.php
index 171c9ef20..ec428e0b2 100644
--- a/src/www/widgets/widgets/services_status.widget.php
+++ b/src/www/widgets/widgets/services_status.widget.php
@@ -37,6 +37,7 @@ require_once("services.inc");
 require_once("ipsec.inc");
 require_once("vpn.inc");
 require_once("widgets/include/services_status.inc");
+require_once("interfaces.inc");
 
 $services = get_services();
 
diff --git a/src/www/widgets/widgets/smart_status.widget.php b/src/www/widgets/widgets/smart_status.widget.php
index 6b212dc89..eeccfed98 100644
--- a/src/www/widgets/widgets/smart_status.widget.php
+++ b/src/www/widgets/widgets/smart_status.widget.php
@@ -29,7 +29,6 @@
 
 require_once("guiconfig.inc");
 require_once("pfsense-utils.inc");
-require_once("functions.inc");
 require_once("widgets/include/smart_status.inc");
 
 ?>
diff --git a/src/www/widgets/widgets/system_information.widget.php b/src/www/widgets/widgets/system_information.widget.php
index fa3bd5a6c..14a67c07a 100644
--- a/src/www/widgets/widgets/system_information.widget.php
+++ b/src/www/widgets/widgets/system_information.widget.php
@@ -29,7 +29,6 @@
         POSSIBILITY OF SUCH DAMAGE.
 */
 
-require_once("functions.inc");
 require_once("guiconfig.inc");
 include_once("includes/functions.inc.php");
 require_once("pfsense-utils.inc");
diff --git a/src/www/widgets/widgets/system_log.widget.php b/src/www/widgets/widgets/system_log.widget.php
index 43627b5ac..4c2a18acb 100644
--- a/src/www/widgets/widgets/system_log.widget.php
+++ b/src/www/widgets/widgets/system_log.widget.php
@@ -28,7 +28,6 @@
 
 require_once("guiconfig.inc");
 require_once("pfsense-utils.inc");
-require_once("functions.inc");;
 
 $system_logfile = '/var/log/system.log';
 
diff --git a/src/www/widgets/widgets/traffic_graphs.widget.php b/src/www/widgets/widgets/traffic_graphs.widget.php
index 611b6ef02..d8b21338d 100644
--- a/src/www/widgets/widgets/traffic_graphs.widget.php
+++ b/src/www/widgets/widgets/traffic_graphs.widget.php
@@ -33,7 +33,7 @@ $nocsrf = true;
 
 require_once("guiconfig.inc");
 require_once("pfsense-utils.inc");
-require_once("functions.inc");
+require_once("interfaces.inc");
 
 $first_time = false;
 
diff --git a/src/www/widgets/widgets/wake_on_lan.widget.php b/src/www/widgets/widgets/wake_on_lan.widget.php
index 73ed9de38..8c7305749 100644
--- a/src/www/widgets/widgets/wake_on_lan.widget.php
+++ b/src/www/widgets/widgets/wake_on_lan.widget.php
@@ -30,6 +30,7 @@ $nocsrf = true;
 
 require_once("guiconfig.inc");
 require_once("widgets/include/wake_on_lan.inc");
+require_once("interfaces.inc");
 
 if (isset($config['wol']['wolentry'])) {
     $wolcomputers = $config['wol']['wolentry'];
diff --git a/src/www/wizard.php b/src/www/wizard.php
index 520f2680f..00df14a1a 100644
--- a/src/www/wizard.php
+++ b/src/www/wizard.php
@@ -29,11 +29,11 @@
 */
 
 require_once("guiconfig.inc");
-require_once("functions.inc");
 require_once("filter.inc");
 require_once("rrd.inc");
 require_once("system.inc");
 require_once("pfsense-utils.inc");
+require_once("interfaces.inc");
 
 /*
  * find_ip_interface($ip): return the interface where an ip is defined