diff --git uppsrc/CodeEditor/CHighlight.cpp uppsrc/CodeEditor/CHighlight.cpp
--- uppsrc/CodeEditor/CHighlight.cpp
+++ uppsrc/CodeEditor/CHighlight.cpp
@@ -136,7 +136,7 @@ bool CSyntax::RawString(const wchar *p, int& n) {
 	raw_string.Cat('\"');
 	n = int(s + 1 - p);
 	return true;
-};
+}
 
 void CSyntax::Highlight(const wchar *ltext, const wchar *e, HighlightOutput& hls, CodeEditor *editor, int line, int64 pos)
 {
diff --git uppsrc/CodeEditor/CSyntax.cpp uppsrc/CodeEditor/CSyntax.cpp
--- uppsrc/CodeEditor/CSyntax.cpp
+++ uppsrc/CodeEditor/CSyntax.cpp
@@ -369,6 +369,6 @@ void CSyntax::Serialize(Stream& s)
 	s % spar;
 	
 	s % highlight;
-};
+}
 
 }
diff --git uppsrc/Core/Convert.cpp uppsrc/Core/Convert.cpp
--- uppsrc/Core/Convert.cpp
+++ uppsrc/Core/Convert.cpp
@@ -318,7 +318,7 @@ Value  Convert::Format(const Value& q) const {
 
 Value  Convert::Scan(const Value& text) const {
 	return text;
-};
+}
 
 int    Convert::Filter(int chr) const {
 	return chr;
diff --git uppsrc/Core/Http.cpp uppsrc/Core/Http.cpp
--- uppsrc/Core/Http.cpp
+++ uppsrc/Core/Http.cpp
@@ -6,7 +6,7 @@ namespace Ini {
 	INI_BOOL(HttpRequest_Trace, false, "Activates HTTP requests tracing")
 	INI_BOOL(HttpRequest_TraceBody, false, "Activates HTTP requests body tracing")
 	INI_BOOL(HttpRequest_TraceShort, false, "Activates HTTP requests short tracing")
-};
+}
 
 #define LLOG(x)      LOG_(Ini::HttpRequest_Trace, x)
 #define LLOGB(x)     LOG_(Ini::HttpRequest_TraceBody, x)
diff --git uppsrc/Core/Ini.cpp uppsrc/Core/Ini.cpp
--- uppsrc/Core/Ini.cpp
+++ uppsrc/Core/Ini.cpp
@@ -422,4 +422,4 @@ String TextSettings::Get(int groupIndex, int keyIndex) const
 		return Null;
 }
 
-};
+}
diff --git uppsrc/Core/Lang.cpp uppsrc/Core/Lang.cpp
--- uppsrc/Core/Lang.cpp
+++ uppsrc/Core/Lang.cpp
@@ -124,7 +124,7 @@ int GetSystemLNG() {
 			lang = SetLNGCharset(lang, CharsetByName(q + 1));
 	};
 	return lang;
-};
+}
 
 #endif
 
diff --git uppsrc/Core/LangInfo.cpp uppsrc/Core/LangInfo.cpp
--- uppsrc/Core/LangInfo.cpp
+++ uppsrc/Core/LangInfo.cpp
@@ -853,4 +853,4 @@ const char *LanguageInfoList[] = {
 	"Malayalam\t\340\264\256\340\264\262\340\264\257\340\264\276\340\264\263\340\264\202\t\004L",
 };
 
-};
+}
diff --git uppsrc/Core/Log.cpp uppsrc/Core/Log.cpp
--- uppsrc/Core/Log.cpp
+++ uppsrc/Core/Log.cpp
@@ -453,7 +453,7 @@ void SetVppLogName(const String& file) {
 }
 
 namespace Ini {
-	INI_BOOL(user_log, false, "Activates logging of user actions");
-};
+	INI_BOOL(user_log, false, "Activates logging of user actions")
+}
 
 }
diff --git uppsrc/Core/SMTP/Smtp.cpp uppsrc/Core/SMTP/Smtp.cpp
--- uppsrc/Core/SMTP/Smtp.cpp
+++ uppsrc/Core/SMTP/Smtp.cpp
@@ -6,7 +6,7 @@ namespace Ini {
 	INI_BOOL(Smtp_Trace, false, "Activates HTTP requests tracing")
 	INI_BOOL(Smtp_TraceBody, false, "Activates HTTP requests body tracing")
 	INI_BOOL(Smtp_CompressLog, false, "Activates log compression (removes long hex/encode64-like data)")
-};
+}
 
 #define LLOG(x)      do { if(Ini::Smtp_Trace) { if(Ini::Smtp_CompressLog) RLOG(CompressLog(String().Cat() << x)); else RLOG(x); } } while(0)
 #define LLOGB(x)      do { if(Ini::Smtp_TraceBody) { if(Ini::Smtp_CompressLog) RLOG(CompressLog(String().Cat() << x)); else RLOG(x); } } while(0)
diff --git uppsrc/Core/SSH/SFtpStream.cpp uppsrc/Core/SSH/SFtpStream.cpp
--- uppsrc/Core/SSH/SFtpStream.cpp
+++ uppsrc/Core/SSH/SFtpStream.cpp
@@ -76,4 +76,4 @@ SFtpStream::~SFtpStream()
 	Close();
 }
 
-};
\ No newline at end of file
+}
diff --git uppsrc/Core/SSH/SSH.h uppsrc/Core/SSH/SSH.h
--- uppsrc/Core/SSH/SSH.h
+++ uppsrc/Core/SSH/SSH.h
@@ -16,7 +16,7 @@
 
 namespace Upp {
 
-INITIALIZE(SSH);
+INITIALIZE(SSH)
 
 using SFtpHandle   = LIBSSH2_SFTP_HANDLE*;
 using SFtpAttrs    = LIBSSH2_SFTP_ATTRIBUTES;
diff --git uppsrc/Core/SSL/SSL.h uppsrc/Core/SSL/SSL.h
--- uppsrc/Core/SSL/SSL.h
+++ uppsrc/Core/SSL/SSL.h
@@ -7,9 +7,9 @@
 
 namespace Upp {
 	
-INITIALIZE(SSL);
-INITIALIZE(SSLSocket);
-INITIALIZE(P7S);
+INITIALIZE(SSL)
+INITIALIZE(SSLSocket)
+INITIALIZE(P7S)
 
 void SslInitThread();
 
diff --git uppsrc/Core/Speller.cpp uppsrc/Core/Speller.cpp
--- uppsrc/Core/Speller.cpp
+++ uppsrc/Core/Speller.cpp
@@ -430,4 +430,4 @@ Vector<String> SpellerFindCloseWords(int lang, const String& w, int n)
 	return r;
 }
 
-};
+}
diff --git uppsrc/Core/UnicodeInfo.cpp uppsrc/Core/UnicodeInfo.cpp
--- uppsrc/Core/UnicodeInfo.cpp
+++ uppsrc/Core/UnicodeInfo.cpp
@@ -244,4 +244,4 @@ bool IsMark_(dword c)
 	return Single<UnicodeInfo>().ismark.Find(c) >= 0;
 }
 
-};
+}
diff --git uppsrc/Core/Utf.cpp uppsrc/Core/Utf.cpp
--- uppsrc/Core/Utf.cpp
+++ uppsrc/Core/Utf.cpp
@@ -176,4 +176,4 @@ String Utf8ToLowerAscii(const String& src)
 	return r;
 }
 
