From ccdaf72bb06724b239c8bd8c2f995efca057a872 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Tue, 21 Jul 2015 13:01:22 +0000
Subject: [PATCH] (legacy) cleanup filter.inc requires

---
 src/etc/inc/authgui.inc                                |  1 -
 src/etc/inc/captiveportal.inc                          |  1 -
 src/etc/inc/vslb.inc                                   |  1 -
 src/www/diag_backup.php                                |  1 -
 src/www/diag_resetstate.php                            |  1 -
 src/www/firewall_aliases_edit.php                      |  1 -
 src/www/firewall_aliases_import.php                    |  1 -
 src/www/firewall_nat_1to1_edit.php                     |  1 -
 src/www/firewall_nat_edit.php                          |  1 -
 src/www/firewall_nat_npt_edit.php                      |  8 ++++----
 src/www/firewall_nat_out_edit.php                      |  1 -
 src/www/firewall_rules_edit.php                        |  1 -
 src/www/firewall_schedule.php                          |  7 ++++---
 src/www/firewall_schedule_edit.php                     |  8 ++++----
 src/www/firewall_virtual_ip_edit.php                   |  1 -
 src/www/interfaces.php                                 |  1 -
 src/www/load_balancer_pool_edit.php                    |  1 -
 src/www/services_captiveportal.php                     |  3 +--
 src/www/services_captiveportal_filemanager.php         |  9 ++++-----
 src/www/services_captiveportal_ip.php                  |  1 -
 src/www/services_captiveportal_ip_edit.php             | 10 +++++-----
 src/www/services_captiveportal_mac.php                 |  1 -
 src/www/services_captiveportal_mac_edit.php            |  9 ++++-----
 src/www/services_captiveportal_vouchers.php            |  1 -
 src/www/services_captiveportal_vouchers_edit.php       |  1 -
 src/www/services_captiveportal_zones.php               |  1 -
 src/www/services_captiveportal_zones_edit.php          |  1 -
 src/www/services_dnsmasq.php                           |  1 -
 src/www/services_upnp.php                              |  1 -
 src/www/status_captiveportal.php                       |  1 -
 src/www/status_captiveportal_expire.php                |  1 -
 src/www/status_captiveportal_test.php                  |  1 -
 src/www/status_captiveportal_voucher_rolls.php         |  1 -
 src/www/status_captiveportal_vouchers.php              |  1 -
 src/www/status_interfaces.php                          |  1 -
 src/www/status_rrd_graph.php                           |  1 -
 src/www/status_rrd_graph_img.php                       |  1 -
 src/www/status_rrd_graph_settings.php                  |  1 -
 src/www/system_gateway_groups.php                      |  1 -
 .../widgets/widgets/load_balancer_status.widget.php    |  1 +
 40 files changed, 27 insertions(+), 60 deletions(-)

diff --git a/src/etc/inc/authgui.inc b/src/etc/inc/authgui.inc
index 8a5f509ab..dda2408b7 100644
--- a/src/etc/inc/authgui.inc
+++ b/src/etc/inc/authgui.inc
@@ -31,7 +31,6 @@
 */
 
 require_once("auth.inc");
-require_once("filter.inc");
 require_once("functions.inc");
 
 // provided via legacy_bindings.inc 
diff --git a/src/etc/inc/captiveportal.inc b/src/etc/inc/captiveportal.inc
index 62a971680..3f7b764da 100644
--- a/src/etc/inc/captiveportal.inc
+++ b/src/etc/inc/captiveportal.inc
@@ -37,7 +37,6 @@
 /* include all configuration functions */
 require_once("config.inc");
 require_once("functions.inc");
-require_once("filter.inc");
 require_once("radius.inc");
 require_once("captiveportal.radius_accounting.inc");
 require_once("captiveportal.radius_authentication.inc");
