diff --git a/configure.ac b/configure.ac
index 10cb7151..a019fc88 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@ AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_MACRO_DIR([config/m4])
 
 PACKAGE=elinks
-VERSION=0.15.1
+VERSION=0.16.GIT
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Package version])
diff --git a/meson.build b/meson.build
index 3ccd46e8..a430b5c5 100644
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,4 @@
-project('elinks', ['c','cpp'], version:'0.15.1', license:'GPLv2')
+project('elinks', ['c','cpp'], version:'0.16.GIT', license:'GPLv2')
 srcs=[]
 
 srcdir = meson.source_root()
@@ -143,7 +143,7 @@ conf_data.set('HAVE_SYS_TIME_H', 1)
 compiler = meson.get_compiler('c')
 
 if conf_data.get('CONFIG_ECMASCRIPT')
-    extracflags = ['-xc++', '-fpermissive', '-Wno-sign-compare', '-std=gnu++17', '-fno-lto']
+    extracflags = ['-xc++', '-fpermissive', '-Wno-sign-compare', '-std=gnu++17']
 else
     extracflags = ['-Wc++-compat']
 endif
diff --git a/src/document/html/parser/stack.c b/src/document/html/parser/stack.c
index ec4fd10e..a16ff414 100644
--- a/src/document/html/parser/stack.c
+++ b/src/document/html/parser/stack.c
@@ -27,7 +27,7 @@
 /* Unsafe macros */
 #include "document/html/internal.h"
 
-#ifdef CONFIG_XML
+#if 0 //def CONFIG_XML
 #include <libxml++/libxml++.h>
 #endif
 
diff --git a/src/document/xml/meson.build b/src/document/xml/meson.build
index b4d65bc5..389c7538 100644
--- a/src/document/xml/meson.build
+++ b/src/document/xml/meson.build
@@ -1,2 +1,2 @@
 #subdir('html')
-srcs += files('renderer.c', 'renderer2.c')
+srcs += files('renderer.cpp', 'renderer2.cpp')
diff --git a/src/document/xml/renderer.c b/src/document/xml/renderer.cpp
similarity index 100%
rename from src/document/xml/renderer.c
rename to src/document/xml/renderer.cpp
diff --git a/src/document/xml/renderer2.c b/src/document/xml/renderer2.cpp
similarity index 100%
rename from src/document/xml/renderer2.c
rename to src/document/xml/renderer2.cpp
diff --git a/src/ecmascript/css2xpath.c b/src/ecmascript/css2xpath.cpp
similarity index 100%
rename from src/ecmascript/css2xpath.c
rename to src/ecmascript/css2xpath.cpp
diff --git a/src/ecmascript/ecmascript.c b/src/ecmascript/ecmascript.cpp
similarity index 100%
rename from src/ecmascript/ecmascript.c
rename to src/ecmascript/ecmascript.cpp
diff --git a/src/ecmascript/empty.cpp b/src/ecmascript/empty.cpp
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/ecmascript/localstorage-db.c b/src/ecmascript/localstorage-db.cpp
similarity index 100%
rename from src/ecmascript/localstorage-db.c
rename to src/ecmascript/localstorage-db.cpp
diff --git a/src/ecmascript/meson.build b/src/ecmascript/meson.build
index 4501e0b2..df915778 100644
--- a/src/ecmascript/meson.build
+++ b/src/ecmascript/meson.build
@@ -1,7 +1,7 @@
 #INCLUDES += $(SPIDERMONKEY_CFLAGS)
 if conf_data.get('CONFIG_ECMASCRIPT_SMJS')
 	subdir('spidermonkey')
-	srcs += files('css2xpath.c', 'ecmascript.c', 'localstorage-db.c', 'spidermonkey.c')
+	srcs += files('css2xpath.cpp', 'ecmascript.cpp', 'localstorage-db.cpp', 'spidermonkey.cpp')
 endif
 
 if conf_data.get('CONFIG_ECMASCRIPT_SMJS')
@@ -13,10 +13,10 @@ else
 endif
 
 if CONFIG_ANY_SPIDERMONKEY
-	srcs += files('spidermonkey-shared.c', 'empty.cpp')
+	srcs += files('spidermonkey-shared.cpp')
 endif
 
 if conf_data.get('CONFIG_QUICKJS')
 	subdir('quickjs')
