(legacy) cleanup IPv6.inc / rrd.inc

src/etc/inc/auth.inc

@@ -37,7 +37,6 @@
  */
 
 /* include globals from notices.inc /utility/XML parser files */
-require_once("IPv6.inc");
 require_once("certs.inc");
 require_once("radius.inc");
 

src/etc/inc/config.inc

@@ -40,8 +40,6 @@ if(php_uname("m") == "amd64") {
 
 /* include globals from notices.inc /utility/XML parser files */
 require_once('config.lib.inc');
-require_once("util.inc");
-require_once("IPv6.inc");
 
 $config = parse_config();
 

src/etc/inc/config.lib.inc

@@ -32,7 +32,6 @@
 require_once("globals.inc");
 require_once("xmlparse.inc");
 require_once("crypt.inc");
-require_once("util.inc");
 require_once("notices.inc");
 require_once("legacy_bindings.inc");
 require_once('upgrade_config.inc');

src/etc/inc/gwlb.inc

@@ -27,8 +27,6 @@
   POSSIBILITY OF SUCH DAMAGE.
 */
 
-require_once("rrd.inc");
-
 /* Returns an array of default values used for apinger.conf */
 function return_apinger_defaults() {
 	return array(

src/etc/inc/upgrade_config.inc

@@ -27,7 +27,6 @@
 	POSSIBILITY OF SUCH DAMAGE.
  */
 
-require_once('rrd.inc');
 require_once("services.inc");
 
 function dump_rrd_to_xml($rrddatabase, $xmldumpfile)

src/etc/inc/util.inc

@@ -26,6 +26,7 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 require_once("interfaces.inc");
+require_once("IPv6.inc");
 
 function killbyname($procname, $sig = 'TERM')
 {

src/etc/rc.newwanip

@@ -35,7 +35,6 @@ require_once("filter.inc");
 require_once("ipsec.inc");
 require_once("vpn.inc");
 require_once("openvpn.inc");
-require_once("IPv6.inc");
 require_once("rrd.inc");
 
 // Do not process while booting

src/etc/rc.newwanipv6

@@ -35,7 +35,6 @@ require_once("filter.inc");
 require_once("ipsec.inc");
 require_once("vpn.inc");
 require_once("openvpn.inc");
-require_once("IPv6.inc");
 require_once("services.inc");
 require_once("rrd.inc");
 

src/www/diag_backup.php

@@ -40,6 +40,7 @@ require_once("guiconfig.inc");
 require_once("functions.inc");
 require_once("services.inc");
 require_once("util.inc");
+require_once("rrd.inc");
 
 /**
  * check if cron exists