diff --git a/bazaar/CtrlProp/Button.icpp b/bazaar/CtrlProp/Button.icpp
index b8ea60efe..52b30d021 100644
--- a/bazaar/CtrlProp/Button.icpp
+++ b/bazaar/CtrlProp/Button.icpp
@@ -1,7 +1,10 @@
 #include "CtrlPropCommon.h"
-#include <CtrlLib/CtrlLib.h>
+
+NAMESPACE_UPP
 
 PROPERTIES(Button, Pusher)
 END_PROPERTIES
 
 PROPS(Ctrl, Button, Pusher)
+
+END_UPP_NAMESPACE
diff --git a/bazaar/CtrlProp/ButtonOption.icpp b/bazaar/CtrlProp/ButtonOption.icpp
index 984a31dca..f6c6d76f7 100644
--- a/bazaar/CtrlProp/ButtonOption.icpp
+++ b/bazaar/CtrlProp/ButtonOption.icpp
@@ -1,5 +1,6 @@
 #include "CtrlPropCommon.h"
-#include <CtrlLib/CtrlLib.h>
+
+NAMESPACE_UPP
 
 bool PropSetLabel(const Value& v, ButtonOption& o) { if(!IsString(v)) return false; o.SetLabel(v); return true; }
 bool PropGetLabel(Value& v, const ButtonOption& o) { v = o.GetLabel(); return true; }
@@ -9,3 +10,5 @@ PROPERTY("label", PropSetLabel, PropGetLabel)
 END_PROPERTIES
 
 PROPS(Ctrl, ButtonOption, Ctrl)
+
+END_UPP_NAMESPACE
diff --git a/bazaar/CtrlProp/Ctrl.icpp b/bazaar/CtrlProp/Ctrl.icpp
index 1b8b4b9d6..a4ccf580e 100644
--- a/bazaar/CtrlProp/Ctrl.icpp
+++ b/bazaar/CtrlProp/Ctrl.icpp
@@ -1,5 +1,6 @@
 #include "CtrlPropCommon.h"
-#include <CtrlLib/CtrlLib.h>
+
+NAMESPACE_UPP
 
 bool PropSetData(const Value& v, Ctrl& o) { o.SetData(v); return true; }
 bool PropGetData(Value& v, const Ctrl& o) { v = o.GetData(); return true; }
@@ -54,3 +55,5 @@ END_PROPERTIES
 
 GETSETPROP_DUMMY(Ctrl, EmptyClass)
 PROPS(Ctrl, Ctrl, EmptyClass)
+
+END_UPP_NAMESPACE
diff --git a/bazaar/CtrlProp/CtrlProp.upp b/bazaar/CtrlProp/CtrlProp.upp
index bfa34d744..0c4bb902b 100644
--- a/bazaar/CtrlProp/CtrlProp.upp
+++ b/bazaar/CtrlProp/CtrlProp.upp
@@ -8,7 +8,6 @@ uses
 	Gen;
 
 file
-	CtrlPropCommon.h,
 	PropList.h,
 	PropList.cpp,
 	PropList.lay,
@@ -17,6 +16,7 @@ file
 	PropEdit.lay,
 	CtrlProp.h,
 	Props readonly separator,
+	CtrlPropCommon.h,
 	Ctrl.icpp,
 	Pusher.icpp,
 	Button.icpp,
diff --git a/bazaar/CtrlProp/CtrlPropCommon.h b/bazaar/CtrlProp/CtrlPropCommon.h
index c816da648..244994a74 100644
--- a/bazaar/CtrlProp/CtrlPropCommon.h
+++ b/bazaar/CtrlProp/CtrlPropCommon.h
@@ -1,13 +1,11 @@
 #ifndef _CtrlProp_CtrlPropCommon_h
 #define _CtrlProp_CtrlPropCommon_h
 
-#include <CtrlLib/CtrlLib.h>
-using namespace Upp;
-
 #include <Property/Property.h>
 #include <Gen/VTypes.h>
+#include <CtrlLib/CtrlLib.h>
 
-//////////////////////
+NAMESPACE_UPP
 
 DEC_PROPERTIES(Ctrl, EmptyClass)
 DEC_PROPERTIES(Pusher, Ctrl)
@@ -48,5 +46,7 @@ DEC_PROPERTIES(Picture, Ctrl)
 DEC_PROPERTIES(SeparatorCtrl, Ctrl)
 DEC_PROPERTIES(SliderCtrl, Ctrl)
 
+END_UPP_NAMESPACE
+
 #endif
 
diff --git a/bazaar/CtrlProp/DisplayCtrl.icpp b/bazaar/CtrlProp/DisplayCtrl.icpp
index 963d847a5..c16b7a591 100644
--- a/bazaar/CtrlProp/DisplayCtrl.icpp
+++ b/bazaar/CtrlProp/DisplayCtrl.icpp
@@ -1,7 +1,10 @@
 #include "CtrlPropCommon.h"
-#include <CtrlLib/CtrlLib.h>
+
+NAMESPACE_UPP
 
 PROPERTIES(DisplayCtrl, Ctrl)
 END_PROPERTIES
 
 PROPS(Ctrl, DisplayCtrl, Ctrl)
