diff --git a/api/index.php b/api/index.php
index d451a3ac8fd53a6620d3d9a70fbc3bf0aadff0d3..ed3c0394a48c2d5fb50f09990a09b12fee7fc36d 100644
--- a/api/index.php
+++ b/api/index.php
@@ -87,4 +87,4 @@
 	header("Api-Content-Length: " . ob_get_length());
 
 	ob_end_flush();
-?>
+
diff --git a/classes/api.php b/classes/api.php
index 895ea52615a9e84bac0751a6467a16b812194d69..8ffe68cc0d1fdfd7d9b48742312941b39b1dc019 100644
--- a/classes/api.php
+++ b/classes/api.php
@@ -887,6 +887,4 @@ class API extends Handler {
 	}
 
 
-}
-
-?>
+}
\ No newline at end of file
diff --git a/classes/auth/base.php b/classes/auth/base.php
index 26b6e4ab7bd120f96c28fb04e87d987dc06bf45c..3044312139042750542159e470b2623528e3dfe5 100644
--- a/classes/auth/base.php
+++ b/classes/auth/base.php
@@ -63,5 +63,3 @@ class Auth_Base {
 
 	}
 }
-
-?>
diff --git a/classes/backend.php b/classes/backend.php
index 7737df0f6971998bab44a1ffb933631f585562e0..75fb4c86c52e116671e69b8085cdb344f2769d43 100644
--- a/classes/backend.php
+++ b/classes/backend.php
@@ -115,5 +115,4 @@ class Backend extends Handler {
 			__('Close this window')."</button></div>"; */
 
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/classes/db.php b/classes/db.php
index e8cb2deab237cf64f0d7b49247046839b557bd7b..3b71f3c8f00cae1db65193b16dba13693bea74cb 100644
--- a/classes/db.php
+++ b/classes/db.php
@@ -97,5 +97,4 @@ class Db implements IDb {
 	function last_query_error() {
 		return $this->adapter->last_query_error();
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/classes/db/mysqli.php b/classes/db/mysqli.php
index 5a3afdda61fa137ca388c0d9f717849705dd10d0..deb29f264cc04a57e2718adfa0232ea7cf34b7ef 100644
--- a/classes/db/mysqli.php
+++ b/classes/db/mysqli.php
@@ -83,4 +83,3 @@ class Db_Mysqli implements IDb {
 	}
 
 }
-?>
diff --git a/classes/db/pdo.php b/classes/db/pdo.php
index 3aeebbe678fea9184cb1362359b5839f5fe6cb97..d3070fac4c14a96c7c170a5deba741606e78975f 100644
--- a/classes/db/pdo.php
+++ b/classes/db/pdo.php
@@ -97,5 +97,4 @@ class Db_PDO implements IDb {
 		return true;
 	}
 
-}
-?>
+}
\ No newline at end of file
diff --git a/classes/db/pgsql.php b/classes/db/pgsql.php
index e8697aba983c972ef4e8085376cf5eb6ebd041fb..98fab6beae62c36a4034cf9a70a39c46a6fbdfc9 100644
--- a/classes/db/pgsql.php
+++ b/classes/db/pgsql.php
@@ -88,5 +88,4 @@ class Db_Pgsql implements IDb {
 
 		return true;
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/classes/db/prefs.php b/classes/db/prefs.php
index 0d4ebc2d2506aa3fdeca93263f71be69fdf93259..a2662949053d14e595d1f440e88fd20040703359 100644
--- a/classes/db/prefs.php
+++ b/classes/db/prefs.php
@@ -183,5 +183,4 @@ class Db_Prefs {
 		}
 	}
 
-}
-?>
+}
\ No newline at end of file
diff --git a/classes/db/stmt.php b/classes/db/stmt.php
index 4d3596ef1faabfd4db308a4766cc93737dc37e98..7d6bbb30a4dd7c37d55396f11f7248a073d68447 100644
--- a/classes/db/stmt.php
+++ b/classes/db/stmt.php
@@ -28,5 +28,4 @@ class Db_Stmt {
 	function fetch() {
 		return $this->stmt->fetch();
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/classes/dbupdater.php b/classes/dbupdater.php
index f9ef4f3bb09ee4e070ff4e674fb52853669cabd2..cb1eecf4bb0e3d768347ac0cdae254f1ca4f5657 100644
--- a/classes/dbupdater.php
+++ b/classes/dbupdater.php
@@ -72,4 +72,4 @@ class DbUpdater {
 		}
 	}
 
-} ?>
+}
\ No newline at end of file
diff --git a/classes/dlg.php b/classes/dlg.php
index 60c5265bf1dce14072e137ceb717180bf601c4d5..53fa602801eb81fb421bd351213dab002e59ff44 100644
--- a/classes/dlg.php
+++ b/classes/dlg.php
@@ -190,5 +190,4 @@ class Dlg extends Handler_Protected {
 		//return;
 	}
 
