* ccss-cairo/Makefile.am:

* ccss-cairo/ccss-cairo-color-priv.h:
* ccss-cairo/ccss-background-parser.c (background_factory):
* ccss-cairo/ccss-background.c (ccss_background_fill):
* ccss-cairo/ccss-background.h:
* ccss-cairo/ccss-border-parser.c (border_color_factory),
(border_factory_impl):
* ccss-cairo/ccss-border.h:
* ccss-cairo/ccss-cairo-color.c (parse_name), (hex), (parse_hex),
(ccss_cairo_color_parse), (ccss_cairo_color_create),
(ccss_cairo_color_destroy), (ccss_cairo_color_convert),
(peek_property_class), (ccss_cairo_color_get_ptable):
* ccss-cairo/ccss-cairo-color.h:
* ccss-cairo/ccss-cairo-grammar.c (ccss_cairo_grammar_create):
* ccss-cairo/ccss-cairo-style.c (ccss_cairo_style_draw_line),
(gather_stroke), (gather_background),
(ccss_cairo_style_draw_rectangle),
(ccss_cairo_style_draw_rectangle_with_gap):
* ccss-cairo/ccss-cairo.h:
* ccss-cairo/ccss-color.c:
* ccss-cairo/ccss-color.h:
Split out public ccss-cairo-color.h.

* ccss-gtk/ccss-gtk-grammar.c (parse_gboolean), (parse_gchararray),
(parse_gfloat), (parse_gint), (parse_guchar), (parse_gdk_color),
(parse_gtk_border), (parse_gtk_relief_style),
(parse_gtk_requisition), (parse_gtk_shadow_type),
(parse_gtk_toolbar_space_style), (parse_gtk_style_property),
(property_destroy), (property_factory), (peek_property_class),
(ccss_gtk_grammar_create):
* ccss-gtk/ccss-gtk-grammar.h:
Work towards parsing gtk style properties.

12 files changed, 125 insertions, 81 deletions

diff --git a/ccss-cairo/Makefile.am b/ccss-cairo/Makefile.am
index f3070e4..c5a434f 100644
--- a/ccss-cairo/Makefile.am
+++ b/ccss-cairo/Makefile.am
@@ -39,8 +39,8 @@ libccss_cairo_1_la_SOURCES = \
 	ccss-cairo-style.c \
 	ccss-cairo-style.h \
 	ccss-cairo-style-priv.h \
-	ccss-color.c \
-	ccss-color.h \
+	ccss-cairo-color.c \
+	ccss-cairo-color-priv.h \
 	ccss-image.c \
 	ccss-image.h \
 	ccss-position.c \
@@ -50,6 +50,7 @@ headersdir = $(includedir)/libccss-1/ccss-cairo
 
 headers_DATA = \
 	ccss-cairo.h \
+	ccss-cairo-color.h \
 	ccss-cairo-grammar.h \
 	ccss-cairo-style.h
 
diff --git a/ccss-cairo/ccss-background-parser.c b/ccss-cairo/ccss-background-parser.c
index a320154..ae5c647 100644
--- a/ccss-cairo/ccss-background-parser.c
+++ b/ccss-cairo/ccss-background-parser.c
@@ -38,7 +38,7 @@ typedef struct {
 	ccss_background_image_t const		*bg_image;
 	ccss_background_position_t const	*bg_position;
 	ccss_background_repeat_t const		*bg_repeat;
-	ccss_color_t const			*bg_color;
+	ccss_cairo_color_t const			*bg_color;
 } background_property_t;
 
 static ccss_property_class_t const *