+
+END_UPP_NAMESPACE
diff --git a/bazaar/CtrlProp/DocEdit.icpp b/bazaar/CtrlProp/DocEdit.icpp
index ade992a19..9f65fa85d 100644
--- a/bazaar/CtrlProp/DocEdit.icpp
+++ b/bazaar/CtrlProp/DocEdit.icpp
@@ -1,5 +1,6 @@
 #include "CtrlPropCommon.h"
-#include <CtrlLib/CtrlLib.h>
+
+NAMESPACE_UPP
 
 bool PropSetAutoHideSb(const Value& v, DocEdit& o) { if(!IsNumber(v)) return false; o.AutoHideSb(v); return true; }
 bool PropGetAutoHideSb(Value& v, const DocEdit& o) { v = o.IsAutoHideSb(); return true; }
@@ -15,3 +16,5 @@ PROPERTY("eofline", PropSetEofLine, PropGetEofLine)
 END_PROPERTIES
 
 PROPS(Ctrl, DocEdit, TextCtrl)
+
+END_UPP_NAMESPACE
diff --git a/bazaar/CtrlProp/EditDate.icpp b/bazaar/CtrlProp/EditDate.icpp
index 0b6c037b4..d022dd1ed 100644
--- a/bazaar/CtrlProp/EditDate.icpp
+++ b/bazaar/CtrlProp/EditDate.icpp
@@ -1,5 +1,6 @@
 #include "CtrlPropCommon.h"
-#include <CtrlLib/CtrlLib.h>
+
+NAMESPACE_UPP
 
 bool PropSetMin(const Value& v, EditDate& o) { if(!IsNumber(v)) return false; o.MinMax(v, o.GetMax()); return true; }
 bool PropGetMin(Value& v, const EditDate& o) { v = o.GetMin(); return true; }
@@ -15,3 +16,5 @@ PROPERTY("notnull", PropSetNotNull, PropGetNotNull)
 END_PROPERTIES
 
 PROPS(Ctrl, EditDate, EditField)
+
+END_UPP_NAMESPACE
diff --git a/bazaar/CtrlProp/EditDateNotNull.icpp b/bazaar/CtrlProp/EditDateNotNull.icpp
index 87add05ce..8defc717e 100644
--- a/bazaar/CtrlProp/EditDateNotNull.icpp
+++ b/bazaar/CtrlProp/EditDateNotNull.icpp
@@ -1,7 +1,10 @@
 #include "CtrlPropCommon.h"
-#include <CtrlLib/CtrlLib.h>
+
+NAMESPACE_UPP
 
 PROPERTIES(EditDateNotNull, EditDate)
 END_PROPERTIES
 
 PROPS(Ctrl, EditDateNotNull, EditDate)
+
+END_UPP_NAMESPACE
diff --git a/bazaar/CtrlProp/EditDouble.icpp b/bazaar/CtrlProp/EditDouble.icpp
index 3083375ce..1096c27cf 100644
--- a/bazaar/CtrlProp/EditDouble.icpp
+++ b/bazaar/CtrlProp/EditDouble.icpp
@@ -1,5 +1,6 @@
 #include "CtrlPropCommon.h"
-#include <CtrlLib/CtrlLib.h>
+
+NAMESPACE_UPP
 
 bool PropSetMin(const Value& v, EditDouble& o) { if(!IsNumber(v)) return false; o.MinMax(v, o.GetMax()); return true; }
 bool PropGetMin(Value& v, const EditDouble& o) { v = o.GetMin(); return true; }
@@ -15,3 +16,5 @@ PROPERTY("notnull", PropSetNotNull, PropGetNotNull)
 END_PROPERTIES
 
 PROPS(Ctrl, EditDouble, EditField)
+
+END_UPP_NAMESPACE
diff --git a/bazaar/CtrlProp/EditDoubleNotNull.icpp b/bazaar/CtrlProp/EditDoubleNotNull.icpp
index 243567d81..96966484e 100644
--- a/bazaar/CtrlProp/EditDoubleNotNull.icpp
+++ b/bazaar/CtrlProp/EditDoubleNotNull.icpp
@@ -1,7 +1,10 @@
 #include "CtrlPropCommon.h"
-#include <CtrlLib/CtrlLib.h>
+
+NAMESPACE_UPP
 
 PROPERTIES(EditDoubleNotNull, EditDouble)
 END_PROPERTIES
 
 PROPS(Ctrl, EditDoubleNotNull, EditDouble)
+
+END_UPP_NAMESPACE
diff --git a/bazaar/CtrlProp/EditDoubleNotNullSpin.icpp b/bazaar/CtrlProp/EditDoubleNotNullSpin.icpp
index a812faeb3..229c84170 100644
--- a/bazaar/CtrlProp/EditDoubleNotNullSpin.icpp
+++ b/bazaar/CtrlProp/EditDoubleNotNullSpin.icpp
@@ -1,7 +1,10 @@
 #include "CtrlPropCommon.h"
-#include <CtrlLib/CtrlLib.h>
+
+NAMESPACE_UPP
 
 PROPERTIES(EditDoubleNotNullSpin, EditDoubleSpin)
 END_PROPERTIES
 
 PROPS(Ctrl, EditDoubleNotNullSpin, EditDoubleSpin)