-};
+}
diff --git uppsrc/Core/Util.h uppsrc/Core/Util.h
--- uppsrc/Core/Util.h
+++ uppsrc/Core/Util.h
@@ -136,13 +136,13 @@ String AsStringIniCurrent_##var() { return AsString(var); } \
 String AsStringIniDefault_##var() { return AsString(DefIni_##var()); } \
 INITBLOCK { AddIniInfo(#var, AsStringIniCurrent_##var, AsStringIniDefault_##var, info); }
 
-#define INI_BOOL(var, def, info)   INI_TYPE(var, def, info, bool, IniBool, 0);
-#define INI_INT(var, def, info)    INI_TYPE(var, def, info, int, IniInt, 0);
-#define INI_INT64(var, def, info)  INI_TYPE(var, def, info, int64, IniInt64, 0);
-#define INI_DOUBLE(var, def, info) INI_TYPE(var, def, info, double, IniDouble, 0);
+#define INI_BOOL(var, def, info)   INI_TYPE(var, def, info, bool, IniBool, 0)
+#define INI_INT(var, def, info)    INI_TYPE(var, def, info, int, IniInt, 0)
+#define INI_INT64(var, def, info)  INI_TYPE(var, def, info, int64, IniInt64, 0)
+#define INI_DOUBLE(var, def, info) INI_TYPE(var, def, info, double, IniDouble, 0)
 
 #define INI_STRING(var, def, info) String& DefRef_##var() { static String x; return x; }\
-                                   INI_TYPE(var, def, info, String, IniString, DefRef_##var);
+                                   INI_TYPE(var, def, info, String, IniString, DefRef_##var)
 
 VectorMap<String, String> LoadIniStream(Stream &in);
 VectorMap<String, String> LoadIniFile(const char *filename);
diff --git uppsrc/Core/Value.cpp uppsrc/Core/Value.cpp
--- uppsrc/Core/Value.cpp
+++ uppsrc/Core/Value.cpp
@@ -252,13 +252,13 @@ String Value::GetName(dword type)
 	return NameNdx()[q];
 }
 
-SVO_FN(s_String, String);
-SVO_FN(s_int, int);
-SVO_FN(s_double, double);
-SVO_FN(s_int64, int64);
-SVO_FN(s_bool, bool);
-SVO_FN(s_date, Date);
-SVO_FN(s_time, Time);
+SVO_FN(s_String, String)
+SVO_FN(s_int, int)
+SVO_FN(s_double, double)
+SVO_FN(s_int64, int64)
+SVO_FN(s_bool, bool)
+SVO_FN(s_date, Date)
+SVO_FN(s_time, Time)
 
 struct SvoVoidFn {
 	static bool       IsNull(const void *p)                      { return true; }
diff --git uppsrc/Core/XML.h uppsrc/Core/XML.h
--- uppsrc/Core/XML.h
+++ uppsrc/Core/XML.h
@@ -228,7 +228,7 @@ public:
 	
 	void           Shrink();
 	
-	rval_default(XmlNode);
+	rval_default(XmlNode)
 
 	XmlNode(const XmlNode& n, int);
 	
diff --git uppsrc/Core/Xmlize.cpp uppsrc/Core/Xmlize.cpp
--- uppsrc/Core/Xmlize.cpp
+++ uppsrc/Core/Xmlize.cpp
@@ -144,15 +144,15 @@ template<> String XmlAttrStore(const Time& var) {
 
 #define VALUE_XMLIZE(type) template <> void Xmlize(XmlIO& xml, type& var) { xml.Attr("value", var); }
 
-VALUE_XMLIZE(int);
-VALUE_XMLIZE(dword);
-VALUE_XMLIZE(double);
-VALUE_XMLIZE(bool);
-VALUE_XMLIZE(int16);
-VALUE_XMLIZE(int64);
-VALUE_XMLIZE(byte);
-VALUE_XMLIZE(Time);
-VALUE_XMLIZE(Date);
+VALUE_XMLIZE(int)
+VALUE_XMLIZE(dword)
+VALUE_XMLIZE(double)
+VALUE_XMLIZE(bool)
+VALUE_XMLIZE(int16)
+VALUE_XMLIZE(int64)
+VALUE_XMLIZE(byte)
+VALUE_XMLIZE(Time)
+VALUE_XMLIZE(Date)
 
 void XmlizeLangAttr(XmlIO& xml, int& lang, const char *id)
 {
diff --git uppsrc/Core/xxHsh.cpp uppsrc/Core/xxHsh.cpp
--- uppsrc/Core/xxHsh.cpp
+++ uppsrc/Core/xxHsh.cpp
@@ -72,4 +72,4 @@ int64 xxHash64(const String& s)
 	return xxHash64(~s, s.GetCount());
 }
 
-};
\ No newline at end of file
+}
diff --git uppsrc/CppBase/CppBase.h uppsrc/CppBase/CppBase.h
--- uppsrc/CppBase/CppBase.h
+++ uppsrc/CppBase/CppBase.h
@@ -298,7 +298,7 @@ public:
 
 struct SrcFile {
 	SrcFile();
-	rval_default(SrcFile);
+	rval_default(SrcFile)
 
 	String      text;
 	Vector<int> linepos;
@@ -340,7 +340,7 @@ inline bool IsCppType(int i)
 
 inline bool IsCppCode(int i) {
 	return i >= CONSTRUCTOR && i <= INLINEFRIEND;
-};
+}
 
 inline bool IsCppData(int i) {
 	return i >= VARIABLE && i <= ENUM;
@@ -444,7 +444,7 @@ struct Parser {
 		String  Dump() const;
 		
 		Context() {}
-		rval_default(Context);
+		rval_default(Context)
 	};
 
 	struct Decla {
@@ -474,7 +474,7 @@ struct Parser {
 	struct Decl : Decla {
 		Array<Decl> param;
 		
-		rval_default(Decl);
+		rval_default(Decl)
 		Decl() {}
 	};
 
diff --git uppsrc/CppBase/Expression.cpp uppsrc/CppBase/Expression.cpp
--- uppsrc/CppBase/Expression.cpp
+++ uppsrc/CppBase/Expression.cpp
@@ -542,4 +542,4 @@ Vector<String> MakeXP(const char *s)
 	return xp;
 }
 
-};
\ No newline at end of file
+}
diff --git uppsrc/CppBase/ppconfig.cpp uppsrc/CppBase/ppconfig.cpp
--- uppsrc/CppBase/ppconfig.cpp
+++ uppsrc/CppBase/ppconfig.cpp
@@ -48,4 +48,4 @@ String GetStdDefs()
 	return defs;
 }
 
-};
\ No newline at end of file
+}
diff --git uppsrc/CtrlCore/Ctrl.cpp uppsrc/CtrlCore/Ctrl.cpp
--- uppsrc/CtrlCore/Ctrl.cpp
+++ uppsrc/CtrlCore/Ctrl.cpp
@@ -473,7 +473,7 @@ void Ctrl::UpdateActionRefresh() {
 	Update();
 	Action();
 	Refresh();
-};
+}
 
 void  Ctrl::CancelModeDeep() {
 	GuiLock __;
@@ -1006,17 +1006,17 @@ void Ctrl::ReSkin()
 	lock--;
 }
 
-CH_INT(GUI_GlobalStyle, GUISTYLE_CLASSIC);
-CH_INT(GUI_DragFullWindow, 1);
-CH_INT(GUI_PopUpEffect, GUIEFFECT_SLIDE);
-CH_INT(GUI_ToolTips, 1);
-CH_INT(GUI_ToolTipDelay, 1000);
-CH_INT(GUI_DropShadows, 1);
-CH_INT(GUI_AltAccessKeys, 1);
-CH_INT(GUI_AKD_Conservative, 0);
-CH_INT(GUI_DragDistance, 4);
-CH_INT(GUI_DblClickTime, 500);
-CH_INT(GUI_WheelScrollLines, 3);
+CH_INT(GUI_GlobalStyle, GUISTYLE_CLASSIC)
+CH_INT(GUI_DragFullWindow, 1)
+CH_INT(GUI_PopUpEffect, GUIEFFECT_SLIDE)
+CH_INT(GUI_ToolTips, 1)
+CH_INT(GUI_ToolTipDelay, 1000)
+CH_INT(GUI_DropShadows, 1)
+CH_INT(GUI_AltAccessKeys, 1)
+CH_INT(GUI_AKD_Conservative, 0)
+CH_INT(GUI_DragDistance, 4)
+CH_INT(GUI_DblClickTime, 500)
+CH_INT(GUI_WheelScrollLines, 3)
 
 String Ctrl::Name0() const {
 	GuiLock __;
diff --git uppsrc/CtrlCore/Frame.cpp uppsrc/CtrlCore/Frame.cpp
--- uppsrc/CtrlCore/Frame.cpp
+++ uppsrc/CtrlCore/Frame.cpp
@@ -42,7 +42,7 @@ CtrlFrame& WhiteFrame() { static BorderFrame h(WhiteBorder()); return h; }
 CtrlFrame& OutsetFrame() { static BorderFrame h(OutsetBorder()); return h; }
 CtrlFrame& ThinOutsetFrame() { static BorderFrame h(ThinOutsetBorder()); return h; }
 
-CH_COLOR(FieldFrameColor, Blend(SColorHighlight, SColorShadow));
+CH_COLOR(FieldFrameColor, Blend(SColorHighlight, SColorShadow))
 
 class XPFieldFrameCls : public CtrlFrame {
 	virtual void FrameLayout(Rect& r)                   { r.Deflate(2); }
@@ -64,12 +64,12 @@ class XPEditFieldFrameCls : public CtrlFrame {
 CtrlFrame& XPFieldFrame() { return Single<XPFieldFrameCls>(); }
 CtrlFrame& XPEditFieldFrame() { return Single<XPEditFieldFrameCls>(); }
 
-CH_INT(EditFieldIsThin, 0);
+CH_INT(EditFieldIsThin, 0)
 
 CtrlFrame& FieldFrame() { return GUI_GlobalStyle() >= GUISTYLE_XP ? XPFieldFrame() : InsetFrame(); }
 
-CH_VALUE(TopSeparator1, SColorShadow());
-CH_VALUE(TopSeparator2, SColorLight());
+CH_VALUE(TopSeparator1, SColorShadow())
+CH_VALUE(TopSeparator2, SColorLight())
 
 class TopSeparatorFrameCls : public CtrlFrame {
 	virtual void FrameLayout(Rect& r)                   { r.top += 2; }
@@ -112,8 +112,8 @@ CtrlFrame& TopSeparatorFrame()    { return Single<TopSeparatorFrameCls>(); }
 CtrlFrame& RightSeparatorFrame()  { return Single<RightSeparatorFrameCls>(); }
 CtrlFrame& LeftSeparatorFrame()   { return Single<LeftSeparatorFrameCls>(); }
 
-CH_INT(FrameButtonWidth, DPI(17));
-CH_INT(ScrollBarArrowSize, FrameButtonWidth());
+CH_INT(FrameButtonWidth, DPI(17))
+CH_INT(ScrollBarArrowSize, FrameButtonWidth())
 
 void LayoutFrameLeft(Rect& r, Ctrl *ctrl, int cx)
 {
diff --git uppsrc/CtrlCore/TopWindow.cpp uppsrc/CtrlCore/TopWindow.cpp
--- uppsrc/CtrlCore/TopWindow.cpp
+++ uppsrc/CtrlCore/TopWindow.cpp
@@ -526,7 +526,7 @@ void Maxisize(TopWindow& win, int screencxmax)
 		win.Maximize();
 }
 
-CH_INT(SwapOKCancel, 0);
+CH_INT(SwapOKCancel, 0)
 
 void ArrangeOKCancel(Ctrl& ok, Ctrl& cancel)
 {
diff --git uppsrc/CtrlLib/ChCoco.h uppsrc/CtrlLib/ChCoco.h
--- uppsrc/CtrlLib/ChCoco.h
+++ uppsrc/CtrlLib/ChCoco.h
@@ -13,6 +13,6 @@ Image Coco_ThemeImage(int cx, int cy, int margin, int type,
 
 Color CocoBrush(int k);
 
-};
+}
 
 #endif
diff --git uppsrc/CtrlLib/ChGtk.h uppsrc/CtrlLib/ChGtk.h
--- uppsrc/CtrlLib/ChGtk.h
+++ uppsrc/CtrlLib/ChGtk.h
@@ -155,6 +155,6 @@ void GtkChScrollBar(Value *lbutton, Value *lbutton2,
                     Value *ubutton2, Value *ubutton,
                     int i_larrow, int i_uarrow, bool horz);
 
-};
+}
 
 #endif
diff --git uppsrc/CtrlLib/CtrlLib.h uppsrc/CtrlLib/CtrlLib.h
--- uppsrc/CtrlLib/CtrlLib.h
+++ uppsrc/CtrlLib/CtrlLib.h
@@ -9,7 +9,7 @@
 
 namespace Upp {
 
-INITIALIZE(CtrlLib);
+INITIALIZE(CtrlLib)
 
 #define IMAGECLASS CtrlImg
 #define IMAGEFILE <CtrlLib/Ctrl.iml>
diff --git uppsrc/CtrlLib/CtrlLibInit.cpp uppsrc/CtrlLib/CtrlLibInit.cpp
--- uppsrc/CtrlLib/CtrlLibInit.cpp
+++ uppsrc/CtrlLib/CtrlLibInit.cpp
@@ -13,6 +13,6 @@ INITIALIZER(CtrlLib) {
 #else
 	CtrlSetDefaultSkin(ChStdSkin, ChStdSkin);
 #endif
-};
+}
 
 }
diff --git uppsrc/CtrlLib/CtrlUtil.cpp uppsrc/CtrlLib/CtrlUtil.cpp
--- uppsrc/CtrlLib/CtrlUtil.cpp
+++ uppsrc/CtrlLib/CtrlUtil.cpp
@@ -375,7 +375,7 @@ void MemoryProfileInfo() {
 	if(peak)
 		text << "\r\n=== Peak memory profile\r\n" << sProfile(*peak);
 	PromptOK("[C " + DeQtfLf(text));
-};
+}
 
 FileSelButton::FileSelButton(MODE mode, const char *title)
 : title(title), mode(mode)
diff --git uppsrc/CtrlLib/DlgColor.cpp uppsrc/CtrlLib/DlgColor.cpp
--- uppsrc/CtrlLib/DlgColor.cpp
+++ uppsrc/CtrlLib/DlgColor.cpp
@@ -896,7 +896,7 @@ static void InitColor(Color *out)
 	out[13] = Color(0xFF, 0x00, 0xFF);
 	out[14] = Color(0x00, 0x80, 0x80);
 	out[15] = Color(0x00, 0xFF, 0xFF);
-};
+}
 
 PalCtrl::Config& PalCtrl::GlobalConfig()
 {
diff --git uppsrc/CtrlLib/DropTree.cpp uppsrc/CtrlLib/DropTree.cpp
--- uppsrc/CtrlLib/DropTree.cpp
+++ uppsrc/CtrlLib/DropTree.cpp
@@ -2,7 +2,7 @@
 
 namespace Upp {
 
-CH_VALUE(TreeDropEdge, ChBorder(BlackBorder()));
+CH_VALUE(TreeDropEdge, ChBorder(BlackBorder()))
 
 CtrlFrame& TreeDropFrame()
 {
@@ -225,4 +225,4 @@ DropTree::DropTree()
 	dropwidth = 0;
 }
 
-};
+}
diff --git uppsrc/CtrlLib/EditField.cpp uppsrc/CtrlLib/EditField.cpp
--- uppsrc/CtrlLib/EditField.cpp
+++ uppsrc/CtrlLib/EditField.cpp
@@ -2,7 +2,7 @@
 
 namespace Upp {
 
-CH_VALUE(ViewEdge, CtrlsImg::VE());
+CH_VALUE(ViewEdge, CtrlsImg::VE())
 
 Value EditFieldEdge()
 {
diff --git uppsrc/CtrlLib/PopupTable.cpp uppsrc/CtrlLib/PopupTable.cpp
--- uppsrc/CtrlLib/PopupTable.cpp
+++ uppsrc/CtrlLib/PopupTable.cpp
@@ -2,7 +2,7 @@
 
 namespace Upp {
 
-CH_VALUE(DropEdge, ChBorder(BlackBorder()));
+CH_VALUE(DropEdge, ChBorder(BlackBorder()))
 
 CtrlFrame& DropFrame()
 {
diff --git uppsrc/CtrlLib/Prompt.cpp uppsrc/CtrlLib/Prompt.cpp
--- uppsrc/CtrlLib/Prompt.cpp
+++ uppsrc/CtrlLib/Prompt.cpp
@@ -193,10 +193,10 @@ int ErrorOKCancel(const char *qtf) {
 	return Prompt(Ctrl::GetAppName(), CtrlImg::error(), qtf, t_("OK"), t_("Cancel"));
 }
 
-CH_IMAGE(YesButtonImage, Null);
-CH_IMAGE(NoButtonImage, Null);
-CH_IMAGE(AbortButtonImage, Null);
-CH_IMAGE(RetryButtonImage, Null);
+CH_IMAGE(YesButtonImage, Null)
+CH_IMAGE(NoButtonImage, Null)
+CH_IMAGE(AbortButtonImage, Null)
+CH_IMAGE(RetryButtonImage, Null)
 
 int PromptYesNo(const char *qtf) {
 	BeepQuestion();
diff --git uppsrc/CtrlLib/ScrollBar.cpp uppsrc/CtrlLib/ScrollBar.cpp
--- uppsrc/CtrlLib/ScrollBar.cpp
+++ uppsrc/CtrlLib/ScrollBar.cpp
@@ -597,7 +597,7 @@ Image SizeGrip::CursorImage(Point p, dword)
 	return Image::Arrow();
 }
 
-CH_IMAGE(SizeGripImg, CtrlsImg::SizeGrip());
+CH_IMAGE(SizeGripImg, CtrlsImg::SizeGrip())
 
 void SizeGrip::Paint(Draw& w)
 {
diff --git uppsrc/CtrlLib/Static.cpp uppsrc/CtrlLib/Static.cpp
--- uppsrc/CtrlLib/Static.cpp
+++ uppsrc/CtrlLib/Static.cpp
@@ -79,10 +79,10 @@ Label::Label() {
 
 Label::~Label() {}
 
-CH_COLOR(LabelBoxColor, SColorShadow());
+CH_COLOR(LabelBoxColor, SColorShadow())
 
-CH_COLOR(LabelBoxTextColor, SColorText());
-CH_COLOR(LabelBoxDisabledTextColor, SColorDisabled());
+CH_COLOR(LabelBoxTextColor, SColorText())
+CH_COLOR(LabelBoxDisabledTextColor, SColorDisabled())
 
 LabelBox::LabelBox()
 {
@@ -316,7 +316,7 @@ void SeparatorCtrl::Paint(Draw& w) {
 		ChPaint(w, q - 1, lmargin, 1, sz.cy - (lmargin + rmargin), style->l1);
 		ChPaint(w, q, lmargin, 1, sz.cy - (lmargin + rmargin), style->l2);
 	}
-};
+}
 
 SeparatorCtrl& SeparatorCtrl::Margin(int l, int r)
 {
diff --git uppsrc/CtrlLib/StatusBar.cpp uppsrc/CtrlLib/StatusBar.cpp
--- uppsrc/CtrlLib/StatusBar.cpp
+++ uppsrc/CtrlLib/StatusBar.cpp
@@ -119,7 +119,7 @@ int InfoCtrl::GetRealTabWidth(int tabi, int width) const
 
 void InfoCtrl::FrameLayout(Rect& r) {
 	(right ? LayoutFrameRight : LayoutFrameLeft)(r, this, cx ? cx : r.Height());
-};
+}
 
 class VCenterDisplay : public Display
 {
@@ -277,7 +277,7 @@ void ProgressDisplayCls::Paint(Draw& w, const Rect& _r, const Value& q,
 		w.DrawRect(r.left + pos - 1, r.top + 1, 1, r.Height() - 1, SColorLight);
 	}
 	w.DrawRect(r.left + pos, r.top, r.Width() - pos, r.Height(), SColorPaper);
-};
+}
 
 Display& ProgressDisplay()
 {
diff --git uppsrc/CtrlLib/key_header.h uppsrc/CtrlLib/key_header.h
--- uppsrc/CtrlLib/key_header.h
+++ uppsrc/CtrlLib/key_header.h
@@ -18,7 +18,7 @@ namespace KEYNAMESPACE {
 #include KEYFILE
 
 #ifdef KEYNAMESPACE
-};
+}
 #endif
 
 #ifdef KEYNAMESPACE
diff --git uppsrc/Draw/DrawRasterData.cpp uppsrc/Draw/DrawRasterData.cpp
--- uppsrc/Draw/DrawRasterData.cpp
+++ uppsrc/Draw/DrawRasterData.cpp
@@ -30,7 +30,7 @@ void cDrawRasterData::Render(ImageBuffer& ib)
 INITBLOCK
 {
 	DataDrawer::Register<cDrawRasterData>("image_data");
-};
+}
 
 void DrawRasterData(Draw& w, int x, int y, int cx, int cy, const String& data)
 {
diff --git uppsrc/Draw/SSettings.cpp uppsrc/Draw/SSettings.cpp
--- uppsrc/Draw/SSettings.cpp
+++ uppsrc/Draw/SSettings.cpp
@@ -2,24 +2,24 @@
 
 namespace Upp {
 
-CH_COLOR(SBlack, AdjustIfDark(Black()));
-CH_COLOR(SGray, AdjustIfDark(Gray()));
-CH_COLOR(SLtGray, AdjustIfDark(LtGray()));
-CH_COLOR(SWhiteGray, AdjustIfDark(WhiteGray()));
-CH_COLOR(SWhite, AdjustIfDark(White()));
-CH_COLOR(SRed, AdjustIfDark(Red()));
-CH_COLOR(SGreen, AdjustIfDark(Green()));
-CH_COLOR(SBrown, AdjustIfDark(Brown()));
-CH_COLOR(SBlue, AdjustIfDark(Blue()));
-CH_COLOR(SMagenta, AdjustIfDark(Magenta()));
-CH_COLOR(SCyan, AdjustIfDark(Cyan()));
-CH_COLOR(SYellow, AdjustIfDark(Yellow()));
-CH_COLOR(SLtRed, AdjustIfDark(LtRed()));
-CH_COLOR(SLtGreen, AdjustIfDark(LtGreen()));
-CH_COLOR(SLtYellow, AdjustIfDark(LtYellow()));
-CH_COLOR(SLtBlue, AdjustIfDark(LtBlue()));
-CH_COLOR(SLtMagenta, AdjustIfDark(LtMagenta()));
-CH_COLOR(SLtCyan, AdjustIfDark(LtCyan()));
+CH_COLOR(SBlack, AdjustIfDark(Black()))
+CH_COLOR(SGray, AdjustIfDark(Gray()))
+CH_COLOR(SLtGray, AdjustIfDark(LtGray()))
+CH_COLOR(SWhiteGray, AdjustIfDark(WhiteGray()))
+CH_COLOR(SWhite, AdjustIfDark(White()))
+CH_COLOR(SRed, AdjustIfDark(Red()))
+CH_COLOR(SGreen, AdjustIfDark(Green()))
+CH_COLOR(SBrown, AdjustIfDark(Brown()))
+CH_COLOR(SBlue, AdjustIfDark(Blue()))
+CH_COLOR(SMagenta, AdjustIfDark(Magenta()))
+CH_COLOR(SCyan, AdjustIfDark(Cyan()))
+CH_COLOR(SYellow, AdjustIfDark(Yellow()))
+CH_COLOR(SLtRed, AdjustIfDark(LtRed()))
+CH_COLOR(SLtGreen, AdjustIfDark(LtGreen()))
+CH_COLOR(SLtYellow, AdjustIfDark(LtYellow()))
+CH_COLOR(SLtBlue, AdjustIfDark(LtBlue()))
+CH_COLOR(SLtMagenta, AdjustIfDark(LtMagenta()))
+CH_COLOR(SLtCyan, AdjustIfDark(LtCyan()))
 
 bool dark_theme__;
 
@@ -30,22 +30,22 @@ CH_VAR0(ChColor, Color, SColorPaper, White())
 	Iml::ResetAll();
 CH_END
 
-CH_COLOR(SColorFace, LtGray());
-CH_COLOR(SColorText, Black());
-CH_COLOR(SColorHighlight, Blue());
-CH_COLOR(SColorHighlightText, White());
-CH_COLOR(SColorMenu, LtGray());
-CH_COLOR(SColorMenuText, Black());
-CH_COLOR(SColorInfo, LtYellow());
-CH_COLOR(SColorInfoText, Black());
-CH_COLOR(SColorDisabled, Gray());
-CH_COLOR(SColorLight, White());
-CH_COLOR(SColorShadow, Gray());
-CH_COLOR(SColorMark, IsDark(SColorPaper()) ? DarkTheme(LtBlue()) : LtBlue());
-CH_COLOR(SColorMenuMark, IsDark(SColorMenu()) ? DarkTheme(LtBlue()) : LtBlue());
-
-CH_COLOR(SColorLtFace, Blend(SColorFace, SColorLight));
-CH_COLOR(SColorDkShadow, Blend(SColorShadow, SColorText));
-CH_COLOR(SColorLabel, SColorText());
+CH_COLOR(SColorFace, LtGray())
+CH_COLOR(SColorText, Black())
+CH_COLOR(SColorHighlight, Blue())
+CH_COLOR(SColorHighlightText, White())
+CH_COLOR(SColorMenu, LtGray())
+CH_COLOR(SColorMenuText, Black())
+CH_COLOR(SColorInfo, LtYellow())
+CH_COLOR(SColorInfoText, Black())
+CH_COLOR(SColorDisabled, Gray())
+CH_COLOR(SColorLight, White())
+CH_COLOR(SColorShadow, Gray())
+CH_COLOR(SColorMark, IsDark(SColorPaper()) ? DarkTheme(LtBlue()) : LtBlue())
+CH_COLOR(SColorMenuMark, IsDark(SColorMenu()) ? DarkTheme(LtBlue()) : LtBlue())
+
+CH_COLOR(SColorLtFace, Blend(SColorFace, SColorLight))
+CH_COLOR(SColorDkShadow, Blend(SColorShadow, SColorText))
+CH_COLOR(SColorLabel, SColorText())
 
 }
diff --git uppsrc/Draw/Uhd.cpp uppsrc/Draw/Uhd.cpp
--- uppsrc/Draw/Uhd.cpp
+++ uppsrc/Draw/Uhd.cpp
@@ -16,7 +16,7 @@ namespace Upscale2x_helper {
 		     +  7 * (r * -169 + g * -331 + b *  500)
 		     +  6 * (r *  500 + g * -419 + b *  -81);
 	}
-};
+}
 
 Image Upscale2x(const Image& src, RGBA bg)
 {
@@ -157,4 +157,4 @@ Image DPI(const Image& img, int expected)
 	return img;
 }
 
-};
\ No newline at end of file
+}
diff --git uppsrc/Geom/Coords/GeomCoords.h uppsrc/Geom/Coords/GeomCoords.h
--- uppsrc/Geom/Coords/GeomCoords.h
+++ uppsrc/Geom/Coords/GeomCoords.h
@@ -779,7 +779,7 @@ public:
 	Point     target2;
 	One<Node> split;
 	
