diff --git a/uppsrc/ScatterCtrl/PieCtrl.h b/uppsrc/ScatterCtrl/PieCtrl.h
index 078802520..5fa6cbcb4 100644
--- a/uppsrc/ScatterCtrl/PieCtrl.h
+++ b/uppsrc/ScatterCtrl/PieCtrl.h
@@ -33,7 +33,7 @@ public:
 	PieCtrl& SetPercentBack(const Upp::Color& pbcolor)	{PieDraw::SetPercentBack(pbcolor); 		return *this;}
 	
 	PieCtrl& ShowLegend(bool show = true)				{PieDraw::ShowLegend(show); 			return *this;}
-	PieCtrl& SetLegendFont(const Font& font)			{PieDraw::SetLegendFont(font); 			return *this;}
+	PieCtrl& SetLegendFont(const Upp::Font& font)		{PieDraw::SetLegendFont(font); 			return *this;}
 	PieCtrl& SetLegendTextColor(const Upp::Color& color){PieDraw::SetLegendTextColor(color); 	return *this;}
 	PieCtrl& SetLegendBackColor(const Upp::Color& color){PieDraw::SetLegendBackColor(color); 	return *this;}
 	PieCtrl& SetLegendLeft(const int& h)				{PieDraw::SetLegendLeft(h); 			return *this;}
diff --git a/uppsrc/ScatterCtrl/PopUpText.cpp b/uppsrc/ScatterCtrl/PopUpText.cpp
index 124d9428f..4f40b19b5 100644
--- a/uppsrc/ScatterCtrl/PopUpText.cpp
+++ b/uppsrc/ScatterCtrl/PopUpText.cpp
@@ -1,3 +1,7 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
 #include "PopUpText.h"
 
 
diff --git a/uppsrc/ScatterCtrl/PopUpText.h b/uppsrc/ScatterCtrl/PopUpText.h
index 5a93ea875..f4b34e993 100644
--- a/uppsrc/ScatterCtrl/PopUpText.h
+++ b/uppsrc/ScatterCtrl/PopUpText.h
@@ -1,10 +1,6 @@
 #ifndef _PopUpText_PopUpText_h
 #define _PopUpText_PopUpText_h
 
-#include <CtrlLib/CtrlLib.h>
-
-using namespace Upp;
-
 class PopUpInfo : public StaticText {
 	Color color;
 	bool opened;
@@ -12,7 +8,7 @@ class PopUpInfo : public StaticText {
 public:
 	void   Paint(Draw& w);
 
-	PopUpInfo& SetFont(Font font)                      { LabelBase::SetFont(font); return *this; }
+	PopUpInfo& SetFont(Upp::Font font)                 { LabelBase::SetFont(font); return *this; }
 	PopUpInfo& SetInk(Color color)                     { LabelBase::SetInk(color); return *this; }
 	PopUpInfo& SetAlign(int align)                     { LabelBase::SetAlign(align); return *this; }
 	PopUpInfo& SetImage(const Image& img, int spc = 0) { LabelBase::SetImage(img, spc); return *this; }
diff --git a/uppsrc/ScatterCtrl/ScatterCtrl.h b/uppsrc/ScatterCtrl/ScatterCtrl.h
index c8f30067e..608acd8b0 100644
--- a/uppsrc/ScatterCtrl/ScatterCtrl.h
+++ b/uppsrc/ScatterCtrl/ScatterCtrl.h
@@ -1,13 +1,15 @@
 #ifndef _ScatterCtrl_ScatterCtrl_h
 #define _ScatterCtrl_ScatterCtrl_h
 
-#include "PopUpText.h"
 #include <ScatterDraw/ScatterDraw.h>
 #include <plugin/jpg/jpg.h>
 #include <GridCtrl/GridCtrl.h>
 
 using namespace Upp;
 
+#include "PopUpText.h"
+
+
 class EditDoubleLostFocus : public EditDouble {
 public:
 	Callback WhenLostFocus;
@@ -202,9 +204,9 @@ public:
 	ScatterCtrl& SetAxisColor(const Upp::Color& axis_color)		{ScatterDraw::SetAxisColor(axis_color);		return *this;};
 	ScatterCtrl& SetAxisWidth(int axis_width)					{ScatterDraw::SetAxisWidth(axis_width);		return *this;};
 	ScatterCtrl& SetTitle(const String& title)		 			{ScatterDraw::SetTitle(title); 				return *this;};
-	ScatterCtrl& SetTitleFont(const Font& fontTitle) 			{ScatterDraw::SetTitleFont(fontTitle); 		return *this;};
+	ScatterCtrl& SetTitleFont(const Upp::Font& fontTitle) 		{ScatterDraw::SetTitleFont(fontTitle); 		return *this;};
 	ScatterCtrl& SetTitleColor(const Upp::Color& colorTitle)	{ScatterDraw::SetTitleColor(colorTitle);	return *this;};
-	ScatterCtrl& SetLabelsFont(const Font& fontLabels) 			{ScatterDraw::SetLabelsFont(fontLabels); 	return *this;};
+	ScatterCtrl& SetLabelsFont(const Upp::Font& fontLabels) 	{ScatterDraw::SetLabelsFont(fontLabels); 	return *this;};
 	ScatterCtrl& SetLabelsColor(const Upp::Color& colorLabels)	{ScatterDraw::SetLabelsColor(colorLabels);	return *this;};
 	ScatterCtrl& SetLabelX(const String& xLabel)				{ScatterDraw::SetLabelX(xLabel); 			return *this;};
 	ScatterCtrl& SetLabelY(const String& yLabel)				{ScatterDraw::SetLabelY(yLabel); 			return *this;};