diff --git a/html/includes/graphs/atmvp/cells.inc.php b/html/includes/graphs/atmvp/cells.inc.php
index 88966210e..dd119ea41 100644
--- a/html/includes/graphs/atmvp/cells.inc.php
+++ b/html/includes/graphs/atmvp/cells.inc.php
@@ -28,6 +28,6 @@ $colour_area_out_max = "FFefaa";
 $graph_max = 1;
 $unit_text = "Cells";
 
-include("generic_duplex.inc.php");
+include("includes/graphs/generic_duplex.inc.php");
 
 ?>
diff --git a/html/includes/graphs/atmvp/errors.inc.php b/html/includes/graphs/atmvp/errors.inc.php
index ca72fe05b..4a66a04ac 100644
--- a/html/includes/graphs/atmvp/errors.inc.php
+++ b/html/includes/graphs/atmvp/errors.inc.php
@@ -29,6 +29,6 @@ $graph_max = 1;
 
 $unit_text = "Errors";
 
-include("generic_duplex.inc.php");
+include("includes/graphs/generic_duplex.inc.php");
 
 ?>
diff --git a/html/includes/graphs/atmvp/packets.inc.php b/html/includes/graphs/atmvp/packets.inc.php
index d67f55daa..66774d3c1 100644
--- a/html/includes/graphs/atmvp/packets.inc.php
+++ b/html/includes/graphs/atmvp/packets.inc.php
@@ -28,6 +28,6 @@ $colour_area_out_max = "FFefaa";
 $graph_max = 1;
 $unit_text = "Packets";
 
-include("generic_duplex.inc.php");
+include("includes/graphs/generic_duplex.inc.php");
 
 ?>
diff --git a/html/includes/graphs/bgp/cbgp_prefixes.inc.php b/html/includes/graphs/bgp/cbgp_prefixes.inc.php
index 2a0f5f17e..72c0ac33c 100644
--- a/html/includes/graphs/bgp/cbgp_prefixes.inc.php
+++ b/html/includes/graphs/bgp/cbgp_prefixes.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-include("common.inc.php");
+include("includes/graphs/common.inc.php");
 
 $scale_min = "0";
 
@@ -19,6 +19,6 @@ $graph_max = 1;
 
 $unit_text = "Prefixes";
 
-include("generic_simplex.inc.php");
+include("includes/graphs/generic_simplex.inc.php");
 
 ?>
diff --git a/html/includes/graphs/bgp/updates.inc.php b/html/includes/graphs/bgp/updates.inc.php
index f4f682c6e..4c28c0270 100644
--- a/html/includes/graphs/bgp/updates.inc.php
+++ b/html/includes/graphs/bgp/updates.inc.php
@@ -21,6 +21,6 @@ $graph_max = 1;
 
 $unit_text = "Updates";
 
-include("generic_duplex.inc.php");
+include("includes/graphs/generic_duplex.inc.php");
 
 ?>
diff --git a/html/includes/graphs/device/current.inc.php b/html/includes/graphs/device/current.inc.php
index 12034d362..aa83a4fce 100644
--- a/html/includes/graphs/device/current.inc.php
+++ b/html/includes/graphs/device/current.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-include("common.inc.php");
+include("includes/graphs/common.inc.php");
 $device = device_by_id_cache($id);
 
 $rrd_options .= " -l 0 -E ";
diff --git a/html/includes/graphs/device/fanspeeds.inc.php b/html/includes/graphs/device/fanspeeds.inc.php
index 322ccf6b2..da875db88 100644
--- a/html/includes/graphs/device/fanspeeds.inc.php
+++ b/html/includes/graphs/device/fanspeeds.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-include("common.inc.php");
+include("includes/graphs/common.inc.php");
 
 $device = device_by_id_cache($id);
 
diff --git a/html/includes/graphs/device/frequencies.inc.php b/html/includes/graphs/device/frequencies.inc.php
index 7fe7f46bc..cada8049b 100644
--- a/html/includes/graphs/device/frequencies.inc.php
+++ b/html/includes/graphs/device/frequencies.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-include("common.inc.php");
+include("includes/graphs/common.inc.php");
 $device = device_by_id_cache($id);
 
 $rrd_options .= " -l 0 -E ";