-}
-?>
+}
\ No newline at end of file
diff --git a/classes/feedenclosure.php b/classes/feedenclosure.php
index 64f1a0616aa89df2ececa1fb8dbe8c485a1d8aa2..2435f68547adb2ef49916c615aec857b2c410c61 100644
--- a/classes/feedenclosure.php
+++ b/classes/feedenclosure.php
@@ -7,4 +7,4 @@ class FeedEnclosure {
 	public $height;
 	public $width;
 }
-?>
+
diff --git a/classes/feeditem.php b/classes/feeditem.php
index e64a13fdc98556b8372a43a227e39f1a29d5f0f7..594f56984cfcea2f7d6139e346d181f0c78752d6 100644
--- a/classes/feeditem.php
+++ b/classes/feeditem.php
@@ -12,4 +12,4 @@ abstract class FeedItem {
 	abstract function get_enclosures();
 	abstract function get_author();
 }
-?>
+
diff --git a/classes/feeditem/atom.php b/classes/feeditem/atom.php
index e132789ba3c33700d7a0a413811f6f011db78d86..76d85b2a210267ff49f5f5ef1a8f2ae61d7f31fc 100644
--- a/classes/feeditem/atom.php
+++ b/classes/feeditem/atom.php
@@ -197,5 +197,4 @@ class FeedItem_Atom extends FeedItem_Common {
 		return $encs;
 	}
 
-}
-?>
+}
\ No newline at end of file
diff --git a/classes/feeditem/common.php b/classes/feeditem/common.php
index 070692d7f872c2f32874ef379233ffbc06829294..4025148077299bd5a690a2157f64a04327b1d454 100644
--- a/classes/feeditem/common.php
+++ b/classes/feeditem/common.php
@@ -82,5 +82,4 @@ abstract class FeedItem_Common extends FeedItem {
 		}
 	}
 
-}
-?>
+}
\ No newline at end of file
diff --git a/classes/feeditem/rss.php b/classes/feeditem/rss.php
index 080e4083ab971743fcbfb874bdca888b3ac34729..a3fa7e636578bfd9ed6c3270d2baac310f226b06 100644
--- a/classes/feeditem/rss.php
+++ b/classes/feeditem/rss.php
@@ -189,5 +189,4 @@ class FeedItem_RSS extends FeedItem_Common {
 		return $encs;
 	}
 
-}
-?>
+}
\ No newline at end of file
diff --git a/classes/feedparser.php b/classes/feedparser.php
index 36ad17f3d70e8985ec05dcdf3c597eca3ea3f406..860ebd73f6d34e8d2ee2bf6b35596921d2a8dd84 100644
--- a/classes/feedparser.php
+++ b/classes/feedparser.php
@@ -283,4 +283,4 @@ class FeedParser {
 
 		return $rv;
 	}
-} ?>
+}
\ No newline at end of file
diff --git a/classes/handler.php b/classes/handler.php
index b209320458d40d52b8d530a9e2ee9324da4ce8d0..16c2096076c5aaeb4c860cf43af1b8b82fb54aa3 100644
--- a/classes/handler.php
+++ b/classes/handler.php
@@ -20,5 +20,4 @@ class Handler implements IHandler {
 		return true;
 	}
 
-}
-?>
+}
\ No newline at end of file
diff --git a/classes/handler/protected.php b/classes/handler/protected.php
index 4ce86534d95ff1038de35917966aae310bb8622b..765b17480e50777aa93c72e47c8f7fbce4bb29b1 100644
--- a/classes/handler/protected.php
+++ b/classes/handler/protected.php
@@ -5,4 +5,3 @@ class Handler_Protected extends Handler {
 		return parent::before($method) && $_SESSION['uid'];
 	}
 }
-?>
diff --git a/classes/iauthmodule.php b/classes/iauthmodule.php
index d47dbacfb9454021aa18ec92d06a1a45759c307d..9ec674078c8e048819e662a978005e1a704de2da 100644
--- a/classes/iauthmodule.php
+++ b/classes/iauthmodule.php
@@ -2,4 +2,3 @@
 interface IAuthModule {
 	function authenticate($login, $password);
 }
-?>
diff --git a/classes/idb.php b/classes/idb.php
index dd1eba142745bb77aa03c5d3f2e640b4e3f48f6d..37fd699060f2cfd836a7320d98ccb8a421ce667e 100644
--- a/classes/idb.php
+++ b/classes/idb.php
@@ -11,4 +11,3 @@ interface IDb {
 	function last_error();
 	function last_query_error();
 }
-?>
diff --git a/classes/ihandler.php b/classes/ihandler.php
index e3c8a535f6df4043ee32b638e45280f15daf21d3..01c9e310992ff690f892cbc79dd277de602e97f9 100644
--- a/classes/ihandler.php
+++ b/classes/ihandler.php
@@ -4,4 +4,3 @@ interface IHandler {
 	function before($method);
 	function after();
 }
-?>
diff --git a/classes/logger.php b/classes/logger.php
index 4a9c1df820cba383d06cbea104831d3b6f63be43..0c486e58b4d208fab3c2b53e83f0590f9bf6d884 100644
--- a/classes/logger.php
+++ b/classes/logger.php
@@ -61,5 +61,4 @@ class Logger {
 		return self::$instance;
 	}
 
-}
-?>
+}
\ No newline at end of file
diff --git a/classes/logger/sql.php b/classes/logger/sql.php
index 96263a97e7f97245f1835845d1d17fa6464e637c..bd192ae78dfa9de4f53df2288fdca8819e4f84b8 100644
--- a/classes/logger/sql.php
+++ b/classes/logger/sql.php
@@ -23,5 +23,4 @@ class Logger_SQL {
 		return false;
 	}
 
-}
-?>
+}
\ No newline at end of file
diff --git a/classes/logger/syslog.php b/classes/logger/syslog.php
index 04416060134575c136c69553cdcf6d7fda6ea08e..ac9980f63c7612559dcb3ee1612d8d9673b3c879 100644
--- a/classes/logger/syslog.php
+++ b/classes/logger/syslog.php
@@ -30,5 +30,4 @@ class Logger_Syslog {
 
 	}
 
-}
-?>
+}
\ No newline at end of file
diff --git a/classes/opml.php b/classes/opml.php
index 0ad5ddf3c1dcc2787357742ada305ca4a77ab207..937a1b9a529bc65c0aa79e0464d6ddbf89037d0e 100644
--- a/classes/opml.php
+++ b/classes/opml.php
@@ -515,4 +515,3 @@ class Opml extends Handler_Protected {
 
 
 }
-?>
diff --git a/classes/plugin.php b/classes/plugin.php
index 5041de0c42878119960fce5200f53e842360f906..5939d51c0c61345771ae8ca5e1cd5f31a1a9c612 100644
--- a/classes/plugin.php
+++ b/classes/plugin.php
@@ -40,5 +40,4 @@ class Plugin {
 	function api_version() {
 		return Plugin::API_VERSION_COMPAT;
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/classes/pluginhandler.php b/classes/pluginhandler.php
index 5ca5c17d3d344b6bb5c6dc9a4d75c38b0261e4e9..1c9e7aef6e8e37663c65755752268b197bfbe1c3 100644
--- a/classes/pluginhandler.php
+++ b/classes/pluginhandler.php
@@ -18,5 +18,3 @@ class PluginHandler extends Handler_Protected {
 		}
 	}
 }
-
-?>
diff --git a/classes/pluginhost.php b/classes/pluginhost.php
index 48ef43e0a0036ca8d1026aee5d44a9b8bab38d4e..047f50b5b2f0872267bb7a6eb47c0c94e2e6a238 100644
--- a/classes/pluginhost.php
+++ b/classes/pluginhost.php
@@ -434,5 +434,4 @@ class PluginHost {
 	function get_filter_actions() {
 		return $this->plugin_actions;
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index 12619858f874b8eab699b62de16c6a294350119e..47c474a0c481814c82540d9e4197112dc0a733ab 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -1976,5 +1976,4 @@ class Pref_Feeds extends Handler_Protected {
 
 		print (int) $this->dbh->fetch_result($result, 0, "num_inactive");
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/classes/pref/filters.php b/classes/pref/filters.php
index f3836d8e1f6d42ed42a4492662673c55b1be3356..5e128409232f5bc4e772be7b6b148e818618fcc8 100755
--- a/classes/pref/filters.php
+++ b/classes/pref/filters.php
@@ -1192,5 +1192,4 @@ class Pref_Filters extends Handler_Protected {
 
 		$this->dbh->query("COMMIT");
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/classes/pref/labels.php b/classes/pref/labels.php
index b127ce95cc28be1f514f9b1199c9697c3cae002e..26fbb02b1b9532b3753523ecb352e6f6ff301aa5 100644
--- a/classes/pref/labels.php
+++ b/classes/pref/labels.php
@@ -311,6 +311,4 @@ class Pref_Labels extends Handler_Protected {
 		print "</div>"; #container
 
 	}
-}
-
-?>
+}
\ No newline at end of file
diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index 5ec7079dc8a405b4cd67816b5096f6a7d15bd434..0e58a34e256f982b9508971db2a9b4c1be1ccaa7 100644
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -1120,5 +1120,4 @@ class Pref_Prefs extends Handler_Protected {
 
 		return "";
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/classes/pref/system.php b/classes/pref/system.php
index 6586d6c6c5920dc88f3cc0e8ea0c0bb57a8553c8..56c0fec943e0a107a10df27bab716d6bd836f607 100644
--- a/classes/pref/system.php
+++ b/classes/pref/system.php
@@ -87,4 +87,3 @@ class Pref_System extends Handler_Protected {
 	}
 
 }
-?>
diff --git a/classes/pref/users.php b/classes/pref/users.php
index 215f05646c9ad2522e2d8ae57ff71e3dc9065aed..a937a240900568cbda4a526792071dbf1d29ff0e 100644
--- a/classes/pref/users.php
+++ b/classes/pref/users.php
@@ -453,6 +453,4 @@ class Pref_Users extends Handler_Protected {
 			print "</div>"; #container
 
 		}
-
-	}
-?>
+	}
\ No newline at end of file
diff --git a/classes/rpc.php b/classes/rpc.php
index 008ed876ab7e14948ccffba2079ba63eeab6b594..1e844a6f341e096f6a95ac494165be888f29df60 100755
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -664,5 +664,4 @@ class RPC extends Handler_Protected {
 		}
 
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/classes/ttrssmailer.php b/classes/ttrssmailer.php
index 4029bbbdb137b2abd2cb12beba9e6ef5c8ca5955..cd10b7cb35a32890296f8082e689575b0b4d62d9 100644
--- a/classes/ttrssmailer.php
+++ b/classes/ttrssmailer.php
@@ -60,6 +60,4 @@ class ttrssMailer extends PHPMailer {
 		$rc=$this->send();
 		return $rc;
 	}
-}
-
-?>
+}
\ No newline at end of file
diff --git a/include/autoload.php b/include/autoload.php
index 505b4447721ea2829965b566cad24b9c40fbd023..28a2effd4f4123905ff7ce129489e81f18942f91 100644
--- a/include/autoload.php
+++ b/include/autoload.php
@@ -10,5 +10,4 @@
 			require $file;
 		}
 
-	}
-?>
+	}
\ No newline at end of file
diff --git a/include/ccache.php b/include/ccache.php
index b938b86643ad17935a734453f1f2edf8c8b1bd1e..45cd4ce6f3ab64f56d12185f35bfbfcbd9ae987c 100644
--- a/include/ccache.php
+++ b/include/ccache.php
@@ -222,4 +222,4 @@
 
 		}
 	} */
-?>
+
diff --git a/include/colors.php b/include/colors.php
index 491d38c1556f1abe41bf7afac5b3a4c9b1194727..c441f7cb189187bb140f86518ce16d89925faf5c 100644
--- a/include/colors.php
+++ b/include/colors.php
@@ -348,4 +348,4 @@ function hsl2rgb($arr) {
 		}
 		return '';
 	}
