diff --git a/headers/private/interface/ShapePrivate.h b/headers/private/interface/ShapePrivate.h
new file mode 100644
index 0000000000..e28abece0d
--- /dev/null
+++ b/headers/private/interface/ShapePrivate.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2003-2006, Haiku.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Adrian Oanca <adioanca@cotty.iren.ro>
+ *		Axel Dörfler, axeld@pinc-software.de
+ */
+#ifndef SHAPE_PRIVATE_H
+#define SHAPE_PRIVATE_H
+
+#define OP_LINETO		0x10000000
+#define OP_BEZIERTO		0x20000000
+#define OP_CLOSE		0x40000000
+#define OP_MOVETO		0x80000000
+
+
+struct shape_data {
+	uint32	*opList;
+	int32	opCount;
+	int32	opSize;
+	int32	opBlockSize;
+	BPoint	*ptList;
+	int32	ptCount;
+	int32	ptSize;
+	int32	ptBlockSize;
+};
+
+#endif
diff --git a/src/kits/interface/Shape.cpp b/src/kits/interface/Shape.cpp
index 4cb28fe4fb..e0b73f037a 100644
--- a/src/kits/interface/Shape.cpp
+++ b/src/kits/interface/Shape.cpp
@@ -16,29 +16,13 @@
 #include <Point.h>
 #include <Rect.h>
 
+#include <ShapePrivate.h>
+
 #include <new>
 #include <stdlib.h>
 #include <string.h>
 
 
-// NOTE: changing these defines will break Painter,
-// currently located in src/servers/app/drawing/Painter/Painter.cpp
-#define OP_LINETO		0x10000000
-#define OP_BEZIERTO		0x20000000
-#define OP_CLOSE		0x40000000
-#define OP_MOVETO		0x80000000
-
-
-struct shape_data {
-	uint32	*opList;
-	int32	opCount;
-	int32	opSize;
-	int32	opBlockSize;
-	BPoint	*ptList;
-	int32	ptCount;
-	int32	ptSize;
-	int32	ptBlockSize;
-};
 
 
 BShapeIterator::BShapeIterator()
diff --git a/src/kits/interface/View.cpp b/src/kits/interface/View.cpp
index 2cdfa547a6..41480cc47f 100644
--- a/src/kits/interface/View.cpp
+++ b/src/kits/interface/View.cpp
@@ -16,6 +16,7 @@
 #include <MessageUtils.h>
 #include <PortLink.h>
 #include <ServerProtocol.h>
+#include <ShapePrivate.h>
 #include <TokenSpace.h>
 #include <ViewPrivate.h>
 
diff --git a/src/servers/app/ServerPicture.cpp b/src/servers/app/ServerPicture.cpp
index 1562cb6933..5f015d7ac3 100644
--- a/src/servers/app/ServerPicture.cpp
+++ b/src/servers/app/ServerPicture.cpp
@@ -18,6 +18,7 @@
 #include <PicturePlayer.h>
 #include <PictureProtocol.h>
 #include <ServerProtocol.h>
+#include <ShapePrivate.h>
 
 #include <Bitmap.h>
 #include <Shape.h>
@@ -25,12 +26,6 @@
 #include <stdio.h>
 #include <stack>
 
-// NOTE: Initially defined in Shape.cpp. 
-#define OP_LINETO   0x10000000
-#define OP_BEZIERTO   0x20000000
-#define OP_CLOSE    0x40000000
-#define OP_MOVETO   0x80000000
-
 
 class ShapePainter : public BShapeIterator {
 	public:
diff --git a/src/servers/app/drawing/Painter/Painter.cpp b/src/servers/app/drawing/Painter/Painter.cpp
index e5b6a2818e..0833ea5ef4 100644
--- a/src/servers/app/drawing/Painter/Painter.cpp
+++ b/src/servers/app/drawing/Painter/Painter.cpp
@@ -15,6 +15,8 @@
 #include <Region.h>
 #include <String.h>
 
+#include <ShapePrivate.h>
+
 #include <agg_bezier_arc.h>
 #include <agg_bounding_rect.h>
 #include <agg_conv_clip_polygon.h>
@@ -520,12 +522,7 @@ Painter::DrawBezier(BPoint* p, bool filled) const
 	}
 }
 
-// this comes from Shape.cpp
-// code duplication ahead...
-#define OP_LINETO		0x10000000
-#define OP_BEZIERTO		0x20000000
-#define OP_CLOSE		0x40000000
-#define OP_MOVETO		0x80000000
+
 
 // DrawShape
 BRect