+
+END_UPP_NAMESPACE
diff --git a/bazaar/CtrlProp/EditDoubleSpin.icpp b/bazaar/CtrlProp/EditDoubleSpin.icpp
index 25af2368c..664d86e57 100644
--- a/bazaar/CtrlProp/EditDoubleSpin.icpp
+++ b/bazaar/CtrlProp/EditDoubleSpin.icpp
@@ -1,5 +1,6 @@
 #include "CtrlPropCommon.h"
-#include <CtrlLib/CtrlLib.h>
+
+NAMESPACE_UPP
 
 bool PropSetInc(const Value& v, EditDoubleSpin& o) { if(!IsNumber(v)) return false; o.SetInc(v); return true; }
 bool PropGetInc(Value& v, const EditDoubleSpin& o) { v = o.GetInc(); return true; }
@@ -12,3 +13,5 @@ PROPERTY("showspin", PropSetShowSpin, PropGetShowSpin)
 END_PROPERTIES
 
 PROPS(Ctrl, EditDoubleSpin, EditDouble)
+
+END_UPP_NAMESPACE
diff --git a/bazaar/CtrlProp/EditField.icpp b/bazaar/CtrlProp/EditField.icpp
index 47bf0dde8..64cfc0b59 100644
--- a/bazaar/CtrlProp/EditField.icpp
+++ b/bazaar/CtrlProp/EditField.icpp
@@ -1,5 +1,6 @@
 #include "CtrlPropCommon.h"
-#include <CtrlLib/CtrlLib.h>
+
+NAMESPACE_UPP
 
 bool PropSetPassword(const Value& v, EditField& o) { if(!IsNumber(v)) return false; o.Password(v); return true; }
 bool PropGetPassword(Value& v, const EditField& o) { v = o.IsPassword(); return true; }
@@ -27,3 +28,5 @@ PROPERTY("alignright", PropSetAlignRight, PropGetAlignRight)
 END_PROPERTIES
 
 PROPS(Ctrl, EditField, Ctrl)
+
+END_UPP_NAMESPACE
diff --git a/bazaar/CtrlProp/EditInt.icpp b/bazaar/CtrlProp/EditInt.icpp
index 542a66b5e..a34eb7e37 100644
--- a/bazaar/CtrlProp/EditInt.icpp
+++ b/bazaar/CtrlProp/EditInt.icpp
@@ -1,5 +1,6 @@
 #include "CtrlPropCommon.h"
-#include <CtrlLib/CtrlLib.h>
+
+NAMESPACE_UPP
 
 bool PropSetMin(const Value& v, EditInt& o) { if(!IsNumber(v)) return false; o.MinMax(v, o.GetMax()); return true; }
 bool PropGetMin(Value& v, const EditInt& o) { v = o.GetMin(); return true; }
@@ -15,3 +16,5 @@ PROPERTY("notnull", PropSetNotNull, PropGetNotNull)
 END_PROPERTIES
 
 PROPS(Ctrl, EditInt, EditField)
+
+END_UPP_NAMESPACE
diff --git a/bazaar/CtrlProp/EditInt64.icpp b/bazaar/CtrlProp/EditInt64.icpp
index 142d46731..8dd487307 100644
--- a/bazaar/CtrlProp/EditInt64.icpp
+++ b/bazaar/CtrlProp/EditInt64.icpp
@@ -1,5 +1,6 @@
 #include "CtrlPropCommon.h"
-#include <CtrlLib/CtrlLib.h>
+
+NAMESPACE_UPP
 
 bool PropSetMin(const Value& v, EditInt64& o) { if(!IsNumber(v)) return false; o.MinMax(v, o.GetMax()); return true; }
 bool PropGetMin(Value& v, const EditInt64& o) { v = o.GetMin(); return true; }
@@ -15,3 +16,5 @@ PROPERTY("notnull", PropSetNotNull, PropGetNotNull)
 END_PROPERTIES
 
 PROPS(Ctrl, EditInt64, EditField)
+
+END_UPP_NAMESPACE
diff --git a/bazaar/CtrlProp/EditInt64NotNull.icpp b/bazaar/CtrlProp/EditInt64NotNull.icpp
index 36375e28b..9864c4cd8 100644
--- a/bazaar/CtrlProp/EditInt64NotNull.icpp
+++ b/bazaar/CtrlProp/EditInt64NotNull.icpp
@@ -1,7 +1,10 @@
 #include "CtrlPropCommon.h"
-#include <CtrlLib/CtrlLib.h>
+
+NAMESPACE_UPP
 
 PROPERTIES(EditInt64NotNull, EditInt64)
 END_PROPERTIES
 
 PROPS(Ctrl, EditInt64NotNull, EditInt64)
+
+END_UPP_NAMESPACE
diff --git a/bazaar/CtrlProp/EditInt64NotNullSpin.icpp b/bazaar/CtrlProp/EditInt64NotNullSpin.icpp
index 3dbcac3f0..fd820c862 100644
--- a/bazaar/CtrlProp/EditInt64NotNullSpin.icpp
+++ b/bazaar/CtrlProp/EditInt64NotNullSpin.icpp
@@ -1,7 +1,10 @@
 #include "CtrlPropCommon.h"
-#include <CtrlLib/CtrlLib.h>
+
+NAMESPACE_UPP
 
 PROPERTIES(EditInt64NotNullSpin, EditInt64Spin)
 END_PROPERTIES
 
 PROPS(Ctrl, EditInt64NotNullSpin, EditInt64Spin)
