diff --git a/src/apps/icon-o-matic/import_export/svg/DocumentBuilder.h b/src/apps/icon-o-matic/import_export/svg/DocumentBuilder.h
index a9e8ece48d..e5f7ddf348 100644
--- a/src/apps/icon-o-matic/import_export/svg/DocumentBuilder.h
+++ b/src/apps/icon-o-matic/import_export/svg/DocumentBuilder.h
@@ -43,7 +43,13 @@
 
 class Icon;
 class SVGImporter;
-class Transformable;
+
+namespace BPrivate {
+namespace Icon {
+	class Transformable;
+}
+}
+using BPrivate::Icon::Transformable;
 
 namespace agg {
 namespace svg {
diff --git a/src/apps/icon-o-matic/import_export/svg/SVGExporter.h b/src/apps/icon-o-matic/import_export/svg/SVGExporter.h
index c6e1ce9076..5e6b96d99b 100644
--- a/src/apps/icon-o-matic/import_export/svg/SVGExporter.h
+++ b/src/apps/icon-o-matic/import_export/svg/SVGExporter.h
@@ -16,7 +16,13 @@
 class Gradient;
 class Shape;
 class Style;
-class Transformable;
+
+namespace BPrivate {
+namespace Icon {
+	class Transformable;
+}
+}
+using BPrivate::Icon::Transformable;
 
 class SVGExporter : public Exporter {
  public:
diff --git a/src/apps/icon-o-matic/shape/commands/FreezeTransformationCommand.h b/src/apps/icon-o-matic/shape/commands/FreezeTransformationCommand.h
index 667d021d3c..346ff6c5ad 100644
--- a/src/apps/icon-o-matic/shape/commands/FreezeTransformationCommand.h
+++ b/src/apps/icon-o-matic/shape/commands/FreezeTransformationCommand.h
@@ -12,7 +12,13 @@
 #include "Command.h"
 
 class Shape;
-class Transformable;
+
+namespace BPrivate {
+namespace Icon {
+	class Transformable;
+}
+}
+using BPrivate::Icon::Transformable;
 
 class FreezeTransformationCommand : public Command {
  public:
diff --git a/src/apps/icon-o-matic/shape/commands/TransformPointsCommand.h b/src/apps/icon-o-matic/shape/commands/TransformPointsCommand.h
index 05cd537b2e..c1542fac48 100644
--- a/src/apps/icon-o-matic/shape/commands/TransformPointsCommand.h
+++ b/src/apps/icon-o-matic/shape/commands/TransformPointsCommand.h
@@ -12,10 +12,16 @@
 #include "TransformBox.h"
 #include "TransformCommand.h"
 
-class Transformable;
 class VectorPath;
 struct control_point;
 
+namespace BPrivate {
+namespace Icon {
+	class Transformable;
+}
+}
+using BPrivate::Icon::Transformable;
+
 class TransformPointsCommand : public TransformCommand,
 							   public TransformBoxListener {
  public:
diff --git a/src/apps/icon-o-matic/transformable/ResetTransformationCommand.h b/src/apps/icon-o-matic/transformable/ResetTransformationCommand.h
index c7e791b349..9d3aa4a8ee 100644
--- a/src/apps/icon-o-matic/transformable/ResetTransformationCommand.h
+++ b/src/apps/icon-o-matic/transformable/ResetTransformationCommand.h
@@ -11,7 +11,12 @@
 
 #include "Command.h"
 
-class Transformable;
+namespace BPrivate {
+namespace Icon {
+	class Transformable;
+}
+}
+using BPrivate::Icon::Transformable;
 
 class ResetTransformationCommand : public Command {
  public:
diff --git a/src/apps/icon-o-matic/transformable/TransformObjectsCommand.h b/src/apps/icon-o-matic/transformable/TransformObjectsCommand.h
index 550df2d01c..912a054aa7 100644
--- a/src/apps/icon-o-matic/transformable/TransformObjectsCommand.h
+++ b/src/apps/icon-o-matic/transformable/TransformObjectsCommand.h
@@ -12,7 +12,12 @@
 #include "TransformBox.h"
 #include "TransformCommand.h"
 
-class Transformable;
+namespace BPrivate {
+namespace Icon {
+	class Transformable;
+}
+}
+using BPrivate::Icon::Transformable;
 
 class TransformObjectsCommand : public TransformCommand,
 								public TransformBoxListener {