-	srcs += files('css2xpath.c', 'ecmascript.c', 'localstorage-db.c', 'quickjs.c', 'empty.cpp')
+	srcs += files('css2xpath.cpp', 'ecmascript.cpp', 'localstorage-db.cpp', 'quickjs.cpp')
 endif
diff --git a/src/ecmascript/quickjs.c b/src/ecmascript/quickjs.cpp
similarity index 100%
rename from src/ecmascript/quickjs.c
rename to src/ecmascript/quickjs.cpp
diff --git a/src/ecmascript/quickjs/attr.c b/src/ecmascript/quickjs/attr.cpp
similarity index 100%
rename from src/ecmascript/quickjs/attr.c
rename to src/ecmascript/quickjs/attr.cpp
diff --git a/src/ecmascript/quickjs/attributes.c b/src/ecmascript/quickjs/attributes.cpp
similarity index 100%
rename from src/ecmascript/quickjs/attributes.c
rename to src/ecmascript/quickjs/attributes.cpp
diff --git a/src/ecmascript/quickjs/collection.c b/src/ecmascript/quickjs/collection.cpp
similarity index 100%
rename from src/ecmascript/quickjs/collection.c
rename to src/ecmascript/quickjs/collection.cpp
diff --git a/src/ecmascript/quickjs/console.c b/src/ecmascript/quickjs/console.cpp
similarity index 100%
rename from src/ecmascript/quickjs/console.c
rename to src/ecmascript/quickjs/console.cpp
diff --git a/src/ecmascript/quickjs/document.c b/src/ecmascript/quickjs/document.cpp
similarity index 100%
rename from src/ecmascript/quickjs/document.c
rename to src/ecmascript/quickjs/document.cpp
diff --git a/src/ecmascript/quickjs/element.c b/src/ecmascript/quickjs/element.cpp
similarity index 100%
rename from src/ecmascript/quickjs/element.c
rename to src/ecmascript/quickjs/element.cpp
diff --git a/src/ecmascript/quickjs/form.c b/src/ecmascript/quickjs/form.cpp
similarity index 100%
rename from src/ecmascript/quickjs/form.c
rename to src/ecmascript/quickjs/form.cpp
diff --git a/src/ecmascript/quickjs/forms.c b/src/ecmascript/quickjs/forms.cpp
similarity index 100%
rename from src/ecmascript/quickjs/forms.c
rename to src/ecmascript/quickjs/forms.cpp
diff --git a/src/ecmascript/quickjs/heartbeat.c b/src/ecmascript/quickjs/heartbeat.cpp
similarity index 100%
rename from src/ecmascript/quickjs/heartbeat.c
rename to src/ecmascript/quickjs/heartbeat.cpp
diff --git a/src/ecmascript/quickjs/history.c b/src/ecmascript/quickjs/history.cpp
similarity index 100%
rename from src/ecmascript/quickjs/history.c
rename to src/ecmascript/quickjs/history.cpp
diff --git a/src/ecmascript/quickjs/implementation.c b/src/ecmascript/quickjs/implementation.cpp
similarity index 100%
rename from src/ecmascript/quickjs/implementation.c
rename to src/ecmascript/quickjs/implementation.cpp
diff --git a/src/ecmascript/quickjs/input.c b/src/ecmascript/quickjs/input.cpp
similarity index 100%
rename from src/ecmascript/quickjs/input.c
rename to src/ecmascript/quickjs/input.cpp
diff --git a/src/ecmascript/quickjs/localstorage.c b/src/ecmascript/quickjs/localstorage.cpp
similarity index 100%
rename from src/ecmascript/quickjs/localstorage.c
rename to src/ecmascript/quickjs/localstorage.cpp
diff --git a/src/ecmascript/quickjs/location.c b/src/ecmascript/quickjs/location.cpp
similarity index 100%
rename from src/ecmascript/quickjs/location.c
rename to src/ecmascript/quickjs/location.cpp
diff --git a/src/ecmascript/quickjs/meson.build b/src/ecmascript/quickjs/meson.build
index 07fb4635..0c7255ed 100644
--- a/src/ecmascript/quickjs/meson.build
+++ b/src/ecmascript/quickjs/meson.build
@@ -1 +1,2 @@
-srcs += files('attr.c', 'attributes.c', 'collection.c', 'console.c', 'document.c', 'element.c', 'form.c', 'forms.c', 'heartbeat.c', 'history.c', 'implementation.c', 'input.c', 'localstorage.c', 'location.c', 'navigator.c', 'nodelist.c', 'screen.c', 'unibar.c', 'window.c')
+srcs += files('attr.cpp', 'attributes.cpp', 'collection.cpp', 'console.cpp', 'document.cpp', 'element.cpp', 'form.cpp', 'forms.cpp', 'heartbeat.cpp', 'history.cpp', 'implementation.cpp',
+'input.cpp', 'localstorage.cpp', 'location.cpp', 'navigator.cpp', 'nodelist.cpp', 'screen.cpp', 'unibar.cpp', 'window.cpp')
diff --git a/src/ecmascript/quickjs/navigator.c b/src/ecmascript/quickjs/navigator.cpp
similarity index 100%
rename from src/ecmascript/quickjs/navigator.c
rename to src/ecmascript/quickjs/navigator.cpp
diff --git a/src/ecmascript/quickjs/nodelist.c b/src/ecmascript/quickjs/nodelist.cpp
similarity index 100%
rename from src/ecmascript/quickjs/nodelist.c
rename to src/ecmascript/quickjs/nodelist.cpp
diff --git a/src/ecmascript/quickjs/screen.c b/src/ecmascript/quickjs/screen.cpp
similarity index 100%
rename from src/ecmascript/quickjs/screen.c
rename to src/ecmascript/quickjs/screen.cpp
diff --git a/src/ecmascript/quickjs/unibar.c b/src/ecmascript/quickjs/unibar.cpp
similarity index 100%
rename from src/ecmascript/quickjs/unibar.c
rename to src/ecmascript/quickjs/unibar.cpp
diff --git a/src/ecmascript/quickjs/window.c b/src/ecmascript/quickjs/window.cpp
similarity index 100%
rename from src/ecmascript/quickjs/window.c
rename to src/ecmascript/quickjs/window.cpp
diff --git a/src/ecmascript/spidermonkey-shared.c b/src/ecmascript/spidermonkey-shared.cpp
similarity index 100%
rename from src/ecmascript/spidermonkey-shared.c
rename to src/ecmascript/spidermonkey-shared.cpp
diff --git a/src/ecmascript/spidermonkey.c b/src/ecmascript/spidermonkey.cpp
similarity index 100%
rename from src/ecmascript/spidermonkey.c
rename to src/ecmascript/spidermonkey.cpp
diff --git a/src/ecmascript/spidermonkey/attr.c b/src/ecmascript/spidermonkey/attr.cpp
similarity index 100%
rename from src/ecmascript/spidermonkey/attr.c
rename to src/ecmascript/spidermonkey/attr.cpp
diff --git a/src/ecmascript/spidermonkey/attributes.c b/src/ecmascript/spidermonkey/attributes.cpp
similarity index 100%
rename from src/ecmascript/spidermonkey/attributes.c
rename to src/ecmascript/spidermonkey/attributes.cpp
diff --git a/src/ecmascript/spidermonkey/collection.c b/src/ecmascript/spidermonkey/collection.cpp
similarity index 100%
rename from src/ecmascript/spidermonkey/collection.c
rename to src/ecmascript/spidermonkey/collection.cpp
diff --git a/src/ecmascript/spidermonkey/console.c b/src/ecmascript/spidermonkey/console.cpp
similarity index 100%
rename from src/ecmascript/spidermonkey/console.c
rename to src/ecmascript/spidermonkey/console.cpp
diff --git a/src/ecmascript/spidermonkey/document.c b/src/ecmascript/spidermonkey/document.cpp
similarity index 100%
rename from src/ecmascript/spidermonkey/document.c
rename to src/ecmascript/spidermonkey/document.cpp
diff --git a/src/ecmascript/spidermonkey/element.c b/src/ecmascript/spidermonkey/element.cpp
similarity index 100%
rename from src/ecmascript/spidermonkey/element.c
rename to src/ecmascript/spidermonkey/element.cpp
diff --git a/src/ecmascript/spidermonkey/form.c b/src/ecmascript/spidermonkey/form.cpp
similarity index 100%
rename from src/ecmascript/spidermonkey/form.c
rename to src/ecmascript/spidermonkey/form.cpp
diff --git a/src/ecmascript/spidermonkey/forms.c b/src/ecmascript/spidermonkey/forms.cpp
similarity index 100%
rename from src/ecmascript/spidermonkey/forms.c
rename to src/ecmascript/spidermonkey/forms.cpp
diff --git a/src/ecmascript/spidermonkey/heartbeat.c b/src/ecmascript/spidermonkey/heartbeat.cpp
similarity index 100%
rename from src/ecmascript/spidermonkey/heartbeat.c
rename to src/ecmascript/spidermonkey/heartbeat.cpp
diff --git a/src/ecmascript/spidermonkey/history.c b/src/ecmascript/spidermonkey/history.cpp
similarity index 100%
rename from src/ecmascript/spidermonkey/history.c
rename to src/ecmascript/spidermonkey/history.cpp
diff --git a/src/ecmascript/spidermonkey/implementation.c b/src/ecmascript/spidermonkey/implementation.cpp
similarity index 100%
rename from src/ecmascript/spidermonkey/implementation.c
rename to src/ecmascript/spidermonkey/implementation.cpp
diff --git a/src/ecmascript/spidermonkey/input.c b/src/ecmascript/spidermonkey/input.cpp
similarity index 100%
rename from src/ecmascript/spidermonkey/input.c
rename to src/ecmascript/spidermonkey/input.cpp
diff --git a/src/ecmascript/spidermonkey/localstorage.c b/src/ecmascript/spidermonkey/localstorage.cpp
similarity index 100%
rename from src/ecmascript/spidermonkey/localstorage.c
rename to src/ecmascript/spidermonkey/localstorage.cpp
diff --git a/src/ecmascript/spidermonkey/location.c b/src/ecmascript/spidermonkey/location.cpp
similarity index 100%
rename from src/ecmascript/spidermonkey/location.c
rename to src/ecmascript/spidermonkey/location.cpp
diff --git a/src/ecmascript/spidermonkey/meson.build b/src/ecmascript/spidermonkey/meson.build
index 0a8b7bd8..76db98e3 100644
--- a/src/ecmascript/spidermonkey/meson.build
+++ b/src/ecmascript/spidermonkey/meson.build
@@ -1,3 +1,4 @@
 #INCLUDES += $(SPIDERMONKEY_CFLAGS)
 