-	rval_default(LinearSegmentTree);
+	rval_default(LinearSegmentTree)
 	LinearSegmentTree() {}
 };
 
@@ -795,7 +795,7 @@ public:
 		Point      trg_topleft, trg_topright, trg_bottomleft, trg_bottomright;
 		One<Split> split;
 		
-		rval_default(Node);
+		rval_default(Node)
 		Node() {}
 	};
 
@@ -810,7 +810,7 @@ public:
 public:
 	Node root;
 	
-	rval_default(PlanarSegmentTree);
+	rval_default(PlanarSegmentTree)
 	PlanarSegmentTree() {}
 };
 
diff --git uppsrc/GridCtrl/GridCtrl.h uppsrc/GridCtrl/GridCtrl.h
--- uppsrc/GridCtrl/GridCtrl.h
+++ uppsrc/GridCtrl/GridCtrl.h
@@ -21,7 +21,7 @@ namespace GF
 		SKIP_CURRENT_ROW = BIT(0),
 		SKIP_HIDDEN = BIT(1)
 	};
-};
+}
 
 class GridFind : public EditString
 {
@@ -231,7 +231,7 @@ class CtrlsHolder : public Ctrl
 class GridClipboard : Moveable<GridClipboard>
 {
 	public:
-		rval_default(GridClipboard);
+		rval_default(GridClipboard)
 		GridClipboard() {}
 
 		struct ClipboardData : Moveable<ClipboardData>
diff --git uppsrc/PdfDraw/PdfDraw.h uppsrc/PdfDraw/PdfDraw.h
--- uppsrc/PdfDraw/PdfDraw.h
+++ uppsrc/PdfDraw/PdfDraw.h
@@ -7,7 +7,7 @@
 
 namespace Upp {
 
-INITIALIZE(PdfDraw);
+INITIALIZE(PdfDraw)
 
 class TTFReader {
 	struct TTFStream {
diff --git uppsrc/RichText/Object.cpp uppsrc/RichText/Object.cpp
--- uppsrc/RichText/Object.cpp
+++ uppsrc/RichText/Object.cpp
@@ -398,7 +398,7 @@ RichObject CreatePaintingObject(const Painting& pw, int cx, int cy)
 
 INITBLOCK {
 	RichObject::Register("Drawing", &Single<RichObjectTypeDrawingCls>());
-};
+}
 
 struct RichObjectTypePNGCls : public RichObjectType
 {
@@ -479,6 +479,6 @@ void RichObjectTypePNGCls::Paint(const Value& data, Draw& w, Size sz) const
 
 INITBLOCK {
 	RichObject::Register("PING", &Single<RichObjectTypePNGCls>());
-};
+}
 
 }
diff --git uppsrc/RichText/Para.h uppsrc/RichText/Para.h
--- uppsrc/RichText/Para.h
+++ uppsrc/RichText/Para.h
@@ -214,7 +214,7 @@ struct RichPara {
 		void                 Justify(const Format& format);
 		int                  BodyHeight() const;
 
-		rval_default(Lines);
+		rval_default(Lines)
 	
 		Lines();
 		~Lines();
@@ -288,7 +288,7 @@ struct RichPara {
 	
 	void        CacheId(int64 id);
 
-	rval_default(RichPara);
+	rval_default(RichPara)
 
 	RichPara();
 	~RichPara();
diff --git uppsrc/RichText/RichImage.cpp uppsrc/RichText/RichImage.cpp
--- uppsrc/RichText/RichImage.cpp
+++ uppsrc/RichText/RichImage.cpp
@@ -95,7 +95,7 @@ Image  RichImage::ToImage(const Value& data, Size sz, void *) const
 
 INITBLOCK {
 	RichObject::Register("image", &Single<RichImage>());
-};
+}
 
 RichObject CreateImageObject(const Image& img, int cx, int cy)
 {
@@ -176,7 +176,7 @@ Image RichPNG::ToImage(const Value& data, Size sz, void *) const
 
 INITBLOCK {
 	RichObject::Register("PNG", &Single<RichPNG>());
-};
+}
 
 struct RichRawImage : public RichObjectType {
 	virtual String GetTypeName(const Value& v) const;
@@ -271,7 +271,7 @@ Image RichRawImage::ToImage(const Value& data, Size sz, void *) const
 
 INITBLOCK {
 	RichObject::Register("rawimage", &Single<RichRawImage>());
-};
+}
 
 RichObject CreateRawImageObject(const String& s, int cx, int cy)
 {
@@ -328,7 +328,7 @@ Image RichImlImage::ToImage(const Value& data, Size sz, void *) const
 
 INITBLOCK {
 	RichObject::Register("iml", &Single<RichImlImage>());
-};
+}
 
 #endif
 
diff --git uppsrc/RichText/RichText.h uppsrc/RichText/RichText.h
--- uppsrc/RichText/RichText.h
+++ uppsrc/RichText/RichText.h
@@ -10,7 +10,7 @@ namespace Upp {
 #define IMAGEFILE <RichText/RichText.iml>
 #include <Draw/iml_header.h>
 
-INITIALIZE(RichImage);
+INITIALIZE(RichImage)
 
 class  PasteClip;
 struct RichPara;
diff --git uppsrc/RichText/Table.h uppsrc/RichText/Table.h
--- uppsrc/RichText/Table.h
+++ uppsrc/RichText/Table.h
@@ -43,7 +43,7 @@ private:
 	friend class RichText;
 
 public:
-	rval_default(RichCell);
+	rval_default(RichCell)
 
 	RichCell(const RichCell& src, int);
 	RichCell();
@@ -112,7 +112,7 @@ private:
 		PaintRow& operator[](int i)                 { return row[i]; }
 		const PaintRow& operator[](int i) const     { return row[i]; }
 		
-		rval_default(Layout); // Old CLANG requires this
+		rval_default(Layout) // Old CLANG requires this
 		Layout() {}
 	};
 
@@ -125,7 +125,7 @@ private:
 		Rect              next_page;
 		Rect              header_page;
 		
-		rval_default(TabLayout); // Old CLANG requires this
+		rval_default(TabLayout) // Old CLANG requires this
 		TabLayout() {}
 	};
 
@@ -238,7 +238,7 @@ public:
 
 	void          Normalize();
 
-	rval_default(RichTable);
+	rval_default(RichTable)
 
 	RichTable(const RichTable& src, int);
 	RichTable();
diff --git uppsrc/RichText/Txt.h uppsrc/RichText/Txt.h
--- uppsrc/RichText/Txt.h
+++ uppsrc/RichText/Txt.h
@@ -258,7 +258,7 @@ public:
 	RichTxt(const RichTxt& src, int);
 	RichTxt();
 
-	rval_default(RichTxt);
+	rval_default(RichTxt)
 
 #ifdef _DEBUG
 	void                  Dump();
diff --git uppsrc/Skylark/App.cpp uppsrc/Skylark/App.cpp
--- uppsrc/Skylark/App.cpp
+++ uppsrc/Skylark/App.cpp
@@ -16,8 +16,8 @@ String GetThreadName()
 }
 	
 namespace Ini {
-	INI_BOOL(skylark_log, false, "Trace of Skylark");
-};
+	INI_BOOL(skylark_log, false, "Trace of Skylark")
+}
 
 #ifdef PLATFORM_WIN32
 BOOL WINAPI SkylarkApp::CtrlCHandlerRoutine(DWORD dwCtrlType)
@@ -279,24 +279,24 @@ const SkylarkConfig& SkylarkApp::Config()
 }
 
 namespace Ini {
-INI_INT(port, 8001, "TCP/IP server port to listen on");
-INI_STRING(ip, "0.0.0.0", "IP address to listen on");
-INI_STRING(path, Nvl(GetEnv("UPP_ASSEMBLY__"), GetFileFolder(GetExeFilePath())), "Path to witz templates and static files");
-INI_INT(threads, 3 * CPU_Cores() + 1, "Number of threads in each Skylark subprocess");
+INI_INT(port, 8001, "TCP/IP server port to listen on")
+INI_STRING(ip, "0.0.0.0", "IP address to listen on")
+INI_STRING(path, Nvl(GetEnv("UPP_ASSEMBLY__"), GetFileFolder(GetExeFilePath())), "Path to witz templates and static files")
+INI_INT(threads, 3 * CPU_Cores() + 1, "Number of threads in each Skylark subprocess")
 #ifdef _DEBUG
-INI_INT(prefork, 0, "Number of preforked Skylark subprocesses");
-INI_INT(timeout, 0, "Timeout in seconds for Skylark event handler");
-INI_BOOL(use_caching, false, "Cache compiled witz templates or other data");
+INI_INT(prefork, 0, "Number of preforked Skylark subprocesses")
+INI_INT(timeout, 0, "Timeout in seconds for Skylark event handler")
+INI_BOOL(use_caching, false, "Cache compiled witz templates or other data")
 INI_INT(caching, 1, "Agressivity of caching on static/** "
-                    "(0=no caching, 1=use ETag header, 2=use versioned path)");
+                    "(0=no caching, 1=use ETag header, 2=use versioned path)")
 #else
-INI_INT(prefork, 1, "Number of preforked Skylark subprocesses");
-INI_INT(timeout, 300, "Timeout in seconds for Skylark event handler");
-INI_BOOL(use_caching, true, "Cache compiled witz templates or other data");
+INI_INT(prefork, 1, "Number of preforked Skylark subprocesses")
+INI_INT(timeout, 300, "Timeout in seconds for Skylark event handler")
+INI_BOOL(use_caching, true, "Cache compiled witz templates or other data")
 INI_INT(caching, 1, "Agressivity of caching on static/** "
-                    "(0=no caching, 1=use ETag header, 2=use versioned path)");
+                    "(0=no caching, 1=use ETag header, 2=use versioned path)")
 #endif
-};
+}
 
 SkylarkApp::SkylarkApp()
 {
@@ -317,4 +317,4 @@ SkylarkApp::~SkylarkApp()
 	app = NULL;
 }
 
-};
\ No newline at end of file
+}
diff --git uppsrc/Skylark/Compile.cpp uppsrc/Skylark/Compile.cpp
--- uppsrc/Skylark/Compile.cpp
+++ uppsrc/Skylark/Compile.cpp
@@ -436,4 +436,4 @@ One<Exe> Compile(const char *code, const Index<String>& vars)
 	return exe;
 }
 
-};
\ No newline at end of file
+}
diff --git uppsrc/Skylark/Dispatch.cpp uppsrc/Skylark/Dispatch.cpp
--- uppsrc/Skylark/Dispatch.cpp
+++ uppsrc/Skylark/Dispatch.cpp
@@ -30,7 +30,7 @@ struct DispatchNode : Moveable<DispatchNode> { // Single node in url hierarchy t
 	
 	enum { GET, POST };
 	
-	rval_default(DispatchNode);
+	rval_default(DispatchNode)
 
 	DispatchNode() { argpos = Null; method = GET; post_raw = false; progress = NULL;}
 };
@@ -518,4 +518,4 @@ void Http::Finalize()
     }
 }
 
-};
+}
diff --git uppsrc/Skylark/Exe.cpp uppsrc/Skylark/Exe.cpp
--- uppsrc/Skylark/Exe.cpp
+++ uppsrc/Skylark/Exe.cpp
@@ -426,4 +426,4 @@ String Render(const One<Exe>& exe, Renderer *r, Vector<Value>& var)
 	return x.out;
 }
 
-};
+}
diff --git uppsrc/Skylark/Http.cpp uppsrc/Skylark/Http.cpp
--- uppsrc/Skylark/Http.cpp
+++ uppsrc/Skylark/Http.cpp
@@ -436,4 +436,4 @@ Http& Http::UxRun(const String& js_code)
 	return Ux("!", js_code);
 }
 
-};
+}
diff --git uppsrc/Skylark/Iml/Lib.icpp uppsrc/Skylark/Iml/Lib.icpp
--- uppsrc/Skylark/Iml/Lib.icpp
+++ uppsrc/Skylark/Iml/Lib.icpp
@@ -28,6 +28,6 @@ Value ImlImg(const Vector<Value>& arg, const Renderer *)
 
 INITBLOCK {
 	Compiler::Register("ImlImg", ImlImg);
-};
+}
 
-};
+}
diff --git uppsrc/Skylark/Optimize.cpp uppsrc/Skylark/Optimize.cpp
--- uppsrc/Skylark/Optimize.cpp
+++ uppsrc/Skylark/Optimize.cpp
@@ -157,4 +157,4 @@ void Compiler::Optimize(One<Exe>& exe)
 	optimized = optimized2;
 }
 
-};
\ No newline at end of file
+}
diff --git uppsrc/Skylark/Preprocess.cpp uppsrc/Skylark/Preprocess.cpp
--- uppsrc/Skylark/Preprocess.cpp
+++ uppsrc/Skylark/Preprocess.cpp
@@ -129,4 +129,4 @@ String GetPreprocessedTemplate(const String& name, int lang)
 	return Join(Split(r, '\n', false), "\r\n");
 }
 
-};
\ No newline at end of file
+}
diff --git uppsrc/Skylark/Renderer.cpp uppsrc/Skylark/Renderer.cpp
--- uppsrc/Skylark/Renderer.cpp
+++ uppsrc/Skylark/Renderer.cpp
@@ -106,4 +106,4 @@ Renderer::~Renderer()
 {
 }
 
-};
\ No newline at end of file
+}
diff --git uppsrc/Skylark/Session.cpp uppsrc/Skylark/Session.cpp
--- uppsrc/Skylark/Session.cpp
+++ uppsrc/Skylark/Session.cpp
@@ -8,15 +8,15 @@
 namespace Upp {
 
 namespace Ini {
-INI_STRING(session_cookie, "__skylark_session_cookie__", "Skylark session cookie ID");
-INI_STRING(session_dir, ConfigFile("session"), "Directory that contains Skylark session files");
-INI_STRING(session_format, "BINARY", "Skylark session format ('BINARY', 'JSON', 'XML')");
-INI_STRING(session_table, "", "SQL table used to store Skylark sessions; if empty, sessions are stored in files");
-INI_STRING(session_id_column, "ID", "Primary key of SQL table used to store Skylark sessions");
-INI_STRING(session_data_column, "DATA", "Name of SQL 'text' column used to store Skylark sessions data");
-INI_STRING(session_lastwrite_column, "LASTWRITE", "Name of SQL timestamp column used to store Skylark session last update time");
-INI_INT(session_expire, 3600 * 24 * 365, "Number of seconds after which Skylark session expires and can be deleted");
-};
+INI_STRING(session_cookie, "__skylark_session_cookie__", "Skylark session cookie ID")
+INI_STRING(session_dir, ConfigFile("session"), "Directory that contains Skylark session files")
+INI_STRING(session_format, "BINARY", "Skylark session format ('BINARY', 'JSON', 'XML')")
+INI_STRING(session_table, "", "SQL table used to store Skylark sessions; if empty, sessions are stored in files")
+INI_STRING(session_id_column, "ID", "Primary key of SQL table used to store Skylark sessions")
+INI_STRING(session_data_column, "DATA", "Name of SQL 'text' column used to store Skylark sessions data")
+INI_STRING(session_lastwrite_column, "LASTWRITE", "Name of SQL timestamp column used to store Skylark session last update time")
+INI_INT(session_expire, 3600 * 24 * 365, "Number of seconds after which Skylark session expires and can be deleted")
+}
 
 SkylarkSessionConfig::SkylarkSessionConfig()
 {
@@ -184,4 +184,4 @@ Http& Http::SetLanguage(int lang_)
 	return *this;
 }
 
-};
\ No newline at end of file
+}
diff --git uppsrc/Skylark/Skylark.h uppsrc/Skylark/Skylark.h
--- uppsrc/Skylark/Skylark.h
+++ uppsrc/Skylark/Skylark.h
@@ -7,7 +7,7 @@ namespace Upp {
 	
 namespace Ini {
 extern IniBool skylark_log;
-};
+}
 
 String GetThreadName();
 
@@ -109,6 +109,6 @@ public:
 #include "Witz.h"
 #include "Http.h"
 
-};
+}
 
 #endif
diff --git uppsrc/Skylark/Sql.cpp uppsrc/Skylark/Sql.cpp
--- uppsrc/Skylark/Sql.cpp
+++ uppsrc/Skylark/Sql.cpp
@@ -79,4 +79,4 @@ SqlInsert Renderer::Insert(SqlId table)
 	return y;
 }
 
-};
\ No newline at end of file
+}
diff --git uppsrc/Skylark/Static.icpp uppsrc/Skylark/Static.icpp
--- uppsrc/Skylark/Static.icpp
+++ uppsrc/Skylark/Static.icpp
@@ -21,7 +21,7 @@ Value CachedStatic(const Vector<Value>& arg, const Renderer *)
 
 INITBLOCK {
 	Compiler::Register("CachedStatic", CachedStatic);
-};
+}
 
 SKYLARK(ServeStaticPage, "static/**")
 {
@@ -68,4 +68,4 @@ SKYLARK(ServeStaticPage, "static/**")
 	http.Content(type, LoadFile(path));
 }
 
-};
+}
diff --git uppsrc/Skylark/StdLib.icpp uppsrc/Skylark/StdLib.icpp
--- uppsrc/Skylark/StdLib.icpp
+++ uppsrc/Skylark/StdLib.icpp
@@ -86,10 +86,10 @@ INITBLOCK {
 	Compiler::Register("cycle", Cycle);
 	Compiler::Register("raw", RawFn);
 	Compiler::Register("count", CountFn);
-	Compiler::Register("post_identity", PostIdentity);
-	Compiler::Register("js_identity", JsIdentity);
-	Compiler::Register("set", VariablesSet);
-	Compiler::Register("render", Render);
-};
-
-};
+	Compiler::Register("post_identity", PostIdentity);
+	Compiler::Register("js_identity", JsIdentity);
+	Compiler::Register("set", VariablesSet);
+	Compiler::Register("render", Render);
+}
+
+}
diff --git uppsrc/Sql/SqlSet.cpp uppsrc/Sql/SqlSet.cpp
--- uppsrc/Sql/SqlSet.cpp
+++ uppsrc/Sql/SqlSet.cpp
@@ -95,7 +95,7 @@ SqlSet::SqlSet(const SqlVal& p0, __List##I(E__SqlVal)) { \
 	__List##I(E__Cat); \
 	priority = SET; \
 }
-__Expand(E__SqlSetF);
+__Expand(E__SqlSetF)
 //$+
 
 FieldOperator::FieldOperator() {}
diff --git uppsrc/Sql/SqlStatement.cpp uppsrc/Sql/SqlStatement.cpp
--- uppsrc/Sql/SqlStatement.cpp
+++ uppsrc/Sql/SqlStatement.cpp
@@ -290,7 +290,7 @@ SqlSelect::SqlSelect(__List##I(E__SqlVal)) { \
 	__List##I(E__SCat); \
 	text = ~set; \
 }
-__Expand(E__QSqlSelectF);
+__Expand(E__QSqlSelectF)
 
 #define E__QSelectF(I) \
 SqlSelect Select(__List##I(E__SqlVal)) { \
@@ -298,7 +298,7 @@ SqlSelect Select(__List##I(E__SqlVal)) { \
 	__List##I(E__SCat); \
 	return Select(set); \
 }
-__Expand(E__QSelectF);
+__Expand(E__QSelectF)
 //$+
 
 // -------------------------------
diff --git uppsrc/Sql/Sqlexp.h uppsrc/Sql/Sqlexp.h
--- uppsrc/Sql/Sqlexp.h
+++ uppsrc/Sql/Sqlexp.h
@@ -500,7 +500,7 @@ public:
 
 //$-SqlSet(const SqlVal& p0, ...)
 #define E__SqlSet(I)   SqlSet(const SqlVal& p0, __List##I(E__SqlVal));
-	__Expand(E__SqlSet);
+	__Expand(E__SqlSet)
 //$+
 	explicit SqlSet(Fields nfields);
 
@@ -636,7 +636,7 @@ public:
 	SqlSelect()                                       { on = valid = false; }
 //$-SqlSelect(SqlVal v, ...);
 #define E__QSelect(I)   SqlSelect(__List##I(E__SqlVal));
-	__Expand(E__QSelect);
+	__Expand(E__QSelect)
 #undef  E__QSelect
 //$+
 
@@ -667,7 +667,7 @@ inline SqlSelect Select(Fields f)           { return SqlSelect(f); }
 
 //$-SqlSelect Select(SqlVal v, ...);
 #define E__QSelect(I)   SqlSelect Select(__List##I(E__SqlVal));
-__Expand(E__QSelect);
+__Expand(E__QSelect)
 #undef  E__QSelect
 //$-
 
@@ -953,7 +953,7 @@ public:
 #define E__Arg(I)       Arg(p##I)
 #define E__Args(I) \
 	SqlWith& operator()(__List##I(E__SqlId)) { __List##I(E__Arg); return *this; }
-	__Expand(E__Args);
+	__Expand(E__Args)
 #undef E__Args
 #undef E__Arg
 #undef E__SqlId
diff --git uppsrc/Sql/Sqls.h uppsrc/Sql/Sqls.h
--- uppsrc/Sql/Sqls.h
+++ uppsrc/Sql/Sqls.h
@@ -459,7 +459,7 @@ class SqlMassInsert {
 		Vector <Value> value;
 		SqlBool        remove;
 		
-		rval_default(Row);
+		rval_default(Row)
 		Row() {}
 	};
 
diff --git uppsrc/TCore/setop.h uppsrc/TCore/setop.h
--- uppsrc/TCore/setop.h
+++ uppsrc/TCore/setop.h
@@ -15,7 +15,7 @@ enum SetOpCode
 
 template <> inline unsigned GetHashValue(const SetOpCode& c) { return c; }
 
-NTL_MOVEABLE(SetOpCode);
+NTL_MOVEABLE(SetOpCode)
 
 template<class V, class I>
 Index<V> SetGetIndex(I begin, I end)
diff --git uppsrc/TSql/util.cpp uppsrc/TSql/util.cpp
--- uppsrc/TSql/util.cpp
+++ uppsrc/TSql/util.cpp
@@ -586,7 +586,7 @@ SqlSelect SelectHint(const char *hint, __List##I(E__SqlVal)) { \
 	__List##I(E__SCat); \
 	return SelectHint(hint, set); \
 }
-__Expand(E__QSelectF);
+__Expand(E__QSelectF)
 */
 SqlSet DeleteHint(const char *hint, const SqlVal& table)
 {
diff --git uppsrc/TSql/util.h uppsrc/TSql/util.h
--- uppsrc/TSql/util.h
+++ uppsrc/TSql/util.h
@@ -104,7 +104,7 @@ SqlSelect             SelectHint(const char *hint, SqlSet set);
 
 #define E__SelectHint(I)\
 SqlSelect             SelectHint(const char *hint, __List##I(E__SqlVal));
-__Expand(E__SelectHint);
+__Expand(E__SelectHint)
 */
 SqlSet                DeleteHint(const char *hint, const SqlVal& table);
 SqlSet                DeleteSchemaHint(const char *hint, const SqlId& table);
diff --git uppsrc/TextDiffCtrl/DiffCtrl.cpp uppsrc/TextDiffCtrl/DiffCtrl.cpp
--- uppsrc/TextDiffCtrl/DiffCtrl.cpp
+++ uppsrc/TextDiffCtrl/DiffCtrl.cpp
@@ -190,4 +190,4 @@ FileSel& DiffFs() {
 	return fs;
 }
 
-};
+}
diff --git uppsrc/TextDiffCtrl/DirDiff.cpp uppsrc/TextDiffCtrl/DirDiff.cpp
--- uppsrc/TextDiffCtrl/DirDiff.cpp
+++ uppsrc/TextDiffCtrl/DirDiff.cpp
@@ -93,7 +93,7 @@ DirDiffDlg::DirDiffDlg()
 	WhenIcon = [](const char *path) -> Image { return NativePathIcon(path); };
 	
 	Title("Compare directories");
-};
+}
 
 void DirDiffDlg::GatherFilesDeep(Index<String>& files, const String& base, const String& path)
 {
@@ -246,4 +246,4 @@ bool Upp::DirDiffDlg::HotKey(dword key)
 	return false;
 }
 
-};
\ No newline at end of file
+}
diff --git uppsrc/TextDiffCtrl/PatchDiff.cpp uppsrc/TextDiffCtrl/PatchDiff.cpp
--- uppsrc/TextDiffCtrl/PatchDiff.cpp
+++ uppsrc/TextDiffCtrl/PatchDiff.cpp
@@ -172,4 +172,4 @@ void PatchDiff::File()
 	rfile <<= p2;
 }
 
-};
\ No newline at end of file
+}
diff --git uppsrc/TextDiffCtrl/TextCtrl.cpp uppsrc/TextDiffCtrl/TextCtrl.cpp
--- uppsrc/TextDiffCtrl/TextCtrl.cpp
+++ uppsrc/TextDiffCtrl/TextCtrl.cpp
@@ -512,4 +512,4 @@ void TextCompareCtrl::SetPos(Point pos)
 	SetSb(l + pos.y);
 }
 
-};
+}
diff --git uppsrc/TextDiffCtrl/TextDiff.cpp uppsrc/TextDiffCtrl/TextDiff.cpp
--- uppsrc/TextDiffCtrl/TextDiff.cpp
+++ uppsrc/TextDiffCtrl/TextDiff.cpp
@@ -210,4 +210,4 @@ void TextComparator::Split(Array<TextSection>& dest, int start1, int end1, int s
 		dest.Add(TextSection(start1, end1 - start1, start2, end2 - start2, false));
 }
 
-};
+}
diff --git uppsrc/TextDiffCtrl/TextDiffCtrl.h uppsrc/TextDiffCtrl/TextDiffCtrl.h
--- uppsrc/TextDiffCtrl/TextDiffCtrl.h
+++ uppsrc/TextDiffCtrl/TextDiffCtrl.h
@@ -322,6 +322,6 @@ public:
 	PatchDiff();
 };
 
-};
+}
 
 #endif
diff --git uppsrc/TextDiffCtrl/patch.cpp uppsrc/TextDiffCtrl/patch.cpp
--- uppsrc/TextDiffCtrl/patch.cpp
+++ uppsrc/TextDiffCtrl/patch.cpp
@@ -206,4 +206,4 @@ String Patch::GetPatchedFile(int i) const
 	return Join(lines, crlf ? "\r\n" : "\n");
 }
 
-};
+}
diff --git uppsrc/ide/Browser/Browser.h uppsrc/ide/Browser/Browser.h
--- uppsrc/ide/Browser/Browser.h
+++ uppsrc/ide/Browser/Browser.h
@@ -175,7 +175,7 @@ struct TopicInfo : Moveable<TopicInfo> {
 
 	TopicInfo() {}
 
-	rval_default(TopicInfo);
+	rval_default(TopicInfo)
 };
 
 String          GetTopicPath(const TopicLink& link);
diff --git uppsrc/ide/Core/Core.h uppsrc/ide/Core/Core.h
--- uppsrc/ide/Core/Core.h
+++ uppsrc/ide/Core/Core.h
@@ -327,7 +327,7 @@ public:
 
 		File()                            { Init(); }
 		File(const String& s) : String(s) { Init(); }
-		rval_default(File);
+		rval_default(File)
 	};
 	struct Config {
 		String name;
diff --git uppsrc/ide/IconDes/IconDes.h uppsrc/ide/IconDes/IconDes.h
--- uppsrc/ide/IconDes/IconDes.h
+++ uppsrc/ide/IconDes/IconDes.h
@@ -37,6 +37,6 @@ struct IdeIconEditPos : IconDes::EditPos, Moveable<IdeIconEditPos> {
 	IdeIconEditPos() { filetime = Null; }
 };
 
-INITIALIZE(IconDes);
+INITIALIZE(IconDes)
 
 #endif
diff --git uppsrc/ide/LayDes/LayDes.h uppsrc/ide/LayDes/LayDes.h
--- uppsrc/ide/LayDes/LayDes.h
+++ uppsrc/ide/LayDes/LayDes.h
@@ -56,7 +56,7 @@ struct LayoutType : Moveable<LayoutType> {
 	Image                      icon[2];
 	Size                       iconsize[2];
 
-	rval_default(LayoutType);	
+	rval_default(LayoutType)
 
 	LayoutType()               { iconsize[0] = iconsize[1] = Null; }
 };
@@ -202,7 +202,7 @@ public:
 	String   SaveProperties(int y = 0) const;
 	String   Save(int i, int y) const;
 
-	rval_default(LayoutItem);
+	rval_default(LayoutItem)
 
 	LayoutItem()                      { csize.cx = -1; hide = false; charset = CHARSET_UNICODE; }
 };