diff --git a/html/includes/graphs/device/hrprocesses.inc.php b/html/includes/graphs/device/hrprocesses.inc.php
index c6b047111..d8ba4109f 100644
--- a/html/includes/graphs/device/hrprocesses.inc.php
+++ b/html/includes/graphs/device/hrprocesses.inc.php
@@ -4,7 +4,7 @@ $device = device_by_id_cache($id);
 
 $scale_min = "0";
 
-include("common.inc.php");
+include("includes/graphs/common.inc.php");
 
 $database = $config['rrd_dir'] . "/" . $device['hostname'] . "/hrSystem.rrd";
 
diff --git a/html/includes/graphs/device/hrusers.inc.php b/html/includes/graphs/device/hrusers.inc.php
index 356b0f39c..e1bac0a9c 100644
--- a/html/includes/graphs/device/hrusers.inc.php
+++ b/html/includes/graphs/device/hrusers.inc.php
@@ -4,7 +4,7 @@ $device = device_by_id_cache($id);
 
 $scale_min = "0";
 
-include("common.inc.php");
+include("includes/graphs/common.inc.php");
 
 $database = $config['rrd_dir'] . "/" . $device['hostname'] . "/hrSystem.rrd";
 
diff --git a/html/includes/graphs/device/humidity.inc.php b/html/includes/graphs/device/humidity.inc.php
index 0ac5e2b81..31e595e6f 100644
--- a/html/includes/graphs/device/humidity.inc.php
+++ b/html/includes/graphs/device/humidity.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-include("common.inc.php");
+include("includes/graphs/common.inc.php");
 $device = device_by_id_cache($id);
 
 $rrd_options .= " -l 0 -E ";
diff --git a/html/includes/graphs/device/icmp.inc.php b/html/includes/graphs/device/icmp.inc.php
index 766c62bf1..0c45f8e75 100644
--- a/html/includes/graphs/device/icmp.inc.php
+++ b/html/includes/graphs/device/icmp.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-  include("common.inc.php");
+  include("includes/graphs/common.inc.php");
 
   $device = device_by_id_cache($id);
 
diff --git a/html/includes/graphs/device/ip.inc.php b/html/includes/graphs/device/ip.inc.php
index 392e938ee..98ea5fec6 100644
--- a/html/includes/graphs/device/ip.inc.php
+++ b/html/includes/graphs/device/ip.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-  include("common.inc.php");
+  include("includes/graphs/common.inc.php");
   $device = device_by_id_cache($id);
 
   $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/netstats-ip.rrd";
diff --git a/html/includes/graphs/device/ipSystemStats.inc.php b/html/includes/graphs/device/ipSystemStats.inc.php
index 8fd3c3eae..3eea55039 100644
--- a/html/includes/graphs/device/ipSystemStats.inc.php
+++ b/html/includes/graphs/device/ipSystemStats.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-  include("common.inc.php");
+  include("includes/graphs/common.inc.php");
   $device = device_by_id_cache($id);
 
   $rrd_filename_4 = $config['rrd_dir'] . "/" . $device['hostname'] . "/ipSystemStats-ipv4.rrd";
diff --git a/html/includes/graphs/device/ipSystemStats_v4.inc.php b/html/includes/graphs/device/ipSystemStats_v4.inc.php
index 294fe5441..480fd3845 100644
--- a/html/includes/graphs/device/ipSystemStats_v4.inc.php
+++ b/html/includes/graphs/device/ipSystemStats_v4.inc.php
@@ -1,7 +1,7 @@
 <?php
 
 
-  include("common.inc.php");
+  include("includes/graphs/common.inc.php");
   $device = device_by_id_cache($id);
 
   $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/ipSystemStats-ipv4.rrd";
diff --git a/html/includes/graphs/device/ipSystemStats_v6.inc.php b/html/includes/graphs/device/ipSystemStats_v6.inc.php
index eea8d6928..6e5d2714c 100644
--- a/html/includes/graphs/device/ipSystemStats_v6.inc.php
+++ b/html/includes/graphs/device/ipSystemStats_v6.inc.php
@@ -1,7 +1,7 @@
 <?php
 
 
-  include("common.inc.php");
+  include("includes/graphs/common.inc.php");
   $device = device_by_id_cache($id);
 
   $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/ipSystemStats-ipv6.rrd";