-srcs += files('attr.c', 'attributes.c', 'collection.c', 'console.c', 'document.c', 'element.c', 'form.c', 'forms.c', 'heartbeat.c', 'history.c', 'implementation.c', 'input.c', 'location.c', 'localstorage.c', 'navigator.c', 'nodelist.c', 'screen.c', 'unibar.c', 'window.c')
+srcs += files('attr.cpp', 'attributes.cpp', 'collection.cpp', 'console.cpp', 'document.cpp', 'element.cpp', 'form.cpp', 'forms.cpp', 'heartbeat.cpp', 'history.cpp', 'implementation.cpp', 'input.cpp',
+'location.cpp', 'localstorage.cpp', 'navigator.cpp', 'nodelist.cpp', 'screen.cpp', 'unibar.cpp', 'window.cpp')
diff --git a/src/ecmascript/spidermonkey/navigator.c b/src/ecmascript/spidermonkey/navigator.cpp
similarity index 100%
rename from src/ecmascript/spidermonkey/navigator.c
rename to src/ecmascript/spidermonkey/navigator.cpp
diff --git a/src/ecmascript/spidermonkey/nodelist.c b/src/ecmascript/spidermonkey/nodelist.cpp
similarity index 100%
rename from src/ecmascript/spidermonkey/nodelist.c
rename to src/ecmascript/spidermonkey/nodelist.cpp
diff --git a/src/ecmascript/spidermonkey/screen.c b/src/ecmascript/spidermonkey/screen.cpp
similarity index 100%
rename from src/ecmascript/spidermonkey/screen.c
rename to src/ecmascript/spidermonkey/screen.cpp
diff --git a/src/ecmascript/spidermonkey/unibar.c b/src/ecmascript/spidermonkey/unibar.cpp
similarity index 100%
rename from src/ecmascript/spidermonkey/unibar.c
rename to src/ecmascript/spidermonkey/unibar.cpp
diff --git a/src/ecmascript/spidermonkey/window.c b/src/ecmascript/spidermonkey/window.cpp
similarity index 100%
rename from src/ecmascript/spidermonkey/window.c
rename to src/ecmascript/spidermonkey/window.cpp
diff --git a/src/scripting/smjs/action_object.c b/src/scripting/smjs/action_object.cpp
similarity index 100%
rename from src/scripting/smjs/action_object.c
rename to src/scripting/smjs/action_object.cpp
diff --git a/src/scripting/smjs/bookmarks.c b/src/scripting/smjs/bookmarks.cpp
similarity index 100%
rename from src/scripting/smjs/bookmarks.c
rename to src/scripting/smjs/bookmarks.cpp
diff --git a/src/scripting/smjs/cache_object.c b/src/scripting/smjs/cache_object.cpp
similarity index 100%
rename from src/scripting/smjs/cache_object.c
rename to src/scripting/smjs/cache_object.cpp
diff --git a/src/scripting/smjs/core.c b/src/scripting/smjs/core.cpp
similarity index 100%
rename from src/scripting/smjs/core.c
rename to src/scripting/smjs/core.cpp
diff --git a/src/scripting/smjs/elinks_object.c b/src/scripting/smjs/elinks_object.cpp
similarity index 100%
rename from src/scripting/smjs/elinks_object.c
rename to src/scripting/smjs/elinks_object.cpp
diff --git a/src/scripting/smjs/global_object.c b/src/scripting/smjs/global_object.cpp
similarity index 100%
rename from src/scripting/smjs/global_object.c
rename to src/scripting/smjs/global_object.cpp
diff --git a/src/scripting/smjs/globhist.c b/src/scripting/smjs/globhist.cpp
similarity index 100%
rename from src/scripting/smjs/globhist.c
rename to src/scripting/smjs/globhist.cpp
diff --git a/src/scripting/smjs/hooks.c b/src/scripting/smjs/hooks.cpp
similarity index 100%
rename from src/scripting/smjs/hooks.c
rename to src/scripting/smjs/hooks.cpp
diff --git a/src/scripting/smjs/keybinding.c b/src/scripting/smjs/keybinding.cpp
similarity index 100%
rename from src/scripting/smjs/keybinding.c
rename to src/scripting/smjs/keybinding.cpp
diff --git a/src/scripting/smjs/load_uri.c b/src/scripting/smjs/load_uri.cpp
similarity index 100%
rename from src/scripting/smjs/load_uri.c
rename to src/scripting/smjs/load_uri.cpp
diff --git a/src/scripting/smjs/meson.build b/src/scripting/smjs/meson.build
index 59cc7c1a..299ed7d4 100644
--- a/src/scripting/smjs/meson.build
+++ b/src/scripting/smjs/meson.build
@@ -1,5 +1,5 @@
 #INCLUDES += $(SPIDERMONKEY_CFLAGS)
 
