2 files changed, 10 insertions, 10 deletions
diff --git a/src/display/cairo-templates.h b/src/display/cairo-templates.h
index 2b97dd6d6..a79f58548 100644
--- a/src/display/cairo-templates.h
+++ b/src/display/cairo-templates.h
@@ -676,16 +676,6 @@ pxclamp(gint32 v, gint32 low, gint32 high) {
     return v;
 }
 
-#define EXTRACT_ARGB32(px,a,r,g,b) \
-    guint32 a, r, g, b; \
-    a = (px & 0xff000000) >> 24; \
-    r = (px & 0x00ff0000) >> 16; \
-    g = (px & 0x0000ff00) >> 8;  \
-    b = (px & 0x000000ff);
-
-#define ASSEMBLE_ARGB32(px,a,r,g,b) \
-    guint32 px = (a << 24) | (r << 16) | (g << 8) | b;
-
 #endif
 /*
   Local Variables:
diff --git a/src/display/cairo-utils.h b/src/display/cairo-utils.h
index 0acdcb46a..aa441f0c5 100644
--- a/src/display/cairo-utils.h
+++ b/src/display/cairo-utils.h
@@ -121,6 +121,16 @@ unpremul_alpha(guint32 color, guint32 alpha)
 void feed_pathvector_to_cairo (cairo_t *ct, Geom::PathVector const &pathv, Geom::Matrix trans, Geom::OptRect area, bool optimize_stroke, double stroke_width);
 void feed_pathvector_to_cairo (cairo_t *ct, Geom::PathVector const &pathv);
 
+#define EXTRACT_ARGB32(px,a,r,g,b) \
+    guint32 a, r, g, b; \
+    a = (px & 0xff000000) >> 24; \
+    r = (px & 0x00ff0000) >> 16; \
+    g = (px & 0x0000ff00) >> 8;  \
+    b = (px & 0x000000ff);
+
+#define ASSEMBLE_ARGB32(px,a,r,g,b) \
+    guint32 px = (a << 24) | (r << 16) | (g << 8) | b;
+
 #endif
 /*
   Local Variables: