diff --git a/api/index.php b/api/index.php
index d451a3ac8..ed3c0394a 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 895ea5261..8ffe68cc0 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 26b6e4ab7..304431213 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 7737df0f6..75fb4c86c 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 e8cb2deab..3b71f3c8f 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 5a3afdda6..deb29f264 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 3aeebbe67..d3070fac4 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 e8697aba9..98fab6bea 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 0d4ebc2d2..a26629490 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 4d3596ef1..7d6bbb30a 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 f9ef4f3bb..cb1eecf4b 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 60c5265bf..53fa60280 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 64f1a0616..2435f6854 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 e64a13fdc..594f56984 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 e132789ba..76d85b2a2 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 070692d7f..402514807 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 080e4083a..a3fa7e636 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 36ad17f3d..860ebd73f 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 b20932045..16c209607 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 4ce86534d..765b17480 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 d47dbacfb..9ec674078 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 dd1eba142..37fd69906 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 e3c8a535f..01c9e3109 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 4a9c1df82..0c486e58b 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 96263a97e..bd192ae78 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 044160601..ac9980f63 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 0ad5ddf3c..937a1b9a5 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 5041de0c4..5939d51c0 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 5ca5c17d3..1c9e7aef6 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 48ef43e0a..047f50b5b 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 12619858f..47c474a0c 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 f3836d8e1..5e1284092 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 b127ce95c..26fbb02b1 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 5ec7079dc..0e58a34e2 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 6586d6c6c..56c0fec94 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 215f05646..a937a2409 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 008ed876a..1e844a6f3 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 4029bbbdb..cd10b7cb3 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 505b44477..28a2effd4 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 b938b8664..45cd4ce6f 100644
--- a/include/ccache.php
+++ b/include/ccache.php
@@ -222,4 +222,4 @@
 
 		}
 	} */
-?>
+
diff --git a/include/colors.php b/include/colors.php
index 491d38c15..c441f7cb1 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 217ad3b0f..3e26dfd5a 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 d122f3baf..91235b479 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 f45f07276..c02e90ef2 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 71ee6d203..ff5d77f10 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 bb2fbaee3..95c9edc69 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 ec4efe15a..b70e47fdf 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 f9ee8245f..97077e9da 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 4149864b3..9e2674b98 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 645d06f89..ff46ac8a1 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 e955c70b2..d0532a014 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 21dce3166..02bc7f3be 100644
--- a/include/version.php
+++ b/include/version.php
@@ -39,4 +39,3 @@
 	}
 
 	define('VERSION', get_version());
-?>