diff --git a/html/includes/print-alerts.inc.php b/html/includes/print-alerts.inc.php
index 2a6d71a47..dcbab4b3d 100644
--- a/html/includes/print-alerts.inc.php
+++ b/html/includes/print-alerts.inc.php
@@ -47,5 +47,3 @@ if ($alert_state!='') {
 }
 
 echo("</tr>");
-
-?>
diff --git a/html/pages/alert-stats.inc.php b/html/pages/alert-stats.inc.php
index 1fcf43830..d392f1dd2 100644
--- a/html/pages/alert-stats.inc.php
+++ b/html/pages/alert-stats.inc.php
@@ -10,4 +10,3 @@
 * the source code distribution for details.
 */
 require_once('includes/print-graph-alerts.inc.php');
-?>
\ No newline at end of file
diff --git a/html/pages/device/alert-stats.inc.php b/html/pages/device/alert-stats.inc.php
index 1fcf43830..d392f1dd2 100644
--- a/html/pages/device/alert-stats.inc.php
+++ b/html/pages/device/alert-stats.inc.php
@@ -10,4 +10,3 @@
 * the source code distribution for details.
 */
 require_once('includes/print-graph-alerts.inc.php');
-?>
\ No newline at end of file
diff --git a/includes/discovery/os/barracuda.inc.php b/includes/discovery/os/barracuda.inc.php
index a28de36f2..bf5d52445 100644
--- a/includes/discovery/os/barracuda.inc.php
+++ b/includes/discovery/os/barracuda.inc.php
@@ -14,4 +14,3 @@ if (!$os) {
         $os = "barracudaloadbalancer";
     }
 }
-?>
diff --git a/includes/discovery/os/drac.inc.php b/includes/discovery/os/drac.inc.php
index 783ba91a1..27e047362 100644
--- a/includes/discovery/os/drac.inc.php
+++ b/includes/discovery/os/drac.inc.php
@@ -8,5 +8,3 @@ if (!$os) {
         $os = "drac";
     }
 }
-
-?>
diff --git a/includes/discovery/os/ibmnos.inc.php b/includes/discovery/os/ibmnos.inc.php
index 48c6c3dec..707eaebb9 100644
--- a/includes/discovery/os/ibmnos.inc.php
+++ b/includes/discovery/os/ibmnos.inc.php
@@ -14,4 +14,3 @@ if (!$os) {
         $os = "ibmnos";
     }
 }
-?>
diff --git a/includes/discovery/os/ruckuswireless.inc.php b/includes/discovery/os/ruckuswireless.inc.php
index edc1c90f9..f12dd5ab2 100644
--- a/includes/discovery/os/ruckuswireless.inc.php
+++ b/includes/discovery/os/ruckuswireless.inc.php
@@ -14,4 +14,3 @@ if (!$os) {
         $os = "ruckuswireless";
     }
 }
-?>
diff --git a/includes/polling/os/asa.inc.php b/includes/polling/os/asa.inc.php
index d94ba4a47..d31f35cda 100644
--- a/includes/polling/os/asa.inc.php
+++ b/includes/polling/os/asa.inc.php
@@ -30,5 +30,3 @@ if (isset($data[1]['entPhysicalModelName']) && $data[1]['entPhysicalModelName']
 if (isset($data[1]['entPhysicalSerialNum']) && $data[1]['entPhysicalSerialNum'] != "") {
     $serial = $data[1]['entPhysicalSerialNum'];
 }
-
-?>
\ No newline at end of file
diff --git a/includes/polling/os/fortigate.inc.php b/includes/polling/os/fortigate.inc.php
index e32ca4e69..a53b83dea 100644
--- a/includes/polling/os/fortigate.inc.php
+++ b/includes/polling/os/fortigate.inc.php
@@ -42,5 +42,3 @@ if (is_numeric($cpu_usage))
   rrdtool_update($cpurrd, " N:$cpu_usage");
   $graphs['fortigate_cpu'] = TRUE;
 }
-
-?>
diff --git a/includes/polling/os/ibmnos.inc.php b/includes/polling/os/ibmnos.inc.php
index a8cfcaff5..c70e4c518 100644
--- a/includes/polling/os/ibmnos.inc.php
+++ b/includes/polling/os/ibmnos.inc.php
@@ -39,4 +39,3 @@ if (strpos($sysdescr_value, 'IBM Networking Operating System') !== false) {
     $version = trim(snmp_get($device, ".1.3.6.1.2.1.47.1.1.1.1.10.1", "-Ovq") , '" ');
     $serial = trim(snmp_get($device, ".1.3.6.1.2.1.47.1.1.1.1.11.1", "-Ovq") , '" ');
 }
-?>
diff --git a/includes/polling/os/ruckuswireless.inc.php b/includes/polling/os/ruckuswireless.inc.php
index d864e0b7b..0f5d55c70 100644
--- a/includes/polling/os/ruckuswireless.inc.php
+++ b/includes/polling/os/ruckuswireless.inc.php
@@ -50,5 +50,3 @@ $ruckus_mibs = array(
     "ruckusZDWLANAPTable" => "RUCKUS-ZD-WLAN-MIB",
 );
 poll_mibs($ruckus_mibs, $device, $graphs);
-
-?>