diff --git a/includes/common.php b/includes/common.php
index 76f52b0be..e09c14bbe 100644
--- a/includes/common.php
+++ b/includes/common.php
@@ -233,4 +233,44 @@ function del_dev_attrib($device, $attrib_type)
   return mysql_query($sql);
 }
 
-?>
\ No newline at end of file
+function formatRates($rate)
+{
+   $rate = format_si($rate) . "bps";
+   return $rate;
+}
+
+function formatStorage($rate, $round = '2')
+{
+   $rate = format_bi($rate, $round) . "B";
+   return $rate;
+}
+
+function format_si($rate)
+{
+  if ($rate >= "0.1")
+  {
+    $sizes = Array('', 'k', 'M', 'G', 'T', 'P', 'E');
+    $round = Array('2','2','2','2','2','2','2','2','2');
+    $ext = $sizes[0];
+    for ($i = 1; (($i < count($sizes)) && ($rate >= 1000)); $i++) { $rate = $rate / 1000; $ext  = $sizes[$i]; }
+  }
+  else
+  {
+    $sizes = Array('', 'm', 'u', 'n');
+    $round = Array('2','2','2','2');
+    $ext = $sizes[0];
+    for ($i = 1; (($i < count($sizes)) && ($rate != 0) && ($rate <= 0.1)); $i++) { $rate = $rate * 1000; $ext  = $sizes[$i]; }
+  }
+
+  return round($rate, $round[$i]).$ext;
+}
+
+function format_bi($size, $round = '2')
+{
+  $sizes = Array('', 'k', 'M', 'G', 'T', 'P', 'E');
+  $ext = $sizes[0];
+  for ($i = 1; (($i < count($sizes)) && ($size >= 1024)); $i++) { $size = $size / 1024; $ext  = $sizes[$i]; }
+  return round($size, $round).$ext;
+}
+
+?>
diff --git a/includes/functions.php b/includes/functions.php
index 2fc9bba7b..e5e954291 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -85,46 +85,6 @@ function getHostOS($device)
   if ($os) { return $os; } else { return "generic"; }
 }
 
-function formatRates($rate)
-{
-   $rate = format_si($rate) . "bps";
-   return $rate;
-}
-
-function formatStorage($rate, $round = '2')
-{
-   $rate = format_bi($rate, $round) . "B";
-   return $rate;
-}
-
-function format_si($rate)
-{
-  if ($rate >= "0.1")
-  {
-    $sizes = Array('', 'k', 'M', 'G', 'T', 'P', 'E');
-    $round = Array('2','2','2','2','2','2','2','2','2');
-    $ext = $sizes[0];
-    for ($i = 1; (($i < count($sizes)) && ($rate >= 1000)); $i++) { $rate = $rate / 1000; $ext  = $sizes[$i]; }
-  }
-  else
-  {
-    $sizes = Array('', 'm', 'u', 'n');
-    $round = Array('2','2','2','2');
-    $ext = $sizes[0];
-    for ($i = 1; (($i < count($sizes)) && ($rate != 0) && ($rate <= 0.1)); $i++) { $rate = $rate * 1000; $ext  = $sizes[$i]; }
-  }
-
-  return round($rate, $round[$i]).$ext;
-}
-
-function format_bi($size, $round = '2')
-{
-  $sizes = Array('', 'k', 'M', 'G', 'T', 'P', 'E');
-  $ext = $sizes[0];
-  for ($i = 1; (($i < count($sizes)) && ($size >= 1024)); $i++) { $size = $size / 1024; $ext  = $sizes[$i]; }
-  return round($size, $round).$ext;
-}
-
 function percent_colour($perc)
 {
   $r = min(255, 5 * ($perc - 25));