-?>
+
diff --git a/include/crypt.php b/include/crypt.php
index 217ad3b0fb5197447dca51a9b311256152bb4ee6..3e26dfd5a01a36fc49a029716c018d589372def0 100644
--- a/include/crypt.php
+++ b/include/crypt.php
@@ -17,5 +17,4 @@
 		}
 
 		return false;
-	}
-?>
+	}
\ No newline at end of file
diff --git a/include/db-prefs.php b/include/db-prefs.php
index d122f3baf90d94c6d6ca42a1b7af95694406c7a1..91235b4792bcc8cccd825f4983b4a249b9946d30 100644
--- a/include/db-prefs.php
+++ b/include/db-prefs.php
@@ -7,5 +7,4 @@
 
 	function set_pref($pref_name, $value, $user_id = false, $strip_tags = true) {
 		return Db_Prefs::get()->write($pref_name, $value, $user_id, $strip_tags);
-	}
-?>
+	}
\ No newline at end of file
diff --git a/include/db.php b/include/db.php
index f45f0727644e3644f083c7a96d6775fd9315351a..c02e90ef264d794ce15b4bdca09d3ade9a758a1e 100644
--- a/include/db.php
+++ b/include/db.php
@@ -36,5 +36,3 @@ function db_last_query_error() {
 function db_quote($str){
 	return Db::get()->quote($str);
 }
-
-?>
diff --git a/include/digest.php b/include/digest.php
index 71ee6d2036e4affed3f099d263adf59c3f5d2291..ff5d77f10a5d96c1e2df57a0279c3294813061ba 100644
--- a/include/digest.php
+++ b/include/digest.php
@@ -189,4 +189,4 @@
 
 		return array($tmp, $headlines_count, $affected_ids, $tmp_t);
 	}
-?>
+
diff --git a/include/errorhandler.php b/include/errorhandler.php
index bb2fbaee37dacd7f485167cf6aaae6a9a267e592..95c9edc69df9ac7b8ad3f414741a844a88b3fe6c 100644
--- a/include/errorhandler.php
+++ b/include/errorhandler.php
@@ -71,4 +71,4 @@ function ttrss_fatal_handler() {
 
 register_shutdown_function('ttrss_fatal_handler');
 set_error_handler('ttrss_error_handler');
-?>
+
diff --git a/include/feedbrowser.php b/include/feedbrowser.php
index ec4efe15a1e24c24f1588c237a539b8ec6322be1..b70e47fdfbc7891fb7ad3a81f5c94376676cfaec 100644
--- a/include/feedbrowser.php
+++ b/include/feedbrowser.php
@@ -110,4 +110,3 @@
 
 		return $rv;
 	}
-?>
diff --git a/include/functions2.php b/include/functions2.php
index f9ee8245f2bfd4df85eae76532420ea5836bfc82..97077e9daefa725d1b242d87772770df7503c145 100644
--- a/include/functions2.php
+++ b/include/functions2.php
@@ -2530,4 +2530,4 @@
 			return "";
 		}
 	}
-?>
+
diff --git a/include/labels.php b/include/labels.php
index 4149864b3b66a41853cffa1214337c9cca994385..9e2674b98a931fc4fabdf8ca3ffe3bcb71d77d96 100644
--- a/include/labels.php
+++ b/include/labels.php
@@ -197,5 +197,3 @@
 
 		return $result;
 	}
-
-?>
diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 645d06f895470fc0ec534d3f71b505b98cf85184..ff46ac8a1c4debff2c1e68d11a302c56532e56c3 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -1531,4 +1531,4 @@
 
 		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_HOUSE_KEEPING, "hook_house_keeping", "");
 	}
-?>
+
diff --git a/include/sessions.php b/include/sessions.php
index e955c70b26087cf7d7ca0bd413095c8121c23638..d0532a0141c41e1df43257adad9dd4fefcc88f7f 100644
--- a/include/sessions.php
+++ b/include/sessions.php
@@ -140,4 +140,3 @@
 			@session_start();
 		}
 	}
-?>
diff --git a/include/version.php b/include/version.php
index 21dce3166191ba2a45a29bd13ea980528679b845..02bc7f3beef73e8a04776438df89cb6b90e76cc4 100644
--- a/include/version.php
+++ b/include/version.php
@@ -39,4 +39,3 @@
 	}
 
 	define('VERSION', get_version());
-?>