diff --git a/src/etc/inc/services.inc b/src/etc/inc/services.inc
index 6f5e6d901..2e6cccd9f 100644
--- a/src/etc/inc/services.inc
+++ b/src/etc/inc/services.inc
@@ -29,208 +29,9 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* XXX remove this file, merging it into system.inc */
-
-function service_by_name($name, $filter = array())
-{
-    $services = plugins_services();
-
-    foreach ($services as $service) {
-        if ($service['name'] != $name) {
-            continue;
-        }
-        if (!count($filter)) {
-            /* force match if filter wasn't set (standard behaviour) */
-            $filter['name'] = $name;
-        }
-        foreach ($filter as $key => $value) {
-            if (isset($service[$key]) && $service[$key] == $value) {
-                return $service;
-            }
-        }
-    }
-
-    return array();
-}
-
-function service_status($service)
-{
-    if (!empty($service['nocheck'])) {
-        return true;
-    }
-
-    if (isset($service['pidfile'])) {
-        return isvalidpid($service['pidfile']);
-    }
-
-    return is_process_running($service['name']);
-}
-
-function service_control_icon($service, $xs = false)
-{
-    $output = '';
-
-    if (service_status($service)) {
-        $output .= '<span class="label label-opnsense label-opnsense-%s label-success"><i class="fa fa-play fa-fw"></i></span>' . PHP_EOL;
-    } else {
-        $output .= '<span class="label label-opnsense label-opnsense-%s label-danger"><i class="fa fa-stop fa-fw"></i></span>' . PHP_EOL;
-    }
-
-    return sprintf($output, $xs ? 'xs' : 'sm');
-}
-
-function service_control_links($service, $xs = false)
-{
-    $service_id = isset($service['id']) ? $service['id'] : '';
-
-    $template  = '<span data-service_id="%s" data-service_action="%s" data-service="%s" ';
-    $template .= 'class="btn btn-%s btn-default %s"><i class="%s"></i></span>' . PHP_EOL;
-
-    $output = '';
-
-    if (service_status($service)) {
-        $output .= sprintf(
-            $template,
-            $service_id,
-            'restart',
-            $service['name'],
-            $xs ? 'xs' : 'sm',
-            'srv_status_act',
-            'fa fa-refresh fa-fw'
-        );
-        if (empty($service['nocheck'])) {
-            $output .= sprintf(
-                $template,
-                $service_id,
-                'stop',
-                $service['name'],
-                $xs ? 'xs' : 'sm',
-                'srv_status_act',
-                'fa fa-stop fa-fw'
-            );
-        }
-    } else {
-        $output .= sprintf(
-            $template,
-            $service_id,
-            'start',
-            $service['name'],
-            $xs ? 'xs' : 'sm',
-            'srv_status_act',
-            'fa fa-play fa-fw'
-        );
-    }
-
-    return $output;
-}
-
-function service_control_start($name, $extras)
-{
-    $filter = array();
-
-    if (!empty($extras['id'])) {
-        $filter['id'] = $extras['id'];
-    }
-
-    $service = service_by_name($name, $filter);
-    if (!isset($service['name'])) {
-        return sprintf(gettext("Could not start unknown service `%s'"), htmlspecialchars($name));
-    }
-
-    if (isset($service['configd']['start'])) {
-        foreach ($service['configd']['start'] as $cmd) {
-            configd_run($cmd);
-        }
-    } elseif (isset($service['php']['start'])) {
-        foreach ($service['php']['start'] as $cmd) {
-            $params = array();
-            if (isset($service['php']['args'])) {
-                foreach ($service['php']['args'] as $param) {
-                    $params[] = $service[$param];
-                }
-            }
-            call_user_func_array($cmd, $params);
-        }
-    } elseif (isset($service['mwexec']['start'])) {
-        foreach ($service['mwexec']['start'] as $cmd) {
-            mwexec($cmd);
-        }
-    } else {
-        return sprintf(gettext("Could not start service `%s'"), htmlspecialchars($name));
-    }
-
-    return sprintf(gettext("Service `%s' has been started."), htmlspecialchars($name));
-}
-
-function service_control_stop($name, $extras)
-{
-    $filter = array();
-
-    if (!empty($extras['id'])) {
-        $filter['id'] = $extras['id'];
-    }
-
-    $service = service_by_name($name, $filter);
-    if (!isset($service['name'])) {
-        return sprintf(gettext("Could not stop unknown service `%s'"), htmlspecialchars($name));
-    }
-
-    if (isset($service['configd']['stop'])) {
-        foreach ($service['configd']['stop'] as $cmd) {
-            configd_run($cmd);
-        }
-    } elseif (isset($service['php']['stop'])) {
-        foreach ($service['php']['stop'] as $cmd) {
-            $cmd();
-        }
-    } elseif (isset($service['mwexec']['stop'])) {
-        foreach ($service['mwexec']['stop'] as $cmd) {
-            mwexec($cmd);
-        }
-    } elseif (isset($service['pidfile'])) {
-        killbypid($service['pidfile'], 'TERM', true);
-    } else {
-        /* last resort, but not very elegant */
-        killbyname($service['name']);
-    }
-
-    return sprintf(gettext("Service `%s' has been stopped."), htmlspecialchars($name));
-}
-
-function service_control_restart($name, $extras)
-{
-    $filter = array();
-
-    if (!empty($extras['id'])) {
-        $filter['id'] = $extras['id'];
-    }
-
-    $service = service_by_name($name, $filter);
-    if (!isset($service['name'])) {
-        return sprintf(gettext("Could not restart unknown service `%s'"), htmlspecialchars($name));
-    }
-
-    if (isset($service['configd']['restart'])) {
-        foreach ($service['configd']['restart'] as $cmd) {
-            configd_run($cmd);
-        }
-    } elseif (isset($service['php']['restart'])) {
-        foreach ($service['php']['restart'] as $cmd) {
-            $params = array();
-            if (isset($service['php']['args'])) {
-                foreach ($service['php']['args'] as $param) {
-                    $params[] = $service[$param];
-                }
-            }
-            call_user_func_array($cmd, $params);
-        }
-    } elseif (isset($service['mwexec']['restart'])) {
-        foreach ($service['mwexec']['restart'] as $cmd) {
-            mwexec($cmd);
-        }
-    } else {
-        return sprintf(gettext("Could not restart service `%s'"), htmlspecialchars($name));
-    }
-
-    return sprintf(gettext("Service `%s' has been restarted."), htmlspecialchars($name));
-}
+/*
+ * XXX remove this file, kept for plugin compatibility
+ *
+ * The content moved to utils.inc and guiconfig.inc and should
+ * thus be available to components without further modification.
+ */
diff --git a/src/etc/inc/util.inc b/src/etc/inc/util.inc
index fd5267bf4..d4fff1a8a 100644
--- a/src/etc/inc/util.inc
+++ b/src/etc/inc/util.inc
@@ -1,7 +1,9 @@
 <?php
 
 /*
- * Copyright (C) 2015-2019 Franco Fichtner <franco@opnsense.org>
+ * Copyright (C) 2014-2019 Franco Fichtner <franco@opnsense.org>
+ * Copyright (C) 2010 Ermal Luçi
+ * Copyright (C) 2005-2006 Colin Smith <ethethlay@gmail.com>
  * Copyright (C) 2004-2007 Scott Ullrich <sullrich@gmail.com>
  * Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>
  * All rights reserved.
@@ -93,6 +95,152 @@ function is_process_running($process)
     return (intval($retval) == 0);
 }
 
+function service_by_name($name, $filter = array())
+{
+    $services = plugins_services();
+
+    foreach ($services as $service) {
+        if ($service['name'] != $name) {
+            continue;
+        }
+        if (!count($filter)) {
+            /* force match if filter wasn't set (standard behaviour) */
+            $filter['name'] = $name;
+        }
+        foreach ($filter as $key => $value) {
+            if (isset($service[$key]) && $service[$key] == $value) {
+                return $service;
+            }
+        }
+    }
+
+    return array();
+}
+
+function service_status($service)
+{
+    if (!empty($service['nocheck'])) {
+        return true;
+    }
+
+    if (isset($service['pidfile'])) {
+        return isvalidpid($service['pidfile']);
+    }
+
+    return is_process_running($service['name']);
+}
+
+function service_control_start($name, $extras)
+{
+    $filter = array();
+
+    if (!empty($extras['id'])) {
+        $filter['id'] = $extras['id'];
+    }
+
+    $service = service_by_name($name, $filter);
+    if (!isset($service['name'])) {
+        return sprintf(gettext("Could not start unknown service `%s'"), htmlspecialchars($name));
+    }
+
+    if (isset($service['configd']['start'])) {
+        foreach ($service['configd']['start'] as $cmd) {
+            configd_run($cmd);
+        }
+    } elseif (isset($service['php']['start'])) {
+        foreach ($service['php']['start'] as $cmd) {
+            $params = array();
+            if (isset($service['php']['args'])) {
+                foreach ($service['php']['args'] as $param) {
+                    $params[] = $service[$param];
+                }
+            }
+            call_user_func_array($cmd, $params);
+        }
+    } elseif (isset($service['mwexec']['start'])) {
+        foreach ($service['mwexec']['start'] as $cmd) {
+            mwexec($cmd);
+        }
+    } else {
+        return sprintf(gettext("Could not start service `%s'"), htmlspecialchars($name));
+    }
+
+    return sprintf(gettext("Service `%s' has been started."), htmlspecialchars($name));
+}
+
+function service_control_stop($name, $extras)
+{
+    $filter = array();
+
+    if (!empty($extras['id'])) {
+        $filter['id'] = $extras['id'];
+    }
+
+    $service = service_by_name($name, $filter);
+    if (!isset($service['name'])) {
+        return sprintf(gettext("Could not stop unknown service `%s'"), htmlspecialchars($name));
+    }
+
+    if (isset($service['configd']['stop'])) {
+        foreach ($service['configd']['stop'] as $cmd) {
+            configd_run($cmd);
+        }
+    } elseif (isset($service['php']['stop'])) {
+        foreach ($service['php']['stop'] as $cmd) {
+            $cmd();
+        }
+    } elseif (isset($service['mwexec']['stop'])) {
+        foreach ($service['mwexec']['stop'] as $cmd) {
+            mwexec($cmd);
+        }
+    } elseif (isset($service['pidfile'])) {
+        killbypid($service['pidfile'], 'TERM', true);
+    } else {
+        /* last resort, but not very elegant */
+        killbyname($service['name']);
+    }
+
+    return sprintf(gettext("Service `%s' has been stopped."), htmlspecialchars($name));
+}
+
+function service_control_restart($name, $extras)
+{
+    $filter = array();
+
+    if (!empty($extras['id'])) {
+        $filter['id'] = $extras['id'];
+    }
+
+    $service = service_by_name($name, $filter);
+    if (!isset($service['name'])) {
+        return sprintf(gettext("Could not restart unknown service `%s'"), htmlspecialchars($name));
+    }
+
+    if (isset($service['configd']['restart'])) {
+        foreach ($service['configd']['restart'] as $cmd) {
+            configd_run($cmd);
+        }
+    } elseif (isset($service['php']['restart'])) {
+        foreach ($service['php']['restart'] as $cmd) {
+            $params = array();
+            if (isset($service['php']['args'])) {
+                foreach ($service['php']['args'] as $param) {
+                    $params[] = $service[$param];
+                }
+            }
+            call_user_func_array($cmd, $params);
+        }
+    } elseif (isset($service['mwexec']['restart'])) {
+        foreach ($service['mwexec']['restart'] as $cmd) {
+            mwexec($cmd);
+        }
+    } else {
+        return sprintf(gettext("Could not restart service `%s'"), htmlspecialchars($name));
+    }
+
+    return sprintf(gettext("Service `%s' has been restarted."), htmlspecialchars($name));
+}
+
 function list_dh_parameters()
 {
     global $config;
diff --git a/src/etc/inc/xmlrpc/service.inc b/src/etc/inc/xmlrpc/service.inc
index cd78b62e1..ed02789f4 100644
--- a/src/etc/inc/xmlrpc/service.inc
+++ b/src/etc/inc/xmlrpc/service.inc
@@ -26,7 +26,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-require_once("services.inc");
 require_once("system.inc");
 require_once('util.inc');
 require_once("filter.inc");
diff --git a/src/sbin/pluginctl b/src/sbin/pluginctl
index 371bff208..176235707 100755
--- a/src/sbin/pluginctl
+++ b/src/sbin/pluginctl
@@ -34,7 +34,6 @@ require_once 'util.inc';
 require_once 'system.inc';
 require_once 'interfaces.inc';
 require_once 'filter.inc';
-require_once 'services.inc';
 require_once 'auth.inc';
 
 /*
diff --git a/src/www/diag_backup.php b/src/www/diag_backup.php
index 7ab41e3a3..2ffd0a632 100644
--- a/src/www/diag_backup.php
+++ b/src/www/diag_backup.php
@@ -33,7 +33,6 @@
 require_once("guiconfig.inc");
 require_once("interfaces.inc");
 require_once("filter.inc");
-require_once("services.inc");
 require_once("rrd.inc");
 require_once("system.inc");
 
diff --git a/src/www/diag_ipsec.php b/src/www/diag_ipsec.php
index a4c8d5648..b629ab159 100644
--- a/src/www/diag_ipsec.php
+++ b/src/www/diag_ipsec.php
@@ -30,7 +30,6 @@
  */
 
 require_once("guiconfig.inc");
-require_once("services.inc");
 require_once("plugins.inc.d/ipsec.inc");
 
 /**
diff --git a/src/www/diag_ipsec_leases.php b/src/www/diag_ipsec_leases.php
index f510b6cc7..2ce697af7 100644
--- a/src/www/diag_ipsec_leases.php
+++ b/src/www/diag_ipsec_leases.php
@@ -29,7 +29,6 @@
 
 require_once("guiconfig.inc");
 require_once("plugins.inc.d/ipsec.inc");
-require_once("services.inc");
 require_once("interfaces.inc");
 
 $service_hook = 'strongswan';
diff --git a/src/www/diag_ipsec_sad.php b/src/www/diag_ipsec_sad.php
index e614c7da6..a49fddcee 100644
--- a/src/www/diag_ipsec_sad.php
+++ b/src/www/diag_ipsec_sad.php
@@ -29,7 +29,6 @@
  */
 
 require_once("guiconfig.inc");
-require_once("services.inc");
 require_once("interfaces.inc");
 require_once("plugins.inc.d/ipsec.inc");
 
diff --git a/src/www/diag_ipsec_spd.php b/src/www/diag_ipsec_spd.php
index 24a769d13..67391e6df 100644
--- a/src/www/diag_ipsec_spd.php
+++ b/src/www/diag_ipsec_spd.php
@@ -29,7 +29,6 @@
  */
 
 require_once("guiconfig.inc");
-require_once("services.inc");
 require_once("interfaces.inc");
 require_once("plugins.inc.d/ipsec.inc");
 
diff --git a/src/www/diag_logs_template.inc b/src/www/diag_logs_template.inc
index 5844b2769..7cb8de113 100644
--- a/src/www/diag_logs_template.inc
+++ b/src/www/diag_logs_template.inc
@@ -1,38 +1,37 @@
 <?php
 
 /*
-    Copyright (C) 2014-2015 Deciso B.V.
-    Copyright (C) 2012 Seth Mos <seth.mos@dds.nl>
-    Copyright (C) 2004-2009 Scott Ullrich <sullrich@gmail.com>
-    Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>
-    All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-
-    2. Redistributions in binary form must reproduce the above copyright
-       notice, this list of conditions and the following disclaimer in the
-       documentation and/or other materials provided with the distribution.
-
-    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-    POSSIBILITY OF SUCH DAMAGE.
-*/
+ * Copyright (C) 2014-2015 Deciso B.V.
+ * Copyright (C) 2012 Seth Mos <seth.mos@dds.nl>
+ * Copyright (C) 2004-2009 Scott Ullrich <sullrich@gmail.com>
+ * Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * 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("system.inc");
 require_once("interfaces.inc");
-require_once("services.inc");
 
 /* expects $logfile to point to the system path */
 /* expects $logclog to be true or false */
diff --git a/src/www/guiconfig.inc b/src/www/guiconfig.inc
index 38ac08ed4..16aa5b2d6 100644
--- a/src/www/guiconfig.inc
+++ b/src/www/guiconfig.inc
@@ -1,8 +1,10 @@
 <?php
 
 /*
- * Copyright (C) 2015-2016 Franco Fichtner <franco@opnsense.org>
+ * Copyright (C) 2014-2019 Franco Fichtner <franco@opnsense.org>
  * Copyright (C) 2014 Deciso B.V.
+ * Copyright (C) 2010 Ermal Luçi
+ * Copyright (C) 2005-2006 Colin Smith <ethethlay@gmail.com>
  * Copyright (C) 2004 Scott Ullrich <sullrich@gmail.com>
  * Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>
  * All rights reserved.
@@ -82,7 +84,6 @@ function get_themed_filename($url)
     return $url; // not found, return source
 }
 
-
 require_once("authgui.inc");
 
 /* Reserved table names to avoid colision */
@@ -95,7 +96,6 @@ $reserved_table_names = array(
     "webConfiguratorlockout"
 );
 
-
 $netbios_nodetypes = array(
     '0' => "none",
     '1' => "b-node",
@@ -562,3 +562,61 @@ function get_menu_messages()
 
     return $menu_messages;
 }
+
+function service_control_icon($service, $xs = false)
+{
+    $output = '';
+
+    if (service_status($service)) {
+        $output .= '<span class="label label-opnsense label-opnsense-%s label-success"><i class="fa fa-play fa-fw"></i></span>' . PHP_EOL;
+    } else {
+        $output .= '<span class="label label-opnsense label-opnsense-%s label-danger"><i class="fa fa-stop fa-fw"></i></span>' . PHP_EOL;
+    }
+
+    return sprintf($output, $xs ? 'xs' : 'sm');
+}
+
+function service_control_links($service, $xs = false)
+{
+    $service_id = isset($service['id']) ? $service['id'] : '';
+
+    $template  = '<span data-service_id="%s" data-service_action="%s" data-service="%s" ';
+    $template .= 'class="btn btn-%s btn-default %s"><i class="%s"></i></span>' . PHP_EOL;
+
+    $output = '';
+
+    if (service_status($service)) {
+        $output .= sprintf(
+            $template,
+            $service_id,
+            'restart',
+            $service['name'],
+            $xs ? 'xs' : 'sm',
+            'srv_status_act',
+            'fa fa-refresh fa-fw'
+        );
+        if (empty($service['nocheck'])) {
+            $output .= sprintf(
+                $template,
+                $service_id,
+                'stop',
+                $service['name'],
+                $xs ? 'xs' : 'sm',
+                'srv_status_act',
+                'fa fa-stop fa-fw'
+            );
+        }
+    } else {
+        $output .= sprintf(
+            $template,
+            $service_id,
+            'start',
+            $service['name'],
+            $xs ? 'xs' : 'sm',
+            'srv_status_act',
+            'fa fa-play fa-fw'
+        );
+    }
+
+    return $output;
+}
diff --git a/src/www/reporting_settings.php b/src/www/reporting_settings.php
index 27a7dd82d..824cfea46 100644
--- a/src/www/reporting_settings.php
+++ b/src/www/reporting_settings.php
@@ -33,7 +33,6 @@ require_once("guiconfig.inc");
 require_once("interfaces.inc");
 require_once("rrd.inc");
 require_once("system.inc");
-require_once("services.inc");
 
 $rrdcfg = &config_read_array('rrd');
 
diff --git a/src/www/services_dhcp.php b/src/www/services_dhcp.php
index 94d18b832..299ecf3e9 100644
--- a/src/www/services_dhcp.php
+++ b/src/www/services_dhcp.php
@@ -29,7 +29,6 @@
 
 require_once("guiconfig.inc");
 require_once("filter.inc");
-require_once("services.inc");
 require_once("system.inc");
 require_once("interfaces.inc");
 require_once("plugins.inc.d/dhcpd.inc");
diff --git a/src/www/services_dhcp_edit.php b/src/www/services_dhcp_edit.php
index 882229695..f576b34ba 100644
--- a/src/www/services_dhcp_edit.php
+++ b/src/www/services_dhcp_edit.php
@@ -28,7 +28,6 @@
  */
 
 require_once("guiconfig.inc");
-require_once("services.inc");
 require_once("interfaces.inc");
 
 if ($_SERVER['REQUEST_METHOD'] === 'GET') {
diff --git a/src/www/services_dhcp_relay.php b/src/www/services_dhcp_relay.php
index b2b6874b2..06b63d728 100644
--- a/src/www/services_dhcp_relay.php
+++ b/src/www/services_dhcp_relay.php
@@ -29,7 +29,6 @@
  */
 
 require_once("guiconfig.inc");
-require_once("services.inc");
 require_once("interfaces.inc");
 
 if ($_SERVER['REQUEST_METHOD'] === 'GET') {
diff --git a/src/www/services_dhcpv6.php b/src/www/services_dhcpv6.php
index c8bafbca2..0344339f3 100644
--- a/src/www/services_dhcpv6.php
+++ b/src/www/services_dhcpv6.php
@@ -32,7 +32,6 @@ require_once("guiconfig.inc");
 require_once("filter.inc");
 require_once("system.inc");
 require_once("interfaces.inc");
-require_once("services.inc");
 require_once("plugins.inc.d/dhcpd.inc");
 
 function reconfigure_dhcpd()
diff --git a/src/www/services_dhcpv6_edit.php b/src/www/services_dhcpv6_edit.php
index 1f3a3b013..de750affa 100644
--- a/src/www/services_dhcpv6_edit.php
+++ b/src/www/services_dhcpv6_edit.php
@@ -30,7 +30,6 @@
 
 require_once("guiconfig.inc");
 require_once("interfaces.inc");
-require_once("services.inc");
 
 if ($_SERVER['REQUEST_METHOD'] === 'GET') {
     // handle identifiers and action
diff --git a/src/www/services_dhcpv6_relay.php b/src/www/services_dhcpv6_relay.php
index 04c65ba7a..cc53195c3 100644
--- a/src/www/services_dhcpv6_relay.php
+++ b/src/www/services_dhcpv6_relay.php
@@ -31,7 +31,6 @@
 
 require_once("guiconfig.inc");
 require_once("interfaces.inc");
-require_once("services.inc");
 
 if ($_SERVER['REQUEST_METHOD'] === 'GET') {
     $pconfig['enable'] = isset($config['dhcrelay6']['enable']);
diff --git a/src/www/services_dnsmasq.php b/src/www/services_dnsmasq.php
index 47832e975..3c3756bfb 100644
--- a/src/www/services_dnsmasq.php
+++ b/src/www/services_dnsmasq.php
@@ -30,7 +30,6 @@
 require_once("guiconfig.inc");
 require_once("interfaces.inc");
 require_once("filter.inc");
-require_once("services.inc");
 require_once("system.inc");
 require_once("plugins.inc.d/dnsmasq.inc");
 
diff --git a/src/www/services_dnsmasq_domainoverride_edit.php b/src/www/services_dnsmasq_domainoverride_edit.php
index 1728b726d..5608a7f74 100644
--- a/src/www/services_dnsmasq_domainoverride_edit.php
+++ b/src/www/services_dnsmasq_domainoverride_edit.php
@@ -30,7 +30,6 @@
 
 require_once("guiconfig.inc");
 require_once("system.inc");
-require_once("services.inc");
 require_once("interfaces.inc");
 require_once("plugins.inc.d/dnsmasq.inc");
 
diff --git a/src/www/services_dnsmasq_edit.php b/src/www/services_dnsmasq_edit.php
index 58ff93aa2..d6234815f 100644
--- a/src/www/services_dnsmasq_edit.php
+++ b/src/www/services_dnsmasq_edit.php
@@ -29,7 +29,6 @@
  */
 
 require_once("guiconfig.inc");
-require_once("services.inc");
 require_once("interfaces.inc");
 
 $a_hosts = &config_read_array('dnsmasq', 'hosts');
diff --git a/src/www/services_ntpd.php b/src/www/services_ntpd.php
index a9d190201..7bac21968 100644
--- a/src/www/services_ntpd.php
+++ b/src/www/services_ntpd.php
@@ -30,7 +30,6 @@
 
 require_once("guiconfig.inc");
 require_once("rrd.inc");
-require_once("services.inc");
 require_once("system.inc");
 require_once("interfaces.inc");
 require_once("plugins.inc.d/ntpd.inc");
diff --git a/src/www/services_ntpd_gps.php b/src/www/services_ntpd_gps.php
index 9f73a2a6f..ff539ca2c 100644
--- a/src/www/services_ntpd_gps.php
+++ b/src/www/services_ntpd_gps.php
@@ -29,7 +29,6 @@
  */
 
 require_once("guiconfig.inc");
-require_once("services.inc");
 require_once("system.inc");
 require_once("interfaces.inc");
 require_once("plugins.inc.d/ntpd.inc");
diff --git a/src/www/services_ntpd_pps.php b/src/www/services_ntpd_pps.php
index b1e6b7596..103510301 100644
--- a/src/www/services_ntpd_pps.php
+++ b/src/www/services_ntpd_pps.php
@@ -28,7 +28,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("services.inc");
 require_once("system.inc");
 require_once("interfaces.inc");
 require_once("plugins.inc.d/ntpd.inc");
diff --git a/src/www/services_router_advertisements.php b/src/www/services_router_advertisements.php
index 1c436f23e..1d252c2fd 100644
--- a/src/www/services_router_advertisements.php
+++ b/src/www/services_router_advertisements.php
@@ -30,7 +30,6 @@
  */
 
 require_once("guiconfig.inc");
-require_once("services.inc");
 require_once("interfaces.inc");
 require_once("plugins.inc.d/dhcpd.inc");
 
diff --git a/src/www/services_unbound.php b/src/www/services_unbound.php
index ac76b3641..24d770691 100644
--- a/src/www/services_unbound.php
+++ b/src/www/services_unbound.php
@@ -30,7 +30,6 @@
  */
 
 require_once("guiconfig.inc");
-require_once("services.inc");
 require_once("system.inc");
 require_once("interfaces.inc");
 require_once("plugins.inc.d/unbound.inc");
diff --git a/src/www/services_unbound_acls.php b/src/www/services_unbound_acls.php
index 9aa9136af..1a426f2b7 100644
--- a/src/www/services_unbound_acls.php
+++ b/src/www/services_unbound_acls.php
@@ -29,7 +29,6 @@
 
 require_once("guiconfig.inc");
 require_once("system.inc");
-require_once("services.inc");
 require_once("interfaces.inc");
 require_once("plugins.inc.d/unbound.inc");
 
diff --git a/src/www/services_unbound_advanced.php b/src/www/services_unbound_advanced.php
index 6195b7fc9..3ee23f1f7 100644
--- a/src/www/services_unbound_advanced.php
+++ b/src/www/services_unbound_advanced.php
@@ -29,7 +29,6 @@
 
 require_once("guiconfig.inc");
 require_once("system.inc");
-require_once("services.inc");
 require_once("plugins.inc.d/unbound.inc");
 
 config_read_array('unbound');
diff --git a/src/www/services_unbound_domainoverride_edit.php b/src/www/services_unbound_domainoverride_edit.php
index 68c0fa897..98b58b38a 100644
--- a/src/www/services_unbound_domainoverride_edit.php
+++ b/src/www/services_unbound_domainoverride_edit.php
@@ -30,7 +30,6 @@
  */
 
 require_once("guiconfig.inc");
-require_once("services.inc");
 require_once("interfaces.inc");
 
 $a_domainOverrides = &config_read_array('unbound', 'domainoverrides');
diff --git a/src/www/services_unbound_host_edit.php b/src/www/services_unbound_host_edit.php
index 03d7c7fe0..e1777e2d1 100644
--- a/src/www/services_unbound_host_edit.php
+++ b/src/www/services_unbound_host_edit.php
@@ -31,7 +31,6 @@
  */
 
 require_once("guiconfig.inc");
-require_once("services.inc");
 require_once("interfaces.inc");
 
 $a_hosts = &config_read_array('unbound', 'hosts');
diff --git a/src/www/services_unbound_overrides.php b/src/www/services_unbound_overrides.php
index 03c9adb30..21f812424 100644
--- a/src/www/services_unbound_overrides.php
+++ b/src/www/services_unbound_overrides.php
@@ -29,7 +29,6 @@
  */
 
 require_once("guiconfig.inc");
-require_once("services.inc");
 require_once("system.inc");
 require_once("interfaces.inc");
 require_once("plugins.inc.d/unbound.inc");
diff --git a/src/www/status_dhcp_leases.php b/src/www/status_dhcp_leases.php
index 9f9365e93..1c152c03a 100644
--- a/src/www/status_dhcp_leases.php
+++ b/src/www/status_dhcp_leases.php
@@ -30,7 +30,6 @@
 
 require_once("guiconfig.inc");
 require_once("config.inc");
-require_once("services.inc");
 require_once("interfaces.inc");
 require_once("plugins.inc.d/dhcpd.inc");
 
diff --git a/src/www/status_dhcpv6_leases.php b/src/www/status_dhcpv6_leases.php
index 12936cdf3..e980a0968 100644
--- a/src/www/status_dhcpv6_leases.php
+++ b/src/www/status_dhcpv6_leases.php
@@ -31,7 +31,6 @@
 
 require_once("guiconfig.inc");
 require_once("interfaces.inc");
-require_once("services.inc");
 require_once("plugins.inc.d/dhcpd.inc");
 
 function adjust_utc($dt)
diff --git a/src/www/status_interfaces.php b/src/www/status_interfaces.php
index bbc31bb5e..c9b2205dc 100644
--- a/src/www/status_interfaces.php
+++ b/src/www/status_interfaces.php
@@ -30,7 +30,6 @@
 
 require_once("guiconfig.inc");
 require_once("system.inc");
-require_once("services.inc");
 require_once("interfaces.inc");
 
 if ($_SERVER['REQUEST_METHOD'] === 'POST') {
diff --git a/src/www/status_ntpd.php b/src/www/status_ntpd.php
index 4bb598290..c4aa2dc12 100644
--- a/src/www/status_ntpd.php
+++ b/src/www/status_ntpd.php
@@ -29,7 +29,6 @@
  */
 
 require_once("guiconfig.inc");
-require_once("services.inc");
 require_once("interfaces.inc");
 
 if (!isset($config['ntpd']['noquery'])) {
diff --git a/src/www/status_openvpn.php b/src/www/status_openvpn.php
index 171894d61..d9d4e7a8c 100644
--- a/src/www/status_openvpn.php
+++ b/src/www/status_openvpn.php
@@ -32,7 +32,6 @@
  */
 
 require_once("guiconfig.inc");
-require_once("services.inc");
 require_once("interfaces.inc");
 require_once("plugins.inc.d/openvpn.inc");
 
diff --git a/src/www/status_services.php b/src/www/status_services.php
index 6e837fdf1..ce267c8a2 100644
--- a/src/www/status_services.php
+++ b/src/www/status_services.php
@@ -29,7 +29,6 @@
  */
 
 require_once("guiconfig.inc");
-require_once("services.inc");
 require_once("system.inc");
 require_once("filter.inc");
 require_once("interfaces.inc");
diff --git a/src/www/system_gateway_groups.php b/src/www/system_gateway_groups.php
index 4877e5434..116bc14ed 100644
--- a/src/www/system_gateway_groups.php
+++ b/src/www/system_gateway_groups.php
@@ -30,7 +30,6 @@
 require_once("guiconfig.inc");
 require_once("interfaces.inc");
 require_once("system.inc");
-require_once("services.inc");
 
 $a_gateway_groups = &config_read_array('gateways', 'gateway_group');
 $gateways_status = return_gateways_status();
diff --git a/src/www/system_gateway_groups_edit.php b/src/www/system_gateway_groups_edit.php
index df5fc5244..f7509c44e 100644
--- a/src/www/system_gateway_groups_edit.php
+++ b/src/www/system_gateway_groups_edit.php
@@ -28,7 +28,6 @@
  */
 
 require_once("guiconfig.inc");
-require_once("services.inc");
 require_once("interfaces.inc");
 
 $a_gateway_groups = &config_read_array('gateways', 'gateway_group');
diff --git a/src/www/system_gateways.php b/src/www/system_gateways.php
index 1f788bceb..c39ce2faf 100644
--- a/src/www/system_gateways.php
+++ b/src/www/system_gateways.php
@@ -30,7 +30,6 @@
 require_once("guiconfig.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 681dfd26c..0a425044c 100644
--- a/src/www/system_gateways_edit.php
+++ b/src/www/system_gateways_edit.php
@@ -28,7 +28,6 @@
  */
 
 require_once("guiconfig.inc");
-require_once("services.inc");
 require_once("interfaces.inc");
 require_once("plugins.inc.d/dpinger.inc");
 
diff --git a/src/www/vpn_ipsec.php b/src/www/vpn_ipsec.php
index 7547cf5f5..c6038e16f 100644
--- a/src/www/vpn_ipsec.php
+++ b/src/www/vpn_ipsec.php
@@ -31,7 +31,6 @@
 require_once("guiconfig.inc");
 require_once("system.inc");
 require_once("filter.inc");
-require_once("services.inc");
 require_once("interfaces.inc");
 require_once("plugins.inc.d/ipsec.inc");
 
diff --git a/src/www/vpn_ipsec_keys.php b/src/www/vpn_ipsec_keys.php
index 14692f2c9..2b7fbcbea 100644
--- a/src/www/vpn_ipsec_keys.php
+++ b/src/www/vpn_ipsec_keys.php
@@ -29,7 +29,6 @@
 
 require_once("guiconfig.inc");
 require_once("filter.inc");
-require_once("services.inc");
 require_once("interfaces.inc");
 require_once("plugins.inc.d/ipsec.inc");
 
diff --git a/src/www/vpn_ipsec_keys_edit.php b/src/www/vpn_ipsec_keys_edit.php
index 2f3fd8f96..c04f3acab 100644
--- a/src/www/vpn_ipsec_keys_edit.php
+++ b/src/www/vpn_ipsec_keys_edit.php
@@ -29,7 +29,6 @@
 
 require_once("guiconfig.inc");
 require_once("interfaces.inc");
-require_once("services.inc");
 require_once("plugins.inc.d/ipsec.inc");
 
 config_read_array('ipsec', 'mobilekey');
diff --git a/src/www/vpn_ipsec_mobile.php b/src/www/vpn_ipsec_mobile.php
index 10e6067b7..e25a6ffa0 100644
--- a/src/www/vpn_ipsec_mobile.php
+++ b/src/www/vpn_ipsec_mobile.php
@@ -30,7 +30,6 @@
 require_once("guiconfig.inc");
 require_once("interfaces.inc");
 require_once("filter.inc");
-require_once("services.inc");
 require_once("plugins.inc.d/ipsec.inc");
 
 config_read_array('ipsec', 'client');
diff --git a/src/www/vpn_ipsec_phase1.php b/src/www/vpn_ipsec_phase1.php
index 66846345b..95de4655b 100644
--- a/src/www/vpn_ipsec_phase1.php
+++ b/src/www/vpn_ipsec_phase1.php
@@ -33,7 +33,6 @@
 require_once("guiconfig.inc");
 require_once("system.inc");
 require_once("filter.inc");
-require_once("services.inc");
 require_once("interfaces.inc");
 require_once("plugins.inc.d/ipsec.inc");
 
diff --git a/src/www/vpn_ipsec_phase2.php b/src/www/vpn_ipsec_phase2.php
index 71b081cd9..aa3fc627d 100644
--- a/src/www/vpn_ipsec_phase2.php
+++ b/src/www/vpn_ipsec_phase2.php
@@ -30,7 +30,6 @@
 
 require_once("guiconfig.inc");
 require_once("interfaces.inc");
-require_once("services.inc");
 require_once("plugins.inc.d/ipsec.inc");
 
 /**
diff --git a/src/www/vpn_ipsec_settings.php b/src/www/vpn_ipsec_settings.php
index e90471891..6178474d5 100644
--- a/src/www/vpn_ipsec_settings.php
+++ b/src/www/vpn_ipsec_settings.php
@@ -29,7 +29,6 @@
 
 require_once("guiconfig.inc");
 require_once("filter.inc");
-require_once("services.inc");
 require_once("interfaces.inc");
 require_once("plugins.inc.d/ipsec.inc");
 
diff --git a/src/www/vpn_openvpn_client.php b/src/www/vpn_openvpn_client.php
index a1f8ea69f..18fe66862 100644
--- a/src/www/vpn_openvpn_client.php
+++ b/src/www/vpn_openvpn_client.php
@@ -28,7 +28,6 @@
  */
 
 require_once("guiconfig.inc");
-require_once("services.inc");
 require_once("interfaces.inc");
 require_once("plugins.inc.d/openvpn.inc");
 
diff --git a/src/www/vpn_openvpn_csc.php b/src/www/vpn_openvpn_csc.php
index ded2d8314..09bf55881 100644
--- a/src/www/vpn_openvpn_csc.php
+++ b/src/www/vpn_openvpn_csc.php
@@ -28,7 +28,6 @@
  */
 
 require_once("guiconfig.inc");
-require_once("services.inc");
 require_once("interfaces.inc");
 require_once("plugins.inc.d/openvpn.inc");
 
diff --git a/src/www/vpn_openvpn_server.php b/src/www/vpn_openvpn_server.php
index 35f11615e..6c51b9cd4 100644
--- a/src/www/vpn_openvpn_server.php
+++ b/src/www/vpn_openvpn_server.php
@@ -28,7 +28,6 @@
  */
 
 require_once("guiconfig.inc");
-require_once("services.inc");
 require_once("interfaces.inc");
 require_once("plugins.inc.d/openvpn.inc");
 
diff --git a/src/www/widgets/widgets/services_status.widget.php b/src/www/widgets/widgets/services_status.widget.php
index bcc802a31..33ad72b8d 100644
--- a/src/www/widgets/widgets/services_status.widget.php
+++ b/src/www/widgets/widgets/services_status.widget.php
@@ -30,7 +30,6 @@
  */
 
 require_once("guiconfig.inc");
-require_once("services.inc");
 require_once("system.inc");
 require_once("interfaces.inc");