+
+END_UPP_NAMESPACE
diff --git a/bazaar/CtrlProp/EditInt64Spin.icpp b/bazaar/CtrlProp/EditInt64Spin.icpp
index 55478fe0a..b30983798 100644
--- a/bazaar/CtrlProp/EditInt64Spin.icpp
+++ b/bazaar/CtrlProp/EditInt64Spin.icpp
@@ -1,5 +1,6 @@
 #include "CtrlPropCommon.h"
-#include <CtrlLib/CtrlLib.h>
+
+NAMESPACE_UPP
 
 bool PropSetInc(const Value& v, EditInt64Spin& o) { if(!IsNumber(v)) return false; o.SetInc(v); return true; }
 bool PropGetInc(Value& v, const EditInt64Spin& o) { v = o.GetInc(); return true; }
@@ -12,3 +13,5 @@ PROPERTY("showspin", PropSetShowSpin, PropGetShowSpin)
 END_PROPERTIES
 
 PROPS(Ctrl, EditInt64Spin, EditInt64)
+
+END_UPP_NAMESPACE
diff --git a/bazaar/CtrlProp/EditIntNotNull.icpp b/bazaar/CtrlProp/EditIntNotNull.icpp
index a91078e83..18205f449 100644
--- a/bazaar/CtrlProp/EditIntNotNull.icpp
+++ b/bazaar/CtrlProp/EditIntNotNull.icpp
@@ -1,7 +1,10 @@
 #include "CtrlPropCommon.h"
-#include <CtrlLib/CtrlLib.h>
+
+NAMESPACE_UPP
 
 PROPERTIES(EditIntNotNull, EditInt)
 END_PROPERTIES
 
 PROPS(Ctrl, EditIntNotNull, EditInt)
+
+END_UPP_NAMESPACE
diff --git a/bazaar/CtrlProp/EditIntNotNullSpin.icpp b/bazaar/CtrlProp/EditIntNotNullSpin.icpp
index df38f864a..e72314c1b 100644
--- a/bazaar/CtrlProp/EditIntNotNullSpin.icpp
+++ b/bazaar/CtrlProp/EditIntNotNullSpin.icpp
@@ -1,7 +1,10 @@
 #include "CtrlPropCommon.h"
-#include <CtrlLib/CtrlLib.h>
+
+NAMESPACE_UPP
 
 PROPERTIES(EditIntNotNullSpin, EditIntSpin)
 END_PROPERTIES
 
 PROPS(Ctrl, EditIntNotNullSpin, EditIntSpin)
+
+END_UPP_NAMESPACE
diff --git a/bazaar/CtrlProp/EditIntSpin.icpp b/bazaar/CtrlProp/EditIntSpin.icpp
index 3cfb7e9f8..8b7537a58 100644
--- a/bazaar/CtrlProp/EditIntSpin.icpp
+++ b/bazaar/CtrlProp/EditIntSpin.icpp
@@ -1,5 +1,6 @@
 #include "CtrlPropCommon.h"
-#include <CtrlLib/CtrlLib.h>
+
+NAMESPACE_UPP
 
 bool PropSetInc(const Value& v, EditIntSpin& o) { if(!IsNumber(v)) return false; o.SetInc(v); return true; }
 bool PropGetInc(Value& v, const EditIntSpin& o) { v = o.GetInc(); return true; }
@@ -12,3 +13,5 @@ PROPERTY("showspin", PropSetShowSpin, PropGetShowSpin)
 END_PROPERTIES
 
 PROPS(Ctrl, EditIntSpin, EditInt)
+
+END_UPP_NAMESPACE
diff --git a/bazaar/CtrlProp/EditString.icpp b/bazaar/CtrlProp/EditString.icpp
index d742bee75..8878bc954 100644
--- a/bazaar/CtrlProp/EditString.icpp
+++ b/bazaar/CtrlProp/EditString.icpp
@@ -1,5 +1,6 @@
 #include "CtrlPropCommon.h"
-#include <CtrlLib/CtrlLib.h>
+
+NAMESPACE_UPP
 
 bool PropSetMaxLen(const Value& v, EditString& o) { if(!IsNumber(v)) return false; o.MaxLen(v); return true; }
 bool PropGetMaxLen(Value& v, const EditString& o) { v = o.GetMaxLength(); return true; }
@@ -18,3 +19,5 @@ PROPERTY("notnull", PropSetNotNull, PropGetNotNull)
 END_PROPERTIES
 
 PROPS(Ctrl, EditString, EditField)
+
+END_UPP_NAMESPACE
diff --git a/bazaar/CtrlProp/EditStringNotNull.icpp b/bazaar/CtrlProp/EditStringNotNull.icpp
index 13107a344..72bfb4dee 100644
--- a/bazaar/CtrlProp/EditStringNotNull.icpp
+++ b/bazaar/CtrlProp/EditStringNotNull.icpp
@@ -1,7 +1,10 @@
 #include "CtrlPropCommon.h"
-#include <CtrlLib/CtrlLib.h>
+
+NAMESPACE_UPP
 
 PROPERTIES(EditStringNotNull, EditString)
 END_PROPERTIES
 
 PROPS(Ctrl, EditStringNotNull, EditString)