@@ -247,7 +247,7 @@ public:
 	bool        IsRedo();
 	void        Redo();
 
-	rval_default(LayoutData);
+	rval_default(LayoutData)
 
 	LayoutData() { size = Size(400, 200); charset = CHARSET_UNICODE; }
 };
diff --git uppsrc/ide/SlideShow.cpp uppsrc/ide/SlideShow.cpp
--- uppsrc/ide/SlideShow.cpp
+++ uppsrc/ide/SlideShow.cpp
@@ -81,7 +81,7 @@ void SlideShow::Serialize(Stream& s)
 
 INITBLOCK {
 	RegisterGlobalConfig("SlideShow");
-};
+}
 
 SlideShow::SlideShow()
 {
diff --git uppsrc/ide/UppDlg.h uppsrc/ide/UppDlg.h
--- uppsrc/ide/UppDlg.h
+++ uppsrc/ide/UppDlg.h
@@ -40,7 +40,7 @@ struct PackageTemplate {
 	Array<TemplateItem> item;
 	Array<FileTemplate> file;
 	
-	rval_default(PackageTemplate);
+	rval_default(PackageTemplate)
 	PackageTemplate() {}
 };
 
@@ -137,7 +137,7 @@ inline bool PackageLess(String a, String b)
 	int nc = CompareNoCase(a, b);
 	if(nc) return nc < 0;
 	return a < b;
-};
+}
 
 struct SelectPackageDlg : public WithSelectPackageLayout<TopWindow> {
 	virtual bool Key(dword key, int count);
diff --git uppsrc/ide/UppWspc.cpp uppsrc/ide/UppWspc.cpp
--- uppsrc/ide/UppWspc.cpp
+++ uppsrc/ide/UppWspc.cpp
@@ -19,7 +19,7 @@ Image ImageOverRed(const Image& m)
 Font WorkspaceWork::ListFont()
 {
 	return StdFont();
-};
+}
 
 void WorkspaceWork::SetErrorFiles(const Vector<String>& files)
 {
diff --git uppsrc/ide/t.cpp uppsrc/ide/t.cpp
--- uppsrc/ide/t.cpp
+++ uppsrc/ide/t.cpp
@@ -37,7 +37,7 @@ struct TFile : Moveable<TFile> {
 		Sort(ls);
 	}
 
-	rval_default(TFile);
+	rval_default(TFile)
 	TFile() { dirty = false; }
 };
 
diff --git uppsrc/plugin/astyle/astyle.h uppsrc/plugin/astyle/astyle.h
--- uppsrc/plugin/astyle/astyle.h
+++ uppsrc/plugin/astyle/astyle.h
@@ -496,7 +496,7 @@ class ASFormatter : public ASBeautifier, private ASEnhancer
 // marks enum BracketType as moveable so it can be used by Upp containers
 namespace Upp
 {
-	NTL_MOVEABLE(astyle::BracketType);
+	NTL_MOVEABLE(astyle::BracketType)
 
 } // end namespace Upp
 
diff --git uppsrc/plugin/bmp/bmp.h uppsrc/plugin/bmp/bmp.h
--- uppsrc/plugin/bmp/bmp.h
+++ uppsrc/plugin/bmp/bmp.h
@@ -5,7 +5,7 @@
 
 namespace Upp {
 	
-INITIALIZE(BMPRaster);
+INITIALIZE(BMPRaster)
 
 class BMPRaster : public StreamRaster {
 	Size             size;
diff --git uppsrc/plugin/ftp/lib/ftplib.h uppsrc/plugin/ftp/lib/ftplib.h
--- uppsrc/plugin/ftp/lib/ftplib.h
+++ uppsrc/plugin/ftp/lib/ftplib.h
@@ -84,7 +84,7 @@ GLOBALREF void FtpQuit(netbuf *nControl);
 GLOBALREF const char *FtpError(netbuf *nControl);
 
 #ifdef __cplusplus
-};
+}
 #endif
 
 #endif /* __FTPLIB_H */
diff --git uppsrc/plugin/gif/gif.icpp uppsrc/plugin/gif/gif.icpp
--- uppsrc/plugin/gif/gif.icpp
+++ uppsrc/plugin/gif/gif.icpp
@@ -2,7 +2,7 @@
 
 namespace Upp {
 	
-// INITIALIZE(GifRaster);
+// INITIALIZE(GifRaster)
 /*
 INITBLOCK {
 	StreamRaster::Register<GIFRaster>();
diff --git uppsrc/plugin/jpg/jpg.h uppsrc/plugin/jpg/jpg.h
--- uppsrc/plugin/jpg/jpg.h
+++ uppsrc/plugin/jpg/jpg.h
@@ -5,7 +5,7 @@
 
 namespace Upp {
 	
-INITIALIZE(JPGRaster);
+INITIALIZE(JPGRaster)
 
 class JPGRaster : public StreamRaster {
 public:
diff --git uppsrc/plugin/lz4/Compress.cpp uppsrc/plugin/lz4/Compress.cpp
--- uppsrc/plugin/lz4/Compress.cpp
+++ uppsrc/plugin/lz4/Compress.cpp
@@ -149,4 +149,4 @@ LZ4CompressStream::~LZ4CompressStream()
 	Close();
 }
 
-};
+}
diff --git uppsrc/plugin/lz4/Decompress.cpp uppsrc/plugin/lz4/Decompress.cpp
--- uppsrc/plugin/lz4/Decompress.cpp
+++ uppsrc/plugin/lz4/Decompress.cpp
@@ -223,4 +223,4 @@ bool IsLZ4(Stream& s)
 	return b;
 }
 
-};
+}
diff --git uppsrc/plugin/lz4/lz4.h uppsrc/plugin/lz4/lz4.h
--- uppsrc/plugin/lz4/lz4.h
+++ uppsrc/plugin/lz4/lz4.h
@@ -133,6 +133,6 @@ String CoLZ4Decompress(const String& s, Gate<int64, int64> progress = Null);
 
 bool IsLZ4(Stream& s);
 
-};
+}
 
 #endif
diff --git uppsrc/plugin/lz4/util.cpp uppsrc/plugin/lz4/util.cpp
--- uppsrc/plugin/lz4/util.cpp
+++ uppsrc/plugin/lz4/util.cpp
@@ -126,4 +126,4 @@ String CoLZ4Decompress(const String& s, Gate<int64, int64> progress)
 
 #endif
 
-};
\ No newline at end of file
+}
diff --git uppsrc/plugin/png/png.h uppsrc/plugin/png/png.h
--- uppsrc/plugin/png/png.h
+++ uppsrc/plugin/png/png.h
@@ -5,7 +5,7 @@
 
 namespace Upp {
 	
-INITIALIZE(PNGRaster);
+INITIALIZE(PNGRaster)
 
 class PNGRaster : public StreamRaster {
 	class Data;
diff --git uppsrc/plugin/tif/tif.h uppsrc/plugin/tif/tif.h
--- uppsrc/plugin/tif/tif.h
+++ uppsrc/plugin/tif/tif.h
@@ -33,7 +33,7 @@ struct tiff *TIFFFileStreamOpen(const char *filename, const char *mode);
 //struct tiff* TIFFWrapOpen(const char*, const char*);
 //int TIFFWrapGetField(::tiff* tif_data, uint32 tag, ...);
 
-INITIALIZE(TIFRaster);
+INITIALIZE(TIFRaster)
 
 class TIFRaster : public StreamRaster {
 public:
diff --git uppsrc/plugin/zstd/Compress.cpp uppsrc/plugin/zstd/Compress.cpp
--- uppsrc/plugin/zstd/Compress.cpp
+++ uppsrc/plugin/zstd/Compress.cpp
@@ -128,4 +128,4 @@ ZstdCompressStream::~ZstdCompressStream()
 	Close();
 }
 
-};
+}
diff --git uppsrc/plugin/zstd/Decompress.cpp uppsrc/plugin/zstd/Decompress.cpp
--- uppsrc/plugin/zstd/Decompress.cpp
+++ uppsrc/plugin/zstd/Decompress.cpp
@@ -195,4 +195,4 @@ bool IsZstd(Stream& s)
 	return b;
 }
 
-};
+}
diff --git uppsrc/plugin/zstd/Util.cpp uppsrc/plugin/zstd/Util.cpp
--- uppsrc/plugin/zstd/Util.cpp
+++ uppsrc/plugin/zstd/Util.cpp
@@ -104,4 +104,4 @@ String CoZstdDecompress(const String& s, Gate<int64, int64> progress)
 
 #endif
 
-};
\ No newline at end of file
+}