diff --git a/html/includes/graphs/device/ipSystemStats_v6_frag.inc.php b/html/includes/graphs/device/ipSystemStats_v6_frag.inc.php
index ed6f9e775..700eceaa2 100644
--- a/html/includes/graphs/device/ipSystemStats_v6_frag.inc.php
+++ b/html/includes/graphs/device/ipSystemStats_v6_frag.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-include("common.inc.php");
+include("includes/graphs/common.inc.php");
 $device = device_by_id_cache($id);
 
 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/ipSystemStats-ipv6.rrd";
diff --git a/html/includes/graphs/device/ip_fragmented.inc.php b/html/includes/graphs/device/ip_fragmented.inc.php
index 01e5b8255..aded7e452 100644
--- a/html/includes/graphs/device/ip_fragmented.inc.php
+++ b/html/includes/graphs/device/ip_fragmented.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-include("common.inc.php");
+include("includes/graphs/common.inc.php");
 $device = device_by_id_cache($id);
 
 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/netstats-ip.rrd";
diff --git a/html/includes/graphs/device/laload.inc.php b/html/includes/graphs/device/laload.inc.php
index 6c307ece8..c686fdc27 100644
--- a/html/includes/graphs/device/laload.inc.php
+++ b/html/includes/graphs/device/laload.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-include("common.inc.php");
+include("includes/graphs/common.inc.php");
 $device = device_by_id_cache($id);
 
 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/ucd_load.rrd";
diff --git a/html/includes/graphs/device/memory.inc.php b/html/includes/graphs/device/memory.inc.php
index 0a1a668fb..0fe41ecb3 100644
--- a/html/includes/graphs/device/memory.inc.php
+++ b/html/includes/graphs/device/memory.inc.php
@@ -3,7 +3,7 @@
 $device = device_by_id_cache($id);
 $query = mysql_query("SELECT * FROM `mempools` where `device_id` = '".$id."'");
 
-include("common.inc.php");
+include("includes/graphs/common.inc.php");
 
   $rrd_options .= " -u 100 -l 0 -E -b 1024 ";
 
diff --git a/html/includes/graphs/device/memory_procurve.inc.php b/html/includes/graphs/device/memory_procurve.inc.php
index 4fba66564..370969603 100644
--- a/html/includes/graphs/device/memory_procurve.inc.php
+++ b/html/includes/graphs/device/memory_procurve.inc.php
@@ -2,7 +2,7 @@
 
 $scale_min = "0";
 
-include("common.inc.php");
+include("includes/graphs/common.inc.php");
 $device = device_by_id_cache($id);
 
 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/procurve-mem.rrd";
diff --git a/html/includes/graphs/device/memory_unix.inc.php b/html/includes/graphs/device/memory_unix.inc.php
index ec6c5b9ff..a85edc60e 100644
--- a/html/includes/graphs/device/memory_unix.inc.php
+++ b/html/includes/graphs/device/memory_unix.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-include("common.inc.php");
+include("includes/graphs/common.inc.php");
 $device = device_by_id_cache($id);
 
 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/ucd_mem.rrd";
diff --git a/html/includes/graphs/device/snmp_packets.inc.php b/html/includes/graphs/device/snmp_packets.inc.php
index c70fabb53..808db2fec 100644
--- a/html/includes/graphs/device/snmp_packets.inc.php
+++ b/html/includes/graphs/device/snmp_packets.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-  include("common.inc.php");
+  include("includes/graphs/common.inc.php");
   $device = device_by_id_cache($id);
 
   $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/netstats-snmp.rrd";
diff --git a/html/includes/graphs/device/snmp_statistics.inc.php b/html/includes/graphs/device/snmp_statistics.inc.php
index de9c63b28..01bbf79d9 100644
--- a/html/includes/graphs/device/snmp_statistics.inc.php
+++ b/html/includes/graphs/device/snmp_statistics.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-  include("common.inc.php");
+  include("includes/graphs/common.inc.php");
 
   $device = device_by_id_cache($id);
 
diff --git a/html/includes/graphs/device/storage.inc.php b/html/includes/graphs/device/storage.inc.php
index 00682ecf1..e3d18b384 100644
--- a/html/includes/graphs/device/storage.inc.php
+++ b/html/includes/graphs/device/storage.inc.php
@@ -3,7 +3,7 @@
 $scale_min = "0";
 $scale_max = "100";
 