+
+END_UPP_NAMESPACE
diff --git a/bazaar/CtrlProp/EditTime.icpp b/bazaar/CtrlProp/EditTime.icpp
index 08ea97dc9..3b037efc9 100644
--- a/bazaar/CtrlProp/EditTime.icpp
+++ b/bazaar/CtrlProp/EditTime.icpp
@@ -1,5 +1,6 @@
 #include "CtrlPropCommon.h"
-#include <CtrlLib/CtrlLib.h>
+
+NAMESPACE_UPP
 
 bool PropSetMin(const Value& v, EditTime& o) { if(!IsNumber(v)) return false; o.MinMax(v, o.GetMax()); return true; }
 bool PropGetMin(Value& v, const EditTime& o) { v = o.GetMin(); return true; }
@@ -18,3 +19,5 @@ PROPERTY("seconds", PropSetSeconds, PropGetSeconds)
 END_PROPERTIES
 
 PROPS(Ctrl, EditTime, EditField)
+
+END_UPP_NAMESPACE
diff --git a/bazaar/CtrlProp/EditTimeNotNull.icpp b/bazaar/CtrlProp/EditTimeNotNull.icpp
index c8276033f..21467c578 100644
--- a/bazaar/CtrlProp/EditTimeNotNull.icpp
+++ b/bazaar/CtrlProp/EditTimeNotNull.icpp
@@ -1,7 +1,10 @@
 #include "CtrlPropCommon.h"
-#include <CtrlLib/CtrlLib.h>
+
+NAMESPACE_UPP
 
 PROPERTIES(EditTimeNotNull, EditTime)
 END_PROPERTIES
 
 PROPS(Ctrl, EditTimeNotNull, EditTime)
+
+END_UPP_NAMESPACE
diff --git a/bazaar/CtrlProp/ImageCtrl.icpp b/bazaar/CtrlProp/ImageCtrl.icpp
index a3b49c4fa..addc57909 100644
--- a/bazaar/CtrlProp/ImageCtrl.icpp
+++ b/bazaar/CtrlProp/ImageCtrl.icpp
@@ -1,7 +1,10 @@
 #include "CtrlPropCommon.h"
-#include <CtrlLib/CtrlLib.h>
+
+NAMESPACE_UPP
 
 PROPERTIES(ImageCtrl, Ctrl)
 END_PROPERTIES
 
 PROPS(Ctrl, ImageCtrl, Ctrl)
+
+END_UPP_NAMESPACE
diff --git a/bazaar/CtrlProp/Label.icpp b/bazaar/CtrlProp/Label.icpp
index 9fed9cee4..da2e011c0 100644
--- a/bazaar/CtrlProp/Label.icpp
+++ b/bazaar/CtrlProp/Label.icpp
@@ -1,5 +1,6 @@
 #include "CtrlPropCommon.h"
-#include <CtrlLib/CtrlLib.h>
+
+NAMESPACE_UPP
 
 bool PropSetText(const Value& v, Label& o) { o.SetText(AsString(v)); return true; }
 bool PropGetText(Value& v, const Label& o) { v = o.GetText(); return true; }
@@ -9,3 +10,5 @@ PROPERTY("text", PropSetText, PropGetText)
 END_PROPERTIES
 
 PROPS(Ctrl, Label, StaticText)
+
+END_UPP_NAMESPACE
diff --git a/bazaar/CtrlProp/LabelBox.icpp b/bazaar/CtrlProp/LabelBox.icpp
index 43f74157e..b21136c7c 100644
--- a/bazaar/CtrlProp/LabelBox.icpp
+++ b/bazaar/CtrlProp/LabelBox.icpp
@@ -1,7 +1,10 @@
 #include "CtrlPropCommon.h"
-#include <CtrlLib/CtrlLib.h>
+
+NAMESPACE_UPP
 
 PROPERTIES(LabelBox, Label)
 END_PROPERTIES
 
 PROPS(Ctrl, LabelBox, Label)
+
+END_UPP_NAMESPACE
diff --git a/bazaar/CtrlProp/LineEdit.icpp b/bazaar/CtrlProp/LineEdit.icpp
index 9beead545..acfa14aea 100644
--- a/bazaar/CtrlProp/LineEdit.icpp
+++ b/bazaar/CtrlProp/LineEdit.icpp
@@ -1,5 +1,6 @@
 #include "CtrlPropCommon.h"
-#include <CtrlLib/CtrlLib.h>
+
+NAMESPACE_UPP
 
 bool PropSetTabSize(const Value& v, LineEdit& o) { if(!IsNumber(v)) return false; o.TabSize(v); return true; }
 bool PropGetTabSize(Value& v, const LineEdit& o) { v = o.GetTabSize(); return true; }
@@ -18,3 +19,5 @@ PROPERTY("nohorzsb", PropSetNoHorzScrollbar, PropGetNoHorzScrollbar)
 END_PROPERTIES
 
 PROPS(Ctrl, LineEdit, TextCtrl)
+
+END_UPP_NAMESPACE
diff --git a/bazaar/CtrlProp/Option.icpp b/bazaar/CtrlProp/Option.icpp
index 7682f9f5b..97332630f 100644
--- a/bazaar/CtrlProp/Option.icpp
+++ b/bazaar/CtrlProp/Option.icpp
@@ -1,5 +1,6 @@
 #include "CtrlPropCommon.h"
