diff --git a/addhost.php b/addhost.php
index c0e929d1d..868df768a 100755
--- a/addhost.php
+++ b/addhost.php
@@ -1,5 +1,5 @@
 #!/usr/bin/php 
-<?
+<?php
 
 include("config.php"); 
 include("includes/functions.php");
diff --git a/cleanup.php b/cleanup.php
index b4266540e..4b9828648 100755
--- a/cleanup.php
+++ b/cleanup.php
@@ -2,7 +2,7 @@
 
 ### Clean up the database removing old IPs and links
 
-<?
+<?php
 include("config.php");
 include("includes/functions.php");
 
diff --git a/delhost.php b/delhost.php
index 6397a9045..43052c9a5 100755
--- a/delhost.php
+++ b/delhost.php
@@ -1,5 +1,6 @@
 #!/usr/bin/php 
-<?
+<?php
+
 include("config.php");
 include("includes/functions.php");
 
diff --git a/discover-cdp.php b/discover-cdp.php
index 12292d74e..db0a22535 100755
--- a/discover-cdp.php
+++ b/discover-cdp.php
@@ -1,5 +1,5 @@
 #!/usr/bin/php
-<?
+<?php
 
 #ini_set('display_errors', 1);
 #ini_set('display_startup_errors', 1);
diff --git a/generate-iplist.php b/generate-iplist.php
index a4478fba8..19161c8ed 100755
--- a/generate-iplist.php
+++ b/generate-iplist.php
@@ -1,5 +1,6 @@
 #!/usr/bin/php
-<?
+<?php
+
 include("config.php");
 include("includes/functions.php");
 
diff --git a/html/includes/add-srv.inc b/html/includes/add-srv.inc
index 102d542eb..1d2aa2c8e 100644
--- a/html/includes/add-srv.inc
+++ b/html/includes/add-srv.inc
@@ -1,4 +1,4 @@
-<?
+<?php
 
   $updated = '1';
 
diff --git a/html/includes/del-srv.inc b/html/includes/del-srv.inc
index 76eb69273..ce8d63fb9 100644
--- a/html/includes/del-srv.inc
+++ b/html/includes/del-srv.inc
@@ -1,4 +1,4 @@
-<?
+<?php
 
   $updated = '1';
 
diff --git a/html/includes/dev-overview-data.inc.php b/html/includes/dev-overview-data.inc.php
index e49f48674..f2d45e59c 100644
--- a/html/includes/dev-overview-data.inc.php
+++ b/html/includes/dev-overview-data.inc.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
   echo("<div style='font-family: courier, serif; margin: 10px';><strong>" . $device['sysDescr'] . "</strong></div>");
 
diff --git a/html/includes/edit-host.inc b/html/includes/edit-host.inc
index 3ce38ece3..bf1304407 100644
--- a/html/includes/edit-host.inc
+++ b/html/includes/edit-host.inc
@@ -1,4 +1,4 @@
-<?
+<?php
 
   $descr = $_POST['descr'];
   $ignore = $_POST['ignore'];
diff --git a/html/includes/print-event-short.inc b/html/includes/print-event-short.inc
index 8b27cd0d2..9755db120 100644
--- a/html/includes/print-event-short.inc
+++ b/html/includes/print-event-short.inc
@@ -1,5 +1,5 @@
 
-<?
+<?php
 
 if($bg == $list_colour_a) { $bg = $list_colour_b; } else { $bg=$list_colour_a; }
 
diff --git a/html/includes/print-event.inc b/html/includes/print-event.inc
index 10502e5f0..ac23a7f10 100644
--- a/html/includes/print-event.inc
+++ b/html/includes/print-event.inc
@@ -1,5 +1,5 @@
 
-<?
+<?php
 
 if($bg == $list_colour_a) { $bg = $list_colour_b; } else { $bg=$list_colour_a; }
 
diff --git a/html/includes/print-syslog.inc b/html/includes/print-syslog.inc
index a002591cd..92a3277d1 100644
--- a/html/includes/print-syslog.inc
+++ b/html/includes/print-syslog.inc
@@ -1,5 +1,5 @@
 
-<?
+<?php
 
 if($bg == $list_colour_a) { $bg = $list_colour_b; } else { $bg=$list_colour_a; }
 
diff --git a/html/index.php b/html/index.php
index 232ed9d46..bb96f9c15 100755
--- a/html/index.php
+++ b/html/index.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
   ini_set('allow_url_fopen', 0);
   ini_set('display_errors', 0);
 