-include("common.inc.php");
+include("includes/graphs/common.inc.php");
 
 $device = device_by_id_cache($id);
 
diff --git a/html/includes/graphs/device/tcp.inc.php b/html/includes/graphs/device/tcp.inc.php
index 635d54c1f..c6e07a7a1 100644
--- a/html/includes/graphs/device/tcp.inc.php
+++ b/html/includes/graphs/device/tcp.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-  include("common.inc.php");
+  include("includes/graphs/common.inc.php");
   $device = device_by_id_cache($id);
 
   $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/netstats-tcp.rrd";
diff --git a/html/includes/graphs/device/temperatures.inc.php b/html/includes/graphs/device/temperatures.inc.php
index a810703d8..386ac92c8 100644
--- a/html/includes/graphs/device/temperatures.inc.php
+++ b/html/includes/graphs/device/temperatures.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-include("common.inc.php");
+include("includes/graphs/common.inc.php");
 $device = device_by_id_cache($id);
 
 $rrd_options .= " -l 0 -E ";
diff --git a/html/includes/graphs/device/toner.inc.php b/html/includes/graphs/device/toner.inc.php
index dde67a9e4..f5098a82b 100644
--- a/html/includes/graphs/device/toner.inc.php
+++ b/html/includes/graphs/device/toner.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-include("common.inc.php");
+include("includes/graphs/common.inc.php");
 $device = device_by_id_cache($id);
 
 $rrd_options .= " -l 0 -E ";
diff --git a/html/includes/graphs/device/udp.inc.php b/html/includes/graphs/device/udp.inc.php
index f3d6e0298..7b955aa4c 100644
--- a/html/includes/graphs/device/udp.inc.php
+++ b/html/includes/graphs/device/udp.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-  include("common.inc.php");
+  include("includes/graphs/common.inc.php");
   $device = device_by_id_cache($id);
 
   $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/netstats-udp.rrd";
diff --git a/html/includes/graphs/device/uptime.inc.php b/html/includes/graphs/device/uptime.inc.php
index 6d6d95cfe..69775f1fc 100644
--- a/html/includes/graphs/device/uptime.inc.php
+++ b/html/includes/graphs/device/uptime.inc.php
@@ -2,7 +2,7 @@
 
 $scale_min = "0";
 