-#include <CtrlLib/CtrlLib.h>
+
+NAMESPACE_UPP
 
 bool PropSetBlackEdge(const Value& v, Option& o) { if(!IsNumber(v)) return false; o.BlackEdge(v); return true; }
 bool PropGetBlackEdge(Value& v, const Option& o) { v = o.IsBlackEdge(); return true; }
@@ -21,3 +22,5 @@ PROPERTY("notnull", PropSetNotNull, PropGetNotNull)
 END_PROPERTIES
 
 PROPS(Ctrl, Option, Pusher)
+
+END_UPP_NAMESPACE
diff --git a/bazaar/CtrlProp/ParentCtrl.icpp b/bazaar/CtrlProp/ParentCtrl.icpp
index 29ead6630..cb3a00db5 100644
--- a/bazaar/CtrlProp/ParentCtrl.icpp
+++ b/bazaar/CtrlProp/ParentCtrl.icpp
@@ -1,7 +1,10 @@
 #include "CtrlPropCommon.h"
-#include <CtrlLib/CtrlLib.h>
+
+NAMESPACE_UPP
 
 PROPERTIES(ParentCtrl, Ctrl)
 END_PROPERTIES
 
 PROPS(Ctrl, ParentCtrl, Ctrl)
+
+END_UPP_NAMESPACE
diff --git a/bazaar/CtrlProp/Picture.icpp b/bazaar/CtrlProp/Picture.icpp
index b0d676096..c67f6bfd5 100644
--- a/bazaar/CtrlProp/Picture.icpp
+++ b/bazaar/CtrlProp/Picture.icpp
@@ -1,7 +1,10 @@
 #include "CtrlPropCommon.h"
-#include <CtrlLib/CtrlLib.h>
+
+NAMESPACE_UPP
 
 PROPERTIES(Picture, Ctrl)
 END_PROPERTIES
 
 PROPS(Ctrl, Picture, Ctrl)
+
+END_UPP_NAMESPACE
diff --git a/bazaar/CtrlProp/PropEdit.cpp b/bazaar/CtrlProp/PropEdit.cpp
index b47764a12..87b60918a 100644
--- a/bazaar/CtrlProp/PropEdit.cpp
+++ b/bazaar/CtrlProp/PropEdit.cpp
@@ -1,5 +1,7 @@
 #include "PropEdit.h"
 
+NAMESPACE_UPP
+
 PropEditCtrl::PropEditCtrl()
 {
 	CtrlLayout(*this);
@@ -167,3 +169,4 @@ void PropEdit::Serialize(Stream& s)
 	}
 }
 
+END_UPP_NAMESPACE
diff --git a/bazaar/CtrlProp/PropEdit.h b/bazaar/CtrlProp/PropEdit.h
index 7f105cc3d..8665b34db 100644
--- a/bazaar/CtrlProp/PropEdit.h
+++ b/bazaar/CtrlProp/PropEdit.h
@@ -1,11 +1,12 @@
 #ifndef _CtrlProp_PropEdit_h_
 #define _CtrlProp_PropEdit_h_
 
-#include "CtrlPropCommon.h"
-
-#include <LogPosCtrl/LogPosCtrl.h>
+#include <Property/Property.h>
+#include <Gen/VTypes.h>
 #include <ValueCtrl/ValueCtrl.h>
 
+NAMESPACE_UPP
+
 #define LAYOUTFILE <CtrlProp/PropEdit.lay>
 #include <CtrlCore/lay.h>
 
@@ -54,4 +55,6 @@ public:
 	PropEditCtrl pec;
 };
 
+END_UPP_NAMESPACE
+
 #endif
diff --git a/bazaar/CtrlProp/PropList.cpp b/bazaar/CtrlProp/PropList.cpp
index 0d340c8b1..3ad6cef7d 100644
--- a/bazaar/CtrlProp/PropList.cpp
+++ b/bazaar/CtrlProp/PropList.cpp
@@ -1,5 +1,7 @@
 #include "PropList.h"
 
+NAMESPACE_UPP
+
 PropListCtrl::PropListCtrl()
 {
 	CtrlLayout(*this);
@@ -47,3 +49,5 @@ PropList::PropList()
 	SetRect(plc.GetRect());
 	Add(plc.HSizePos().VSizePos(0,20));
 }
+
+END_UPP_NAMESPACE
diff --git a/bazaar/CtrlProp/PropList.h b/bazaar/CtrlProp/PropList.h
index 657e6fefc..cc13d400c 100644
--- a/bazaar/CtrlProp/PropList.h
+++ b/bazaar/CtrlProp/PropList.h
@@ -1,11 +1,12 @@
 #ifndef _CtrlProp_PropList_h_
 #define _CtrlProp_PropList_h_
 
-#include "CtrlPropCommon.h"
-
-#include <LogPosCtrl/LogPosCtrl.h>
+#include <Property/Property.h>
+#include <Gen/VTypes.h>
 #include <ValueCtrl/ValueCtrl.h>
 
+NAMESPACE_UPP
+
 #define LAYOUTFILE <CtrlProp/PropList.lay>
 #include <CtrlCore/lay.h>
 
@@ -39,4 +40,6 @@ public:
 	PropListCtrl plc;
 };
 
+END_UPP_NAMESPACE
+
 #endif