@@ -230,7 +230,7 @@ background_factory (ccss_grammar_t const	*grammar,
 		    void			*user_data)
 {
 	ccss_background_attachment_t	*bg_attachment,	bga;
-	ccss_color_t			*bg_color,	bgc;
+	ccss_cairo_color_t			*bg_color,	bgc;
 	ccss_background_image_t		*bg_image,	bgi;
 	ccss_background_position_t	*bg_position,	bgp;
 	ccss_background_repeat_t	*bg_repeat,	bgr;
@@ -254,9 +254,9 @@ background_factory (ccss_grammar_t const	*grammar,
 	/* PONDERING: also support `background-size' here, but let's stick
 	 * to CSS2 for now. */
 	ccss_property_init (&bgc.base, peek_property_class ("background-color"));
-	ret = ccss_color_parse (&bgc, grammar, user_data, &values);
+	ret = ccss_cairo_color_parse (&bgc, grammar, user_data, &values);
 	if (ret) {
-		bg_color = g_new0 (ccss_color_t, 1);
+		bg_color = g_new0 (ccss_cairo_color_t, 1);
 		*bg_color = bgc;
 		ccss_block_add_property (self, "background-color", &bg_color->base);
 		have_bg_properties = true;
@@ -603,9 +603,9 @@ static ccss_property_class_t const _ptable[] = {
 	.property_inherit = NULL
     }, {
 	.name = "background-color",
-	.property_create = ccss_color_create,
+	.property_create = ccss_cairo_color_create,
 	.property_destroy = (ccss_property_destroy_f) g_free,
-	.property_convert = (ccss_property_convert_f) ccss_color_convert,
+	.property_convert = (ccss_property_convert_f) ccss_cairo_color_convert,
 	.property_factory = NULL,
 	.property_inherit = NULL
     }, {
diff --git a/ccss-cairo/ccss-background.c b/ccss-cairo/ccss-background.c
index e923177..3fbc1d2 100644
--- a/ccss-cairo/ccss-background.c
+++ b/ccss-cairo/ccss-background.c
@@ -151,7 +151,7 @@ no_repeat (ccss_background_image_t const	*bg_image,
  **/
 void
 ccss_background_fill (ccss_background_attachment_t const	*bg_attachment, 
-		     ccss_color_t const			*bg_color,
+		     ccss_cairo_color_t const			*bg_color,
 		     ccss_background_image_t const	*bg_image,
 		     ccss_background_position_t const	*bg_position,
 		     ccss_background_repeat_t const	*bg_repeat,
diff --git a/ccss-cairo/ccss-background.h b/ccss-cairo/ccss-background.h
index 3b3190c..c5d492a 100644
--- a/ccss-cairo/ccss-background.h
+++ b/ccss-cairo/ccss-background.h
@@ -25,7 +25,7 @@
 #include <cairo.h>
 #include <libcroco/libcroco.h>
 #include <ccss/ccss.h>
-#include <ccss-cairo/ccss-color.h>
+#include <ccss-cairo/ccss-cairo-color.h>
 #include <ccss-cairo/ccss-image.h>
 #include <ccss-cairo/ccss-position.h>
 
@@ -75,7 +75,7 @@ typedef struct {
 	ccss_property_base_t		base;
 
 	ccss_background_attachment_t	bg_attachment;
-	ccss_color_t			bg_color;
+	ccss_cairo_color_t			bg_color;
 	ccss_background_image_t		bg_image;
 	ccss_background_position_t	bg_position;
 	ccss_background_repeat_t		bg_repeat;
@@ -83,7 +83,7 @@ typedef struct {
 } ccss_background_t;
 
 void ccss_background_fill (ccss_background_attachment_t const *bg_attachment, 
-			  ccss_color_t const *bg_color,
+			  ccss_cairo_color_t const *bg_color,
 			  ccss_background_image_t const *bg_image,
 			  ccss_background_position_t const *bg_position,
 			  ccss_background_repeat_t const *bg_repeat,
diff --git a/ccss-cairo/ccss-border-parser.c b/ccss-cairo/ccss-border-parser.c
index 3bc450b..ccbc41c 100644
--- a/ccss-cairo/ccss-border-parser.c
+++ b/ccss-cairo/ccss-border-parser.c
@@ -28,7 +28,7 @@
 #define INSERT_BORDER_COLOR(block_, prop_name_, prop_, prop_ptr_)	       \
 	G_STMT_START {							       \
 	prop_.base.property_class = peek_property_class (prop_name_);	       \
-	prop_ptr_ = g_new0 (ccss_color_t, 1);				       \
+	prop_ptr_ = g_new0 (ccss_cairo_color_t, 1);				       \
 	*prop_ptr_ = prop_;						       \
 	ccss_block_add_property (block_, prop_name_, &prop_ptr_->base);	       \
 	} G_STMT_END
@@ -68,7 +68,7 @@ typedef struct {
 	ccss_property_base_t	 base;
 	ccss_border_width_t	*width;
 	ccss_border_style_t	*style;
-	ccss_color_t const	*color;
+	ccss_cairo_color_t const	*color;
 } border_property_t;
 
 /*!
@@ -187,15 +187,15 @@ border_color_factory (ccss_grammar_t const	*grammar,
 		      void			*user_data)
 {
 	CRTerm const	*iter;
-	ccss_color_t	 c, c0, c1, c2, c3;
-	ccss_color_t	*color;
+	ccss_cairo_color_t	 c, c0, c1, c2, c3;
+	ccss_cairo_color_t	*color;
 
 	/* If `border-color: inherit;' then insert a dummy. */
 	memset (&c, 0, sizeof (c));
 	ccss_property_init (&c.base, peek_property_class ("border-color"));
 	c.base.state = ccss_property_parse_state (&values);
 	if (c.base.state == CCSS_PROPERTY_STATE_INHERIT) {
-		color = g_new0 (ccss_color_t, 1);
+		color = g_new0 (ccss_cairo_color_t, 1);
 		*color = c;
 		ccss_block_add_property (self, "border-color", &color->base);
 		return true;
@@ -207,10 +207,10 @@ border_color_factory (ccss_grammar_t const	*grammar,
 	memset (&c3, 0, sizeof (c3));
 
 	iter = values;
-	if (iter) { ccss_color_parse (&c0, grammar, user_data, &iter); }
-	if (iter) { ccss_color_parse (&c1, grammar, user_data, &iter); }
-	if (iter) { ccss_color_parse (&c2, grammar, user_data, &iter); }
-	if (iter) { ccss_color_parse (&c3, grammar, user_data, &iter); }
+	if (iter) { ccss_cairo_color_parse (&c0, grammar, user_data, &iter); }
+	if (iter) { ccss_cairo_color_parse (&c1, grammar, user_data, &iter); }
+	if (iter) { ccss_cairo_color_parse (&c2, grammar, user_data, &iter); }
+	if (iter) { ccss_cairo_color_parse (&c3, grammar, user_data, &iter); }
 
 	if (CCSS_PROPERTY_STATE_INVALID == c0.base.state) {
 
@@ -584,7 +584,7 @@ border_factory_impl (ccss_grammar_t const	*grammar,
 {
 	CRTerm const		*iter;
 	border_property_t	*border, b;
-	ccss_color_t		 c;
+	ccss_cairo_color_t		 c;
 	ccss_border_style_t	 s;
 	ccss_border_width_t	 w;
 	char			*property_name;
@@ -612,12 +612,12 @@ border_factory_impl (ccss_grammar_t const	*grammar,
 	}
 
 	if (iter) {
-		ccss_color_parse (&c, grammar, user_data, &iter);
+		ccss_cairo_color_parse (&c, grammar, user_data, &iter);
 	}
 
 	if (c.base.state != CCSS_PROPERTY_STATE_INVALID) { 
 
-		ccss_color_t *color = NULL;
+		ccss_cairo_color_t *color = NULL;
 		property_name = g_strdup_printf ("%s-color", property_prefix);
 		INSERT_BORDER_COLOR (self, property_name, c, color);
 		g_free (property_name), property_name = NULL;
@@ -1108,9 +1108,9 @@ static ccss_property_class_t const _ptable[] = {
 	.property_inherit = border_radius_inherit
     }, {
 	.name = "border-left-color",
-	.property_create = ccss_color_create,
+	.property_create = ccss_cairo_color_create,
 	.property_destroy = (ccss_property_destroy_f) g_free,
-	.property_convert = (ccss_property_convert_f) ccss_color_convert,
+	.property_convert = (ccss_property_convert_f) ccss_cairo_color_convert,
 	.property_factory = NULL,
 	.property_inherit = NULL
     }, {
@@ -1129,9 +1129,9 @@ static ccss_property_class_t const _ptable[] = {
 	.property_inherit = NULL
     }, {
 	.name = "border-top-color",
-	.property_create = ccss_color_create,
+	.property_create = ccss_cairo_color_create,
 	.property_destroy = (ccss_property_destroy_f) g_free,
-	.property_convert = (ccss_property_convert_f) ccss_color_convert,
+	.property_convert = (ccss_property_convert_f) ccss_cairo_color_convert,
 	.property_factory = NULL,
 	.property_inherit = NULL
     }, {
@@ -1150,9 +1150,9 @@ static ccss_property_class_t const _ptable[] = {
 	.property_inherit = NULL
     }, {
 	.name = "border-right-color",
-	.property_create = ccss_color_create,
+	.property_create = ccss_cairo_color_create,
 	.property_destroy = (ccss_property_destroy_f) g_free,
-	.property_convert = (ccss_property_convert_f) ccss_color_convert,
+	.property_convert = (ccss_property_convert_f) ccss_cairo_color_convert,
 	.property_factory = NULL,
 	.property_inherit = NULL
     }, {
@@ -1171,9 +1171,9 @@ static ccss_property_class_t const _ptable[] = {
 	.property_inherit = NULL
     }, {
 	.name = "border-bottom-color",
-	.property_create = ccss_color_create,
+	.property_create = ccss_cairo_color_create,
 	.property_destroy = (ccss_property_destroy_f) g_free,
-	.property_convert = (ccss_property_convert_f) ccss_color_convert,
+	.property_convert = (ccss_property_convert_f) ccss_cairo_color_convert,
 	.property_factory = NULL,
 	.property_inherit = NULL
     }, {
@@ -1222,7 +1222,7 @@ static ccss_property_class_t const _ptable[] = {
 	.name = "border-color",
 	.property_create = NULL,
 	.property_destroy = (ccss_property_destroy_f) g_free,
-	.property_convert = (ccss_property_convert_f) ccss_color_convert,
+	.property_convert = (ccss_property_convert_f) ccss_cairo_color_convert,
 	.property_factory = (ccss_property_factory_f) border_color_factory,
 	.property_inherit = border_color_inherit
     }, {
diff --git a/ccss-cairo/ccss-border.h b/ccss-cairo/ccss-border.h
index 29da0cf..2cca700 100644
--- a/ccss-cairo/ccss-border.h
+++ b/ccss-cairo/ccss-border.h
@@ -24,7 +24,7 @@
 #include <stdint.h>
 #include <cairo.h>
 #include <ccss/ccss.h>
-#include <ccss-cairo/ccss-color.h>
+#include <ccss-cairo/ccss-cairo-color.h>
 
 CCSS_BEGIN_DECLS
 
@@ -67,7 +67,7 @@ typedef struct {
 } ccss_border_width_t;
 
 typedef struct {
-	ccss_color_t const *		color;
+	ccss_cairo_color_t const *		color;
 	ccss_border_style_t const *	style;
 	ccss_border_width_t const *	width;
 } ccss_border_stroke_t; 
diff --git a/ccss-cairo/ccss-cairo-color-priv.h b/ccss-cairo/ccss-cairo-color-priv.h
new file mode 100644
index 0000000..ab25599
--- /dev/null
+++ b/ccss-cairo/ccss-cairo-color-priv.h
@@ -0,0 +1,49 @@
+/* The Cairo CSS Drawing Library.
+ * Copyright (C) 2008 Robert Staudinger
+ *
+ * This  library is free  software; you can  redistribute it and/or
+ * modify it  under  the terms  of the  GNU Lesser  General  Public
+ * License  as published  by the Free  Software  Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed  in the hope that it will be useful,
+ * but  WITHOUT ANY WARRANTY; without even  the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License  along  with  this library;  if not,  write to  the Free
+ * Software Foundation, Inc., 51  Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#ifndef CCSS_CAIRO_COLOR_PRIV_H
+#define CCSS_CAIRO_COLOR_PRIV_H
+
+#include <stdbool.h>
+#include <libcroco/libcroco.h>
+#include <ccss/ccss.h>
+#include <ccss-cairo/ccss-cairo-color.h>
+
+CCSS_BEGIN_DECLS
+
+ccss_property_base_t *
+ccss_cairo_color_create (ccss_grammar_t const	*grammar,
+			 CRTerm const		*value,
+			 void			*user_data);
+
+void
+ccss_cairo_color_destroy (ccss_cairo_color_t *self);
+
+bool
+ccss_cairo_color_convert (ccss_cairo_color_t const	*property,
+			  ccss_property_type_t		 target,
+			  void				*value);
+
+ccss_property_class_t const *
+ccss_cairo_color_get_ptable (void);
+
+CCSS_END_DECLS
+
+#endif /* CCSS_CAIRO_COLOR_PRIV_H */
+
diff --git a/ccss-cairo/ccss-color.c b/ccss-cairo/ccss-cairo-color.c
index 0305450..8d655e0 100644
--- a/ccss-cairo/ccss-color.c
+++ b/ccss-cairo/ccss-cairo-color.c
@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <glib.h>
-#include "ccss-color.h"
+#include "ccss-cairo-color-priv.h"
 #include "config.h"
 
 static ccss_property_class_t const *
@@ -34,7 +34,7 @@ peek_property_class (void);
 
 static const struct {
 	char const		*name;
-	const ccss_color_t	color;
+	const ccss_cairo_color_t	color;
 } _color_map[] = {
   { "aliceblue",		{ { NULL, CCSS_PROPERTY_STATE_SET }, 0xf0/255., 0xf8/255., 0xff/255. } },
   { "antiquewhite",		{ { NULL, CCSS_PROPERTY_STATE_SET }, 0xfa/255., 0xeb/255., 0xd7/255. } },
@@ -186,7 +186,7 @@ static const struct {
 };
 
 static bool
-parse_name (ccss_color_t	*self,
+parse_name (ccss_cairo_color_t	*self,
 	    char const	*css_color_name)
 {
 	g_return_val_if_fail (css_color_name && self, false);
@@ -223,7 +223,7 @@ hex (char const		*color,
 }
 
 static bool
-parse_hex (ccss_color_t	*self,
+parse_hex (ccss_cairo_color_t	*self,
 	   char const	*color)
 {
 	size_t		len;
@@ -262,7 +262,7 @@ parse_hex (ccss_color_t	*self,
 }
 
 bool
-ccss_color_parse (ccss_color_t		 *self,
+ccss_cairo_color_parse (ccss_cairo_color_t		 *self,
 		  ccss_grammar_t const	 *grammar,
 		  void			 *user_data,
 		  CRTerm const		**value)
@@ -354,17 +354,17 @@ bail:
 }
 
 ccss_property_base_t *
-ccss_color_create (ccss_grammar_t const *grammar,
+ccss_cairo_color_create (ccss_grammar_t const *grammar,
 		   CRTerm const		*value,
 		   void			*user_data)
 {
-	ccss_color_t	*self, c;
+	ccss_cairo_color_t	*self, c;
 	bool		 ret;
 
-	ret = ccss_color_parse (&c, grammar, user_data, &value);
+	ret = ccss_cairo_color_parse (&c, grammar, user_data, &value);
 	if (ret) {
 		c.base.property_class = peek_property_class ();
-		self = g_new0 (ccss_color_t, 1);
+		self = g_new0 (ccss_cairo_color_t, 1);
 		*self = c;
 		return &self->base;
 	}
@@ -373,7 +373,7 @@ ccss_color_create (ccss_grammar_t const *grammar,
 }
 
 void
-ccss_color_destroy (ccss_color_t *self)
+ccss_cairo_color_destroy (ccss_cairo_color_t *self)
 {
 	g_return_if_fail (self);
 
@@ -381,7 +381,7 @@ ccss_color_destroy (ccss_color_t *self)
 }
 
 bool
-ccss_color_convert (ccss_color_t const		*property,
+ccss_cairo_color_convert (ccss_cairo_color_t const		*property,
 		    ccss_property_type_t	 target,
 		    void			*value)
 {
@@ -400,9 +400,9 @@ ccss_color_convert (ccss_color_t const		*property,
 static ccss_property_class_t const _ptable[] = {
     {
 	.name = "color",
-	.property_create = ccss_color_create,
+	.property_create = ccss_cairo_color_create,
 	.property_destroy = (ccss_property_destroy_f) g_free,
-	.property_convert = (ccss_property_convert_f) ccss_color_convert,
+	.property_convert = (ccss_property_convert_f) ccss_cairo_color_convert,
 	.property_factory = NULL,
 	.property_inherit = NULL
     }, {
@@ -417,7 +417,7 @@ peek_property_class (void)
 }
 
 ccss_property_class_t const *
-ccss_color_get_ptable (void)
+ccss_cairo_color_get_ptable (void)
 {
 	return _ptable;
 }
diff --git a/ccss-cairo/ccss-color.h b/ccss-cairo/ccss-cairo-color.h
index 754d209..f6d187c 100644
--- a/ccss-cairo/ccss-color.h
+++ b/ccss-cairo/ccss-cairo-color.h
@@ -17,8 +17,8 @@
  * MA 02110-1301, USA.
  */
 
-#ifndef CCSS_COLOR_H
-#define CCSS_COLOR_H
+#ifndef CCSS_CAIRO_COLOR_H
+#define CCSS_CAIRO_COLOR_H
 
 #include <stdbool.h>
 #include <libcroco/libcroco.h>
@@ -26,44 +26,37 @@
 
 CCSS_BEGIN_DECLS
 
-#define CCSS_COLOR_ASSIGN(lhs_, rhs_) {		\
-	(lhs_).state = (rhs_).state;		\
-	(lhs_).red = (rhs_).red;		\
-	(lhs_).green = (rhs_).green;		\
-	(lhs_).blue = (rhs_).blue;		\
-}
-
 typedef struct {
 	ccss_property_base_t	base;
 
 	double			red;
 	double			green;
 	double			blue;
-} ccss_color_t;
+} ccss_cairo_color_t;
 
 ccss_property_base_t *
-ccss_color_create (ccss_grammar_t const	*grammar,
-		   CRTerm const		*value,
-		   void			*user_data);
+ccss_cairo_color_create (ccss_grammar_t const	*grammar,
+			 CRTerm const		*value,
+			 void			*user_data);
 
 void
-ccss_color_destroy (ccss_color_t *self);
+ccss_cairo_color_destroy (ccss_cairo_color_t *self);
 
 bool
-ccss_color_convert (ccss_color_t const		*property,
-		    ccss_property_type_t	 target,
-		    void			*value);
+ccss_cairo_color_convert (ccss_cairo_color_t const	*property,
+			  ccss_property_type_t		 target,
+			  void				*value);
 
 bool
-ccss_color_parse (ccss_color_t		 *self,
-		  ccss_grammar_t const	 *grammar,
-		  void			 *user_data,
-		  CRTerm const		**values);
+ccss_cairo_color_parse (ccss_cairo_color_t	 *self,
+			ccss_grammar_t const	 *grammar,
+			void			 *user_data,
+			CRTerm const		**values);
 
 ccss_property_class_t const *
-ccss_color_get_ptable (void);
+ccss_cairo_color_get_ptable (void);
 
 CCSS_END_DECLS
 
-#endif /* CCSS_COLOR_H */
+#endif /* CCSS_CAIRO_COLOR_H */
 
diff --git a/ccss-cairo/ccss-cairo-grammar.c b/ccss-cairo/ccss-cairo-grammar.c
index afd506f..8d3e9c5 100644
--- a/ccss-cairo/ccss-cairo-grammar.c
+++ b/ccss-cairo/ccss-cairo-grammar.c
@@ -21,7 +21,7 @@
 #include "ccss-border-parser.h"
 #include "ccss-border-image-parser.h"
 #include "ccss-cairo-grammar.h"
-#include "ccss-color.h"
+#include "ccss-cairo-color.h"
 
 /**
  * ccss_cairo_grammar_create:
@@ -43,7 +43,7 @@ ccss_cairo_grammar_create (void)
 	ccss_grammar_add_properties (self, ccss_background_get_ptable ());
 	ccss_grammar_add_properties (self, ccss_border_get_ptable ());
 	ccss_grammar_add_properties (self, ccss_border_image_get_ptable ());
-	ccss_grammar_add_properties (self, ccss_color_get_ptable ());
+	ccss_grammar_add_properties (self, ccss_cairo_color_get_ptable ());
 
 	return self;
 }
diff --git a/ccss-cairo/ccss-cairo-style.c b/ccss-cairo/ccss-cairo-style.c
index 169999a..cb46a41 100644
--- a/ccss-cairo/ccss-cairo-style.c
+++ b/ccss-cairo/ccss-cairo-style.c
@@ -123,7 +123,7 @@ ccss_cairo_style_draw_line (ccss_style_t const	*self,
 	ccss_border_stroke_t		 stroke;
 	double				 off;
 
-	stroke.color = (ccss_color_t *) lookup_property_r (self,
+	stroke.color = (ccss_cairo_color_t *) lookup_property_r (self,
 						CCSS_PROPERTY_BORDER_COLOR);
 	if (NULL == stroke.color) {
 		stroke.color = NULL;
@@ -161,14 +161,14 @@ ccss_cairo_style_draw_line (ccss_style_t const	*self,
 static void
 gather_stroke (ccss_style_t const		*self,
 	       GQuark				 color_prop,
-	       ccss_color_t const		*color_fallback,
+	       ccss_cairo_color_t const		*color_fallback,
 	       GQuark				 style_prop,
 	       ccss_border_style_t const	*style_fallback,
 	       GQuark				 width_prop,
 	       ccss_border_width_t const	*width_fallback,
 	       ccss_border_stroke_t		*stroke)
 {
-	stroke->color = (ccss_color_t *) lookup_property_r (self, color_prop);
+	stroke->color = (ccss_cairo_color_t *) lookup_property_r (self, color_prop);
 	if (NULL == stroke->color) {
 		stroke->color = color_fallback;
 	}
@@ -251,7 +251,7 @@ gather_outline (ccss_style_t const		 *self,
 static void
 gather_background (ccss_style_t const			 *self,
 		   ccss_background_attachment_t const	**bg_attachment, 
-		   ccss_color_t const			**bg_color,
+		   ccss_cairo_color_t const			**bg_color,
 		   ccss_background_image_t const	**bg_image,
 		   ccss_background_position_t const	**bg_position,
 		   ccss_background_repeat_t const	**bg_repeat,
@@ -264,7 +264,7 @@ gather_background (ccss_style_t const			 *self,
 	if (!*bg_attachment)
 		*bg_attachment = NULL;
 
-	*bg_color = (ccss_color_t const *)
+	*bg_color = (ccss_cairo_color_t const *)
 		g_hash_table_lookup (
 			self->properties,
 			(gpointer) CCSS_PROPERTY_BACKGROUND_COLOR);
@@ -364,7 +364,7 @@ ccss_cairo_style_draw_rectangle (ccss_style_t const	*self,
 	ccss_border_image_t const	*border_image;
 
 	ccss_background_attachment_t const	*bg_attachment;
-	ccss_color_t const			*bg_color;
+	ccss_cairo_color_t const			*bg_color;
 	ccss_background_image_t const		*bg_image;
 	ccss_background_position_t const	*bg_position;
 	ccss_background_repeat_t const		*bg_repeat;
@@ -458,7 +458,7 @@ ccss_cairo_style_draw_rectangle_with_gap (ccss_style_t const		*self,
 	ccss_border_join_t const	*tr;
 
 	ccss_background_attachment_t const	*bg_attachment;
-	ccss_color_t const			*bg_color;
+	ccss_cairo_color_t const			*bg_color;
 	ccss_background_image_t const		*bg_image;
 	ccss_background_position_t const	*bg_position;
 	ccss_background_repeat_t const		*bg_repeat;
diff --git a/ccss-cairo/ccss-cairo.h b/ccss-cairo/ccss-cairo.h
index bdeaa29..abe726f 100644
--- a/ccss-cairo/ccss-cairo.h
+++ b/ccss-cairo/ccss-cairo.h
@@ -21,6 +21,7 @@
 #define CCSS_CAIRO_H
 
 #include <ccss/ccss.h>
+#include <ccss-cairo/ccss-cairo-color.h>
 #include <ccss-cairo/ccss-cairo-grammar.h>
 #include <ccss-cairo/ccss-cairo-style.h>