-include("common.inc.php");
+include("includes/graphs/common.inc.php");
 $device = device_by_id_cache($id);
 
 if (is_file($config['rrd_dir'] . "/" . $device['hostname'] . "/hrSystem.rrd")) {
diff --git a/html/includes/graphs/device/voltages.inc.php b/html/includes/graphs/device/voltages.inc.php
index ecfe8ac72..880f4e936 100644
--- a/html/includes/graphs/device/voltages.inc.php
+++ b/html/includes/graphs/device/voltages.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-include("common.inc.php");
+include("includes/graphs/common.inc.php");
 $device = device_by_id_cache($id);
 
 $rrd_options .= " -l 0 -E ";
diff --git a/html/includes/graphs/device/wificlients.inc.php b/html/includes/graphs/device/wificlients.inc.php
index a2028ea2f..d195475c5 100644
--- a/html/includes/graphs/device/wificlients.inc.php
+++ b/html/includes/graphs/device/wificlients.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-include("common.inc.php");
+include("includes/graphs/common.inc.php");
 $device = device_by_id_cache($id);
 
 $rrd_options .= " -l 0 -E ";
diff --git a/html/includes/graphs/diskio/bits.inc.php b/html/includes/graphs/diskio/bits.inc.php
index 610aa00d1..83aceb370 100644
--- a/html/includes/graphs/diskio/bits.inc.php
+++ b/html/includes/graphs/diskio/bits.inc.php
@@ -12,6 +12,6 @@ if(is_file($config['rrd_dir'] . "/" . $disk['hostname'] . "/ucd_diskio-" . safen
 $rra_in = "read";
 $rra_out = "written";
 
-include("generic_bits.inc.php");
+include("includes/graphs/generic_bits.inc.php");
 
 ?>
diff --git a/html/includes/graphs/diskio/ops.inc.php b/html/includes/graphs/diskio/ops.inc.php
index 04a8d6996..34ce00492 100644
--- a/html/includes/graphs/diskio/ops.inc.php
+++ b/html/includes/graphs/diskio/ops.inc.php
@@ -24,6 +24,6 @@ $graph_max = 1;
 
 $unit_text = "Ops/s";
 
-include("generic_duplex.inc.php");
+include("includes/graphs/generic_duplex.inc.php");
 
 ?>
diff --git a/html/includes/graphs/mempool/usage.inc.php b/html/includes/graphs/mempool/usage.inc.php
index 9b6fc1448..1a709bf08 100644
--- a/html/includes/graphs/mempool/usage.inc.php
+++ b/html/includes/graphs/mempool/usage.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-include("common.inc.php");
+include("includes/graphs/common.inc.php");
 
   $rrd_options .= " -u 100 -l 0 -E -b 1024 ";
 
diff --git a/html/includes/graphs/port/bits.inc.php b/html/includes/graphs/port/bits.inc.php
index 14897d2c3..9366de267 100644
--- a/html/includes/graphs/port/bits.inc.php
+++ b/html/includes/graphs/port/bits.inc.php
@@ -16,6 +16,6 @@ if(is_file($config['rrd_dir'] . "/" . $port['hostname'] . "/" . safename($port['
 $rra_in = "INOCTETS";
 $rra_out = "OUTOCTETS";
 
-include("generic_bits.inc.php");
+include("includes/graphs/generic_bits.inc.php");
 
 ?>
diff --git a/html/includes/graphs/port/errors.inc.php b/html/includes/graphs/port/errors.inc.php
index 36674b56c..28fdc8295 100644
--- a/html/includes/graphs/port/errors.inc.php
+++ b/html/includes/graphs/port/errors.inc.php
@@ -28,6 +28,6 @@ $graph_max = 1;
 
 $unit_text = "Errors";
 
-include("generic_duplex.inc.php");
+include("includes/graphs/generic_duplex.inc.php");
 
 ?>
diff --git a/html/includes/graphs/port/fanspeed.inc.php b/html/includes/graphs/port/fanspeed.inc.php
index be77d1ee6..e47194136 100644
--- a/html/includes/graphs/port/fanspeed.inc.php
+++ b/html/includes/graphs/port/fanspeed.inc.php
@@ -2,7 +2,7 @@
 
 $scale_min = "0";
 
-include("common.inc.php");
+include("includes/graphs/common.inc.php");
 
   $rrd_options .= " COMMENT:'                         Last     Max\\n'";
 
diff --git a/html/includes/graphs/port/mac_acc_bits.inc.php b/html/includes/graphs/port/mac_acc_bits.inc.php
index f76993625..ab088b9ee 100644
--- a/html/includes/graphs/port/mac_acc_bits.inc.php
+++ b/html/includes/graphs/port/mac_acc_bits.inc.php
@@ -11,6 +11,6 @@ if(is_file($config['rrd_dir'] . "/" . $acc['hostname'] . "/" . safename("cip-" .
 $rra_in = "IN";
 $rra_out = "OUT";
 
-include("generic_bits.inc.php");
+include("includes/graphs/generic_bits.inc.php");
 
 ?>
diff --git a/html/includes/graphs/port/mac_acc_pkts.inc.php b/html/includes/graphs/port/mac_acc_pkts.inc.php
index 5b8ed4af5..1648ed022 100644
--- a/html/includes/graphs/port/mac_acc_pkts.inc.php
+++ b/html/includes/graphs/port/mac_acc_pkts.inc.php
@@ -22,6 +22,6 @@ $colour_area_out_max = "FFEFAA";
 $graph_max = 1;
 $unit_text = "Pkts\ \ \ ";
 
-include("generic_duplex.inc.php");
+include("includes/graphs/generic_duplex.inc.php");
 
 ?>
diff --git a/html/includes/graphs/port/mac_acc_total.inc.php b/html/includes/graphs/port/mac_acc_total.inc.php
index 8c24eddcd..2cd60b0de 100644
--- a/html/includes/graphs/port/mac_acc_total.inc.php
+++ b/html/includes/graphs/port/mac_acc_total.inc.php
@@ -6,7 +6,7 @@ $sort      = mres($_GET['sort']);
 
 if(is_numeric($_GET['topn'])) { $topn = $_GET['topn']; } else { $topn = '10'; }
 
-  include("common.inc.php");
+  include("includes/graphs/common.inc.php");
 
   if($stat == "pkts") {
     $units='pps'; $unit = 'p'; $multiplier = '1';
diff --git a/html/includes/graphs/port/upkts.inc.php b/html/includes/graphs/port/upkts.inc.php
index 0b83a21b1..ef664f98e 100644
--- a/html/includes/graphs/port/upkts.inc.php
+++ b/html/includes/graphs/port/upkts.inc.php
@@ -27,6 +27,6 @@ $colour_area_out_max = "FFefaa";
 $graph_max = 1;
 $unit_text = "Packets";
 
-include("generic_duplex.inc.php");
+include("includes/graphs/generic_duplex.inc.php");
 
 ?>
diff --git a/html/includes/graphs/processor/usage.inc.php b/html/includes/graphs/processor/usage.inc.php
index 134096b2d..c1179e3aa 100755
--- a/html/includes/graphs/processor/usage.inc.php
+++ b/html/includes/graphs/processor/usage.inc.php
@@ -3,7 +3,7 @@
 $scale_min = "0";
 $scale_max = "100";
 
-include("common.inc.php");
+include("includes/graphs/common.inc.php");
 
   $iter = "1";
 
diff --git a/html/includes/graphs/sensor/current.inc.php b/html/includes/graphs/sensor/current.inc.php
index 76a684388..8e6ed8ecf 100644
--- a/html/includes/graphs/sensor/current.inc.php
+++ b/html/includes/graphs/sensor/current.inc.php
@@ -2,7 +2,7 @@
 
 $scale_min = "0";
 
-include("common.inc.php");
+include("includes/graphs/common.inc.php");
 
   $rrd_options .= " COMMENT:'                                 Last   Max\\n'";
 
diff --git a/html/includes/graphs/sensor/frequency.inc.php b/html/includes/graphs/sensor/frequency.inc.php
index 7e98d134d..9fb47ce74 100644
--- a/html/includes/graphs/sensor/frequency.inc.php
+++ b/html/includes/graphs/sensor/frequency.inc.php
@@ -2,7 +2,7 @@
 
 $scale_min = "0";
 
-include("common.inc.php");
+include("includes/graphs/common.inc.php");
 
   $rrd_options .= " COMMENT:'                                 Last   Max\\n'";
 
diff --git a/html/includes/graphs/sensor/humidity.inc.php b/html/includes/graphs/sensor/humidity.inc.php
index a07a89164..512668163 100644
--- a/html/includes/graphs/sensor/humidity.inc.php
+++ b/html/includes/graphs/sensor/humidity.inc.php
@@ -3,7 +3,7 @@
 $scale_min = "25";
 $scale_max = "40";
 
-include("common.inc.php");
+include("includes/graphs/common.inc.php");
 
   $rrd_options .= " COMMENT:'                                 Last   Max\\n'";
 
diff --git a/html/includes/graphs/sensor/temperature.inc.php b/html/includes/graphs/sensor/temperature.inc.php
index 5c0e107ef..7f9b5db4c 100644
--- a/html/includes/graphs/sensor/temperature.inc.php
+++ b/html/includes/graphs/sensor/temperature.inc.php
@@ -3,7 +3,7 @@
 $scale_min = "25";
 $scale_max = "40";
 
-include("common.inc.php");
+include("includes/graphs/common.inc.php");
 
   $rrd_options .= " COMMENT:'                                 Last   Min   Max\\n'";
 
diff --git a/html/includes/graphs/sensor/voltage.inc.php b/html/includes/graphs/sensor/voltage.inc.php
index 262d18ea6..bd48743bd 100644
--- a/html/includes/graphs/sensor/voltage.inc.php
+++ b/html/includes/graphs/sensor/voltage.inc.php
@@ -2,7 +2,7 @@
 
 $scale_min = "0";
 
-include("common.inc.php");
+include("includes/graphs/common.inc.php");
 
 $rrd_options .= " -A ";
 
diff --git a/html/includes/graphs/storage/usage.inc.php b/html/includes/graphs/storage/usage.inc.php
index c56c195d6..cad06ec56 100644
--- a/html/includes/graphs/storage/usage.inc.php
+++ b/html/includes/graphs/storage/usage.inc.php
@@ -3,7 +3,7 @@
 $scale_min = "0";
 $scale_max = "100";
 
-include("common.inc.php");
+include("includes/graphs/common.inc.php");
 
 $rrd_options .= " -b 1024";