diff --git a/bazaar/CtrlProp/Pusher.icpp b/bazaar/CtrlProp/Pusher.icpp
index 6d003b82a..583d71180 100644
--- a/bazaar/CtrlProp/Pusher.icpp
+++ b/bazaar/CtrlProp/Pusher.icpp
@@ -1,5 +1,6 @@
 #include "CtrlPropCommon.h"
-#include <CtrlLib/CtrlLib.h>
+
+NAMESPACE_UPP
 
 bool PropSetLabel(const Value& v, Pusher& o) { if(!IsString(v)) return false; o.SetLabel(String(v)); return true; }
 bool PropGetLabel(Value& v, const Pusher& o) { v = o.GetLabel(); return true; }
@@ -14,3 +15,5 @@ PROPERTY("clickfocus", PropSetClickFocus, PropGetClickFocus)
 END_PROPERTIES
 
 PROPS(Ctrl, Pusher, Ctrl)
+
+END_UPP_NAMESPACE
diff --git a/bazaar/CtrlProp/SeparatorCtrl.icpp b/bazaar/CtrlProp/SeparatorCtrl.icpp
index 849b80542..00e7088b0 100644
--- a/bazaar/CtrlProp/SeparatorCtrl.icpp
+++ b/bazaar/CtrlProp/SeparatorCtrl.icpp
@@ -1,7 +1,10 @@
 #include "CtrlProp.h"
-#include <CtrlLib/CtrlLib.h>
+
+NAMESPACE_UPP
 
 PROPERTIES(SeparatorCtrl, Ctrl)
 END_PROPERTIES
 
 PROPS(Ctrl, SeparatorCtrl, Ctrl)
+
+END_UPP_NAMESPACE
diff --git a/bazaar/CtrlProp/SliderCtrl.icpp b/bazaar/CtrlProp/SliderCtrl.icpp
index 61654571e..3285da5f7 100644
--- a/bazaar/CtrlProp/SliderCtrl.icpp
+++ b/bazaar/CtrlProp/SliderCtrl.icpp
@@ -1,7 +1,6 @@
 #include "CtrlPropCommon.h"
-#include <CtrlLib/CtrlLib.h>
 
-//SliderCtrl
+NAMESPACE_UPP
 
 bool PropSetMin(const Value& v, SliderCtrl& o) { if(!IsNumber(v)) return false; o.MinMax(v, o.GetMax()); return true; }
 bool PropGetMin(Value& v, const SliderCtrl& o) { v = o.GetMin(); return true; }
@@ -17,3 +16,5 @@ PROPERTY("step", PropSetStep, PropGetStep)
 END_PROPERTIES
 
 PROPS(Ctrl, SliderCtrl, Ctrl)
+
+END_UPP_NAMESPACE
diff --git a/bazaar/CtrlProp/StaticRect.icpp b/bazaar/CtrlProp/StaticRect.icpp
index 1bd9ee6dd..e11e8e564 100644
--- a/bazaar/CtrlProp/StaticRect.icpp
+++ b/bazaar/CtrlProp/StaticRect.icpp
@@ -1,5 +1,6 @@
 #include "CtrlPropCommon.h"
-#include <CtrlLib/CtrlLib.h>
+
+NAMESPACE_UPP
 
 bool PropSetBackground(const Value& v, StaticRect& o) { if(!v.Is<Color>()) return false; o.Background(v); return true; }
 bool PropGetBackground(Value& v, const StaticRect& o) { v = o.GetBackground(); return true; }
@@ -9,3 +10,5 @@ PROPERTY("background", PropSetBackground, PropGetBackground)
 END_PROPERTIES
 
 PROPS(Ctrl, StaticRect, Ctrl)
+
+END_UPP_NAMESPACE
diff --git a/bazaar/CtrlProp/StaticText.icpp b/bazaar/CtrlProp/StaticText.icpp
index fd253a63e..8d28765bd 100644
--- a/bazaar/CtrlProp/StaticText.icpp
+++ b/bazaar/CtrlProp/StaticText.icpp
@@ -1,5 +1,6 @@
 #include "CtrlPropCommon.h"
-#include <CtrlLib/CtrlLib.h>
+
+NAMESPACE_UPP
 
 bool PropSetInk(const Value& v, StaticText& o) { if(!v.Is<Color>()) return false; o.SetInk(v); return true; }
 bool PropGetInk(Value& v, const StaticText& o) { v = o.GetInk(); return true; }
@@ -15,3 +16,5 @@ PROPERTY("align", PropSetAlign, PropGetAlign)
 END_PROPERTIES
 
 PROPS(Ctrl, StaticText, Ctrl)
+
+END_UPP_NAMESPACE
diff --git a/bazaar/CtrlProp/Switch.icpp b/bazaar/CtrlProp/Switch.icpp
index cecd822bd..757802126 100644
--- a/bazaar/CtrlProp/Switch.icpp
+++ b/bazaar/CtrlProp/Switch.icpp
@@ -1,5 +1,6 @@
 #include "CtrlPropCommon.h"
-#include <CtrlLib/CtrlLib.h>
+
+NAMESPACE_UPP
 
 bool PropSetLabel(const Value& v, Switch& o) { o.SetLabel(AsString(v)); return true; }
 bool PropGetLabel(Value& v, const Switch& o) { v = o.GetLabel(); return true; }
