diff --git a/src/apps/icon-o-matic/document/Icon.h b/src/apps/icon-o-matic/document/Icon.h
index ae3fc20438..e222ed099f 100644
--- a/src/apps/icon-o-matic/document/Icon.h
+++ b/src/apps/icon-o-matic/document/Icon.h
@@ -14,6 +14,7 @@
 #include "Observer.h"
 #include "ShapeContainer.h"
 
+class BRect;
 class PathContainer;
 
 class IconListener {
diff --git a/src/apps/icon-o-matic/document/IconRenderer.h b/src/apps/icon-o-matic/document/IconRenderer.h
index 7ad048e5fe..e6994a7dbf 100644
--- a/src/apps/icon-o-matic/document/IconRenderer.h
+++ b/src/apps/icon-o-matic/document/IconRenderer.h
@@ -20,6 +20,7 @@
 #include "agg_trans_affine.h"
 
 class BBitmap;
+class BRect;
 class Icon;
 class StyleManager;
 
diff --git a/src/apps/icon-o-matic/generic/gui/panel/color_picker/ColorPreview.cpp b/src/apps/icon-o-matic/generic/gui/panel/color_picker/ColorPreview.cpp
index b729b805c0..cedfd2d3d1 100644
--- a/src/apps/icon-o-matic/generic/gui/panel/color_picker/ColorPreview.cpp
+++ b/src/apps/icon-o-matic/generic/gui/panel/color_picker/ColorPreview.cpp
@@ -79,7 +79,7 @@ ColorPreview::MessageReceived(BMessage* message)
 		_DragColor(where);
 
 	} else {
-#ifdef TARGET_PLATFORM_ZETA
+#ifdef HAIKU_TARGET_PLATFORM_DANO
 		const
 #endif
 		char* nameFound;
diff --git a/src/apps/icon-o-matic/generic/gui/stateview/Manipulator.h b/src/apps/icon-o-matic/generic/gui/stateview/Manipulator.h
index c85e3c122f..836f29e4c8 100644
--- a/src/apps/icon-o-matic/generic/gui/stateview/Manipulator.h
+++ b/src/apps/icon-o-matic/generic/gui/stateview/Manipulator.h
@@ -13,6 +13,7 @@
 
 #include "Observer.h"
 
+class BMessage;
 class BView;
 class Command;
 
diff --git a/src/apps/icon-o-matic/shape/commands/RemovePointsCommand.h b/src/apps/icon-o-matic/shape/commands/RemovePointsCommand.h
index de9c5aedce..af8ca49193 100644
--- a/src/apps/icon-o-matic/shape/commands/RemovePointsCommand.h
+++ b/src/apps/icon-o-matic/shape/commands/RemovePointsCommand.h
@@ -11,6 +11,8 @@
 
 #include "PathCommand.h"
 
+class BPoint;
+
 class RemovePointsCommand : public PathCommand {
  public:
 								// for removing the point clicked on