diff --git a/src/etc/inc/vslb.inc b/src/etc/inc/vslb.inc
index ecbf41304..6df276b02 100644
--- a/src/etc/inc/vslb.inc
+++ b/src/etc/inc/vslb.inc
@@ -25,7 +25,6 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
-require_once("filter.inc");
 
 function subnetv4_expand($subnet) {
 	$result = array();
diff --git a/src/www/diag_backup.php b/src/www/diag_backup.php
index f9edd09d6..b893d580e 100644
--- a/src/www/diag_backup.php
+++ b/src/www/diag_backup.php
@@ -38,7 +38,6 @@ $nocsrf = true;
 
 require_once("guiconfig.inc");
 require_once("functions.inc");
-require_once("filter.inc");
 require_once("services.inc");
 require_once("util.inc");
 
diff --git a/src/www/diag_resetstate.php b/src/www/diag_resetstate.php
index 0c0b4df48..388f7db1e 100644
--- a/src/www/diag_resetstate.php
+++ b/src/www/diag_resetstate.php
@@ -29,7 +29,6 @@
 
 
 require_once("guiconfig.inc");
-require_once("filter.inc");
 
 function filter_flush_state_table()
 {
diff --git a/src/www/firewall_aliases_edit.php b/src/www/firewall_aliases_edit.php
index 644a99d77..e2296efa0 100644
--- a/src/www/firewall_aliases_edit.php
+++ b/src/www/firewall_aliases_edit.php
@@ -32,7 +32,6 @@
 
 require_once("guiconfig.inc");
 require_once("functions.inc");
-require_once("filter.inc");
 
 /* returns an array consisting of every element of $haystack that is not equal to $needle. */
 function array_exclude($needle, $haystack)
diff --git a/src/www/firewall_aliases_import.php b/src/www/firewall_aliases_import.php
index 06ae5dda9..afeb8ae51 100644
--- a/src/www/firewall_aliases_import.php
+++ b/src/www/firewall_aliases_import.php
@@ -32,7 +32,6 @@ $reserved_keywords = array("all", "pass", "block", "out", "queue", "max", "min",
 
 require_once("guiconfig.inc");
 require_once("util.inc");
-require_once("filter.inc");
 
 $pgtitle = array(gettext("Firewall"),gettext("Aliases"),gettext("Bulk import"));
 
diff --git a/src/www/firewall_nat_1to1_edit.php b/src/www/firewall_nat_1to1_edit.php
index 59da05526..280bd4258 100644
--- a/src/www/firewall_nat_1to1_edit.php
+++ b/src/www/firewall_nat_1to1_edit.php
@@ -28,7 +28,6 @@
 
 require_once("guiconfig.inc");
 require_once("interfaces.inc");
-require_once("filter.inc");
 
 $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/firewall_nat_1to1.php');
 
diff --git a/src/www/firewall_nat_edit.php b/src/www/firewall_nat_edit.php
index f0f035453..686e5005d 100644
--- a/src/www/firewall_nat_edit.php
+++ b/src/www/firewall_nat_edit.php
@@ -28,7 +28,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("filter.inc");
 
 /****f* itemid/delete_id
  * NAME
diff --git a/src/www/firewall_nat_npt_edit.php b/src/www/firewall_nat_npt_edit.php
index ebe971c50..f7f68a6ff 100644
--- a/src/www/firewall_nat_npt_edit.php
+++ b/src/www/firewall_nat_npt_edit.php
@@ -26,6 +26,10 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
+require_once("guiconfig.inc");
+require_once("interfaces.inc");
+
+
 function natnptcmp($a, $b) {
 	return ipcmp($a['external'], $b['external']);
 }
@@ -40,10 +44,6 @@ function nat_npt_rules_sort() {
         usort($config['nat']['npt'], "natnptcmp");
 }
 
-require_once("guiconfig.inc");
-require_once("interfaces.inc");
-require_once("filter.inc");
-
 $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/firewall_nat_npt.php');
 
 $ifdisp = get_configured_interface_with_descr();
diff --git a/src/www/firewall_nat_out_edit.php b/src/www/firewall_nat_out_edit.php
index dc8715d9b..9059d1850 100644
--- a/src/www/firewall_nat_out_edit.php
+++ b/src/www/firewall_nat_out_edit.php
@@ -28,7 +28,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("filter.inc");
 
 $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/firewall_nat_out.php');
 
diff --git a/src/www/firewall_rules_edit.php b/src/www/firewall_rules_edit.php
index 3ce14173a..ef0c50696 100644
--- a/src/www/firewall_rules_edit.php
+++ b/src/www/firewall_rules_edit.php
@@ -29,7 +29,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("filter.inc");
 
 $firewall_rules_dscp_types = array("af11",
 				"af12",
diff --git a/src/www/firewall_schedule.php b/src/www/firewall_schedule.php
index 413cd0db8..049d19c25 100644
--- a/src/www/firewall_schedule.php
+++ b/src/www/firewall_schedule.php
@@ -27,12 +27,13 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
-$dayArray = array (gettext('Mon'),gettext('Tues'),gettext('Wed'),gettext('Thur'),gettext('Fri'),gettext('Sat'),gettext('Sun'));
-$monthArray = array (gettext('January'),gettext('February'),gettext('March'),gettext('April'),gettext('May'),gettext('June'),gettext('July'),gettext('August'),gettext('September'),gettext('October'),gettext('November'),gettext('December'));
-
 require_once("guiconfig.inc");
 require_once("filter.inc");
 
+
+$dayArray = array (gettext('Mon'),gettext('Tues'),gettext('Wed'),gettext('Thur'),gettext('Fri'),gettext('Sat'),gettext('Sun'));
+$monthArray = array (gettext('January'),gettext('February'),gettext('March'),gettext('April'),gettext('May'),gettext('June'),gettext('July'),gettext('August'),gettext('September'),gettext('October'),gettext('November'),gettext('December'));
+
 $pgtitle = array(gettext("Firewall"),gettext("Schedules"));
 
 if (!is_array($config['schedules']['schedule']))
diff --git a/src/www/firewall_schedule_edit.php b/src/www/firewall_schedule_edit.php
index f1ef1c7fd..9a51230f8 100644
--- a/src/www/firewall_schedule_edit.php
+++ b/src/www/firewall_schedule_edit.php
@@ -27,6 +27,10 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
+require_once("guiconfig.inc");
+require_once("functions.inc");
+
+
 /****f* legacy/is_schedule_inuse
  * NAME
  *   checks to see if a schedule is currently in use by a rule
@@ -71,10 +75,6 @@ function schedule_sort(){
         usort($config['schedules']['schedule'], "schedulecmp");
 }
 
-require_once("guiconfig.inc");
-require_once("functions.inc");
-require_once("filter.inc");
-
 $pgtitle = array(gettext("Firewall"),gettext("Schedules"),gettext("Edit"));
 
 $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/firewall_schedule.php');
diff --git a/src/www/firewall_virtual_ip_edit.php b/src/www/firewall_virtual_ip_edit.php
index 3078d036a..5d2eb6f25 100644
--- a/src/www/firewall_virtual_ip_edit.php
+++ b/src/www/firewall_virtual_ip_edit.php
@@ -30,7 +30,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("filter.inc");
 
 $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/firewall_virtual_ip.php');
 
diff --git a/src/www/interfaces.php b/src/www/interfaces.php
index 72a773576..7f6894358 100644
--- a/src/www/interfaces.php
+++ b/src/www/interfaces.php
@@ -33,7 +33,6 @@
 
 require_once("guiconfig.inc");
 require_once("ipsec.inc");
-require_once("functions.inc");
 require_once("captiveportal.inc");
 require_once("filter.inc");
 require_once("rrd.inc");
diff --git a/src/www/load_balancer_pool_edit.php b/src/www/load_balancer_pool_edit.php
index 466010d2f..d0f94e775 100644
--- a/src/www/load_balancer_pool_edit.php
+++ b/src/www/load_balancer_pool_edit.php
@@ -28,7 +28,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("filter.inc");
 require_once("util.inc");
 
 $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/load_balancer_pool.php');
diff --git a/src/www/services_captiveportal.php b/src/www/services_captiveportal.php
index 880ef8e08..488cf2b76 100644
--- a/src/www/services_captiveportal.php
+++ b/src/www/services_captiveportal.php
@@ -27,14 +27,13 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
+require_once("guiconfig.inc");
 require_once("functions.inc");
-require_once("filter.inc");
 require_once("captiveportal.inc");
 
 if (substr($_GET['act'], 0, 3) == "get")
 	$nocsrf = true;
 
-require_once("guiconfig.inc");
 
 global $cpzone;
 global $cpzoneid;
diff --git a/src/www/services_captiveportal_filemanager.php b/src/www/services_captiveportal_filemanager.php
index 199691cde..c881c5e56 100644
--- a/src/www/services_captiveportal_filemanager.php
+++ b/src/www/services_captiveportal_filemanager.php
@@ -27,6 +27,10 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
+require_once("guiconfig.inc");
+require_once("functions.inc");
+require_once("captiveportal.inc");
+
 
 $captiveportal_element_sizelimit = 1048576;
 
@@ -42,11 +46,6 @@ function cpelements_sort()
         usort($config['captiveportal'][$cpzone]['element'], "cpelementscmp");
 }
 
-require_once("guiconfig.inc");
-require_once("functions.inc");
-require_once("filter.inc");
-require_once("captiveportal.inc");
-
 $cpzone = $_GET['zone'];
 if (isset($_POST['zone'])) {
         $cpzone = $_POST['zone'];
diff --git a/src/www/services_captiveportal_ip.php b/src/www/services_captiveportal_ip.php
index 0511283e9..3f841f35e 100644
--- a/src/www/services_captiveportal_ip.php
+++ b/src/www/services_captiveportal_ip.php
@@ -28,7 +28,6 @@
 
 require_once("guiconfig.inc");
 require_once("functions.inc");
-require_once("filter.inc");
 require_once("captiveportal.inc");
 
 $cpzone = $_GET['zone'];
diff --git a/src/www/services_captiveportal_ip_edit.php b/src/www/services_captiveportal_ip_edit.php
index e812b8c3b..d8245ac50 100644
--- a/src/www/services_captiveportal_ip_edit.php
+++ b/src/www/services_captiveportal_ip_edit.php
@@ -28,6 +28,11 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
+require_once("guiconfig.inc");
+require_once("functions.inc");
+require_once("captiveportal.inc");
+
+
 function allowedipscmp($a, $b)
 {
     return strcmp($a['ip'], $b['ip']);
@@ -40,11 +45,6 @@ function allowedips_sort()
     usort($config['captiveportal'][$cpzone]['allowedip'], "allowedipscmp");
 }
 
-require_once("guiconfig.inc");
-require_once("functions.inc");
-require_once("filter.inc");
-require_once("captiveportal.inc");
-
 $pgtitle = array(gettext("Services"),gettext("Captive portal"),gettext("Edit allowed IP address"));
 $shortcut_section = "captiveportal";
 
diff --git a/src/www/services_captiveportal_mac.php b/src/www/services_captiveportal_mac.php
index 4d7e06ca0..94fed0138 100644
--- a/src/www/services_captiveportal_mac.php
+++ b/src/www/services_captiveportal_mac.php
@@ -29,7 +29,6 @@
 
 require_once("guiconfig.inc");
 require_once("functions.inc");
-require_once("filter.inc");
 require_once("captiveportal.inc");
 
 global $cpzone;
diff --git a/src/www/services_captiveportal_mac_edit.php b/src/www/services_captiveportal_mac_edit.php
index 35bf73d1f..da7bc53a9 100644
--- a/src/www/services_captiveportal_mac_edit.php
+++ b/src/www/services_captiveportal_mac_edit.php
@@ -26,6 +26,10 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
+require_once("guiconfig.inc");
+require_once("functions.inc");
+require_once("captiveportal.inc");
+
 
 function passthrumacscmp($a, $b)
 {
@@ -39,11 +43,6 @@ function passthrumacs_sort()
     usort($config['captiveportal'][$cpzone]['passthrumac'], "passthrumacscmp");
 }
 
-require_once("guiconfig.inc");
-require_once("functions.inc");
-require_once("filter.inc");
-require_once("captiveportal.inc");
-
 global $cpzone;
 global $cpzoneid;
 
diff --git a/src/www/services_captiveportal_vouchers.php b/src/www/services_captiveportal_vouchers.php
index a4805f4c6..ca62a886f 100644
--- a/src/www/services_captiveportal_vouchers.php
+++ b/src/www/services_captiveportal_vouchers.php
@@ -33,7 +33,6 @@ if ($_POST['postafterlogin']) {
 
 require_once('guiconfig.inc');
 require_once('functions.inc');
-require_once('filter.inc');
 require_once('captiveportal.inc');
 require_once('voucher.inc');
 
diff --git a/src/www/services_captiveportal_vouchers_edit.php b/src/www/services_captiveportal_vouchers_edit.php
index e49b5b60d..9446f515c 100644
--- a/src/www/services_captiveportal_vouchers_edit.php
+++ b/src/www/services_captiveportal_vouchers_edit.php
@@ -28,7 +28,6 @@
 
 require_once("guiconfig.inc");
 require_once("functions.inc");
-require_once("filter.inc");
 require_once("captiveportal.inc");
 require_once("voucher.inc");
 
diff --git a/src/www/services_captiveportal_zones.php b/src/www/services_captiveportal_zones.php
index f0d5d709d..24fa5bc12 100644
--- a/src/www/services_captiveportal_zones.php
+++ b/src/www/services_captiveportal_zones.php
@@ -27,7 +27,6 @@
 
 require_once("guiconfig.inc");
 require_once("functions.inc");
-require_once("filter.inc");
 require_once("captiveportal.inc");
 
 global $cpzone;
diff --git a/src/www/services_captiveportal_zones_edit.php b/src/www/services_captiveportal_zones_edit.php
index dcc9b01e0..889c5b1bb 100644
--- a/src/www/services_captiveportal_zones_edit.php
+++ b/src/www/services_captiveportal_zones_edit.php
@@ -28,7 +28,6 @@
 
 require_once("guiconfig.inc");
 require_once("functions.inc");
-require_once("filter.inc");
 require_once("captiveportal.inc");
 
 $pgtitle = array(gettext("Services"),gettext("Captive portal"),gettext("Edit Zones"));
diff --git a/src/www/services_dnsmasq.php b/src/www/services_dnsmasq.php
index daa5f1279..2acf49222 100644
--- a/src/www/services_dnsmasq.php
+++ b/src/www/services_dnsmasq.php
@@ -29,7 +29,6 @@
 
 require_once("guiconfig.inc");
 require_once("functions.inc");
-require_once("filter.inc");
 
 $pconfig['enable'] = isset($config['dnsmasq']['enable']);
 $pconfig['regdhcp'] = isset($config['dnsmasq']['regdhcp']);
diff --git a/src/www/services_upnp.php b/src/www/services_upnp.php
index 5352c6d49..12c89f931 100644
--- a/src/www/services_upnp.php
+++ b/src/www/services_upnp.php
@@ -33,7 +33,6 @@ $shortcut_section = "upnp";
 
 require_once("guiconfig.inc");
 require_once("functions.inc");
-require_once("filter.inc");
 require_once('miniupnpd.inc');
 
 function upnp_validate_ip($ip, $check_cdir) {
diff --git a/src/www/status_captiveportal.php b/src/www/status_captiveportal.php
index 4a9b893ad..f65f2b50b 100644
--- a/src/www/status_captiveportal.php
+++ b/src/www/status_captiveportal.php
@@ -28,7 +28,6 @@
 
 require_once("guiconfig.inc");
 require_once("functions.inc");
-require_once("filter.inc");
 require_once("captiveportal.inc");
 
 $cpzone = $_GET['zone'];
diff --git a/src/www/status_captiveportal_expire.php b/src/www/status_captiveportal_expire.php
index 96ff786b1..7dedba691 100644
--- a/src/www/status_captiveportal_expire.php
+++ b/src/www/status_captiveportal_expire.php
@@ -29,7 +29,6 @@
 
 require_once("guiconfig.inc");
 require_once("functions.inc");
-require_once("filter.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 7d51c27e5..fe50a0ef8 100644
--- a/src/www/status_captiveportal_test.php
+++ b/src/www/status_captiveportal_test.php
@@ -29,7 +29,6 @@
 
 require_once("guiconfig.inc");
 require_once("functions.inc");
-require_once("filter.inc");
 require_once("captiveportal.inc");
 require_once("voucher.inc");
 
diff --git a/src/www/status_captiveportal_voucher_rolls.php b/src/www/status_captiveportal_voucher_rolls.php
index fc2349321..018c61af9 100644
--- a/src/www/status_captiveportal_voucher_rolls.php
+++ b/src/www/status_captiveportal_voucher_rolls.php
@@ -29,7 +29,6 @@
 
 require_once("guiconfig.inc");
 require_once("functions.inc");
-require_once("filter.inc");
 require_once("captiveportal.inc");
 require_once("voucher.inc");
 
diff --git a/src/www/status_captiveportal_vouchers.php b/src/www/status_captiveportal_vouchers.php
index c8d6609f0..0dbbb2179 100644
--- a/src/www/status_captiveportal_vouchers.php
+++ b/src/www/status_captiveportal_vouchers.php
@@ -29,7 +29,6 @@
 
 require_once("guiconfig.inc");
 require_once("functions.inc");
-require_once("filter.inc");
 require_once("captiveportal.inc");
 require_once("voucher.inc");
 
diff --git a/src/www/status_interfaces.php b/src/www/status_interfaces.php
index 79816b9b8..5e5cf68ca 100644
--- a/src/www/status_interfaces.php
+++ b/src/www/status_interfaces.php
@@ -29,7 +29,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("filter.inc");
 
 if ($_POST['if'] && $_POST['submit']) {
 	$interface = $_POST['if'];
diff --git a/src/www/status_rrd_graph.php b/src/www/status_rrd_graph.php
index b1a8517de..9478bdb8f 100644
--- a/src/www/status_rrd_graph.php
+++ b/src/www/status_rrd_graph.php
@@ -27,7 +27,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("filter.inc");
 require_once("rrd.inc");
 
 unset($input_errors);
diff --git a/src/www/status_rrd_graph_img.php b/src/www/status_rrd_graph_img.php
index 34f627502..ad493e98c 100644
--- a/src/www/status_rrd_graph_img.php
+++ b/src/www/status_rrd_graph_img.php
@@ -28,7 +28,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("filter.inc");
 require_once("rrd.inc");
 
 global $g;
diff --git a/src/www/status_rrd_graph_settings.php b/src/www/status_rrd_graph_settings.php
index 8510f42a5..e77ca47cf 100644
--- a/src/www/status_rrd_graph_settings.php
+++ b/src/www/status_rrd_graph_settings.php
@@ -27,7 +27,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("filter.inc");
 require_once("rrd.inc");
 
 $pconfig['enable'] = isset($config['rrd']['enable']);
diff --git a/src/www/system_gateway_groups.php b/src/www/system_gateway_groups.php
index 550a953df..cf4c8c47d 100644
--- a/src/www/system_gateway_groups.php
+++ b/src/www/system_gateway_groups.php
@@ -29,7 +29,6 @@
 
 require_once("guiconfig.inc");
 require_once("functions.inc");
-require_once("filter.inc");
 require_once("openvpn.inc");
 
 // Resync and restart all VPNs using a gateway group.
diff --git a/src/www/widgets/widgets/load_balancer_status.widget.php b/src/www/widgets/widgets/load_balancer_status.widget.php
index 7b185e906..bcda71e0e 100644
--- a/src/www/widgets/widgets/load_balancer_status.widget.php
+++ b/src/www/widgets/widgets/load_balancer_status.widget.php
@@ -36,6 +36,7 @@ $nocsrf = true;
 require_once("guiconfig.inc");
 require_once("pfsense-utils.inc");
 require_once("functions.inc");
+require_once("filter.inc");
 require_once("vslb.inc");
 
 $now = time();