@@ -9,3 +10,5 @@ PROPERTY("label", PropSetLabel, PropGetLabel)
 END_PROPERTIES
 
 PROPS(Ctrl, Switch, Ctrl)
+
+END_UPP_NAMESPACE
diff --git a/bazaar/CtrlProp/TextCtrl.icpp b/bazaar/CtrlProp/TextCtrl.icpp
index f76bd8236..2b19d6868 100644
--- a/bazaar/CtrlProp/TextCtrl.icpp
+++ b/bazaar/CtrlProp/TextCtrl.icpp
@@ -1,5 +1,6 @@
 #include "CtrlPropCommon.h"
-#include <CtrlLib/CtrlLib.h>
+
+NAMESPACE_UPP
 
 bool PropSetUndoSteps(const Value& v, TextCtrl& o) { if(!IsNumber(v)) return false; o.UndoSteps(v); return true; }
 bool PropGetUndoSteps(Value& v, const TextCtrl& o) { v = o.GetUndoSteps(); return true; }
@@ -18,3 +19,5 @@ PROPERTY("nobackground", PropSetNoBackground, PropGetNoBackground)
 END_PROPERTIES
 
 PROPS(Ctrl, TextCtrl, Ctrl)
+
+END_UPP_NAMESPACE
diff --git a/bazaar/Property/Property.cpp b/bazaar/Property/Property.cpp
index 90974a1d7..0fc15e5d6 100644
--- a/bazaar/Property/Property.cpp
+++ b/bazaar/Property/Property.cpp
@@ -1,5 +1,7 @@
 #include "Property.h"
 
+NAMESPACE_UPP
+
 void AddToValueArray(Value& v, const Vector<String>& k)
 {
 	if(!v.Is<ValueArray>()) 
@@ -11,3 +13,5 @@ void AddToValueArray(Value& v, const Vector<String>& k)
 	for(int i = 0; i < k.GetCount(); i++)
 		vv << k[i];
 }
+
+END_UPP_NAMESPACE
diff --git a/bazaar/Property/Property.h b/bazaar/Property/Property.h
index 0cc77101b..8134eb953 100644
--- a/bazaar/Property/Property.h
+++ b/bazaar/Property/Property.h
@@ -1,9 +1,9 @@
 #ifndef _Property_Property_h
 #define _Property_Property_h
 
-#include <CtrlLib/CtrlLib.h>
+#include <Core/Core.h>
 
-using namespace Upp;
+NAMESPACE_UPP
 
 template<class T>
 struct Property
@@ -39,6 +39,9 @@ struct Accessor
 	bool Set(const T& a) const { ASSERT(set); return set(a); }
 	bool Get(T& a) const { ASSERT(get); return get(a); }
 
+	inline T operator= (const T& a) const { Set(a); return a; }
+	inline operator T() const { T t; Get(t); return t; }
+
 public:
 	const S set;
 	const G get;
@@ -338,5 +341,7 @@ __base:	return GetSetProp##BASE(c,p,v,f); \
  \
 
 
+END_UPP_NAMESPACE
+
 #endif
 
diff --git a/bazaar/ValueCtrl/ValueCtrl.cpp b/bazaar/ValueCtrl/ValueCtrl.cpp
index 346da7af5..1d8cea353 100644
--- a/bazaar/ValueCtrl/ValueCtrl.cpp
+++ b/bazaar/ValueCtrl/ValueCtrl.cpp
@@ -1,5 +1,7 @@
 #include "ValueCtrl.h"
 
+NAMESPACE_UPP
+
 VectorMap<int, String>& GetValueTypeNoNameMap()
 {
 	static VectorMap<int, String> _;
@@ -212,3 +214,5 @@ void ValueCtrl::Updated()
 	else
 		SetText(v.ToString());
 }
+
+END_UPP_NAMESPACE
diff --git a/bazaar/ValueCtrl/ValueCtrl.h b/bazaar/ValueCtrl/ValueCtrl.h
index b095cf22a..4efe1ebac 100644
--- a/bazaar/ValueCtrl/ValueCtrl.h
+++ b/bazaar/ValueCtrl/ValueCtrl.h
@@ -3,8 +3,6 @@
 
 #include <CtrlLib/CtrlLib.h>
 
-using namespace Upp;
-
 #include <PopUpC/PopUpC.h>
 #include <Gen/VTypes.h>
 
@@ -12,13 +10,13 @@ using namespace Upp;
 #include <WithEnterAction/WithEnterAction.h>
 #include <Gen/Gen.h>
 
+NAMESPACE_UPP
+
 #define LAYOUTFILE <ValueCtrl/ValueCtrl.lay>
 #include <CtrlCore/lay.h>
 
 //For ValuePacker / RichValue<Value> and GCC
-NAMESPACE_UPP
 template<> inline bool IsNull(const Value& v)       { return v.IsNull(); }
-END_UPP_NAMESPACE
 
 VectorMap<int, String>& GetValueTypeNoNameMap();
 #define ADDVALUETYPENO(x) GetAdd(x, ASSTRING(x))
@@ -285,5 +283,7 @@ public:
 	virtual Value GetData() const { return ErrorValue(EditString::GetData()); }	
 };
 
+END_UPP_NAMESPACE
+
 #endif