-srcs += files('smjs.c', 'core.c', 'global_object.c', 'hooks.c', 'elinks_object.c', 'cache_object.c',
-	'view_state_object.c', 'action_object.c', 'bookmarks.c', 'globhist.c', 'keybinding.c', 'load_uri.c',
-	'session_object.c', 'terminal_object.c')
+srcs += files('smjs.cpp', 'core.cpp', 'global_object.cpp', 'hooks.cpp', 'elinks_object.cpp', 'cache_object.cpp',
+	'view_state_object.cpp', 'action_object.cpp', 'bookmarks.cpp', 'globhist.cpp', 'keybinding.cpp', 'load_uri.cpp',
+	'session_object.cpp', 'terminal_object.cpp')
diff --git a/src/scripting/smjs/session_object.c b/src/scripting/smjs/session_object.cpp
similarity index 100%
rename from src/scripting/smjs/session_object.c
rename to src/scripting/smjs/session_object.cpp
diff --git a/src/scripting/smjs/smjs.c b/src/scripting/smjs/smjs.cpp
similarity index 100%
rename from src/scripting/smjs/smjs.c
rename to src/scripting/smjs/smjs.cpp
diff --git a/src/scripting/smjs/terminal_object.c b/src/scripting/smjs/terminal_object.cpp
similarity index 100%
rename from src/scripting/smjs/terminal_object.c
rename to src/scripting/smjs/terminal_object.cpp
diff --git a/src/scripting/smjs/view_state_object.c b/src/scripting/smjs/view_state_object.cpp
similarity index 100%
rename from src/scripting/smjs/view_state_object.c
rename to src/scripting/smjs/view_state_object.cpp