diff --git a/synfig-core/src/modules/lyr_std/bevel.cpp b/synfig-core/src/modules/lyr_std/bevel.cpp
index d553cd2..433924d 100644
--- a/synfig-core/src/modules/lyr_std/bevel.cpp
+++ b/synfig-core/src/modules/lyr_std/bevel.cpp
@@ -52,9 +52,10 @@
 
 #endif
 
-using namespace synfig;
-using namespace etl;
 using namespace std;
+using namespace etl;
+using namespace synfig;
+using namespace lyr_std;
 
 /*#define TYPE_BOX			0
 #define TYPE_FASTGUASSIAN	1
@@ -76,7 +77,7 @@ SYNFIG_LAYER_SET_CVS_ID(Layer_Bevel,"$Id$");
 
 /* -- F U N C T I O N S ----------------------------------------------------- */
 
-inline void clamp(synfig::Vector &v)
+inline void clamp(Vector &v)
 {
 	if(v[0]<0.0)v[0]=0.0;
 	if(v[1]<0.0)v[1]=0.0;
@@ -102,8 +103,8 @@ Layer_Bevel::Layer_Bevel():
 void
 Layer_Bevel::calc_offset()
 {
-	synfig::Angle angle=param_angle.get(synfig::Angle());
-	synfig::Real depth=param_depth.get(synfig::Real());
+	Angle angle=param_angle.get(Angle());
+	Real depth=param_depth.get(Real());
 	
 	offset[0]=Angle::cos(angle).get()*depth;
 	offset[1]=Angle::sin(angle).get()*depth;
@@ -117,7 +118,7 @@ Layer_Bevel::set_param(const String &param, const ValueBase &value)
 {
 	IMPORT_VALUE_PLUS(param_softness,
 		{
-			synfig::Real softness=param_softness.get(Real());
+			Real softness=param_softness.get(Real());
 			softness=softness>0?softness:0;
 			param_softness.set(softness);
 		}
@@ -154,10 +155,10 @@ Layer_Bevel::get_param(const String &param)const
 Color
 Layer_Bevel::get_color(Context context, const Point &pos)const
 {
-	synfig::Real softness=param_softness.get(Real());
+	Real softness=param_softness.get(Real());
 	int type=param_type.get(int());
-	synfig::Color color1=param_color1.get(synfig::Color());
-	synfig::Color color2=param_color2.get(synfig::Color());
+	Color color1=param_color1.get(Color());
+	Color color2=param_color2.get(Color());
 	
 	const Vector size(softness,softness);
 	Point blurpos = Blur(size,type)(pos);
@@ -184,10 +185,10 @@ Layer_Bevel::accelerated_render(Context context,Surface *surface,int quality, co
 {
 	RENDER_TRANSFORMED_IF_NEED(__FILE__, __LINE__)
 
-	synfig::Real softness=param_softness.get(Real());
+	Real softness=param_softness.get(Real());
 	int type=param_type.get(int());
-	synfig::Color color1=param_color1.get(synfig::Color());
-	synfig::Color color2=param_color2.get(synfig::Color());
+	Color color1=param_color1.get(Color());
+	Color color2=param_color2.get(Color());
 	bool use_luma=param_use_luma.get(bool());
 	bool solid=param_solid.get(bool());
 	
@@ -382,10 +383,10 @@ Layer_Bevel::accelerated_render(Context context,Surface *surface,int quality, co
 bool
 Layer_Bevel::accelerated_cairorender(Context context, cairo_t *cr,int quality, const RendDesc &renddesc, ProgressCallback *cb)const
 {
-	synfig::Real softness=param_softness.get(Real());
+	Real softness=param_softness.get(Real());
 	int type=param_type.get(int());
-	synfig::Color color1=param_color1.get(synfig::Color());
-	synfig::Color color2=param_color2.get(synfig::Color());
+	Color color1=param_color1.get(Color());
+	Color color2=param_color2.get(Color());
 	bool use_luma=param_use_luma.get(bool());
 	bool solid=param_solid.get(bool());
 
@@ -504,14 +505,14 @@ Layer_Bevel::accelerated_cairorender(Context context, cairo_t *cr,int quality, c
 	CairoSurface cairoworksurface(worksurface);
 	if(!cairoworksurface.map_cairo_image())
 	{
-		synfig::info("map cairo image failed");
+		info("map cairo image failed");
 		return false;
 	}
 	// Extract the CairoSurface from the cairo_surface_t
 	CairoSurface cairosurface(surface);
 	if(!cairosurface.map_cairo_image())
 	{
-		synfig::info("map cairo image failed");
+		info("map cairo image failed");
 		return false;
 	}
 
@@ -666,8 +667,8 @@ Layer_Bevel::get_param_vocab(void)const
 Rect
 Layer_Bevel::get_full_bounding_rect(Context context)const
 {
-	synfig::Real softness=param_softness.get(Real());
-	synfig::Real depth=param_depth.get(synfig::Real());
+	Real softness=param_softness.get(Real());
+	Real depth=param_depth.get(Real());
 
 	if(is_disabled())
 		return context.get_full_bounding_rect();
diff --git a/synfig-core/src/modules/lyr_std/bevel.h b/synfig-core/src/modules/lyr_std/bevel.h
index fd2a52e..1f21302 100644
--- a/synfig-core/src/modules/lyr_std/bevel.h
+++ b/synfig-core/src/modules/lyr_std/bevel.h
@@ -35,53 +35,56 @@
 #include <synfig/blur.h>
 #include <synfig/angle.h>
 
+namespace lyr_std
+{
+
 using namespace synfig;
-using namespace std;
-using namespace etl;
 
-class Layer_Bevel : public synfig::Layer_Composite
+class Layer_Bevel : public Layer_Composite
 {
 	SYNFIG_LAYER_MODULE_EXT
 private:
 	//!Parameter: (int) type of blur to use
 	ValueBase param_type;
-	//!Parameter: (synfig::Real) amount of blur
+	//!Parameter: (Real) amount of blur
 	ValueBase param_softness;
-	//!Parameter: (synfig::Color) light color
+	//!Parameter: (Color) light color
 	ValueBase param_color1;
-	//!Parameter: (synfig::Color) dark color
+	//!Parameter: (Color) dark color
 	ValueBase param_color2;
-	//!Parameter: (synfig::Angle) angle of the light source
+	//!Parameter: (Angle) angle of the light source
 	ValueBase param_angle;
-	//!Parameter: (synfig::Real) depth of the bevel
+	//!Parameter: (Real) depth of the bevel
 	ValueBase param_depth;
 	//!Parameter: (bool) use luma
 	ValueBase param_use_luma;
 	//!Parameter: (bool) solid
 	ValueBase param_solid;
 	
-	synfig::Vector	offset;
-	synfig::Vector	offset45;
+	Vector	offset;
+	Vector	offset45;
 
 
 	void calc_offset();
 public:
 	Layer_Bevel();
 
-	virtual bool set_param(const String & param, const synfig::ValueBase &value);
+	virtual bool set_param(const String &param, const ValueBase &value);
 
-	virtual ValueBase get_param(const String & param)const;
+	virtual ValueBase get_param(const String &param)const;
 
 	virtual Color get_color(Context context, const Point &pos)const;
 
 	virtual bool accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const;
 	virtual bool accelerated_cairorender(Context context, cairo_t *cr,int quality, const RendDesc &renddesc, ProgressCallback *cb)const;
 
-	virtual synfig::Rect get_full_bounding_rect(Context context)const;
+	virtual Rect get_full_bounding_rect(Context context)const;
 	virtual Vocab get_param_vocab()const;
 	virtual bool reads_context()const { return true; }
 }; // END of class Layer_Bevel
 
+} // END of namespace lyr_std
+
 /* -- E X T E R N S --------------------------------------------------------- */
 
 /* -- E N D ----------------------------------------------------------------- */
diff --git a/synfig-core/src/modules/lyr_std/booleancurve.cpp b/synfig-core/src/modules/lyr_std/booleancurve.cpp
index dfed92c..2a771a6 100644
--- a/synfig-core/src/modules/lyr_std/booleancurve.cpp
+++ b/synfig-core/src/modules/lyr_std/booleancurve.cpp
@@ -50,6 +50,7 @@
 using namespace std;
 using namespace etl;
 using namespace synfig;
+using namespace lyr_std;
 
 /* === M A C R O S ========================================================= */
 
@@ -69,9 +70,9 @@ BooleanCurve::~BooleanCurve()
 {
 }
 
-bool BooleanCurve::set_param(const String & param, const synfig::ValueBase &value)
+bool BooleanCurve::set_param(const String & param, const ValueBase &value)
 {
-	if(param=="regions" && value.same_type_as(synfig::ValueBase::List()))
+	if(param=="regions" && value.same_type_as(ValueBase::List()))
 	{
 		vector<BLinePoint> bv;
 		int size = value.get_list().size();
diff --git a/synfig-core/src/modules/lyr_std/booleancurve.h b/synfig-core/src/modules/lyr_std/booleancurve.h
index 4d716b7..ba5297b 100644
--- a/synfig-core/src/modules/lyr_std/booleancurve.h
+++ b/synfig-core/src/modules/lyr_std/booleancurve.h
@@ -26,19 +26,23 @@
 #define __SYNFIG_BOOLEAN_CURVE_H
 
 /* === H E A D E R S ======================================================= */
-#include <synfig/layers/layer_shape.h>
-#include <synfig/blinepoint.h>
 
 #include <vector>
 
+#include <synfig/layers/layer_shape.h>
+#include <synfig/blinepoint.h>
+
 /* === M A C R O S ========================================================= */
 
 /* === T Y P E D E F S ===================================================== */
 
 /* === C L A S S E S & S T R U C T S ======================================= */
-namespace synfig
+
+namespace lyr_std
 {
 
+using namespace synfig;
+
 class BooleanCurve : public Layer_Shape
 {
 	//dynamic list of regions and such
@@ -60,16 +64,17 @@ public:
 	BooleanCurve();
 	~BooleanCurve();
 
-	virtual bool set_param(const String & param, const synfig::ValueBase &value);
-	virtual ValueBase get_param(const String & param)const;
+	virtual bool set_param(const String &param, const ValueBase &value);
+	virtual ValueBase get_param(const String &param)const;
 
 	virtual Vocab get_param_vocab()const;
 
 	virtual Color get_color(Context context, const Point &pos)const;
-	virtual bool accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const;
+	virtual bool accelerated_render(Context context, Surface *surface, int quality, const RendDesc &renddesc, ProgressCallback *cb)const;
 };
 
-} //end of namespace synfig
+} // END of namespace lyr_std
+
 /* === E N D =============================================================== */
 
 #endif
diff --git a/synfig-core/src/modules/lyr_std/clamp.cpp b/synfig-core/src/modules/lyr_std/clamp.cpp
index 8331738..87f80e7 100644
--- a/synfig-core/src/modules/lyr_std/clamp.cpp
+++ b/synfig-core/src/modules/lyr_std/clamp.cpp
@@ -48,9 +48,10 @@
 
 /* === U S I N G =========================================================== */
 
-using namespace etl;
 using namespace std;
+using namespace etl;
 using namespace synfig;
+using namespace lyr_std;
 
 /* === G L O B A L S ======================================================= */
 
@@ -82,8 +83,8 @@ Layer_Clamp::clamp_color(const Color &in)const
 {
 	bool invert_negative=param_invert_negative.get(bool());
 	bool clamp_ceiling=param_clamp_ceiling.get(bool());
-	synfig::Real ceiling=param_ceiling.get(synfig::Real());
-	synfig::Real floor=param_floor.get(synfig::Real());
+	Real ceiling=param_ceiling.get(Real());
+	Real floor=param_floor.get(Real());
 	
 	Color ret(in);
 
diff --git a/synfig-core/src/modules/lyr_std/clamp.h b/synfig-core/src/modules/lyr_std/clamp.h
index 0c82d3a..508fd5b 100644
--- a/synfig-core/src/modules/lyr_std/clamp.h
+++ b/synfig-core/src/modules/lyr_std/clamp.h
@@ -36,7 +36,10 @@
 
 /* === C L A S S E S & S T R U C T S ======================================= */
 
-namespace synfig {
+namespace lyr_std
+{
+
+using namespace synfig;
 
 class Layer_Clamp : public Layer
 {
@@ -47,9 +50,9 @@ private:
 	ValueBase param_invert_negative;
 	//!Parameter: (bool)
 	ValueBase param_clamp_ceiling;
-	//!Parameter: (synfig::Real)
+	//!Parameter: (Real)
 	ValueBase param_ceiling;
-	//!Parameter: (synfig::Real)
+	//!Parameter: (Real)
 	ValueBase param_floor;
 
 	Color clamp_color(const Color &in)const;
@@ -58,7 +61,7 @@ public:
 
 	Layer_Clamp();
 
-	virtual bool set_param(const String & param, const synfig::ValueBase &value);
+	virtual bool set_param(const String & param, const ValueBase &value);
 
 	virtual ValueBase get_param(const String & param)const;
 
@@ -71,7 +74,7 @@ public:
 	virtual Vocab get_param_vocab()const;
 }; // END of class Layer_Clamp
 
-}; // END of namespace synfig
+} // END of namespace lyr_std
 
 /* === E N D =============================================================== */
 
diff --git a/synfig-core/src/modules/lyr_std/curvewarp.cpp b/synfig-core/src/modules/lyr_std/curvewarp.cpp
index b07b1a1..b6dcb34 100644
--- a/synfig-core/src/modules/lyr_std/curvewarp.cpp
+++ b/synfig-core/src/modules/lyr_std/curvewarp.cpp
@@ -47,6 +47,11 @@
 
 #endif
 
+using namespace std;
+using namespace etl;
+using namespace synfig;
+using namespace lyr_std;
+
 /* === M A C R O S ========================================================= */
 
 #define FAKE_TANGENT_STEP 0.000001
@@ -63,10 +68,10 @@ SYNFIG_LAYER_SET_CVS_ID(CurveWarp,"$Id$");
 
 /* === P R O C E D U R E S ================================================= */
 
-inline float calculate_distance(const std::vector<synfig::BLinePoint>& bline)
+inline float calculate_distance(const std::vector<BLinePoint>& bline)
 {
-	std::vector<synfig::BLinePoint>::const_iterator iter,next,ret;
-	std::vector<synfig::BLinePoint>::const_iterator end(bline.end());
+	std::vector<BLinePoint>::const_iterator iter,next,ret;
+	std::vector<BLinePoint>::const_iterator end(bline.end());
 
 	float dist(0);
 
@@ -85,11 +90,11 @@ inline float calculate_distance(const std::vector<synfig::BLinePoint>& bline)
 	return dist;
 }
 
-std::vector<synfig::BLinePoint>::const_iterator
-find_closest_to_bline(bool fast, const std::vector<synfig::BLinePoint>& bline,const Point& p,float& t, float& len, bool& extreme)
+std::vector<BLinePoint>::const_iterator
+find_closest_to_bline(bool fast, const std::vector<BLinePoint>& bline,const Point& p,float& t, float& len, bool& extreme)
 {
-	std::vector<synfig::BLinePoint>::const_iterator iter,next,ret;
-	std::vector<synfig::BLinePoint>::const_iterator end(bline.end());
+	std::vector<BLinePoint>::const_iterator iter,next,ret;
+	std::vector<BLinePoint>::const_iterator end(bline.end());
 
 	ret=bline.end();
 	float dist(100000000000.0);
@@ -153,7 +158,7 @@ find_closest_to_bline(bool fast, const std::vector<synfig::BLinePoint>& bline,co
 inline void
 CurveWarp::sync()
 {
-	std::vector<synfig::BLinePoint> bline(param_bline.get_list_of(synfig::BLinePoint()));
+	std::vector<BLinePoint> bline(param_bline.get_list_of(BLinePoint()));
 	Point start_point=param_start_point.get(Point());
 	Point end_point=param_end_point.get(Point());
 	
@@ -166,10 +171,10 @@ CurveWarp::CurveWarp():
 	param_perp_width(ValueBase(Real(1))),
 	param_start_point(ValueBase(Point(-2.5,-0.5))),
 	param_end_point(ValueBase(Point(2.5,-0.3))),
-	param_bline(ValueBase(std::vector<synfig::BLinePoint>())),
+	param_bline(ValueBase(std::vector<BLinePoint>())),
 	param_fast(ValueBase(true))
 {
-	std::vector<synfig::BLinePoint> bline;
+	std::vector<BLinePoint> bline;
 	bline.push_back(BLinePoint());
 	bline.push_back(BLinePoint());
 	bline[0].set_vertex(Point(-2.5,0));
@@ -188,7 +193,7 @@ CurveWarp::CurveWarp():
 inline Point
 CurveWarp::transform(const Point &point_, Real *dist, Real *along, int quality)const
 {
-	std::vector<synfig::BLinePoint> bline(param_bline.get_list_of(synfig::BLinePoint()));
+	std::vector<BLinePoint> bline(param_bline.get_list_of(BLinePoint()));
 	Point start_point=param_start_point.get(Point());
 	Point end_point=param_end_point.get(Point());
 	Point origin=param_origin.get(Point());
@@ -218,7 +223,7 @@ CurveWarp::transform(const Point &point_, Real *dist, Real *along, int quality)c
 	{
 		Point point(point_-origin);
 
-		std::vector<synfig::BLinePoint>::const_iterator iter,next;
+		std::vector<BLinePoint>::const_iterator iter,next;
 
 		// Figure out the BLinePoint we will be using,
 		next=find_closest_to_bline(fast,bline,point,t,len,extreme);
@@ -267,7 +272,7 @@ CurveWarp::transform(const Point &point_, Real *dist, Real *along, int quality)c
 					if (other_tangent[0] == 0 && other_tangent[1] == 0)
 					{
 						// find the previous blinepoint
-						std::vector<synfig::BLinePoint>::const_iterator prev;
+						std::vector<BLinePoint>::const_iterator prev;
 						if (iter != bline.begin()) (prev = iter)--;
 						else prev = iter;
 
@@ -292,7 +297,7 @@ CurveWarp::transform(const Point &point_, Real *dist, Real *along, int quality)c
 					if (other_tangent[0] == 0 && other_tangent[1] == 0)
 					{
 						// find the next blinepoint
-						std::vector<synfig::BLinePoint>::const_iterator next2(next);
+						std::vector<BLinePoint>::const_iterator next2(next);
 						if (++next2 == bline.end())
 							next2 = next;
 
@@ -324,13 +329,13 @@ CurveWarp::transform(const Point &point_, Real *dist, Real *along, int quality)c
 
 		if (t < 0.5)
 		{
-			std::vector<synfig::BLinePoint>::const_iterator iter(bline.begin());
+			std::vector<BLinePoint>::const_iterator iter(bline.begin());
 			tangent = iter->get_tangent1().norm();
 			len = 0;
 		}
 		else
 		{
-			std::vector<synfig::BLinePoint>::const_iterator iter(--bline.end());
+			std::vector<BLinePoint>::const_iterator iter(--bline.end());
 			tangent = iter->get_tangent2().norm();
 			len = curve_length_;
 		}
@@ -354,8 +359,8 @@ CurveWarp::transform(const Point &point_, Real *dist, Real *along, int quality)c
 			perp_ * unscaled_distance/(thickness*perp_width));
 }
 
-synfig::Layer::Handle
-CurveWarp::hit_check(synfig::Context context, const synfig::Point &point)const
+Layer::Handle
+CurveWarp::hit_check(Context context, const Point &point)const
 {
 	return context.hit_check(transform(point));
 }
@@ -494,7 +499,7 @@ CurveWarp::accelerated_render(Context context,Surface *surface,int quality, cons
 
 #if 0
 	// look at each blinepoint
-	std::vector<synfig::BLinePoint>::const_iterator iter;
+	std::vector<BLinePoint>::const_iterator iter;
 	for (iter=bline.begin(); iter!=bline.end(); iter++)
 		src_rect.expand(transform(iter->get_vertex()+origin, &dist, &along)); UPDATE_DIST;
 #endif
@@ -680,7 +685,7 @@ if (along > max_along) max_along = along
 	
 #if 0
 	// look at each blinepoint
-	std::vector<synfig::BLinePoint>::const_iterator iter;
+	std::vector<BLinePoint>::const_iterator iter;
 	for (iter=bline.begin(); iter!=bline.end(); iter++)
 		src_rect.expand(transform(iter->get_vertex()+origin, &dist, &along)); UPDATE_DIST;
 #endif
diff --git a/synfig-core/src/modules/lyr_std/curvewarp.h b/synfig-core/src/modules/lyr_std/curvewarp.h
index 9e29ed8..e85749f 100644
--- a/synfig-core/src/modules/lyr_std/curvewarp.h
+++ b/synfig-core/src/modules/lyr_std/curvewarp.h
@@ -42,9 +42,10 @@
 
 /* === C L A S S E S & S T R U C T S ======================================= */
 
+namespace lyr_std
+{
+
 using namespace synfig;
-using namespace std;
-using namespace etl;
 
 class CurveWarp : public Layer
 {
@@ -59,7 +60,7 @@ private:
 	ValueBase param_start_point;
 	//!Parameter: (Point) end point of source
 	ValueBase param_end_point;
-	//!Parameter: (std::vector<synfig::BlinePoint>) spline of the warp
+	//!Parameter: (std::vector<BlinePoint>) spline of the warp
 	ValueBase param_bline;
 	//!Parameter: (bool)
 	ValueBase param_fast;
@@ -78,11 +79,13 @@ public:
 	virtual Color get_color(Context context, const Point &pos)const;
 	virtual bool accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const;
 	virtual bool accelerated_cairorender(Context context,cairo_t *cr, int quality, const RendDesc &renddesc, ProgressCallback *cb)const;
-	synfig::Layer::Handle hit_check(synfig::Context context, const synfig::Point &point)const;
+	Layer::Handle hit_check(Context context, const Point &point)const;
 
 	virtual Vocab get_param_vocab()const;
 };
 
+} // END of namespace lyr_std
+
 /* === E N D =============================================================== */
 
 #endif
diff --git a/synfig-core/src/modules/lyr_std/freetime.cpp b/synfig-core/src/modules/lyr_std/freetime.cpp
index 8462f84..131213c 100644
--- a/synfig-core/src/modules/lyr_std/freetime.cpp
+++ b/synfig-core/src/modules/lyr_std/freetime.cpp
@@ -34,19 +34,20 @@
 #include <synfig/localization.h>
 #include <synfig/general.h>
 
-#include "freetime.h"
-
 #include <synfig/time.h>
 #include <synfig/context.h>
 #include <synfig/canvas.h>
 #include <synfig/value.h>
 #include <synfig/paramdesc.h>
 
+#include "freetime.h"
+
 #endif
 
-using namespace synfig;
 using namespace std;
 using namespace etl;
+using namespace synfig;
+using namespace lyr_std;
 
 /* === M A C R O S ========================================================= */
 
@@ -109,3 +110,4 @@ Layer_FreeTime::set_time(IndependentContext context, Time /* t */)const
 	Time time = param_time.get(Time());
 	context.set_time(time);
 }
+
diff --git a/synfig-core/src/modules/lyr_std/freetime.h b/synfig-core/src/modules/lyr_std/freetime.h
index c450939..b5ffe81 100644
--- a/synfig-core/src/modules/lyr_std/freetime.h
+++ b/synfig-core/src/modules/lyr_std/freetime.h
@@ -34,9 +34,11 @@
 /* === T Y P E D E F S ===================================================== */
 
 /* === C L A S S E S & S T R U C T S ======================================= */
+
+namespace lyr_std
+{
+
 using namespace synfig;
-using namespace std;
-using namespace etl;
 
 class Layer_FreeTime : public Layer_Invisible
 {
@@ -53,16 +55,13 @@ public:
 	~Layer_FreeTime();
 
 	virtual bool set_param(const String & param, const ValueBase &value);
-
 	virtual ValueBase get_param(const String & param)const;
-
 	virtual Vocab get_param_vocab()const;
-	virtual bool set_version(const String &ver);
-	virtual void reset_version();
-
 	virtual void set_time(IndependentContext context, Time time)const;
 };
 
+} // END of namespace lyr_std
+
 /* === E N D =============================================================== */
 
 #endif
diff --git a/synfig-core/src/modules/lyr_std/import.cpp b/synfig-core/src/modules/lyr_std/import.cpp
index 1b03d91..135eb5d 100644
--- a/synfig-core/src/modules/lyr_std/import.cpp
+++ b/synfig-core/src/modules/lyr_std/import.cpp
@@ -53,9 +53,10 @@
 
 #endif
 
-using namespace synfig;
 using namespace std;
 using namespace etl;
+using namespace synfig;
+using namespace lyr_std;
 
 /* === M A C R O S ========================================================= */
 
@@ -122,7 +123,7 @@ Import::set_param(const String & param, const ValueBase &value)
 
 		//if(get_canvas()->get_file_path()==dirname(newfilename))
 		//{
-		//	synfig::info("Image seems to be in local directory. Adjusting path...");
+		//	info("Image seems to be in local directory. Adjusting path...");
 		//	newfilename=basename(newfilename);
 		//}
 
@@ -133,7 +134,7 @@ Import::set_param(const String & param, const ValueBase &value)
 			while(basename(curpath)==".")curpath=dirname(curpath);
 
 			newfilename=relative_path(curpath,newfilename);
-			synfig::info("basename(curpath)=%s, Path adjusted to %s",basename(curpath).c_str(),newfilename.c_str());
+			info("basename(curpath)=%s, Path adjusted to %s",basename(curpath).c_str(),newfilename.c_str());
 		}
 #endif
 
@@ -164,7 +165,7 @@ Import::set_param(const String & param, const ValueBase &value)
 				// If we are already loaded, don't reload
 				if(filename==newfilename && importer)
 				{
-					synfig::warning(strprintf(_("Filename seems to already be set to \"%s\" (%s)"),filename.c_str(),newfilename.c_str()));
+					warning(strprintf(_("Filename seems to already be set to \"%s\" (%s)"),filename.c_str(),newfilename.c_str()));
 					return true;
 				}
 
@@ -189,7 +190,7 @@ Import::set_param(const String & param, const ValueBase &value)
 					newimporter=Importer::open(file_system->get_identifier(get_canvas()->get_file_path()+ETL_DIRECTORY_SEPARATOR+basename(newfilename_orig)));
 					if(!newimporter)
 					{
-						synfig::error(strprintf("Unable to create an importer object with file \"%s\"",filename_with_path.c_str()));
+						error(strprintf("Unable to create an importer object with file \"%s\"",filename_with_path.c_str()));
 						importer=0;
 						filename=newfilename;
 						abs_filename=filename_with_path;
@@ -202,7 +203,7 @@ Import::set_param(const String & param, const ValueBase &value)
 				surface.clear();
 				if(!newimporter->get_frame(surface,get_canvas()->rend_desc(),Time(0),trimmed,width,height,top,left))
 				{
-					synfig::warning(strprintf("Unable to get frame from \"%s\"",filename_with_path.c_str()));
+					warning(strprintf("Unable to get frame from \"%s\"",filename_with_path.c_str()));
 				}
 
 				rendering_surface = new rendering::SurfaceSW();
@@ -224,7 +225,7 @@ Import::set_param(const String & param, const ValueBase &value)
 				
 				if(filename==newfilename && cimporter)
 				{
-					synfig::warning(strprintf(_("Filename seems to already be set to \"%s\" (%s)"),filename.c_str(),newfilename.c_str()));
+					warning(strprintf(_("Filename seems to already be set to \"%s\" (%s)"),filename.c_str(),newfilename.c_str()));
 					return true;
 				}
 				assert(get_canvas());
@@ -248,7 +249,7 @@ Import::set_param(const String & param, const ValueBase &value)
 					newimporter=CairoImporter::open(file_system->get_identifier(get_canvas()->get_file_path()+ETL_DIRECTORY_SEPARATOR+basename(newfilename_orig)));
 					if(!newimporter)
 					{
-						synfig::error(strprintf("Unable to create an importer object with file \"%s\"",filename_with_path.c_str()));
+						error(strprintf("Unable to create an importer object with file \"%s\"",filename_with_path.c_str()));
 						cimporter=0;
 						filename=newfilename;
 						abs_filename=filename_with_path;
@@ -261,7 +262,7 @@ Import::set_param(const String & param, const ValueBase &value)
 				cairo_surface_t* cs;
 				if(!newimporter->get_frame(cs, get_canvas()->rend_desc(), Time(0), trimmed, width, height, top, left))
 				{
-					synfig::warning(strprintf("Unable to get frame from \"%s\"",filename_with_path.c_str()));
+					warning(strprintf("Unable to get frame from \"%s\"",filename_with_path.c_str()));
 				}
 				set_cairo_surface(cs);
 				cairo_surface_destroy(cs);
diff --git a/synfig-core/src/modules/lyr_std/import.h b/synfig-core/src/modules/lyr_std/import.h
index ed3bb6d..adf0863 100644
--- a/synfig-core/src/modules/lyr_std/import.h
+++ b/synfig-core/src/modules/lyr_std/import.h
@@ -35,14 +35,17 @@
 #include <synfig/cairoimporter.h>
 #include <synfig/rendermethod.h>
 
-using namespace synfig;
-
 /* === M A C R O S ========================================================= */
 
 /* === T Y P E D E F S ===================================================== */
 
 /* === C L A S S E S & S T R U C T S ======================================= */
 
+namespace lyr_std
+{
+
+using namespace synfig;
+
 class Import : public Layer_Bitmap
 {
 	SYNFIG_LAYER_MODULE_EXT
@@ -78,6 +81,8 @@ public:
 	virtual void set_render_method(Context context, RenderMethod x);
 };
 
+} // END of namespace lyr_std
+
 /* === E N D =============================================================== */
 
 #endif
diff --git a/synfig-core/src/modules/lyr_std/insideout.cpp b/synfig-core/src/modules/lyr_std/insideout.cpp
index 3226ddb..3321e60 100644
--- a/synfig-core/src/modules/lyr_std/insideout.cpp
+++ b/synfig-core/src/modules/lyr_std/insideout.cpp
@@ -49,6 +49,11 @@
 
 #endif
 
+using namespace std;
+using namespace etl;
+using namespace synfig;
+using namespace lyr_std;
+
 /* === M A C R O S ========================================================= */
 
 /* === G L O B A L S ======================================================= */
@@ -89,8 +94,8 @@ InsideOut::get_param(const String & param)const
 	return ValueBase();
 }
 
-synfig::Layer::Handle
-InsideOut::hit_check(synfig::Context context, const synfig::Point &p)const
+Layer::Handle
+InsideOut::hit_check(Context context, const Point &p)const
 {
 	Point origin=param_origin.get(Point());
 	Point pos(p-origin);
@@ -119,13 +124,13 @@ InsideOut::get_cairocolor(Context context, const Point &p)const
 	return context.get_cairocolor(invpos+origin);
 }
 
-class InsideOut_Trans : public Transform
+class lyr_std::InsideOut_Trans : public Transform
 {
 	etl::handle<const InsideOut> layer;
 public:
 	InsideOut_Trans(const InsideOut* x):Transform(x->get_guid()),layer(x) { }
 
-	synfig::Vector perform(const synfig::Vector& x)const
+	Vector perform(const Vector& x)const
 	{
 		Point origin=layer->param_origin.get(Point());
 		Point pos(x-origin);
@@ -135,7 +140,7 @@ public:
 		return x;
 	}
 
-	synfig::Vector unperform(const synfig::Vector& x)const
+	Vector unperform(const Vector& x)const
 	{
 		Point origin=layer->param_origin.get(Point());
 		Point pos(x-origin);
@@ -145,7 +150,7 @@ public:
 		return x;
 	}
 
-	synfig::String get_string()const
+	String get_string()const
 	{
 		return "insideout";
 	}
diff --git a/synfig-core/src/modules/lyr_std/insideout.h b/synfig-core/src/modules/lyr_std/insideout.h
index 59b1ea3..861bee7 100644
--- a/synfig-core/src/modules/lyr_std/insideout.h
+++ b/synfig-core/src/modules/lyr_std/insideout.h
@@ -39,9 +39,11 @@
 
 /* === C L A S S E S & S T R U C T S ======================================= */
 
+namespace lyr_std
+{
+
 using namespace synfig;
-using namespace std;
-using namespace etl;
+
 class InsideOut_Trans;
 
 class InsideOut : public Layer
@@ -60,11 +62,13 @@ public:
 	virtual ValueBase get_param(const String &param)const;
 	virtual Color get_color(Context context, const Point &pos)const;
 	virtual CairoColor get_cairocolor(Context context, const Point &pos)const;
-	synfig::Layer::Handle hit_check(synfig::Context context, const synfig::Point &point)const;
+	Layer::Handle hit_check(Context context, const Point &point)const;
 	virtual Vocab get_param_vocab()const;
-	virtual etl::handle<synfig::Transform> get_transform()const;
+	virtual etl::handle<Transform> get_transform()const;
 };
 
+} // END of namespace lyr_std
+
 /* === E N D =============================================================== */
 
 #endif
diff --git a/synfig-core/src/modules/lyr_std/julia.cpp b/synfig-core/src/modules/lyr_std/julia.cpp
index bf36d6c..947d4ad 100644
--- a/synfig-core/src/modules/lyr_std/julia.cpp
+++ b/synfig-core/src/modules/lyr_std/julia.cpp
@@ -48,6 +48,11 @@
 
 #endif
 
+using namespace std;
+using namespace etl;
+using namespace synfig;
+using namespace lyr_std;
+
 /* === M A C R O S ========================================================= */
 
 #define LOG_OF_2		0.69314718055994528623
@@ -217,11 +222,11 @@ Julia::get_param(const String & param)const
 Color
 Julia::get_color(Context context, const Point &pos)const
 {
-	synfig::Color icolor=param_icolor.get(synfig::Color());
-	synfig::Color ocolor=param_ocolor.get(synfig::Color());
-	synfig::Angle color_shift=param_color_shift.get(synfig::Angle());
+	Color icolor=param_icolor.get(Color());
+	Color ocolor=param_ocolor.get(Color());
+	Angle color_shift=param_color_shift.get(Angle());
 	int iterations=param_iterations.get(int());
-	synfig::Point seed=param_seed.get(synfig::Point());
+	Point seed=param_seed.get(Point());
 	bool distort_inside=param_distort_inside.get(bool());
 	bool shade_inside=param_shade_inside.get(bool());
 	bool solid_inside=param_solid_inside.get(bool());
diff --git a/synfig-core/src/modules/lyr_std/julia.h b/synfig-core/src/modules/lyr_std/julia.h
index a7a7a59..6a57ef2 100644
--- a/synfig-core/src/modules/lyr_std/julia.h
+++ b/synfig-core/src/modules/lyr_std/julia.h
@@ -40,24 +40,25 @@
 
 /* === C L A S S E S & S T R U C T S ======================================= */
 
+namespace lyr_std
+{
+
 using namespace synfig;
-using namespace std;
-using namespace etl;
 
-class Julia : public synfig::Layer
+class Julia : public Layer
 {
 	SYNFIG_LAYER_MODULE_EXT
 
 private:
-	//!Parameter: (synfig::Color)
+	//!Parameter: (Color)
 	ValueBase param_icolor;
-	//!Parameter: (synfig::Color)
+	//!Parameter: (Color)
 	ValueBase param_ocolor;
-	//!Parameter: (synfig::Angle)
+	//!Parameter: (Angle)
 	ValueBase param_color_shift;
 	//!Parameter: (int)
 	ValueBase param_iterations;
-	//!Parameter: (synfig::Point)
+	//!Parameter: (Point)
 	ValueBase param_seed;
 	//!Parameter: (Real)
 	ValueBase param_bailout;
@@ -94,15 +95,17 @@ private:
 public:
 	Julia();
 
-	virtual bool set_param(const synfig::String &param, const synfig::ValueBase &value);
+	virtual bool set_param(const String &param, const ValueBase &value);
 
-	virtual ValueBase get_param(const synfig::String &param)const;
+	virtual ValueBase get_param(const String &param)const;
 
-	virtual Color get_color(synfig::Context context, const synfig::Point &pos)const;
+	virtual Color get_color(Context context, const Point &pos)const;
 
 	virtual Vocab get_param_vocab()const;
 };
 
+} // END of namespace lyr_std
+
 /* === E N D =============================================================== */
 
 #endif
diff --git a/synfig-core/src/modules/lyr_std/main.cpp b/synfig-core/src/modules/lyr_std/main.cpp
index 4a96bb4..29ac167 100644
--- a/synfig-core/src/modules/lyr_std/main.cpp
+++ b/synfig-core/src/modules/lyr_std/main.cpp
@@ -75,6 +75,11 @@
 
 #endif
 
+using namespace std;
+using namespace etl;
+using namespace synfig;
+using namespace lyr_std;
+
 /* === E N T R Y P O I N T ================================================= */
 
 MODULE_DESC_BEGIN(liblyr_std)
diff --git a/synfig-core/src/modules/lyr_std/mandelbrot.cpp b/synfig-core/src/modules/lyr_std/mandelbrot.cpp
index ff88d06..4bdcea5 100644
--- a/synfig-core/src/modules/lyr_std/mandelbrot.cpp
+++ b/synfig-core/src/modules/lyr_std/mandelbrot.cpp
@@ -48,6 +48,11 @@
 
 #endif
 
+using namespace std;
+using namespace etl;
+using namespace synfig;
+using namespace lyr_std;
+
 /* === M A C R O S ========================================================= */
 
 #define LOG_OF_2		0.69314718055994528623
diff --git a/synfig-core/src/modules/lyr_std/mandelbrot.h b/synfig-core/src/modules/lyr_std/mandelbrot.h
index 609626c..4d1df8f 100644
--- a/synfig-core/src/modules/lyr_std/mandelbrot.h
+++ b/synfig-core/src/modules/lyr_std/mandelbrot.h
@@ -40,9 +40,10 @@
 
 /* === C L A S S E S & S T R U C T S ======================================= */
 
+namespace lyr_std
+{
+
 using namespace synfig;
-using namespace std;
-using namespace etl;
 
 class Mandelbrot : public Layer
 {
@@ -97,6 +98,8 @@ public:
 	virtual Vocab get_param_vocab()const;
 };
 
+} // END of namespace lyr_std
+
 /* === E N D =============================================================== */
 
 #endif
diff --git a/synfig-core/src/modules/lyr_std/rotate.cpp b/synfig-core/src/modules/lyr_std/rotate.cpp
index 85e127c..c26ad2f 100644
--- a/synfig-core/src/modules/lyr_std/rotate.cpp
+++ b/synfig-core/src/modules/lyr_std/rotate.cpp
@@ -55,6 +55,11 @@
 
 #endif
 
+using namespace std;
+using namespace etl;
+using namespace synfig;
+using namespace lyr_std;
+
 /* === M A C R O S ========================================================= */
 
 /* === G L O B A L S ======================================================= */
@@ -135,27 +140,27 @@ Rotate::get_param_vocab()const
 	return ret;
 }
 
-class Rotate_Trans : public Transform
+class lyr_std::Rotate_Trans : public Transform
 {
 	etl::handle<const Rotate> layer;
 public:
 	Rotate_Trans(const Rotate* x):Transform(x->get_guid()),layer(x) { }
 
-	synfig::Vector perform(const synfig::Vector& x)const
+	Vector perform(const Vector& x)const
 	{
 		Vector origin=layer->param_origin.get(Vector());
 		Point pos(x-origin);
 		return Point(layer->cos_val*pos[0]-layer->sin_val*pos[1],layer->sin_val*pos[0]+layer->cos_val*pos[1])+origin;
 	}
 
-	synfig::Vector unperform(const synfig::Vector& x)const
+	Vector unperform(const Vector& x)const
 	{
 		Vector origin=layer->param_origin.get(Vector());
 		Point pos(x-origin);
 		return Point(layer->cos_val*pos[0]+layer->sin_val*pos[1],-layer->sin_val*pos[0]+layer->cos_val*pos[1])+origin;
 	}
 
-	synfig::String get_string()const
+	String get_string()const
 	{
 		return "rotate";
 	}
@@ -166,8 +171,8 @@ Rotate::get_transform()const
 	return new Rotate_Trans(this);
 }
 
-synfig::Layer::Handle
-Rotate::hit_check(synfig::Context context, const synfig::Point &p)const
+Layer::Handle
+Rotate::hit_check(Context context, const Point &p)const
 {
 	Vector origin=param_origin.get(Vector());
 	Point pos(p-origin);
diff --git a/synfig-core/src/modules/lyr_std/rotate.h b/synfig-core/src/modules/lyr_std/rotate.h
index 8b509e6..a98404b 100644
--- a/synfig-core/src/modules/lyr_std/rotate.h
+++ b/synfig-core/src/modules/lyr_std/rotate.h
@@ -40,9 +40,11 @@
 
 /* === C L A S S E S & S T R U C T S ======================================= */
 
+namespace lyr_std
+{
+
 using namespace synfig;
-using namespace std;
-using namespace etl;
+
 class Rotate_Trans;
 
 class Rotate : public Layer
@@ -61,21 +63,23 @@ public:
 	Rotate();
 	~Rotate();
 
-	virtual bool set_param(const synfig::String & param, const synfig::ValueBase &value);
-	virtual ValueBase get_param(const synfig::String & param)const;
+	virtual bool set_param(const String & param, const ValueBase &value);
+	virtual ValueBase get_param(const String & param)const;
 	virtual Color get_color(Context context, const Point &pos)const;
 	virtual bool accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const;
 	virtual bool accelerated_cairorender(Context context, cairo_t *cr, int quality, const RendDesc &renddesc, ProgressCallback *cb)const;
-	synfig::Layer::Handle hit_check(synfig::Context context, const synfig::Point &point)const;
+	Layer::Handle hit_check(Context context, const Point &point)const;
 	virtual Vocab get_param_vocab()const;
 	virtual Rect get_full_bounding_rect(Context context)const;
 
-	virtual etl::handle<synfig::Transform> get_transform()const;
+	virtual etl::handle<Transform> get_transform()const;
 
 protected:
 	virtual rendering::Task::Handle build_rendering_task_vfunc(Context context)const;
 };
 
+} // END of namespace lyr_std
+
 /* === E N D =============================================================== */
 
 #endif
diff --git a/synfig-core/src/modules/lyr_std/shade.cpp b/synfig-core/src/modules/lyr_std/shade.cpp
index 7f29bc1..918d3ce 100644
--- a/synfig-core/src/modules/lyr_std/shade.cpp
+++ b/synfig-core/src/modules/lyr_std/shade.cpp
@@ -53,9 +53,10 @@
 
 #endif
 
-using namespace synfig;
-using namespace etl;
 using namespace std;
+using namespace etl;
+using namespace synfig;
+using namespace lyr_std;
 
 /*#define TYPE_BOX			0
 #define TYPE_FASTGUASSIAN	1
@@ -75,7 +76,7 @@ SYNFIG_LAYER_SET_CVS_ID(Layer_Shade,"$Id$");
 
 /* -- F U N C T I O N S ----------------------------------------------------- */
 
-inline void clamp(synfig::Vector &v)
+inline void clamp(Vector &v)
 {
 	if(v[0]<0.0)v[0]=0.0;
 	if(v[1]<0.0)v[1]=0.0;
@@ -98,7 +99,7 @@ Layer_Shade::set_param(const String &param, const ValueBase &value)
 {
 	IMPORT_VALUE_PLUS(param_size,
 		{
-			synfig::Vector size=param_size.get(synfig::Vector());
+			Vector size=param_size.get(Vector());
 			clamp(size);
 			param_size.set(size);
 		}
@@ -106,7 +107,7 @@ Layer_Shade::set_param(const String &param, const ValueBase &value)
 	IMPORT_VALUE(param_type);
 	IMPORT_VALUE_PLUS(param_color,
 		{
-			synfig::Color color=param_color.get(synfig::Color());
+			Color color=param_color.get(Color());
 			if (color.get_a() == 0)
 			{
 				if (converted_blend_)
@@ -147,10 +148,10 @@ Layer_Shade::get_param(const String &param)const
 Color
 Layer_Shade::get_color(Context context, const Point &pos)const
 {
-	synfig::Vector size=param_size.get(synfig::Vector());
+	Vector size=param_size.get(Vector());
 	int type=param_type.get(int());
-	synfig::Color color=param_color.get(synfig::Color());
-	synfig::Vector origin=param_origin.get(synfig::Vector());
+	Color color=param_color.get(Color());
+	Vector origin=param_origin.get(Vector());
 	bool invert=param_invert.get(bool());
 	
 	Point blurpos = Blur(size,type)(pos);
@@ -173,10 +174,10 @@ Layer_Shade::accelerated_render(Context context,Surface *surface,int quality, co
 {
 	RENDER_TRANSFORMED_IF_NEED(__FILE__, __LINE__)
 
-	synfig::Vector size=param_size.get(synfig::Vector());
+	Vector size=param_size.get(Vector());
 	int type=param_type.get(int());
-	synfig::Color color=param_color.get(synfig::Color());
-	synfig::Vector origin=param_origin.get(synfig::Vector());
+	Color color=param_color.get(Color());
+	Vector origin=param_origin.get(Vector());
 	bool invert=param_invert.get(bool());
 
 	int x,y;
@@ -356,7 +357,7 @@ Layer_Shade::accelerated_render(Context context,Surface *surface,int quality, co
 
 		workdesc.clear_flags();
 		workdesc.set_wh(tmpw,tmph);
-		//synfig::info("fw: %d, fh: %d",fw,fh);
+		//info("fw: %d, fh: %d",fw,fh);
 
 		//render the blur fodder
 		if(!context.accelerated_render(&worksurface,quality,workdesc,&stageone))
@@ -412,10 +413,10 @@ Layer_Shade::accelerated_render(Context context,Surface *surface,int quality, co
 bool
 Layer_Shade::accelerated_cairorender(Context context,cairo_t *cr, int quality, const RendDesc &renddesc, ProgressCallback *cb)const
 {
-	synfig::Vector size=param_size.get(synfig::Vector());
+	Vector size=param_size.get(Vector());
 	int type=param_type.get(int());
-	synfig::Color color=param_color.get(synfig::Color());
-	synfig::Vector origin=param_origin.get(synfig::Vector());
+	Color color=param_color.get(Color());
+	Vector origin=param_origin.get(Vector());
 	bool invert=param_invert.get(bool());
 
 	int x,y;
@@ -562,7 +563,7 @@ Layer_Shade::accelerated_cairorender(Context context,cairo_t *cr, int quality, c
 	CairoSurface cairoworksurface(worksurface);
 	if(!cairoworksurface.map_cairo_image())
 	{
-		synfig::info("map cairo image failed");
+		info("map cairo image failed");
 		return false;
 	}
 	// Extract the alpha
@@ -654,8 +655,8 @@ Layer_Shade::get_param_vocab(void)const
 Rect
 Layer_Shade::get_full_bounding_rect(Context context)const
 {
-	synfig::Vector size=param_size.get(synfig::Vector());
-	synfig::Vector origin=param_origin.get(synfig::Vector());
+	Vector size=param_size.get(Vector());
+	Vector origin=param_origin.get(Vector());
 	bool invert=param_invert.get(bool());
 
 	if(is_disabled())
diff --git a/synfig-core/src/modules/lyr_std/shade.h b/synfig-core/src/modules/lyr_std/shade.h
index 2b2d9a1..2cb9880 100644
--- a/synfig-core/src/modules/lyr_std/shade.h
+++ b/synfig-core/src/modules/lyr_std/shade.h
@@ -34,21 +34,22 @@
 #include <synfig/vector.h>
 #include <synfig/blur.h>
 
+namespace lyr_std
+{
+
 using namespace synfig;
-using namespace std;
-using namespace etl;
 
-class Layer_Shade : public synfig::Layer_Composite
+class Layer_Shade : public Layer_Composite
 {
 	SYNFIG_LAYER_MODULE_EXT
 private:
-	//!Parameter: (synfig::Vector)
+	//!Parameter: (Vector)
 	ValueBase param_size;
 	//!Parameter: (int)
 	ValueBase param_type;
-	//!Parameter: (synfig::Color)
+	//!Parameter: (Color)
 	ValueBase param_color;
-	//!Parameter: (synfig::Vector)
+	//!Parameter: (Vector)
 	ValueBase param_origin;
 	//!Parameter: (bool)
 	ValueBase param_invert;
@@ -56,7 +57,7 @@ private:
 public:
 	Layer_Shade();
 
-	virtual bool set_param(const String & param, const synfig::ValueBase &value);
+	virtual bool set_param(const String & param, const ValueBase &value);
 
 	virtual ValueBase get_param(const String & param)const;
 
@@ -69,6 +70,8 @@ public:
 	virtual bool reads_context()const { return true; }
 }; // END of class Layer_Shade
 
+} // END of namespace lyr_std
+
 /* -- E X T E R N S --------------------------------------------------------- */
 
 /* -- E N D ----------------------------------------------------------------- */
diff --git a/synfig-core/src/modules/lyr_std/sphere_distort.cpp b/synfig-core/src/modules/lyr_std/sphere_distort.cpp
index 7ccd46d..1776168 100644
--- a/synfig-core/src/modules/lyr_std/sphere_distort.cpp
+++ b/synfig-core/src/modules/lyr_std/sphere_distort.cpp
@@ -56,6 +56,7 @@
 using namespace std;
 using namespace etl;
 using namespace synfig;
+using namespace lyr_std;
 
 /* === M A C R O S ========================================================= */
 
@@ -302,8 +303,8 @@ inline Point sphtrans(const Point &p, const Point &center, const Real &radius,
 	return sphtrans(p, center, radius, percent, type, tmp);
 }
 
-synfig::Layer::Handle
-Layer_SphereDistort::hit_check(synfig::Context context, const synfig::Point &pos)const
+Layer::Handle
+Layer_SphereDistort::hit_check(Context context, const Point &pos)const
 {
 	Vector center=param_center.get(Vector());
 	double radius=param_radius.get(double());
@@ -374,7 +375,7 @@ Layer_SphereDistort::accelerated_render(Context context,Surface *surface,int qua
 			(type == TYPE_DISTH && (sphr.minx >= windr.maxx || windr.minx >= sphr.maxx)) ||
 			(type == TYPE_DISTV && (sphr.miny >= windr.maxy || windr.miny >= sphr.maxy)) )
 		{
-			//synfig::warning("Spherize: Bounding box reject");
+			//warning("Spherize: Bounding box reject");
 			if (clip)
 			{
 				surface->set_wh(renddesc.get_w(), renddesc.get_h());
@@ -385,7 +386,7 @@ Layer_SphereDistort::accelerated_render(Context context,Surface *surface,int qua
 				return context.accelerated_render(surface,quality,renddesc,cb);
 		}
 
-		//synfig::warning("Spherize: Bounding box accept");
+		//warning("Spherize: Bounding box accept");
 	}
 
 	//Ok, so we overlap some... now expand the window for rendering
@@ -414,10 +415,10 @@ Layer_SphereDistort::accelerated_render(Context context,Surface *surface,int qua
 		//expandr.set_point(tl[0],tl[1]);
 		//expandr.expand(br[0],br[1]);
 
-		//synfig::warning("Spherize: Loop through lines and stuff");
+		//warning("Spherize: Loop through lines and stuff");
 		for(int i=0; i<4; ++i)
 		{
-			//synfig::warning("Spherize: 	%d", i);
+			//warning("Spherize: 	%d", i);
 			Vector p_o = center-origin[i];
 
 			//project onto left line
@@ -437,13 +438,13 @@ Layer_SphereDistort::accelerated_render(Context context,Surface *surface,int qua
 			expandr.expand(p[0],p[1]);
 		}
 
-		/*synfig::warning("Spherize: Bounding box (%f,%f)-(%f,%f)",
+		/*warning("Spherize: Bounding box (%f,%f)-(%f,%f)",
 							expandr.minx,expandr.miny,expandr.maxx,expandr.maxy);*/
 
 		//now that we have the bounding rectangle of ALL the pixels (should be...)
 		//order it so that it's in the same orientation as the tl,br pair
 
-		//synfig::warning("Spherize: Organize like tl,br");
+		//warning("Spherize: Organize like tl,br");
 		Point ntl(0,0),nbr(0,0);
 
 		//sort x
@@ -484,7 +485,7 @@ Layer_SphereDistort::accelerated_render(Context context,Surface *surface,int qua
 		nw = renddesc.get_w() + nr - nl;
 		nh = renddesc.get_h() + nb - nt;
 
-		//synfig::warning("Spherize: Setting subwindow (%d,%d) (%d,%d) (%d,%d)",nl,nt,nr,nb,nw,nh);
+		//warning("Spherize: Setting subwindow (%d,%d) (%d,%d) (%d,%d)",nl,nt,nr,nb,nw,nh);
 		r.set_subwindow(nl,nt,nw,nh);
 
 		/*r = renddesc;
@@ -492,10 +493,10 @@ Layer_SphereDistort::accelerated_render(Context context,Surface *surface,int qua
 		nl = 0, nt = 0;*/
 	}
 
-	//synfig::warning("Spherize: render background");
+	//warning("Spherize: render background");
 	if(!context.accelerated_render(&background,quality,r,cb))
 	{
-		synfig::warning("SphereDistort: Layer below failed");
+		warning("SphereDistort: Layer below failed");
 		return false;
 	}
 
@@ -511,7 +512,7 @@ Layer_SphereDistort::accelerated_render(Context context,Surface *surface,int qua
 
 	Point rtl = r.get_tl();
 
-	//synfig::warning("Spherize: About to transform");
+	//warning("Spherize: About to transform");
 
 	for(y = 0; y < h; ++y, sample[1] += ph, p.inc_y())
 	{
@@ -531,7 +532,7 @@ Layer_SphereDistort::accelerated_render(Context context,Surface *surface,int qua
 
 			if(!(xs >= 0 && xs < nw && ys >= 0 && ys < nh))
 			{
-				//synfig::warning("Spherize: we failed to account for %f,%f",xs,ys);
+				//warning("Spherize: we failed to account for %f,%f",xs,ys);
 				p.put_value(context.get_color(trans));//Color::alpha());
 				continue;
 			}
@@ -717,7 +718,7 @@ Layer_SphereDistort::accelerated_cairorender(Context context, cairo_t *cr, int q
 	cairo_translate(subcr, -wtlx, -wtly);
 	if(!context.accelerated_cairorender(subcr,quality,r,cb))
 	{
-		synfig::warning("Cairo SphereDistort: Layer below failed");
+		warning("Cairo SphereDistort: Layer below failed");
 		return false;
 	}
 	cairo_destroy(subcr);
@@ -732,13 +733,13 @@ Layer_SphereDistort::accelerated_cairorender(Context context, cairo_t *cr, int q
 	CairoSurface cresult(result);
 	if(!cresult.map_cairo_image())
 	{
-		synfig::warning("Sphere Distort: map cairo surface failed");
+		warning("Sphere Distort: map cairo surface failed");
 		return false;
 	}
 	CairoSurface cbackground(background);
 	if(!cbackground.map_cairo_image())
 	{
-		synfig::warning("Sphere Distort: map cairo surface failed");
+		warning("Sphere Distort: map cairo surface failed");
 		return false;
 	}
 	
@@ -796,23 +797,23 @@ Layer_SphereDistort::accelerated_cairorender(Context context, cairo_t *cr, int q
 
 #endif
 
-class synfig::Spherize_Trans : public synfig::Transform
+class lyr_std::Spherize_Trans : public Transform
 {
 	etl::handle<const Layer_SphereDistort> layer;
 public:
 	Spherize_Trans(const Layer_SphereDistort* x):Transform(x->get_guid()),layer(x) { }
 
-	synfig::Vector perform(const synfig::Vector& x)const
+	Vector perform(const Vector& x)const
 	{
 		return sphtrans(x,layer->param_center.get(Vector()),layer->param_radius.get(double()),-layer->param_amount.get(double()),layer->param_type.get(int()));
 	}
 
-	synfig::Vector unperform(const synfig::Vector& x)const
+	Vector unperform(const Vector& x)const
 	{
 		return sphtrans(x,layer->param_center.get(Vector()),layer->param_radius.get(double()),-layer->param_amount.get(double()),layer->param_type.get(int()));
 	}
 
-	synfig::String get_string()const
+	String get_string()const
 	{
 		return "spheredistort";
 	}
diff --git a/synfig-core/src/modules/lyr_std/sphere_distort.h b/synfig-core/src/modules/lyr_std/sphere_distort.h
index d8fa31b..ea6d649 100644
--- a/synfig-core/src/modules/lyr_std/sphere_distort.h
+++ b/synfig-core/src/modules/lyr_std/sphere_distort.h
@@ -37,8 +37,12 @@
 /* === T Y P E D E F S ===================================================== */
 
 /* === C L A S S E S & S T R U C T S ======================================= */
-namespace synfig
+
+namespace lyr_std
 {
+
+using namespace synfig;
+
 class Spherize_Trans;
 
 class Layer_SphereDistort : public Layer
@@ -83,7 +87,7 @@ public:
 	virtual etl::handle<Transform> get_transform()const;
 }; // END of class Layer_SphereDistort
 
-}
+} // END of namespace lyr_std
 
 /* === E N D =============================================================== */
 
diff --git a/synfig-core/src/modules/lyr_std/stretch.cpp b/synfig-core/src/modules/lyr_std/stretch.cpp
index d3c26ef..4cdc0a7 100644
--- a/synfig-core/src/modules/lyr_std/stretch.cpp
+++ b/synfig-core/src/modules/lyr_std/stretch.cpp
@@ -53,9 +53,10 @@
 
 /* === U S I N G =========================================================== */
 
-using namespace etl;
 using namespace std;
+using namespace etl;
 using namespace synfig;
+using namespace lyr_std;
 
 /* === G L O B A L S ======================================================= */
 
@@ -121,8 +122,8 @@ Layer_Stretch::get_param_vocab()const
 	return ret;
 }
 
-synfig::Layer::Handle
-Layer_Stretch::hit_check(synfig::Context context, const synfig::Point &pos)const
+Layer::Handle
+Layer_Stretch::hit_check(Context context, const Point &pos)const
 {
 	Vector amount=param_amount.get(Vector());
 	Point center=param_center.get(Point());
@@ -145,13 +146,13 @@ Layer_Stretch::get_color(Context context, const Point &pos)const
 	return context.get_color(npos);
 }
 
-class Stretch_Trans : public Transform
+class lyr_std::Stretch_Trans : public Transform
 {
 	etl::handle<const Layer_Stretch> layer;
 public:
 	Stretch_Trans(const Layer_Stretch* x):Transform(x->get_guid()),layer(x) { }
 
-	synfig::Vector perform(const synfig::Vector& x)const
+	Vector perform(const Vector& x)const
 	{
 		Vector amount=layer->param_amount.get(Vector());
 		Point center=layer->param_center.get(Point());
@@ -160,7 +161,7 @@ public:
 					  (x[1]-center[1])*amount[1]+center[1]);
 	}
 
-	synfig::Vector unperform(const synfig::Vector& x)const
+	Vector unperform(const Vector& x)const
 	{
 		Vector amount=layer->param_amount.get(Vector());
 		Point center=layer->param_center.get(Point());
@@ -169,7 +170,7 @@ public:
 					  (x[1]-center[1])/amount[1]+center[1]);
 	}
 
-	synfig::String get_string()const
+	String get_string()const
 	{
 		return "stretch";
 	}
diff --git a/synfig-core/src/modules/lyr_std/stretch.h b/synfig-core/src/modules/lyr_std/stretch.h
index 4621fee..1eb790b 100644
--- a/synfig-core/src/modules/lyr_std/stretch.h
+++ b/synfig-core/src/modules/lyr_std/stretch.h
@@ -38,13 +38,17 @@
 
 /* === C L A S S E S & S T R U C T S ======================================= */
 
+namespace lyr_std
+{
+
+using namespace synfig;
+
 class Stretch_Trans;
-namespace synfig {
 
 class Layer_Stretch : public Layer
 {
 	SYNFIG_LAYER_MODULE_EXT
-	friend class ::Stretch_Trans;
+	friend class Stretch_Trans;
 
 private:
 	//!Parameter (Vector)
@@ -56,7 +60,7 @@ public:
 
 	Layer_Stretch();
 
-	virtual bool set_param(const String & param, const synfig::ValueBase &value);
+	virtual bool set_param(const String & param, const ValueBase &value);
 
 	virtual ValueBase get_param(const String & param)const;
 
@@ -64,17 +68,17 @@ public:
 
 	virtual bool accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const;
 	virtual bool accelerated_cairorender(Context context, cairo_t *cr,int quality, const RendDesc &renddesc, ProgressCallback *cb)const;
-	synfig::Layer::Handle hit_check(synfig::Context context, const synfig::Point &point)const;
+	Layer::Handle hit_check(Context context, const Point &point)const;
 
 	virtual Vocab get_param_vocab()const;
-	virtual etl::handle<synfig::Transform> get_transform()const;
-	virtual synfig::Rect get_full_bounding_rect(Context context)const;
+	virtual etl::handle<Transform> get_transform()const;
+	virtual Rect get_full_bounding_rect(Context context)const;
 
 protected:
 	virtual rendering::Task::Handle build_rendering_task_vfunc(Context context)const;
 }; // END of class Layer_Stretch
 
-}; // END of namespace synfig
+} // END of namespace lyr_std
 
 /* === E N D =============================================================== */
 
diff --git a/synfig-core/src/modules/lyr_std/stroboscope.cpp b/synfig-core/src/modules/lyr_std/stroboscope.cpp
index 1d1d0e7..eb8b09a 100644
--- a/synfig-core/src/modules/lyr_std/stroboscope.cpp
+++ b/synfig-core/src/modules/lyr_std/stroboscope.cpp
@@ -51,9 +51,10 @@
 
 #endif
 
-using namespace synfig;
 using namespace std;
 using namespace etl;
+using namespace synfig;
+using namespace lyr_std;
 
 /* === M A C R O S ========================================================= */
 
diff --git a/synfig-core/src/modules/lyr_std/stroboscope.h b/synfig-core/src/modules/lyr_std/stroboscope.h
index 623062d..5b178bb 100644
--- a/synfig-core/src/modules/lyr_std/stroboscope.h
+++ b/synfig-core/src/modules/lyr_std/stroboscope.h
@@ -40,9 +40,11 @@
 /* === T Y P E D E F S ===================================================== */
 
 /* === C L A S S E S & S T R U C T S ======================================= */
+
+namespace lyr_std
+{
+
 using namespace synfig;
-using namespace std;
-using namespace etl;
 
 class Layer_Stroboscope : public Layer_Invisible
 {
@@ -66,6 +68,9 @@ public:
 
 	virtual void set_time(IndependentContext context, Time time)const;
 };
+
+} // END of namespace lyr_std
+
 /* === E N D =============================================================== */
 
 #endif
diff --git a/synfig-core/src/modules/lyr_std/supersample.cpp b/synfig-core/src/modules/lyr_std/supersample.cpp
index 16c8073..b19dd7f 100644
--- a/synfig-core/src/modules/lyr_std/supersample.cpp
+++ b/synfig-core/src/modules/lyr_std/supersample.cpp
@@ -52,6 +52,11 @@
 
 #endif
 
+using namespace std;
+using namespace etl;
+using namespace synfig;
+using namespace lyr_std;
+
 /* === M A C R O S ========================================================= */
 
 /* === G L O B A L S ======================================================= */
diff --git a/synfig-core/src/modules/lyr_std/supersample.h b/synfig-core/src/modules/lyr_std/supersample.h
index 341858a..5cc0af3 100644
--- a/synfig-core/src/modules/lyr_std/supersample.h
+++ b/synfig-core/src/modules/lyr_std/supersample.h
@@ -38,11 +38,12 @@
 
 /* === C L A S S E S & S T R U C T S ======================================= */
 
+namespace lyr_std
+{
+
 using namespace synfig;
-using namespace std;
-using namespace etl;
 
-class SuperSample : public synfig::Layer
+class SuperSample : public Layer
 {
 	SYNFIG_LAYER_MODULE_EXT
 
@@ -54,18 +55,19 @@ private:
 public:
 	SuperSample();
 
-	virtual bool set_param(const String & param, const synfig::ValueBase &value);
+	virtual bool set_param(const String & param, const ValueBase &value);
 
 	virtual ValueBase get_param(const String & param)const;
 
 	virtual bool accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const;
 	virtual bool accelerated_cairorender(Context context,cairo_t *cr, int quality, const RendDesc &renddesc, ProgressCallback *cb)const;
-	using Layer::get_bounding_rect;
-	virtual synfig::Rect get_bounding_rect(Context context)const;
+	virtual Rect get_bounding_rect(Context context)const;
 
 	virtual Vocab get_param_vocab()const;
 };
 
+} // END of namespace lyr_std
+
 /* === E N D =============================================================== */
 
 #endif
diff --git a/synfig-core/src/modules/lyr_std/timeloop.cpp b/synfig-core/src/modules/lyr_std/timeloop.cpp
index ad7399e..50b159d 100644
--- a/synfig-core/src/modules/lyr_std/timeloop.cpp
+++ b/synfig-core/src/modules/lyr_std/timeloop.cpp
@@ -49,9 +49,10 @@
 
 #endif
 
-using namespace synfig;
 using namespace std;
 using namespace etl;
+using namespace synfig;
+using namespace lyr_std;
 
 /* === M A C R O S ========================================================= */
 
diff --git a/synfig-core/src/modules/lyr_std/timeloop.h b/synfig-core/src/modules/lyr_std/timeloop.h
index eea30f8..467c04e 100644
--- a/synfig-core/src/modules/lyr_std/timeloop.h
+++ b/synfig-core/src/modules/lyr_std/timeloop.h
@@ -39,9 +39,11 @@
 /* === T Y P E D E F S ===================================================== */
 
 /* === C L A S S E S & S T R U C T S ======================================= */
+
+namespace lyr_std
+{
+
 using namespace synfig;
-using namespace std;
-using namespace etl;
 
 class Layer_TimeLoop : public Layer_Invisible
 {
@@ -80,6 +82,8 @@ public:
 	virtual void set_time(IndependentContext context, Time time)const;
 };
 
+} // END of namespace lyr_std
+
 /* === E N D =============================================================== */
 
 #endif
diff --git a/synfig-core/src/modules/lyr_std/translate.cpp b/synfig-core/src/modules/lyr_std/translate.cpp
index c0154ac..4e795fb 100644
--- a/synfig-core/src/modules/lyr_std/translate.cpp
+++ b/synfig-core/src/modules/lyr_std/translate.cpp
@@ -53,6 +53,11 @@
 
 #endif
 
+using namespace std;
+using namespace etl;
+using namespace synfig;
+using namespace lyr_std;
+
 /* === M A C R O S ========================================================= */
 
 /* === G L O B A L S ======================================================= */
@@ -111,8 +116,8 @@ Translate::get_param_vocab()const
 	return ret;
 }
 
-synfig::Layer::Handle
-Translate::hit_check(synfig::Context context, const synfig::Point &pos)const
+Layer::Handle
+Translate::hit_check(Context context, const Point &pos)const
 {
 	Vector origin=param_origin.get(Vector());
 	return context.hit_check(pos-origin);
@@ -125,23 +130,23 @@ Translate::get_color(Context context, const Point &pos)const
 	return context.get_color(pos-origin);
 }
 
-class Translate_Trans : public Transform
+class lyr_std::Translate_Trans : public Transform
 {
 	etl::handle<const Translate> layer;
 public:
 	Translate_Trans(const Translate* x):Transform(x->get_guid()),layer(x) { }
 
-	synfig::Vector perform(const synfig::Vector& x)const
+	Vector perform(const Vector& x)const
 	{
 		return x+layer->param_origin.get(Vector());
 	}
 
-	synfig::Vector unperform(const synfig::Vector& x)const
+	Vector unperform(const Vector& x)const
 	{
 		return x-layer->param_origin.get(Vector());
 	}
 
-	synfig::String get_string()const
+	String get_string()const
 	{
 		return "translate";
 	}
diff --git a/synfig-core/src/modules/lyr_std/translate.h b/synfig-core/src/modules/lyr_std/translate.h
index 60cb526..ad7d479 100644
--- a/synfig-core/src/modules/lyr_std/translate.h
+++ b/synfig-core/src/modules/lyr_std/translate.h
@@ -40,9 +40,10 @@
 
 /* === C L A S S E S & S T R U C T S ======================================= */
 
+namespace lyr_std
+{
+
 using namespace synfig;
-using namespace std;
-using namespace etl;
 
 class Translate_Trans;
 
@@ -57,20 +58,22 @@ public:
 	Translate();
 	~Translate();
 
-	virtual bool set_param(const String & param, const synfig::ValueBase &value);
+	virtual bool set_param(const String & param, const ValueBase &value);
 	virtual ValueBase get_param(const String & param)const;
 	virtual Color get_color(Context context, const Point &pos)const;
 	virtual bool accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const;
 	virtual bool accelerated_cairorender(Context context, cairo_t *cr, int quality, const RendDesc &renddesc, ProgressCallback *cb)const;
 	virtual Vocab get_param_vocab()const;
-	virtual synfig::Rect get_full_bounding_rect(Context context)const;
-	synfig::Layer::Handle hit_check(synfig::Context context, const synfig::Point &point)const;
-	virtual etl::handle<synfig::Transform> get_transform()const;
+	virtual Rect get_full_bounding_rect(Context context)const;
+	Layer::Handle hit_check(Context context, const Point &point)const;
+	virtual etl::handle<Transform> get_transform()const;
 
 protected:
 	virtual rendering::Task::Handle build_rendering_task_vfunc(Context context)const;
 };
 
+} // END of namespace lyr_std
+
 /* === E N D =============================================================== */
 
 #endif
diff --git a/synfig-core/src/modules/lyr_std/twirl.cpp b/synfig-core/src/modules/lyr_std/twirl.cpp
index 89faab6..837254d 100644
--- a/synfig-core/src/modules/lyr_std/twirl.cpp
+++ b/synfig-core/src/modules/lyr_std/twirl.cpp
@@ -48,9 +48,10 @@
 
 /* === U S I N G =========================================================== */
 
-using namespace etl;
 using namespace std;
+using namespace etl;
 using namespace synfig;
+using namespace lyr_std;
 
 /* === G L O B A L S ======================================================= */
 
@@ -142,12 +143,12 @@ Twirl::get_param_vocab()const
 	return ret;
 }
 
-synfig::Point
-Twirl::distort(const synfig::Point &pos,bool reverse)const
+Point
+Twirl::distort(const Point &pos,bool reverse)const
 {
-	synfig::Point center=param_center.get(synfig::Point());
-	synfig::Real radius=param_radius.get(synfig::Real());
-	synfig::Angle rotations=param_rotations.get(synfig::Angle());
+	Point center=param_center.get(Point());
+	Real radius=param_radius.get(Real());
+	Angle rotations=param_rotations.get(Angle());
 	bool distort_inside=param_distort_inside.get(bool());
 	bool distort_outside=param_distort_outside.get(bool());
 	
@@ -173,8 +174,8 @@ Twirl::distort(const synfig::Point &pos,bool reverse)const
 	return twirled+center;
 }
 
-synfig::Layer::Handle
-Twirl::hit_check(synfig::Context context, const synfig::Point &pos)const
+Layer::Handle
+Twirl::hit_check(Context context, const Point &pos)const
 {
 	return context.hit_check(distort(pos));
 }
@@ -192,23 +193,23 @@ Twirl::get_cairocolor(Context context, const Point &pos)const
 }
 
 
-class Twirl_Trans : public Transform
+class lyr_std::Twirl_Trans : public Transform
 {
 	etl::handle<const Twirl> layer;
 public:
 	Twirl_Trans(const Twirl* x):Transform(x->get_guid()),layer(x) { }
 
-	synfig::Vector perform(const synfig::Vector& x)const
+	Vector perform(const Vector& x)const
 	{
 		return layer->distort(x,true);
 	}
 
-	synfig::Vector unperform(const synfig::Vector& x)const
+	Vector unperform(const Vector& x)const
 	{
 		return layer->distort(x,false);
 	}
 
-	synfig::String get_string()const
+	String get_string()const
 	{
 		return "twirl";
 	}
diff --git a/synfig-core/src/modules/lyr_std/twirl.h b/synfig-core/src/modules/lyr_std/twirl.h
index 48cc12d..2bcd160 100644
--- a/synfig-core/src/modules/lyr_std/twirl.h
+++ b/synfig-core/src/modules/lyr_std/twirl.h
@@ -41,46 +41,54 @@
 /* === T Y P E D E F S ===================================================== */
 
 /* === C L A S S E S & S T R U C T S ======================================= */
+
+namespace lyr_std
+{
+
+using namespace synfig;
+
 class Twirl_Trans;
 
-class Twirl : public synfig::Layer_Composite
+class Twirl : public Layer_Composite
 {
 	SYNFIG_LAYER_MODULE_EXT
 	friend class Twirl_Trans;
 
 private:
-	//! Parameter: (synfig::Point)
-	synfig::ValueBase param_center;
-	//! Parameter: (synfig::Real)
-	synfig::ValueBase param_radius;
-	//! Parameter: (synfig::Angle)
-	synfig::ValueBase param_rotations;
+	//! Parameter: (Point)
+	ValueBase param_center;
+	//! Parameter: (Real)
+	ValueBase param_radius;
+	//! Parameter: (Angle)
+	ValueBase param_rotations;
 	//! Parameter: (bool)
-	synfig::ValueBase param_distort_inside;
+	ValueBase param_distort_inside;
 	//! Parameter: (bool)
-	synfig::ValueBase param_distort_outside;
+	ValueBase param_distort_outside;
 
-	synfig::Point distort(const synfig::Point &pos, bool reverse=false)const;
+	Point distort(const Point &pos, bool reverse=false)const;
 public:
 
 	Twirl();
 
-	virtual bool set_param(const synfig::String & param, const synfig::ValueBase &value);
+	virtual bool set_param(const String & param, const ValueBase &value);
 
-	virtual synfig::ValueBase get_param(const synfig::String & param)const;
+	virtual ValueBase get_param(const String & param)const;
 
-	virtual synfig::Color get_color(synfig::Context context, const synfig::Point &pos)const;
-	virtual synfig::CairoColor get_cairocolor(synfig::Context context, const synfig::Point &pos)const;
+	virtual Color get_color(Context context, const Point &pos)const;
+	virtual CairoColor get_cairocolor(Context context, const Point &pos)const;
 
-	//virtual bool accelerated_render(synfig::Context context,synfig::Surface *surface,int quality, const synfig::RendDesc &renddesc, synfig::ProgressCallback *cb)const;
+	//virtual bool accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const;
 
-	synfig::Layer::Handle hit_check(synfig::Context context, const synfig::Point &point)const;
+	Layer::Handle hit_check(Context context, const Point &point)const;
 
 	virtual Vocab get_param_vocab()const;
-	virtual etl::handle<synfig::Transform> get_transform()const;
+	virtual etl::handle<Transform> get_transform()const;
 	virtual bool reads_context()const { return true; }
 }; // END of class Twirl
 
+} // END of namespace lyr_std
+
 /* === E N D =============================================================== */
 
 #endif
diff --git a/synfig-core/src/modules/lyr_std/warp.cpp b/synfig-core/src/modules/lyr_std/warp.cpp
index b020276..5420836 100644
--- a/synfig-core/src/modules/lyr_std/warp.cpp
+++ b/synfig-core/src/modules/lyr_std/warp.cpp
@@ -52,6 +52,11 @@
 
 #endif
 
+using namespace std;
+using namespace etl;
+using namespace synfig;
+using namespace lyr_std;
+
 /* === M A C R O S ========================================================= */
 
 /* === G L O B A L S ======================================================= */
@@ -428,20 +433,20 @@ Warp::get_param_vocab()const
 }
 
 
-class Warp_Trans : public Transform
+class lyr_std::Warp_Trans : public Transform
 {
 	etl::handle<const Warp> layer;
 public:
 	Warp_Trans(const Warp* x):Transform(x->get_guid()),layer(x) { }
 
-	synfig::Vector perform(const synfig::Vector& x)const
+	Vector perform(const Vector& x)const
 	{
 		return layer->transform_backward(x);
 		//Point pos(x-layer->origin);
 		//return Point(layer->cos_val*pos[0]-layer->sin_val*pos[1],layer->sin_val*pos[0]+layer->cos_val*pos[1])+layer->origin;
 	}
 
-	synfig::Vector unperform(const synfig::Vector& x)const
+	Vector unperform(const Vector& x)const
 	{
 
 		return layer->transform_forward(x);
@@ -449,7 +454,7 @@ public:
 		//return Point(layer->cos_val*pos[0]+layer->sin_val*pos[1],-layer->sin_val*pos[0]+layer->cos_val*pos[1])+layer->origin;
 	}
 
-	synfig::String get_string()const
+	String get_string()const
 	{
 		return "warp";
 	}
@@ -460,8 +465,8 @@ Warp::get_transform()const
 	return new Warp_Trans(this);
 }
 
-synfig::Layer::Handle
-Warp::hit_check(synfig::Context context, const synfig::Point &p)const
+Layer::Handle
+Warp::hit_check(Context context, const Point &p)const
 {
 	Point src_tl=param_src_tl.get(Point());
 	Point src_br=param_src_br.get(Point());
@@ -642,8 +647,8 @@ Warp::accelerated_render(Context context,Surface *surface,int quality, const Ren
 	;
 	swap(tl[1],br[1]);*/
 
-	//synfig::warning("given window: [%f,%f]-[%f,%f] %dx%d",tl[0],tl[1],br[0],br[1],renddesc.get_w(),renddesc.get_h());
-	//synfig::warning("Projected: [%f,%f]-[%f,%f]",bounding_rect.get_min()[0],bounding_rect.get_min()[1],bounding_rect.get_max()[0],bounding_rect.get_max()[1]);
+	//warning("given window: [%f,%f]-[%f,%f] %dx%d",tl[0],tl[1],br[0],br[1],renddesc.get_w(),renddesc.get_h());
+	//warning("Projected: [%f,%f]-[%f,%f]",bounding_rect.get_min()[0],bounding_rect.get_min()[1],bounding_rect.get_max()[0],bounding_rect.get_max()[1]);
 
 	// If we are clipping, then go ahead and clip to the
 	// source rectangle
@@ -701,7 +706,7 @@ Warp::accelerated_render(Context context,Surface *surface,int quality, const Ren
 	desc.set_br(br);
 	desc.set_wh(ceil_to_int(src_pw*(br[0]-tl[0])),ceil_to_int(src_ph*(br[1]-tl[1])));
 
-	//synfig::warning("surface to render: [%f,%f]-[%f,%f] %dx%d",desc.get_tl()[0],desc.get_tl()[1],desc.get_br()[0],desc.get_br()[1],desc.get_w(),desc.get_h());
+	//warning("surface to render: [%f,%f]-[%f,%f] %dx%d",desc.get_tl()[0],desc.get_tl()[1],desc.get_br()[0],desc.get_br()[1],desc.get_w(),desc.get_h());
 	if(desc.get_w()==0 && desc.get_h()==0)
 	{
 		surface->set_wh(renddesc.get_w(),renddesc.get_h());
@@ -981,8 +986,8 @@ Warp::accelerated_cairorender(Context context, cairo_t *cr, int quality, const R
 	 ;
 	 swap(tl[1],br[1]);*/
 	
-	//synfig::warning("given window: [%f,%f]-[%f,%f] %dx%d",tl[0],tl[1],br[0],br[1],renddesc.get_w(),renddesc.get_h());
-	//synfig::warning("Projected: [%f,%f]-[%f,%f]",bounding_rect.get_min()[0],bounding_rect.get_min()[1],bounding_rect.get_max()[0],bounding_rect.get_max()[1]);
+	//warning("given window: [%f,%f]-[%f,%f] %dx%d",tl[0],tl[1],br[0],br[1],renddesc.get_w(),renddesc.get_h());
+	//warning("Projected: [%f,%f]-[%f,%f]",bounding_rect.get_min()[0],bounding_rect.get_min()[1],bounding_rect.get_max()[0],bounding_rect.get_max()[1]);
 	
 	// If we are clipping, then go ahead and clip to the
 	// source rectangle
@@ -1038,7 +1043,7 @@ Warp::accelerated_cairorender(Context context, cairo_t *cr, int quality, const R
 	desc.set_br(br);
 	desc.set_wh(ceil_to_int(src_pw*(br[0]-tl[0])),ceil_to_int(src_ph*(br[1]-tl[1])));
 	
-	//synfig::warning("surface to render: [%f,%f]-[%f,%f] %dx%d",desc.get_tl()[0],desc.get_tl()[1],desc.get_br()[0],desc.get_br()[1],desc.get_w(),desc.get_h());
+	//warning("surface to render: [%f,%f]-[%f,%f] %dx%d",desc.get_tl()[0],desc.get_tl()[1],desc.get_br()[0],desc.get_br()[1],desc.get_w(),desc.get_h());
 	if(desc.get_w()==0 && desc.get_h()==0)
 	{
 		cairo_save(cr);
@@ -1143,13 +1148,13 @@ Warp::accelerated_cairorender(Context context, cairo_t *cr, int quality, const R
 	return true;
 }
 
-synfig::Rect
+Rect
 Warp::get_bounding_rect()const
 {
 	return Rect::full_plane();
 }
 
-synfig::Rect
+Rect
 Warp::get_full_bounding_rect(Context context)const
 {
 //	return Rect::full_plane();
diff --git a/synfig-core/src/modules/lyr_std/warp.h b/synfig-core/src/modules/lyr_std/warp.h
index 5365a50..ec2c2aa 100644
--- a/synfig-core/src/modules/lyr_std/warp.h
+++ b/synfig-core/src/modules/lyr_std/warp.h
@@ -41,9 +41,11 @@
 
 /* === C L A S S E S & S T R U C T S ======================================= */
 
+namespace lyr_std
+{
+
 using namespace synfig;
-using namespace std;
-using namespace etl;
+
 class Warp_Trans;
 
 class Warp : public Layer
@@ -81,19 +83,21 @@ public:
 	Warp();
 	~Warp();
 
-	virtual synfig::Rect get_full_bounding_rect(synfig::Context context)const;
-	virtual synfig::Rect get_bounding_rect()const;
+	virtual Rect get_full_bounding_rect(Context context)const;
+	virtual Rect get_bounding_rect()const;
 
-	virtual bool set_param(const synfig::String & param, const synfig::ValueBase &value);
-	virtual ValueBase get_param(const synfig::String & param)const;
+	virtual bool set_param(const String & param, const ValueBase &value);
+	virtual ValueBase get_param(const String & param)const;
 	virtual Color get_color(Context context, const Point &pos)const;
 	virtual bool accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const;
 	virtual bool accelerated_cairorender(Context context, cairo_t *cr, int quality, const RendDesc &renddesc, ProgressCallback *cb)const;
-	synfig::Layer::Handle hit_check(synfig::Context context, const synfig::Point &point)const;
+	Layer::Handle hit_check(Context context, const Point &point)const;
 	virtual Vocab get_param_vocab()const;
-	virtual etl::handle<synfig::Transform> get_transform()const;
+	virtual etl::handle<Transform> get_transform()const;
 };
 
+} // END of namespace lyr_std
+
 /* === E N D =============================================================== */
 
 #endif
diff --git a/synfig-core/src/modules/lyr_std/xorpattern.cpp b/synfig-core/src/modules/lyr_std/xorpattern.cpp
index ee72f4b..e79f69f 100644
--- a/synfig-core/src/modules/lyr_std/xorpattern.cpp
+++ b/synfig-core/src/modules/lyr_std/xorpattern.cpp
@@ -49,6 +49,11 @@
 
 #endif
 
+using namespace std;
+using namespace etl;
+using namespace synfig;
+using namespace lyr_std;
+
 /* === M A C R O S ========================================================= */
 
 /* === G L O B A L S ======================================================= */
@@ -141,15 +146,15 @@ XORPattern::get_param_vocab()const
 	return ret;
 }
 
-synfig::Layer::Handle
-XORPattern::hit_check(synfig::Context context, const synfig::Point &getpos)const
+Layer::Handle
+XORPattern::hit_check(Context context, const Point &getpos)const
 {
 	// if we have a zero amount
 	if(get_amount()==0.0)
 		// then the click passes down to our context
 		return context.hit_check(getpos);
 
-	synfig::Layer::Handle tmp;
+	Layer::Handle tmp;
 	// if we are behind the context, and the click hits something in the context
 	if(get_blend_method()==Color::BLEND_BEHIND && (tmp=context.hit_check(getpos)))
 		// then return the thing it hit in the context
diff --git a/synfig-core/src/modules/lyr_std/xorpattern.h b/synfig-core/src/modules/lyr_std/xorpattern.h
index 361f19a..ca552e9 100644
--- a/synfig-core/src/modules/lyr_std/xorpattern.h
+++ b/synfig-core/src/modules/lyr_std/xorpattern.h
@@ -42,11 +42,12 @@
 
 /* === C L A S S E S & S T R U C T S ======================================= */
 
+namespace lyr_std
+{
+
 using namespace synfig;
-using namespace std;
-using namespace etl;
 
-class XORPattern : public synfig::Layer_Composite, public synfig::Layer_NoDeform
+class XORPattern : public Layer_Composite, public Layer_NoDeform
 {
 	SYNFIG_LAYER_MODULE_EXT
 
@@ -63,9 +64,11 @@ public:
 	virtual ValueBase get_param(const String &param)const;
 	virtual Color get_color(Context context, const Point &pos)const;
 	virtual Vocab get_param_vocab()const;
-	virtual synfig::Layer::Handle hit_check(synfig::Context context, const synfig::Point &point)const;
+	virtual Layer::Handle hit_check(Context context, const Point &point)const;
 };
 
+} // END of namespace lyr_std
+
 /* === E N D =============================================================== */
 
 #endif
diff --git a/synfig-core/src/modules/lyr_std/zoom.cpp b/synfig-core/src/modules/lyr_std/zoom.cpp
index d7a3313..fe2abbc 100644
--- a/synfig-core/src/modules/lyr_std/zoom.cpp
+++ b/synfig-core/src/modules/lyr_std/zoom.cpp
@@ -50,6 +50,11 @@
 
 #endif
 
+using namespace std;
+using namespace etl;
+using namespace synfig;
+using namespace lyr_std;
+
 /* === M A C R O S ========================================================= */
 
 /* === G L O B A L S ======================================================= */
@@ -117,8 +122,8 @@ Zoom::get_param_vocab()const
 	return ret;
 }
 
-synfig::Layer::Handle
-Zoom::hit_check(synfig::Context context, const synfig::Point &pos)const
+Layer::Handle
+Zoom::hit_check(Context context, const Point &pos)const
 {
 	Vector center=param_center.get(Vector());
 	return context.hit_check((pos-center)/exp(param_amount.get(Real()))+center);
@@ -131,27 +136,27 @@ Zoom::get_color(Context context, const Point &pos)const
 	return context.get_color((pos-center)/exp(param_amount.get(Real()))+center);
 }
 
-class Zoom_Trans : public Transform
+class lyr_std::Zoom_Trans : public Transform
 {
 	etl::handle<const Zoom> layer;
 public:
 	Zoom_Trans(const Zoom* x):Transform(x->get_guid()),layer(x) { }
 
-	synfig::Vector perform(const synfig::Vector& x)const
+	Vector perform(const Vector& x)const
 	{
 		Vector center=layer->param_center.get(Vector());
 		Real amount=layer->param_amount.get(Real());
 		return (x-center)*exp(amount)+center;
 	}
 
-	synfig::Vector unperform(const synfig::Vector& x)const
+	Vector unperform(const Vector& x)const
 	{
 		Vector center=layer->param_center.get(Vector());
 		Real amount=layer->param_amount.get(Real());
 		return (x-center)/exp(amount)+center;
 	}
 
-	synfig::String get_string()const
+	String get_string()const
 	{
 		return "zoom";
 	}
@@ -206,8 +211,8 @@ Zoom::accelerated_cairorender(Context context, cairo_t *cr,int quality, const Re
 /////
 
 
-synfig::Rect
-Zoom::get_full_bounding_rect(synfig::Context context)const
+Rect
+Zoom::get_full_bounding_rect(Context context)const
 {
 	Vector center=param_center.get(Vector());
 	return (context.get_full_bounding_rect()-center)*exp(param_amount.get(Real()))+center;
diff --git a/synfig-core/src/modules/lyr_std/zoom.h b/synfig-core/src/modules/lyr_std/zoom.h
index d6cdb31..ff24dfc 100644
--- a/synfig-core/src/modules/lyr_std/zoom.h
+++ b/synfig-core/src/modules/lyr_std/zoom.h
@@ -37,9 +37,10 @@
 
 /* === C L A S S E S & S T R U C T S ======================================= */
 
+namespace lyr_std
+{
+
 using namespace synfig;
-using namespace std;
-using namespace etl;
 
 class Zoom_Trans;
 
@@ -55,20 +56,22 @@ private:
 public:
 	Zoom();
 
-	virtual bool set_param(const String & param, const synfig::ValueBase &value);
+	virtual bool set_param(const String & param, const ValueBase &value);
 	virtual ValueBase get_param(const String & param)const;
 	virtual Color get_color(Context context, const Point &pos)const;
 	virtual bool accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const;
 	virtual bool accelerated_cairorender(Context context, cairo_t *cr, int quality, const RendDesc &renddesc, ProgressCallback *cb)const;
-	synfig::Layer::Handle hit_check(synfig::Context context, const synfig::Point &point)const;
+	Layer::Handle hit_check(Context context, const Point &point)const;
 	virtual Vocab get_param_vocab()const;
-	virtual synfig::Rect get_full_bounding_rect(synfig::Context context)const;
-	virtual etl::handle<synfig::Transform> get_transform()const;
+	virtual Rect get_full_bounding_rect(Context context)const;
+	virtual etl::handle<Transform> get_transform()const;
 
 protected:
 	virtual rendering::Task::Handle build_rendering_task_vfunc(Context context)const;
 };
 
+} // END of namespace lyr_std
+
 /* === E N D =============================================================== */
 
 #endif