diff --git a/html/ajax/list_interfaces.php b/html/ajax/list_interfaces.php
index 9ba835713..232ba02b6 100755
--- a/html/ajax/list_interfaces.php
+++ b/html/ajax/list_interfaces.php
@@ -2,7 +2,7 @@
 
   include("../../config.php");
   include("../../includes/functions.php");
-  include("../includes/authenticate.inc");
+  include("../includes/authenticate.inc.php");
   if(!$_SESSION['authenticated']) { echo("unauthenticated"); exit; }
 
 if(isset($_GET['device_id'])){
diff --git a/html/billing-graph.php b/html/billing-graph.php
index a1d10584b..096157b7b 100644
--- a/html/billing-graph.php
+++ b/html/billing-graph.php
@@ -7,7 +7,7 @@
 
 include("../config.php");
 include("../includes/functions.php");
-include("includes/authenticate.inc");
+include("includes/authenticate.inc.php");
 if(!$_SESSION['authenticated']) { echo("unauthenticated"); exit; }
 require("includes/jpgraph/src/jpgraph.php");
 include("includes/jpgraph/src/jpgraph_line.php");
diff --git a/html/collectd-graph.php b/html/collectd-graph.php
index 022d3d935..1e63079a5 100755
--- a/html/collectd-graph.php
+++ b/html/collectd-graph.php
@@ -26,7 +26,7 @@ if($_GET['debug']) {
 
 include("../config.php");
 include("../includes/functions.php");
-include("includes/authenticate.inc");
+include("includes/authenticate.inc.php");
 if(!$_SESSION['authenticated']) { echo("not authenticated"); exit; }
 
 function makeTextBlock($text, $fontfile, $fontsize, $width) {
diff --git a/html/graph.php b/html/graph.php
index 64e4428dd..7c3768aac 100644
--- a/html/graph.php
+++ b/html/graph.php
@@ -13,7 +13,7 @@ if($_GET['debug']) {
   include("../includes/common.php");
   include("../includes/graphing.php");
   include("../includes/rewrites.php");
-  include("includes/authenticate.inc");
+  include("includes/authenticate.inc.php");
 
 #  if(!$_SESSION['authenticated']) { echo("not authenticated"); exit; }
   
diff --git a/html/includes/authenticate.inc b/html/includes/authenticate.inc.php
similarity index 100%
rename from html/includes/authenticate.inc
rename to html/includes/authenticate.inc.php
diff --git a/html/includes/edit-host.inc b/html/includes/device-edit.inc.php
similarity index 100%
rename from html/includes/edit-host.inc
rename to html/includes/device-edit.inc.php
diff --git a/html/includes/device-header.inc b/html/includes/device-header.inc.php
similarity index 100%
rename from html/includes/device-header.inc
rename to html/includes/device-header.inc.php
diff --git a/html/includes/add-srv.inc b/html/includes/service-add.inc.php
similarity index 100%
rename from html/includes/add-srv.inc
rename to html/includes/service-add.inc.php
diff --git a/html/includes/del-srv.inc b/html/includes/service-delete.inc.php
similarity index 100%
rename from html/includes/del-srv.inc
rename to html/includes/service-delete.inc.php
diff --git a/html/index.php b/html/index.php
index a5efea74f..1d4de9705 100755
--- a/html/index.php
+++ b/html/index.php
@@ -15,7 +15,7 @@ if($debug) {
   include("../config.php"); 
   include("../includes/functions.php");  
   include("includes/functions.inc.php");
-  include("includes/authenticate.inc");
+  include("includes/authenticate.inc.php");
   $start = utime();
 
   $now = time();
diff --git a/html/map.php b/html/map.php
index 554ecd325..c046a2ae5 100755
--- a/html/map.php
+++ b/html/map.php
@@ -2,7 +2,7 @@
 
 include("../config.php");
 include("../includes/functions.php");
-include("includes/authenticate.inc");
+include("includes/authenticate.inc.php");
 
 if (isset($_GET['device'])) { $where = "WHERE device_id = ".$_GET['device']; } else { $where = ""; }
 $deviceresult = mysql_query("SELECT * from devices $where");
diff --git a/html/netcmd.php b/html/netcmd.php
index a5060a493..9255411ed 100644
--- a/html/netcmd.php
+++ b/html/netcmd.php
@@ -12,7 +12,7 @@ if($_GET[debug]) {
 
 include("../config.php");
 include("../includes/functions.php");
-include("includes/authenticate.inc");
+include("includes/authenticate.inc.php");
 if(!$_SESSION['authenticated']) { echo("unauthenticated"); exit; }
 
 
diff --git a/html/pages/addsrv.php b/html/pages/addsrv.php
index fa878dfc4..5d20695e5 100644
--- a/html/pages/addsrv.php
+++ b/html/pages/addsrv.php
@@ -6,7 +6,7 @@ if($_SESSION['userlevel'] < '10') {
 
 if($_POST['addsrv']) {
   if($_SESSION['userlevel'] == '10') {
-    include("includes/add-srv.inc");
+    include("includes/service-add.inc.php");
   }
 }
 
diff --git a/html/pages/delsrv.php b/html/pages/delsrv.php
index ad6e5899f..f063e0c45 100644
--- a/html/pages/delsrv.php
+++ b/html/pages/delsrv.php
@@ -6,7 +6,7 @@ if($_SESSION['userlevel'] < '5') {
 
 if($_POST['delsrv']) {
   if($_SESSION['userlevel'] > "5") {
-    include("includes/del-srv.inc");
+    include("includes/service-delete.inc.php");
   }
 }
 
diff --git a/html/pages/device.php b/html/pages/device.php
index 2e477e052..480b7f817 100644
--- a/html/pages/device.php
+++ b/html/pages/device.php
@@ -17,7 +17,7 @@ $select[$section] = "selected";
 $device_query = mysql_query("SELECT * FROM `devices` WHERE `device_id` = '" . $_GET['id'] . "'");
 while($device = mysql_fetch_array($device_query)) {
   echo('<table cellpadding="15" cellspacing="0" class="devicetable" width="100%">');
-  include("includes/device-header.inc");
+  include("includes/device-header.inc.php");
   echo("</table>");
 
 echo("<div class=mainpane>");
diff --git a/html/pages/device/edit.inc.php b/html/pages/device/edit.inc.php
index 48d01e612..f23108274 100644
--- a/html/pages/device/edit.inc.php
+++ b/html/pages/device/edit.inc.php
@@ -6,7 +6,7 @@ if($_SESSION['userlevel'] < '5') {
 
 if($_POST['editing']) {
   if($_SESSION['userlevel'] > "5") {
-    include("includes/edit-host.inc");
+    include("includes/device-edit.inc.php");
   }
 }
 
diff --git a/html/pages/vrf.php b/html/pages/vrf.php
index 6bfbac917..44efc93cb 100644
--- a/html/pages/vrf.php
+++ b/html/pages/vrf.php
@@ -39,7 +39,7 @@ if($_GET['opta'] == "details" ) {
      $hostname = $device['hostname'];
      #if(!is_integer($x/2)) { $device_colour = $list_colour_a; } else { $device_colour = $list_colour_b; }
      echo("<table cellpadding=7 cellspacing=0 class=devicetable width=100%>");
-     include("includes/device-header.inc");
+     include("includes/device-header.inc.php");
      echo("</table>");
      $ports = mysql_query("SELECT * FROM `ports` WHERE `ifVrf` = '".$device['vrf_id']."' and device_id = '".$device['device_id']."'");
      unset($seperator);
diff --git a/html/percentage.php b/html/percentage.php
index b8527baf0..2cab79524 100644
--- a/html/percentage.php
+++ b/html/percentage.php
@@ -2,7 +2,7 @@
 
 include("../config.php");
 include("../includes/functions.php");
-include("includes/authenticate.inc");
+include("includes/authenticate.inc.php");
 
 if (isset($_GET["dir"])) {
   $dir = $_GET["dir"];