@@ -56,7 +56,7 @@ function popUp(URL) {
 <tr>
 <td align=left></td>
 <td align=right>
-  <? 
+  <?php
      if($_SESSION['authenticated']) { 
        echo("Logged in as <b>".$_SESSION['username']."</b> (<a href='?logout=yes'>Logout</a>)"); 
      } else { 
diff --git a/html/map.php b/html/map.php
index 6e6ab7831..bad9a5d42 100755
--- a/html/map.php
+++ b/html/map.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 include("../config.php");
 include("../includes/functions.php");
diff --git a/html/pages/adduser.php b/html/pages/adduser.php
index 9225887a6..e868d9501 100644
--- a/html/pages/adduser.php
+++ b/html/pages/adduser.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 echo("<div style='margin: 10px;'>");
 
diff --git a/html/pages/alerts.php b/html/pages/alerts.php
index 4e7187906..bb335d073 100644
--- a/html/pages/alerts.php
+++ b/html/pages/alerts.php
@@ -1,5 +1,5 @@
 <meta http-equiv="refresh" content="60">
-<?
+<?php
 
 if($_GET['del']) { 
   $id = mres($_GET['del']);
diff --git a/html/pages/authlog.php b/html/pages/authlog.php
index 04a4e53db..445906711 100644
--- a/html/pages/authlog.php
+++ b/html/pages/authlog.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 if($_SESSION['userlevel'] == '10') {
   $query = "SELECT *,DATE_FORMAT(datetime, '%D %b %Y %T') as humandate  FROM `authlog` ORDER BY `datetime` DESC LIMIT 0,250";
diff --git a/html/pages/device.php b/html/pages/device.php
index c7081840f..504d5d977 100644
--- a/html/pages/device.php
+++ b/html/pages/device.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 if($_GET['id']) {$_GET['id'] = mres($_GET['id']); } 
 
diff --git a/html/pages/device/events.inc.php b/html/pages/device/events.inc.php
index d5e19330c..bd6b01e56 100644
--- a/html/pages/device/events.inc.php
+++ b/html/pages/device/events.inc.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 $query = "SELECT *,DATE_FORMAT(datetime, '%D %b %Y %T') as humandate  FROM `eventlog` WHERE `host` = '$_GET[id]' ORDER BY `datetime` DESC LIMIT 0,250";
 $data = mysql_query($query);
diff --git a/html/pages/device/graphs.inc.php b/html/pages/device/graphs.inc.php
index 2707486ef..8c1fa4199 100644
--- a/html/pages/device/graphs.inc.php
+++ b/html/pages/device/graphs.inc.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 $device_query = mysql_query("select * from devices WHERE `device_id` = '$_GET[id]'");
 while($device = mysql_fetch_array($device_query)) {
diff --git a/html/pages/device/graphs/os-ios_xe.inc.php b/html/pages/device/graphs/os-ios_xe.inc.php
index 2354f8d7d..96c4a952f 100644
--- a/html/pages/device/graphs/os-ios_xe.inc.php
+++ b/html/pages/device/graphs/os-ios_xe.inc.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 include("os-ios.inc.php");
 
diff --git a/html/pages/device/interface.inc.php b/html/pages/device/interface.inc.php
index b61fb18cd..32b7ea1d5 100644
--- a/html/pages/device/interface.inc.php
+++ b/html/pages/device/interface.inc.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 $interface_query = mysql_query("select * from interfaces WHERE interface_id = '".$_GET['opta']."'");
 $interface = mysql_fetch_array($interface_query);
diff --git a/html/pages/device/nagios.inc.php b/html/pages/device/nagios.inc.php
index e9be08c81..47f54f793 100644
--- a/html/pages/device/nagios.inc.php
+++ b/html/pages/device/nagios.inc.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 ### Connect to database
 
diff --git a/html/pages/device/srv.inc.php b/html/pages/device/srv.inc.php
index 507a78ebd..ed474cccc 100644
--- a/html/pages/device/srv.inc.php
+++ b/html/pages/device/srv.inc.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 $hostname = gethostbyid($_GET[id]);
 
diff --git a/html/pages/edituser.php b/html/pages/edituser.php
index bcce3e0f9..3736e0d3e 100644
--- a/html/pages/edituser.php
+++ b/html/pages/edituser.php
@@ -26,7 +26,7 @@ function createInterfaces(index)
 
 </script>
 
-<?
+<?php
 
 echo("<div style='margin: 10px;'>");
 
diff --git a/html/pages/eventlog.php b/html/pages/eventlog.php
index e6a2be74a..b57b713c3 100644
--- a/html/pages/eventlog.php
+++ b/html/pages/eventlog.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 if($_SESSION['userlevel'] >= '5') {
   $query = "SELECT *,DATE_FORMAT(datetime, '%D %b %Y %T') as humandate  FROM `eventlog` ORDER BY `datetime` DESC LIMIT 0,250";
diff --git a/html/pages/inventory.php b/html/pages/inventory.php
index 85b043e81..61819864d 100644
--- a/html/pages/inventory.php
+++ b/html/pages/inventory.php
@@ -60,7 +60,7 @@
 </div>
 
 
-<?
+<?php
 
 if($_POST['string']) {
   $where .= " AND E.entPhysicalDescr LIKE '%".$_POST['string']."%'";
diff --git a/html/pages/locations.php b/html/pages/locations.php
index f82767981..350597ebb 100644
--- a/html/pages/locations.php
+++ b/html/pages/locations.php
@@ -1,4 +1,4 @@
-<?
+<?php
 echo("<table cellpadding=7 cellspacing=0 class=devicetable width=100%>");
 
 if($_SESSION['userlevel'] == '10') {
diff --git a/html/pages/syslog.php b/html/pages/syslog.php
index 50b637306..f150dfec1 100644
--- a/html/pages/syslog.php
+++ b/html/pages/syslog.php
@@ -56,7 +56,7 @@
   <b class='rounded1'><b></b></b></b>
 </div>
 
-<?
+<?php
 
 if($_POST['string']) {
   $where = " AND S.msg LIKE '%".$_POST['string']."%'";
diff --git a/includes/common.php b/includes/common.php
index ed51635a5..9e3a9f8dc 100644
--- a/includes/common.php
+++ b/includes/common.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 ## Common Functions
 
diff --git a/includes/discovery/bgp-peers.php b/includes/discovery/bgp-peers.php
index 4219625bd..d526e2bc6 100755
--- a/includes/discovery/bgp-peers.php
+++ b/includes/discovery/bgp-peers.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 ### Discover BGP peers on Cisco devices
 
diff --git a/includes/discovery/cisco-mac-accounting.php b/includes/discovery/cisco-mac-accounting.php
index 7585976cb..6abaa0bec 100755
--- a/includes/discovery/cisco-mac-accounting.php
+++ b/includes/discovery/cisco-mac-accounting.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
   unset ($mac_table);
 
diff --git a/includes/discovery/cisco-mempool.php b/includes/discovery/cisco-mempool.php
index 9861c8e52..0ca7f1bbc 100755
--- a/includes/discovery/cisco-mempool.php
+++ b/includes/discovery/cisco-mempool.php
@@ -1,4 +1,4 @@
-<?
+<?php
   $id = $device['device_id'];
   $hostname = $device['hostname'];
   $community = $device['community'];
diff --git a/includes/discovery/cisco-processors.php b/includes/discovery/cisco-processors.php
index 4c28d7c16..8027adef0 100755
--- a/includes/discovery/cisco-processors.php
+++ b/includes/discovery/cisco-processors.php
@@ -1,4 +1,4 @@
-<?
+<?php
   $id = $device['device_id'];
   $hostname = $device['hostname'];
   $community = $device['community'];
diff --git a/includes/discovery/cisco-vlans.php b/includes/discovery/cisco-vlans.php
index dd2aee1e1..70b7a6852 100755
--- a/includes/discovery/cisco-vlans.php
+++ b/includes/discovery/cisco-vlans.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
   echo("Cisco VLANs : ");
 
diff --git a/includes/discovery/cisco-vrf.php b/includes/discovery/cisco-vrf.php
index a7cb3cd80..19199d1b9 100755
--- a/includes/discovery/cisco-vrf.php
+++ b/includes/discovery/cisco-vrf.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
   unset( $vrf_count );
 
diff --git a/includes/discovery/interfaces.php b/includes/discovery/interfaces.php
index 44272c733..8602a6779 100755
--- a/includes/discovery/interfaces.php
+++ b/includes/discovery/interfaces.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 # Discover interfaces
 
diff --git a/includes/discovery/storage.php b/includes/discovery/storage.php
index ec158496f..483f73635 100755
--- a/includes/discovery/storage.php
+++ b/includes/discovery/storage.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
   unset( $storage_exists );
 
diff --git a/includes/discovery/temperatures.php b/includes/discovery/temperatures.php
index 0e7177be9..f73dcfaab 100755
--- a/includes/discovery/temperatures.php
+++ b/includes/discovery/temperatures.php
@@ -1,4 +1,4 @@
-<?
+<?php
   $id = $device['device_id'];
   $hostname = $device['hostname'];
   $community = $device['community'];
diff --git a/includes/functions.php b/includes/functions.php
index eef56f6f3..3977b5305 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 ## Include from PEAR
 
diff --git a/includes/generic.php b/includes/generic.php
index a47f5eba0..baa5a5b01 100755
--- a/includes/generic.php
+++ b/includes/generic.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 function pollDevice() {
 
diff --git a/includes/graphing/windows.php b/includes/graphing/windows.php
index 88a853f1c..5afbd84d7 100755
--- a/includes/graphing/windows.php
+++ b/includes/graphing/windows.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 function memgraphWin ($rrd, $graph, $from="-2d")
 {
diff --git a/includes/osdiscovery/discover-freebsd.php b/includes/osdiscovery/discover-freebsd.php
index 9fd7d6c28..be6870f2c 100755
--- a/includes/osdiscovery/discover-freebsd.php
+++ b/includes/osdiscovery/discover-freebsd.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 if(!$os) {
   if(strstr($sysDescr, "FreeBSD")) { $os = "FreeBSD"; }  ## It's FreeBSD!
diff --git a/includes/osdiscovery/discover-netbsd.php b/includes/osdiscovery/discover-netbsd.php
index 84d97d4e4..d5a03f320 100755
--- a/includes/osdiscovery/discover-netbsd.php
+++ b/includes/osdiscovery/discover-netbsd.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 if(!$os) {
   if(preg_match("/^NetBSD/", $sysDescr)) { $os = "NetBSD"; }
diff --git a/includes/osdiscovery/discover-openbsd.php b/includes/osdiscovery/discover-openbsd.php
index d84b6fa1c..e43cefc7b 100755
--- a/includes/osdiscovery/discover-openbsd.php
+++ b/includes/osdiscovery/discover-openbsd.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 if(!$os) {
   if(preg_match("/^OpenBSD/", $sysDescr)) { $os = "OpenBSD"; }
diff --git a/includes/polling/bgpPeer.inc.php b/includes/polling/bgpPeer.inc.php
index da34c1a04..df4e6e810 100755
--- a/includes/polling/bgpPeer.inc.php
+++ b/includes/polling/bgpPeer.inc.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 echo("Polling BGP peers\n");
 
diff --git a/includes/polling/cisco-entity-sensors.inc.php b/includes/polling/cisco-entity-sensors.inc.php
index 526379215..c29652a22 100755
--- a/includes/polling/cisco-entity-sensors.inc.php
+++ b/includes/polling/cisco-entity-sensors.inc.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 $query = "SELECT * FROM entPhysical WHERE device_id = '" . $device['device_id'] . "' AND entPhysicalClass = 'sensor'";
 $sensors = mysql_query($query);
diff --git a/includes/polling/cisco-mempool.inc.php b/includes/polling/cisco-mempool.inc.php
index e17954363..5203c5f07 100755
--- a/includes/polling/cisco-mempool.inc.php
+++ b/includes/polling/cisco-mempool.inc.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 $query = "SELECT * FROM cempMemPool WHERE device_id = '" . $device['device_id'] . "'";
 $pool_data = mysql_query($query);
diff --git a/includes/polling/cisco-processors.inc.php b/includes/polling/cisco-processors.inc.php
index a435cb7cb..47adc360e 100755
--- a/includes/polling/cisco-processors.inc.php
+++ b/includes/polling/cisco-processors.inc.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 $query = "SELECT * FROM cpmCPU WHERE device_id = '" . $device['device_id'] . "'";
 $proc_data = mysql_query($query);
diff --git a/includes/polling/device-ios.inc.php b/includes/polling/device-ios.inc.php
index 05514c4b9..2702e1d0f 100755
--- a/includes/polling/device-ios.inc.php
+++ b/includes/polling/device-ios.inc.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
    $community = $device['community'];
    $id = $device['device_id'];
diff --git a/includes/polling/device-procurve.inc.php b/includes/polling/device-procurve.inc.php
index effc3b462..cc1c19cf2 100755
--- a/includes/polling/device-procurve.inc.php
+++ b/includes/polling/device-procurve.inc.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 $cpurrd   = $config['rrd_dir'] . "/" . $hostname . "/cpu.rrd";
 $memrrd   = $config['rrd_dir'] . "/" . $hostname . "/mem.rrd";
diff --git a/includes/polling/device-screenos.inc.php b/includes/polling/device-screenos.inc.php
index 351ad3e5a..314773a6d 100755
--- a/includes/polling/device-screenos.inc.php
+++ b/includes/polling/device-screenos.inc.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 echo("Doing Juniper Netscreen (ScreenOS)");
 
diff --git a/includes/polling/device-snom.inc.php b/includes/polling/device-snom.inc.php
index f2fc2719b..686d9d8cd 100755
--- a/includes/polling/device-snom.inc.php
+++ b/includes/polling/device-snom.inc.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
    echo("Polling SNOM device...\n");
 
diff --git a/includes/polling/device-windows.inc.php b/includes/polling/device-windows.inc.php
index 8a7c7a789..d0824dd89 100755
--- a/includes/polling/device-windows.inc.php
+++ b/includes/polling/device-windows.inc.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
    if(strstr($sysDescr, "x86")) { $hardware = "Generic x86"; }
    if(strstr($sysDescr, "Windows Version 5.2")) { $version = "2003 Server"; }
diff --git a/includes/polling/interfaces.inc.php b/includes/polling/interfaces.inc.php
index 255e4eb25..15ab9c6a7 100644
--- a/includes/polling/interfaces.inc.php
+++ b/includes/polling/interfaces.inc.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 $interface_query = mysql_query("SELECT * FROM `interfaces` $where");
 while ($interface = mysql_fetch_array($interface_query)) {
diff --git a/includes/polling/temperatures.inc.php b/includes/polling/temperatures.inc.php
index 39dfbd012..207fee231 100755
--- a/includes/polling/temperatures.inc.php
+++ b/includes/polling/temperatures.inc.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 $query = "SELECT * FROM temperature WHERE temp_host = '" . $device['device_id'] . "'";
 $temp_data = mysql_query($query);
diff --git a/includes/procurve.php b/includes/procurve.php
index 9cb220868..fdbb9db5c 100755
--- a/includes/procurve.php
+++ b/includes/procurve.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 include("procurve-graphing.php");
 
diff --git a/includes/unix.php b/includes/unix.php
index 00f558c14..c6cfff126 100755
--- a/includes/unix.php
+++ b/includes/unix.php
@@ -1,4 +1,3 @@
-<?
-
-include("unix-graphing.php");
-
+<?php
+  include("unix-graphing.php");
+?>
diff --git a/map.php b/map.php
index 2b28a89be..e726ec26d 100755
--- a/map.php
+++ b/map.php
@@ -1,5 +1,5 @@
 #!/usr/bin/php
-<?
+<?php
 
 include("config.php");
 include("includes/functions.php");
diff --git a/poll-device.php b/poll-device.php
index b15b68fdd..4fd928599 100755
--- a/poll-device.php
+++ b/poll-device.php
@@ -1,5 +1,5 @@
 #!/usr/bin/php
-<?
+<?php
 
 include("config.php");
 include("includes/functions.php");
diff --git a/poll-os.php b/poll-os.php
index 1e9f4dcc2..7f582ad98 100755
--- a/poll-os.php
+++ b/poll-os.php
@@ -1,5 +1,5 @@
 #!/usr/bin/php
-<?
+<?php
 
 include("config.php");
 include("includes/functions.php");
diff --git a/poll-reachability.php b/poll-reachability.php
index 086a33052..1cea42516 100755
--- a/poll-reachability.php
+++ b/poll-reachability.php
@@ -1,8 +1,5 @@
 #!/usr/bin/php
-<?
-#
-# Test Reachability
-#
+<?php
 
 include("config.php");
 include("includes/functions.php");
diff --git a/remove-deleted-interfaces.php b/remove-deleted-interfaces.php
index 608c16c08..eb1c96497 100755
--- a/remove-deleted-interfaces.php
+++ b/remove-deleted-interfaces.php
@@ -2,7 +2,8 @@
 
 ### Purge deleted interfaces from the database
 
-<?
+<?php
+
 include("config.php");
 include("includes/functions.php");
 
diff --git a/renamehost.php b/renamehost.php
index 30b810d50..5abe2b7f9 100755
--- a/renamehost.php
+++ b/renamehost.php
@@ -1,5 +1,6 @@
 #!/usr/bin/php 
-<?
+<?php
+
 include("config.php");
 include("includes/functions.php");
 
diff --git a/scan-snmp.php b/scan-snmp.php
index 45d1fbc9e..0085aa3a6 100755
--- a/scan-snmp.php
+++ b/scan-snmp.php
@@ -1,5 +1,5 @@
 #!/usr/bin/php
-<?
+<?php
 
 include("config.php");
 include("includes/functions.php");
diff --git a/update-interface.php b/update-interface.php
index 0f466de5c..1e4f2b6ad 100755
--- a/update-interface.php
+++ b/update-interface.php
@@ -1,5 +1,5 @@
 #!/usr/bin/php
-<?
+<?php
 
 include("config.php");
 include("includes/functions.php");