diff --git a/src/libs/icon/shape/Shape.h b/src/libs/icon/shape/Shape.h
index e80ee73596..59c4b3ae03 100644
--- a/src/libs/icon/shape/Shape.h
+++ b/src/libs/icon/shape/Shape.h
@@ -42,12 +42,12 @@ class ShapeListener {
 
 #ifdef ICON_O_MATIC
 class Shape : public IconObject,
-			  public Transformable,
+			  public BPrivate::Icon::Transformable,
 			  public Observer,	// observing all the paths and the style
 			  public PathContainerListener,
 			  public PathListener {
 #else
-class Shape : public Transformable {
+class Shape : public BPrivate::Icon::Transformable {
 #endif
 
  public:
diff --git a/src/libs/icon/shape/VectorPath.h b/src/libs/icon/shape/VectorPath.h
index bd7ab129ee..1a76c600b3 100644
--- a/src/libs/icon/shape/VectorPath.h
+++ b/src/libs/icon/shape/VectorPath.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006, Haiku.
+ * Copyright 2006-2007, Haiku.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -14,6 +14,8 @@
 
 #include <agg_path_storage.h>
 
+#include "Transformable.h"
+
 #ifdef ICON_O_MATIC
 # include <Archivable.h>
 # include <List.h>
@@ -24,7 +26,6 @@
 class BBitmap;
 class BMessage;
 class BView;
-class Transformable;
 
 struct control_point {
 	BPoint		point;		// actual point on path
@@ -84,7 +85,7 @@ class VectorPath {
 
 	// VectorPath
 			VectorPath&			operator=(const VectorPath& from);
-//			bool				operator==(const VectorPath& frrom) const;
+//			bool				operator==(const VectorPath& from) const;
 
 			void				MakeEmpty();
 
diff --git a/src/libs/icon/transformable/Transformable.h b/src/libs/icon/transformable/Transformable.h
index 018660098d..d916b83db5 100644
--- a/src/libs/icon/transformable/Transformable.h
+++ b/src/libs/icon/transformable/Transformable.h
@@ -13,6 +13,9 @@
 
 #include <agg_trans_affine.h>
 
+namespace BPrivate {
+namespace Icon {
+
 class Transformable : public agg::trans_affine {
  public:
 	enum {
@@ -66,5 +69,10 @@ class Transformable : public agg::trans_affine {
 		// is changed for some reason
 };
 
+} // namespace Icon
+} // namespace BPrivate
+
+using namespace BPrivate::Icon;
+
 #endif // TRANSFORMABLE_H