diff --git a/includes/billing-functions.php b/includes/billing.php
similarity index 100%
rename from includes/billing-functions.php
rename to includes/billing.php
diff --git a/includes/functions.php b/includes/functions.php
index e27d04235..336a8d965 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -8,11 +8,10 @@ include_once("Net/IPv6.php");
 ## Observer Includes
 
 include_once($config['install_dir'] . "/includes/generic.php");
-include_once($config['install_dir'] . "/includes/unix.php");
 include_once($config['install_dir'] . "/includes/procurve.php");
 include_once($config['install_dir'] . "/includes/graphing.php");
 include_once($config['install_dir'] . "/includes/print-functions.php");
-include_once($config['install_dir'] . "/includes/billing-functions.php");
+include_once($config['install_dir'] . "/includes/billing.php");
 include_once($config['install_dir'] . "/includes/cisco-entities.php");
 include_once($config['install_dir'] . "/includes/syslog.php");
 
diff --git a/includes/graphing.php b/includes/graphing.php
index 0a4b5fe13..f80003429 100644
--- a/includes/graphing.php
+++ b/includes/graphing.php
@@ -3,6 +3,7 @@
 include("graphing/screenos.php");
 include("graphing/fortigate.php");
 include("graphing/windows.php");
+include("graphing/unix.php");
 
 function graph_multi_bits ($interfaces, $graph, $from, $to, $width, $height) {
   global $config, $installdir;