Ensure there are zero global symbols without css_ or css__ in front of them. This helps prevent confusion if someone else wants a function called parse_background or similar

svn path=/trunk/libcss/; revision=11416

32 files changed, 415 insertions, 415 deletions

diff --git a/src/parse/properties/azimuth.c b/src/parse/properties/azimuth.c
index e6d28e6..ace29a2 100644
--- a/src/parse/properties/azimuth.c
+++ b/src/parse/properties/azimuth.c
@@ -27,7 +27,7 @@
  * Post condition: \a *ctx is updated with the next token to process
  *		   If the input is invalid, then \a *ctx remains unchanged.
  */
-css_error parse_azimuth(css_language *c, 
+css_error css__parse_azimuth(css_language *c, 
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result)
 {
@@ -184,7 +184,7 @@ css_error parse_azimuth(css_language *c,
 			value |= AZIMUTH_CENTER;
 		}
 	} else {
-		error = parse_unit_specifier(c, vector, ctx, UNIT_DEG, 
+		error = css__parse_unit_specifier(c, vector, ctx, UNIT_DEG, 
 				&length, &unit);
 		if (error != CSS_OK) {
 			*ctx = orig_ctx;
diff --git a/src/parse/properties/background.c b/src/parse/properties/background.c
index f12fde7..137372e 100644
--- a/src/parse/properties/background.c
+++ b/src/parse/properties/background.c
@@ -27,7 +27,7 @@
  * Post condition: \a *ctx is updated with the next token to process
  *		   If the input is invalid, then \a *ctx remains unchanged.
  */
-css_error parse_background(css_language *c,
+css_error css__parse_background(css_language *c,
 		const parserutils_vector *vector, int *ctx,
 		css_style *result)
 {
@@ -118,30 +118,30 @@ css_error parse_background(css_language *c,
 
 		if (is_css_inherit(c, token)) {
 			error = CSS_INVALID;
-			goto parse_background_cleanup;
+			goto css__parse_background_cleanup;
 		}
 
 		/* Try each property parser in turn, but only if we
 		 * haven't already got a value for this property.
 		 */
 		if ((attachment) && 
-		    (error = parse_background_attachment(c, vector, ctx, 
+		    (error = css__parse_background_attachment(c, vector, ctx, 
 					    attachment_style)) == CSS_OK) {
 			attachment = false;
 		} else if ((color) && 
-			   (error = parse_background_color(c, vector, ctx,
+			   (error = css__parse_background_color(c, vector, ctx,
 					    color_style)) == CSS_OK) {
 			color = false;
 		} else if ((image) && 
-			   (error = parse_background_image(c, vector, ctx,
+			   (error = css__parse_background_image(c, vector, ctx,
 					    image_style)) == CSS_OK) {
 			image = false;
 		} else if ((position) &&
-			   (error = parse_background_position(c, vector, ctx, 
+			   (error = css__parse_background_position(c, vector, ctx, 
 					position_style)) == CSS_OK) {
 			position = false;
 		} else if ((repeat) &&
-			   (error = parse_background_repeat(c, vector, ctx, 
+			   (error = css__parse_background_repeat(c, vector, ctx, 
 					repeat_style)) == CSS_OK) {
 			repeat = false;
 		}
@@ -161,7 +161,7 @@ css_error parse_background(css_language *c,
 				CSS_PROP_BACKGROUND_ATTACHMENT, 0, 
 				BACKGROUND_ATTACHMENT_SCROLL);
 		if (error != CSS_OK)
-			goto parse_background_cleanup;
+			goto css__parse_background_cleanup;
 	}
 
 	if (color) {
@@ -169,7 +169,7 @@ css_error parse_background(css_language *c,
 				CSS_PROP_BACKGROUND_COLOR, 0, 
 				BACKGROUND_COLOR_TRANSPARENT);
 		if (error != CSS_OK)
-			goto parse_background_cleanup;
+			goto css__parse_background_cleanup;
 	}
 
 	if (image) {
@@ -177,7 +177,7 @@ css_error parse_background(css_language *c,
 				CSS_PROP_BACKGROUND_IMAGE,
 				0, BACKGROUND_IMAGE_NONE);
 		if (error != CSS_OK)
-			goto parse_background_cleanup;
+			goto css__parse_background_cleanup;
 	}
 
 	if (position) {
@@ -186,7 +186,7 @@ css_error parse_background(css_language *c,
 				0, BACKGROUND_POSITION_HORZ_LEFT |
 				BACKGROUND_POSITION_VERT_TOP);
 		if (error != CSS_OK)
-			goto parse_background_cleanup;
+			goto css__parse_background_cleanup;
 	}
 
 	if (repeat) {
@@ -194,28 +194,28 @@ css_error parse_background(css_language *c,
 				CSS_PROP_BACKGROUND_REPEAT,
 				0, BACKGROUND_REPEAT_REPEAT);
 		if (error != CSS_OK)
-			goto parse_background_cleanup;
+			goto css__parse_background_cleanup;
 	}
 
 	error = css_stylesheet_merge_style(result, attachment_style);
 	if (error != CSS_OK)
-		goto parse_background_cleanup;
+		goto css__parse_background_cleanup;
 
 	error = css_stylesheet_merge_style(result, color_style);
 	if (error != CSS_OK)
-		goto parse_background_cleanup;
+		goto css__parse_background_cleanup;
 
 	error = css_stylesheet_merge_style(result, image_style);
 	if (error != CSS_OK)
-		goto parse_background_cleanup;
+		goto css__parse_background_cleanup;
 
 	error = css_stylesheet_merge_style(result, position_style);
 	if (error != CSS_OK)
-		goto parse_background_cleanup;
+		goto css__parse_background_cleanup;
 
 	error = css_stylesheet_merge_style(result, repeat_style);
 
-parse_background_cleanup:
+css__parse_background_cleanup:
 	css_stylesheet_style_destroy(attachment_style);
 	css_stylesheet_style_destroy(color_style);
 	css_stylesheet_style_destroy(image_style);
diff --git a/src/parse/properties/background_position.c b/src/parse/properties/background_position.c
index e74072f..af38882 100644
--- a/src/parse/properties/background_position.c
+++ b/src/parse/properties/background_position.c
@@ -27,7 +27,7 @@
  * Post condition: \a *ctx is updated with the next token to process
  *		   If the input is invalid, then \a *ctx remains unchanged.
  */
-css_error parse_background_position(css_language *c, 
+css_error css__parse_background_position(css_language *c, 
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result)
 {
@@ -108,7 +108,7 @@ css_error parse_background_position(css_language *c,
 			} else if (token->type == CSS_TOKEN_DIMENSION ||
 					token->type == CSS_TOKEN_NUMBER ||
 					token->type == CSS_TOKEN_PERCENTAGE) {
-				error = parse_unit_specifier(c, vector, ctx, 
+				error = css__parse_unit_specifier(c, vector, ctx, 
 						UNIT_PX, &length[i], &unit[i]);
 				if (error != CSS_OK) {
 					*ctx = orig_ctx;
diff --git a/src/parse/properties/border.c b/src/parse/properties/border.c
index e33aa40..98ad08b 100644
--- a/src/parse/properties/border.c
+++ b/src/parse/properties/border.c
@@ -27,35 +27,35 @@
  * Post condition: \a *ctx is updated with the next token to process
  *		   If the input is invalid, then \a *ctx remains unchanged.
  */
-css_error parse_border(css_language *c,
+css_error css__parse_border(css_language *c,
 		const parserutils_vector *vector, int *ctx,
 		css_style *result)
 {
 	int orig_ctx = *ctx;
 	css_error error;
 
-	error = parse_border_side(c, vector, ctx, result, BORDER_SIDE_TOP);
+	error = css__parse_border_side(c, vector, ctx, result, BORDER_SIDE_TOP);
 	if (error != CSS_OK) {
 		*ctx = orig_ctx;
 		return error;
 	}
 
 	*ctx = orig_ctx;
-	error = parse_border_side(c, vector, ctx, result, BORDER_SIDE_RIGHT);
+	error = css__parse_border_side(c, vector, ctx, result, BORDER_SIDE_RIGHT);
 	if (error != CSS_OK) {
 		*ctx = orig_ctx;
 		return error;
 	}
 
 	*ctx = orig_ctx;
-	error = parse_border_side(c, vector, ctx, result, BORDER_SIDE_BOTTOM);
+	error = css__parse_border_side(c, vector, ctx, result, BORDER_SIDE_BOTTOM);
 	if (error != CSS_OK) {
 		*ctx = orig_ctx;
 		return error;
 	}
 
 	*ctx = orig_ctx;
-	error = parse_border_side(c, vector, ctx, result, BORDER_SIDE_LEFT);
+	error = css__parse_border_side(c, vector, ctx, result, BORDER_SIDE_LEFT);
 	if (error != CSS_OK) 
 		*ctx = orig_ctx;
 	
diff --git a/src/parse/properties/border_color.c b/src/parse/properties/border_color.c
index aa337ad..87c1c5f 100644
--- a/src/parse/properties/border_color.c
+++ b/src/parse/properties/border_color.c
@@ -27,7 +27,7 @@
  * Post condition: \a *ctx is updated with the next token to process
  *		   If the input is invalid, then \a *ctx remains unchanged.
  */
-css_error parse_border_color(css_language *c,
+css_error css__parse_border_color(css_language *c,
 		const parserutils_vector *vector, int *ctx,
 		css_style *result)
 {
@@ -83,7 +83,7 @@ css_error parse_border_color(css_language *c,
 			error = CSS_OK;
 		} else {
 			side_val[side_count] = BORDER_COLOR_SET;
-			error = parse_colour_specifier(c, vector, ctx, &side_color[side_count]);
+			error = css__parse_colour_specifier(c, vector, ctx, &side_color[side_count]);
 		}
 
 		if (error == CSS_OK) {
diff --git a/src/parse/properties/border_spacing.c b/src/parse/properties/border_spacing.c
index 3d8f994..0d6bc76 100644
--- a/src/parse/properties/border_spacing.c
+++ b/src/parse/properties/border_spacing.c
@@ -27,7 +27,7 @@
  * Post condition: \a *ctx is updated with the next token to process
  *		   If the input is invalid, then \a *ctx remains unchanged.
  */
-css_error parse_border_spacing(css_language *c, 
+css_error css__parse_border_spacing(css_language *c, 
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result)
 {
@@ -58,7 +58,7 @@ css_error parse_border_spacing(css_language *c,
 	} else {
 		int num_lengths = 0;
 
-		error = parse_unit_specifier(c, vector, ctx, UNIT_PX,
+		error = css__parse_unit_specifier(c, vector, ctx, UNIT_PX,
 				&length[0], &unit[0]);
 		if (error != CSS_OK) {
 			*ctx = orig_ctx;
@@ -82,7 +82,7 @@ css_error parse_border_spacing(css_language *c,
 			 * any remaining junk is thrown out.
 			 * Ctx will be preserved on error, as usual
 			 */
-			error = parse_unit_specifier(c, vector, ctx, UNIT_PX,
+			error = css__parse_unit_specifier(c, vector, ctx, UNIT_PX,
 					&length[1], &unit[1]);
 			if (error == CSS_OK) {
 				if (unit[1] & UNIT_ANGLE || 
diff --git a/src/parse/properties/border_style.c b/src/parse/properties/border_style.c
index 7ee6922..ae697df 100644
--- a/src/parse/properties/border_style.c
+++ b/src/parse/properties/border_style.c
@@ -27,7 +27,7 @@
  * Post condition: \a *ctx is updated with the next token to process
  *		   If the input is invalid, then \a *ctx remains unchanged.
  */
-css_error parse_border_style(css_language *c,
+css_error css__parse_border_style(css_language *c,
 		const parserutils_vector *vector, int *ctx,
 		css_style *result)
 {
diff --git a/src/parse/properties/border_width.c b/src/parse/properties/border_width.c
index de4845a..88abae5 100644
--- a/src/parse/properties/border_width.c
+++ b/src/parse/properties/border_width.c
@@ -27,7 +27,7 @@
  * Post condition: \a *ctx is updated with the next token to process
  *		   If the input is invalid, then \a *ctx remains unchanged.
  */
-css_error parse_border_width(css_language *c,
+css_error css__parse_border_width(css_language *c,
 		const parserutils_vector *vector, int *ctx,
 		css_style *result)
 {
@@ -90,7 +90,7 @@ css_error parse_border_width(css_language *c,
 		} else {
 			side_val[side_count] = BORDER_WIDTH_SET;
 
-			error = parse_unit_specifier(c, vector, ctx, UNIT_PX, &side_length[side_count], &side_unit[side_count]);
+			error = css__parse_unit_specifier(c, vector, ctx, UNIT_PX, &side_length[side_count], &side_unit[side_count]);
 			if (error == CSS_OK) {
 				if (side_unit[side_count] == UNIT_PCT ||
 				    side_unit[side_count] & UNIT_ANGLE ||
diff --git a/src/parse/properties/clip.c b/src/parse/properties/clip.c
index 8b0cda6..0e06fd0 100644
--- a/src/parse/properties/clip.c
+++ b/src/parse/properties/clip.c
@@ -27,7 +27,7 @@
  * Post condition: \a *ctx is updated with the next token to process
  *                 If the input is invalid, then \a *ctx remains unchanged.
  */
-css_error parse_clip(css_language *c, 
+css_error css__parse_clip(css_language *c, 
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result)
 {
@@ -95,7 +95,7 @@ css_error parse_clip(css_language *c,
 
 				parserutils_vector_iterate(vector, ctx);
 			} else {
-				error = parse_unit_specifier(c, vector, ctx, 
+				error = css__parse_unit_specifier(c, vector, ctx, 
 						UNIT_PX, 
 						&length[num_lengths], 
 						&unit[num_lengths]);
diff --git a/src/parse/properties/content.c b/src/parse/properties/content.c
index 9a3a425..8ea8e2f 100644
--- a/src/parse/properties/content.c
+++ b/src/parse/properties/content.c
@@ -28,7 +28,7 @@
  * Post condition: \a *ctx is updated with the next token to process
  *		   If the input is invalid, then \a *ctx remains unchanged.
  */
-css_error parse_content(css_language *c,
+css_error css__parse_content(css_language *c,
 		const parserutils_vector *vector, int *ctx,
 		css_style *result)
 {
@@ -233,7 +233,7 @@ css_error parse_content(css_language *c,
 						return CSS_INVALID;
 					}
 
-					error = parse_list_style_type_value(c, token, &v);
+					error = css__parse_list_style_type_value(c, token, &v);
 					if (error != CSS_OK) {
 						*ctx = orig_ctx;
 						return error;
@@ -339,7 +339,7 @@ css_error parse_content(css_language *c,
 						return CSS_INVALID;
 					}
 
-					error = parse_list_style_type_value(c,
+					error = css__parse_list_style_type_value(c,
 									    token, &v);
 					if (error != CSS_OK) {
 						*ctx = orig_ctx;
diff --git a/src/parse/properties/css_property_parser_gen.c b/src/parse/properties/css_property_parser_gen.c
index a348c6a..d53fe16 100644
--- a/src/parse/properties/css_property_parser_gen.c
+++ b/src/parse/properties/css_property_parser_gen.c
@@ -106,7 +106,7 @@ void output_header(FILE *outputf, const char *descriptor, struct keyval *parser_
 		" * Post condition: \\a *ctx is updated with the next token to process\n"
 		" *		   If the input is invalid, then \\a *ctx remains unchanged.\n"
 		" */\n"
-		"css_error parse_%s(css_language *c,\n"
+		"css_error css__parse_%s(css_language *c,\n"
 		"		const parserutils_vector *vector, int *ctx,\n"
 		"		css_style *result%s)\n"
 		"{\n",
@@ -232,7 +232,7 @@ void output_number(FILE *outputf, struct keyval *parseid, struct keyval_list *kv
 		"if (token->type == CSS_TOKEN_NUMBER) {\n"
 		"\t\tcss_fixed num = 0;\n"
 		"\t\tsize_t consumed = 0;\n\n"
-		"\t\tnum = number_from_lwc_string(token->idata, %s, &consumed);\n"
+		"\t\tnum = css__number_from_lwc_string(token->idata, %s, &consumed);\n"
 		"\t\t/* Invalid if there are trailing characters */\n"
 		"\t\tif (consumed != lwc_string_length(token->idata)) {\n"
 		"\t\t\t*ctx = orig_ctx;\n"
@@ -274,7 +274,7 @@ void output_color(FILE *outputf, struct keyval *parseid, struct keyval_list *kvl
 		"{\n"
 		"\t\tuint32_t color = 0;\n"
 		"\t\t*ctx = orig_ctx;\n\n"
-		"\t\terror = parse_colour_specifier(c, vector, ctx, &color);\n"
+		"\t\terror = css__parse_colour_specifier(c, vector, ctx, &color);\n"
 		"\t\tif (error != CSS_OK) {\n"
 		"\t\t\t*ctx = orig_ctx;\n"
 		"\t\t\treturn error;\n"
@@ -302,7 +302,7 @@ void output_length_unit(FILE *outputf, struct keyval *parseid, struct keyval_lis
 		"\t\tcss_fixed length = 0;\n"
 		"\t\tuint32_t unit = 0;\n"
 		"\t\t*ctx = orig_ctx;\n\n"
-		"\t\terror = parse_unit_specifier(c, vector, ctx, %s, &length, &unit);\n"
+		"\t\terror = css__parse_unit_specifier(c, vector, ctx, %s, &length, &unit);\n"
 		"\t\tif (error != CSS_OK) {\n"
 		"\t\t\t*ctx = orig_ctx;\n"
 		"\t\t\treturn error;\n"
@@ -383,7 +383,7 @@ void output_ident_list(FILE *outputf, struct keyval *parseid, struct keyval_list
 			"\t\t\ttoken = parserutils_vector_iterate(vector, ctx);\n"
 			"\t\t\tif ((token != NULL) && (token->type == CSS_TOKEN_NUMBER)) {\n"
 			"\t\t\t\tsize_t consumed = 0;\n\n"
-			"\t\t\t\tnum = number_from_lwc_string(token->idata, true, &consumed);\n"
+			"\t\t\t\tnum = css__number_from_lwc_string(token->idata, true, &consumed);\n"
 			"\t\t\t\tif (consumed != lwc_string_length(token->idata)) {\n"
 			"\t\t\t\t\t*ctx = orig_ctx;\n"
 			"\t\t\t\t\treturn CSS_INVALID;\n"
diff --git a/src/parse/properties/cue.c b/src/parse/properties/cue.c
index 096c121..ea94adb 100644
--- a/src/parse/properties/cue.c
+++ b/src/parse/properties/cue.c
@@ -27,7 +27,7 @@
  * Post condition: \a *ctx is updated with the next token to process
  *		   If the input is invalid, then \a *ctx remains unchanged.
  */
-css_error parse_cue(css_language *c, 
+css_error css__parse_cue(css_language *c, 
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result)
 {
@@ -44,7 +44,7 @@ css_error parse_cue(css_language *c,
 
 	first_token = parserutils_vector_peek(vector, *ctx);
 
-	error = parse_cue_before(c, vector, ctx, result);
+	error = css__parse_cue_before(c, vector, ctx, result);
 	if (error == CSS_OK) {
 		/* first token parsed */
 		
@@ -54,14 +54,14 @@ css_error parse_cue(css_language *c,
 		if (token == NULL)  {
 			/* no second token, re-parse the first */
 			*ctx = orig_ctx;
-			error = parse_cue_after(c, vector, ctx, result);
+			error = css__parse_cue_after(c, vector, ctx, result);
 		} else {
 			/* second token - might be useful */
 			if (is_css_inherit(c, token)) {
 				/* another inherit which is bogus */
 				error = CSS_INVALID;
 			} else {
-				error = parse_cue_after(c, vector, ctx, result);
+				error = css__parse_cue_after(c, vector, ctx, result);
 				if (error == CSS_OK) { 
 					/* second token parsed */
 					if (is_css_inherit(c, first_token)) {
@@ -71,7 +71,7 @@ css_error parse_cue(css_language *c,
 				} else {
 					/* second token appears to be junk re-try with first */
 					*ctx = orig_ctx;
-					error = parse_cue_after(c, vector, ctx, result);
+					error = css__parse_cue_after(c, vector, ctx, result);
 				}
 			}
 		}
diff --git a/src/parse/properties/cursor.c b/src/parse/properties/cursor.c
index e063a9b..ef94806 100644
--- a/src/parse/properties/cursor.c
+++ b/src/parse/properties/cursor.c
@@ -26,7 +26,7 @@
  * Post condition: \a *ctx is updated with the next token to process
  *                 If the input is invalid, then \a *ctx remains unchanged.
  */
-css_error parse_cursor(css_language *c, 
+css_error css__parse_cursor(css_language *c, 
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result)
 {
diff --git a/src/parse/properties/elevation.c b/src/parse/properties/elevation.c
index d0c47d8..8c5e48e 100644
--- a/src/parse/properties/elevation.c
+++ b/src/parse/properties/elevation.c
@@ -27,7 +27,7 @@
  * Post condition: \a *ctx is updated with the next token to process
  *		   If the input is invalid, then \a *ctx remains unchanged.
  */
-css_error parse_elevation(css_language *c, 
+css_error css__parse_elevation(css_language *c, 
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result)
 {
@@ -84,7 +84,7 @@ css_error parse_elevation(css_language *c,
 		parserutils_vector_iterate(vector, ctx);
 		value = ELEVATION_LOWER;
 	} else {
-		error = parse_unit_specifier(c, vector, ctx, UNIT_DEG,
+		error = css__parse_unit_specifier(c, vector, ctx, UNIT_DEG,
 				&length, &unit);
 		if (error != CSS_OK) {
 			*ctx = orig_ctx;
diff --git a/src/parse/properties/font.c b/src/parse/properties/font.c
index 93029a4..1417dda 100644
--- a/src/parse/properties/font.c
+++ b/src/parse/properties/font.c
@@ -27,7 +27,7 @@
  * Post condition: \a *ctx is updated with the next token to process
  *		   If the input is invalid, then \a *ctx remains unchanged.
  */
-css_error parse_font(css_language *c,
+css_error css__parse_font(css_language *c,
 		const parserutils_vector *vector, int *ctx,
 		css_style *result)
 {
@@ -138,19 +138,19 @@ css_error parse_font(css_language *c,
 		token = parserutils_vector_peek(vector, *ctx);
 		if ((token != NULL) && is_css_inherit(c, token)) {
 			error = CSS_INVALID;
-			goto parse_font_cleanup;
+			goto css__parse_font_cleanup;
 		}
 
 		if ((style) && 
-		    (error = parse_font_style(c, vector,
+		    (error = css__parse_font_style(c, vector,
 					ctx, style_style)) == CSS_OK) {
 			style = false;
 		} else if ((variant) && 
-			   (error = parse_font_variant(c, vector, ctx,
+			   (error = css__parse_font_variant(c, vector, ctx,
 					variant_style)) == CSS_OK) {
 			variant = false;
 		} else if ((weight) && 
-			   (error = parse_font_weight(c, vector, ctx,
+			   (error = css__parse_font_weight(c, vector, ctx,
 				weight_style)) == CSS_OK) {
 			weight = false;
 		}
@@ -171,13 +171,13 @@ css_error parse_font(css_language *c,
 	token = parserutils_vector_peek(vector, *ctx);
 	if ((token != NULL) && is_css_inherit(c, token)) {
 		error = CSS_INVALID;
-		goto parse_font_cleanup;
+		goto css__parse_font_cleanup;
 	}
 
 	/* Now expect a font-size */
-	error = parse_font_size(c, vector, ctx, size_style);
+	error = css__parse_font_size(c, vector, ctx, size_style);
 	if (error != CSS_OK)
-		goto parse_font_cleanup;
+		goto css__parse_font_cleanup;
 	size = false;
 
 	consumeWhitespace(vector, ctx);
@@ -193,12 +193,12 @@ css_error parse_font(css_language *c,
 		token = parserutils_vector_peek(vector, *ctx);
 		if ((token != NULL) && is_css_inherit(c, token)) {
 			error = CSS_INVALID;
-			goto parse_font_cleanup;
+			goto css__parse_font_cleanup;
 		}
 
-		error = parse_line_height(c, vector, ctx, line_height_style);
+		error = css__parse_line_height(c, vector, ctx, line_height_style);
 		if (error != CSS_OK)
-			goto parse_font_cleanup;
+			goto css__parse_font_cleanup;
 
 		line_height = false;
 	}
@@ -209,13 +209,13 @@ css_error parse_font(css_language *c,
 	token = parserutils_vector_peek(vector, *ctx);
 	if ((token != NULL) && is_css_inherit(c, token)) {
 		error = CSS_INVALID;
-		goto parse_font_cleanup;
+		goto css__parse_font_cleanup;
 	}
 
 	/* Now expect a font-family */
-	error = parse_font_family(c, vector, ctx, family_style);
+	error = css__parse_font_family(c, vector, ctx, family_style);
 	if (error != CSS_OK)
-		goto parse_font_cleanup;
+		goto css__parse_font_cleanup;
 	family = false;
 
 	/* Must have size and family */
@@ -229,7 +229,7 @@ css_error parse_font(css_language *c,
 				CSS_PROP_FONT_STYLE, 0, 
 				FONT_STYLE_NORMAL);
 		if (error != CSS_OK)
-			goto parse_font_cleanup;
+			goto css__parse_font_cleanup;
 	}
 
 	if (variant) {
@@ -237,7 +237,7 @@ css_error parse_font(css_language *c,
 				CSS_PROP_FONT_VARIANT, 0, 
 				FONT_VARIANT_NORMAL);
 		if (error != CSS_OK)
-			goto parse_font_cleanup;
+			goto css__parse_font_cleanup;
 	}
 
 	if (weight) {
@@ -245,7 +245,7 @@ css_error parse_font(css_language *c,
 				CSS_PROP_FONT_WEIGHT,
 				0, FONT_WEIGHT_NORMAL);
 		if (error != CSS_OK)
-			goto parse_font_cleanup;
+			goto css__parse_font_cleanup;
 	}
 
 	if (line_height) {
@@ -253,35 +253,35 @@ css_error parse_font(css_language *c,
 				CSS_PROP_LINE_HEIGHT,
 				0, LINE_HEIGHT_NORMAL);
 		if (error != CSS_OK)
-			goto parse_font_cleanup;
+			goto css__parse_font_cleanup;
 	}
 
 	/* merge final output */
 	error = css_stylesheet_merge_style(result, style_style);
 		if (error != CSS_OK)
-			goto parse_font_cleanup;
+			goto css__parse_font_cleanup;
 
 	error = css_stylesheet_merge_style(result, variant_style);
 		if (error != CSS_OK)
-			goto parse_font_cleanup;
+			goto css__parse_font_cleanup;
 
 	error = css_stylesheet_merge_style(result, weight_style);
 		if (error != CSS_OK)
-			goto parse_font_cleanup;
+			goto css__parse_font_cleanup;
 
 	error = css_stylesheet_merge_style(result, size_style);
 		if (error != CSS_OK)
-			goto parse_font_cleanup;
+			goto css__parse_font_cleanup;
 
 	error = css_stylesheet_merge_style(result, line_height_style);
 		if (error != CSS_OK)
-			goto parse_font_cleanup;
+			goto css__parse_font_cleanup;
 
 	error = css_stylesheet_merge_style(result, family_style);
 
 
 
-parse_font_cleanup:
+css__parse_font_cleanup:
 	css_stylesheet_style_destroy(style_style);
 	css_stylesheet_style_destroy(variant_style);
 	css_stylesheet_style_destroy(weight_style);
diff --git a/src/parse/properties/font_family.c b/src/parse/properties/font_family.c
index a2e9511..4d0a3b1 100644
--- a/src/parse/properties/font_family.c
+++ b/src/parse/properties/font_family.c
@@ -98,7 +98,7 @@ static css_code_t font_family_value(css_language *c, const css_token *token, boo
  * Post condition: \a *ctx is updated with the next token to process
  *		   If the input is invalid, then \a *ctx remains unchanged.
  */
-css_error parse_font_family(css_language *c, 
+css_error css__parse_font_family(css_language *c, 
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result)
 {
@@ -131,7 +131,7 @@ css_error parse_font_family(css_language *c,
 	} else {
 		*ctx = orig_ctx;
 
-		error = comma_list_to_style(c, vector, ctx,
+		error = css__comma_list_to_style(c, vector, ctx,
 				font_family_reserved, font_family_value,
 				result);
 		if (error != CSS_OK) {
diff --git a/src/parse/properties/font_weight.c b/src/parse/properties/font_weight.c
index 03e6e51..9c4048b 100644
--- a/src/parse/properties/font_weight.c
+++ b/src/parse/properties/font_weight.c
@@ -27,7 +27,7 @@
  * Post condition: \a *ctx is updated with the next token to process
  *		   If the input is invalid, then \a *ctx remains unchanged.
  */
-css_error parse_font_weight(css_language *c, 
+css_error css__parse_font_weight(css_language *c, 
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result)
 {
@@ -53,7 +53,7 @@ css_error parse_font_weight(css_language *c,
 		flags |= FLAG_INHERIT;
 	} else if (token->type == CSS_TOKEN_NUMBER) {
 		size_t consumed = 0;
-		css_fixed num = number_from_lwc_string(token->idata, 
+		css_fixed num = css__number_from_lwc_string(token->idata, 
 				true, &consumed);
 		/* Invalid if there are trailing characters */
 		if (consumed != lwc_string_length(token->idata)) {
diff --git a/src/parse/properties/list_style.c b/src/parse/properties/list_style.c
index b9406c1..7ac0831 100644
--- a/src/parse/properties/list_style.c
+++ b/src/parse/properties/list_style.c
@@ -27,7 +27,7 @@
  * Post condition: \a *ctx is updated with the next token to process
  *		   If the input is invalid, then \a *ctx remains unchanged.
  */
-css_error parse_list_style(css_language *c,
+css_error css__parse_list_style(css_language *c,
 		const parserutils_vector *vector, int *ctx,
 		css_style *result)
 {
@@ -91,19 +91,19 @@ css_error parse_list_style(css_language *c,
 		token = parserutils_vector_peek(vector, *ctx);
 		if (token != NULL && is_css_inherit(c, token)) {
 			error = CSS_INVALID;
-			goto parse_list_style_cleanup;
+			goto css__parse_list_style_cleanup;
 		}
 
 		if ((type) && 
-		    (error = parse_list_style_type(c, vector,
+		    (error = css__parse_list_style_type(c, vector,
 				ctx, type_style)) == CSS_OK) {
 			type = false;
 		} else if ((position) && 
-			   (error = parse_list_style_position(c, vector, 
+			   (error = css__parse_list_style_position(c, vector, 
 				ctx, position_style)) == CSS_OK) {
 			position = false;
 		} else if ((image) && 
-			   (error = parse_list_style_image(c, vector, ctx,
+			   (error = css__parse_list_style_image(c, vector, ctx,
 				image_style)) == CSS_OK) {
 			image = false;
 		}
@@ -141,16 +141,16 @@ css_error parse_list_style(css_language *c,
 
 	error = css_stylesheet_merge_style(result, image_style);
 	if (error != CSS_OK)
-		goto parse_list_style_cleanup;
+		goto css__parse_list_style_cleanup;
 
 	error = css_stylesheet_merge_style(result, position_style);
 	if (error != CSS_OK)
-		goto parse_list_style_cleanup;
+		goto css__parse_list_style_cleanup;
 
 	error = css_stylesheet_merge_style(result, type_style);
 
 
-parse_list_style_cleanup:
+css__parse_list_style_cleanup:
 
 	css_stylesheet_style_destroy(type_style);
 	css_stylesheet_style_destroy(position_style);
diff --git a/src/parse/properties/list_style_type.c b/src/parse/properties/list_style_type.c
index 3afab3a..12fb465 100644
--- a/src/parse/properties/list_style_type.c
+++ b/src/parse/properties/list_style_type.c
@@ -27,7 +27,7 @@
  * Post condition: \a *ctx is updated with the next token to process
  *		   If the input is invalid, then \a *ctx remains unchanged.
  */
-css_error parse_list_style_type(css_language *c, 
+css_error css__parse_list_style_type(css_language *c, 
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result)
 {
@@ -54,7 +54,7 @@ css_error parse_list_style_type(css_language *c,
 			&match) == lwc_error_ok && match)) {
 		flags |= FLAG_INHERIT;
 	} else {
-		error = parse_list_style_type_value(c, ident, &value);
+		error = css__parse_list_style_type_value(c, ident, &value);
 		if (error != CSS_OK) {
 			*ctx = orig_ctx;
 			return error;
diff --git a/src/parse/properties/margin.c b/src/parse/properties/margin.c
index b320e85..04b8795 100644
--- a/src/parse/properties/margin.c
+++ b/src/parse/properties/margin.c
@@ -27,7 +27,7 @@
  * Post condition: \a *ctx is updated with the next token to process
  *		   If the input is invalid, then \a *ctx remains unchanged.
  */
-css_error parse_margin(css_language *c,
+css_error css__parse_margin(css_language *c,
 		const parserutils_vector *vector, int *ctx,
 		css_style *result)
 {
@@ -82,7 +82,7 @@ css_error parse_margin(css_language *c,
 		} else {
 			side_val[side_count] = MARGIN_SET;
 
-			error = parse_unit_specifier(c, vector, ctx, UNIT_PX, &side_length[side_count], &side_unit[side_count]);
+			error = css__parse_unit_specifier(c, vector, ctx, UNIT_PX, &side_length[side_count], &side_unit[side_count]);
 			if (error == CSS_OK) {
 				if (side_unit[side_count] & UNIT_ANGLE||
 				    side_unit[side_count] & UNIT_TIME||
diff --git a/src/parse/properties/outline.c b/src/parse/properties/outline.c
index 7af2cc3..7cd74cd 100644
--- a/src/parse/properties/outline.c
+++ b/src/parse/properties/outline.c
@@ -27,7 +27,7 @@
  * Post condition: \a *ctx is updated with the next token to process
  *		   If the input is invalid, then \a *ctx remains unchanged.
  */
-css_error parse_outline(css_language *c,
+css_error css__parse_outline(css_language *c,
 		const parserutils_vector *vector, int *ctx,
 		css_style *result)
 {
@@ -91,19 +91,19 @@ css_error parse_outline(css_language *c,
 		token = parserutils_vector_peek(vector, *ctx);
 		if (token != NULL && is_css_inherit(c, token)) {
 			error = CSS_INVALID;
-			goto parse_outline_cleanup;
+			goto css__parse_outline_cleanup;
 		}
 
 		if ((color) && 
-			   (error = parse_outline_color(c, vector, ctx,
+			   (error = css__parse_outline_color(c, vector, ctx,
 				color_style)) == CSS_OK) {
 			color = false;
 		} else if ((style) && 
-			   (error = parse_outline_style(c, vector, 
+			   (error = css__parse_outline_style(c, vector, 
 				ctx, style_style)) == CSS_OK) {
 			style = false;
 		} else if ((width) && 
-		    (error = parse_outline_width(c, vector,
+		    (error = css__parse_outline_width(c, vector,
 				ctx, width_style)) == CSS_OK) {
 			width = false;
 		} 
@@ -141,16 +141,16 @@ css_error parse_outline(css_language *c,
 
 	error = css_stylesheet_merge_style(result, color_style);
 	if (error != CSS_OK)
-		goto parse_outline_cleanup;
+		goto css__parse_outline_cleanup;
 
 	error = css_stylesheet_merge_style(result, style_style);
 	if (error != CSS_OK)
-		goto parse_outline_cleanup;
+		goto css__parse_outline_cleanup;
 
 	error = css_stylesheet_merge_style(result, width_style);
 
 
-parse_outline_cleanup:
+css__parse_outline_cleanup:
 
 	css_stylesheet_style_destroy(width_style);
 	css_stylesheet_style_destroy(style_style);
diff --git a/src/parse/properties/padding.c b/src/parse/properties/padding.c
index 263906d..5211e9d 100644
--- a/src/parse/properties/padding.c
+++ b/src/parse/properties/padding.c
@@ -27,7 +27,7 @@
  * Post condition: \a *ctx is updated with the next token to process
  *		   If the input is invalid, then \a *ctx remains unchanged.
  */
-css_error parse_padding(css_language *c,
+css_error css__parse_padding(css_language *c,
 		const parserutils_vector *vector, int *ctx,
 		css_style *result)
 {
@@ -73,7 +73,7 @@ css_error parse_padding(css_language *c,
 			return CSS_INVALID;
 		}
 
-		error = parse_unit_specifier(c, vector, ctx, UNIT_PX, &side_length[side_count], &side_unit[side_count]);
+		error = css__parse_unit_specifier(c, vector, ctx, UNIT_PX, &side_length[side_count], &side_unit[side_count]);
 		if (error == CSS_OK) {
 			if (side_unit[side_count] & UNIT_ANGLE ||
 			    side_unit[side_count] & UNIT_TIME ||
diff --git a/src/parse/properties/pause.c b/src/parse/properties/pause.c
index c1612aa..fcb4644 100644
--- a/src/parse/properties/pause.c
+++ b/src/parse/properties/pause.c
@@ -27,7 +27,7 @@
  * Post condition: \a *ctx is updated with the next token to process
  *		   If the input is invalid, then \a *ctx remains unchanged.
  */
-css_error parse_pause(css_language *c,
+css_error css__parse_pause(css_language *c,
 		const parserutils_vector *vector, int *ctx,
 		css_style *result)
 {
@@ -44,7 +44,7 @@ css_error parse_pause(css_language *c,
 
 	first_token = parserutils_vector_peek(vector, *ctx);
 
-	error = parse_pause_before(c, vector, ctx, result);
+	error = css__parse_pause_before(c, vector, ctx, result);
 	if (error == CSS_OK) {
 		/* first token parsed */
 
@@ -54,14 +54,14 @@ css_error parse_pause(css_language *c,
 		if (token == NULL)  {
 			/* no second token, re-parse the first */
 			*ctx = orig_ctx;
-			error = parse_pause_after(c, vector, ctx, result);
+			error = css__parse_pause_after(c, vector, ctx, result);
 		} else {
 			/* second token - might be useful */
 			if (is_css_inherit(c, token)) {
 				/* another bogus inherit */
 				error = CSS_INVALID;
 			} else {
-				error = parse_pause_after(c, vector, ctx, result);
+				error = css__parse_pause_after(c, vector, ctx, result);
 				if (error == CSS_OK) { 
 					/* second token parsed */
 					if (is_css_inherit(c, first_token)) {
@@ -71,7 +71,7 @@ css_error parse_pause(css_language *c,
 				} else {
 					/* second token appears to be junk re-try with first */
 					*ctx = orig_ctx;
-					error = parse_pause_after(c, vector, ctx, result);
+					error = css__parse_pause_after(c, vector, ctx, result);
 				}
 			}
 		}
diff --git a/src/parse/properties/play_during.c b/src/parse/properties/play_during.c
index d2f6521..8d83a92 100644
--- a/src/parse/properties/play_during.c
+++ b/src/parse/properties/play_during.c
@@ -27,7 +27,7 @@
  * Post condition: \a *ctx is updated with the next token to process
  *		   If the input is invalid, then \a *ctx remains unchanged.
  */
-css_error parse_play_during(css_language *c, 
+css_error css__parse_play_during(css_language *c, 
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result)
 {
diff --git a/src/parse/properties/properties.c b/src/parse/properties/properties.c
index 79ad1a5..09ee255 100644
--- a/src/parse/properties/properties.c
+++ b/src/parse/properties/properties.c
@@ -12,120 +12,120 @@
  */
 const css_prop_handler property_handlers[LAST_PROP + 1 - FIRST_PROP] =
 {
-	parse_azimuth,
-	parse_background,
-	parse_background_attachment,
-	parse_background_color,
-	parse_background_image,
-	parse_background_position,
-	parse_background_repeat,
-	parse_border,
-	parse_border_bottom,
-	parse_border_bottom_color,
-	parse_border_bottom_style,
-	parse_border_bottom_width,
-	parse_border_collapse,
-	parse_border_color,
-	parse_border_left,
-	parse_border_left_color,
-	parse_border_left_style,
-	parse_border_left_width,
-	parse_border_right,
-	parse_border_right_color,
-	parse_border_right_style,
-	parse_border_right_width,
-	parse_border_spacing,
-	parse_border_style,
-	parse_border_top,
-	parse_border_top_color,
-	parse_border_top_style,
-	parse_border_top_width,
-	parse_border_width,
-	parse_bottom,
-	parse_caption_side,
-	parse_clear,
-	parse_clip,
-	parse_color,
-	parse_content,
-	parse_counter_increment,
-	parse_counter_reset,
-	parse_cue,
-	parse_cue_after,
-	parse_cue_before,
-	parse_cursor,
-	parse_direction,
-	parse_display,
-	parse_elevation,
-	parse_empty_cells,
-	parse_float,
-	parse_font,
-	parse_font_family,
-	parse_font_size,
-	parse_font_style,
-	parse_font_variant,
-	parse_font_weight,
-	parse_height,
-	parse_left,
-	parse_letter_spacing,
-	parse_line_height,
-	parse_list_style,
-	parse_list_style_image,
-	parse_list_style_position,
-	parse_list_style_type,
-	parse_margin,
-	parse_margin_bottom,
-	parse_margin_left,
-	parse_margin_right,
-	parse_margin_top,
-	parse_max_height,
-	parse_max_width,
-	parse_min_height,
-	parse_min_width,
-	parse_orphans,
-	parse_outline,
-	parse_outline_color,
-	parse_outline_style,
-	parse_outline_width,
-	parse_overflow,
-	parse_padding,
-	parse_padding_bottom,
-	parse_padding_left,
-	parse_padding_right,
-	parse_padding_top,
-	parse_page_break_after,
-	parse_page_break_before,
-	parse_page_break_inside,
-	parse_pause,
-	parse_pause_after,
-	parse_pause_before,
-	parse_pitch_range,
-	parse_pitch,
-	parse_play_during,
-	parse_position,
-	parse_quotes,
-	parse_richness,
-	parse_right,
-	parse_speak_header,
-	parse_speak_numeral,
-	parse_speak_punctuation,
-	parse_speak,
-	parse_speech_rate,
-	parse_stress,
-	parse_table_layout,
-	parse_text_align,
-	parse_text_decoration,
-	parse_text_indent,
-	parse_text_transform,
-	parse_top,
-	parse_unicode_bidi,
-	parse_vertical_align,
-	parse_visibility,
-	parse_voice_family,
-	parse_volume,
-	parse_white_space,
-	parse_widows,
-	parse_width,
-	parse_word_spacing,
-	parse_z_index
+	css__parse_azimuth,
+	css__parse_background,
+	css__parse_background_attachment,
+	css__parse_background_color,
+	css__parse_background_image,
+	css__parse_background_position,
+	css__parse_background_repeat,
+	css__parse_border,
+	css__parse_border_bottom,
+	css__parse_border_bottom_color,
+	css__parse_border_bottom_style,
+	css__parse_border_bottom_width,
+	css__parse_border_collapse,
+	css__parse_border_color,
+	css__parse_border_left,
+	css__parse_border_left_color,
+	css__parse_border_left_style,
+	css__parse_border_left_width,
+	css__parse_border_right,
+	css__parse_border_right_color,
+	css__parse_border_right_style,
+	css__parse_border_right_width,
+	css__parse_border_spacing,
+	css__parse_border_style,
+	css__parse_border_top,
+	css__parse_border_top_color,
+	css__parse_border_top_style,
+	css__parse_border_top_width,
+	css__parse_border_width,
+	css__parse_bottom,
+	css__parse_caption_side,
+	css__parse_clear,
+	css__parse_clip,
+	css__parse_color,
+	css__parse_content,
+	css__parse_counter_increment,
+	css__parse_counter_reset,
+	css__parse_cue,
+	css__parse_cue_after,
+	css__parse_cue_before,
+	css__parse_cursor,
+	css__parse_direction,
+	css__parse_display,
+	css__parse_elevation,
+	css__parse_empty_cells,
+	css__parse_float,
+	css__parse_font,
+	css__parse_font_family,
+	css__parse_font_size,
+	css__parse_font_style,
+	css__parse_font_variant,
+	css__parse_font_weight,
+	css__parse_height,
+	css__parse_left,
+	css__parse_letter_spacing,
+	css__parse_line_height,
+	css__parse_list_style,
+	css__parse_list_style_image,
+	css__parse_list_style_position,
+	css__parse_list_style_type,
+	css__parse_margin,
+	css__parse_margin_bottom,
+	css__parse_margin_left,
+	css__parse_margin_right,
+	css__parse_margin_top,
+	css__parse_max_height,
+	css__parse_max_width,
+	css__parse_min_height,
+	css__parse_min_width,
+	css__parse_orphans,
+	css__parse_outline,
+	css__parse_outline_color,
+	css__parse_outline_style,
+	css__parse_outline_width,
+	css__parse_overflow,
+	css__parse_padding,
+	css__parse_padding_bottom,
+	css__parse_padding_left,
+	css__parse_padding_right,
+	css__parse_padding_top,
+	css__parse_page_break_after,
+	css__parse_page_break_before,
+	css__parse_page_break_inside,
+	css__parse_pause,
+	css__parse_pause_after,
+	css__parse_pause_before,
+	css__parse_pitch_range,
+	css__parse_pitch,
+	css__parse_play_during,
+	css__parse_position,
+	css__parse_quotes,
+	css__parse_richness,
+	css__parse_right,
+	css__parse_speak_header,
+	css__parse_speak_numeral,
+	css__parse_speak_punctuation,
+	css__parse_speak,
+	css__parse_speech_rate,
+	css__parse_stress,
+	css__parse_table_layout,
+	css__parse_text_align,
+	css__parse_text_decoration,
+	css__parse_text_indent,
+	css__parse_text_transform,
+	css__parse_top,
+	css__parse_unicode_bidi,
+	css__parse_vertical_align,
+	css__parse_visibility,
+	css__parse_voice_family,
+	css__parse_volume,
+	css__parse_white_space,
+	css__parse_widows,
+	css__parse_width,
+	css__parse_word_spacing,
+	css__parse_z_index
 };
 
diff --git a/src/parse/properties/properties.gen b/src/parse/properties/properties.gen
index 7666a3a..b0e84b8 100644
--- a/src/parse/properties/properties.gen
+++ b/src/parse/properties/properties.gen
@@ -34,10 +34,10 @@ letter_spacing:CSS_PROP_LETTER_SPACING IDENT:( INHERIT: NORMAL:0,LETTER_SPACING_
 
 line_height:CSS_PROP_LINE_HEIGHT IDENT:( INHERIT: NORMAL:0,LINE_HEIGHT_NORMAL IDENT:) NUMBER:( false:LINE_HEIGHT_NUMBER RANGE:num<0 NUMBER:) LENGTH_UNIT:( UNIT_PX:LINE_HEIGHT_DIMENSION DISALLOW:unit&UNIT_ANGLE||unit&UNIT_TIME||unit&UNIT_FREQ RANGE:<0 LENGTH_UNIT:)
 
-border_top:BORDER_SIDE_TOP WRAP:parse_border_side
-border_bottom:BORDER_SIDE_BOTTOM WRAP:parse_border_side
-border_left:BORDER_SIDE_LEFT WRAP:parse_border_side
-border_right:BORDER_SIDE_RIGHT WRAP:parse_border_side
+border_top:BORDER_SIDE_TOP WRAP:css__parse_border_side
+border_bottom:BORDER_SIDE_BOTTOM WRAP:css__parse_border_side
+border_left:BORDER_SIDE_LEFT WRAP:css__parse_border_side
+border_right:BORDER_SIDE_RIGHT WRAP:css__parse_border_side
 
 max_height:CSS_PROP_MAX_HEIGHT IDENT:( INHERIT: NONE:0,MAX_HEIGHT_NONE IDENT:) LENGTH_UNIT:( UNIT_PX:MAX_HEIGHT_SET DISALLOW:unit&UNIT_ANGLE||unit&UNIT_TIME||unit&UNIT_FREQ RANGE:<0 LENGTH_UNIT:)
 
@@ -52,53 +52,53 @@ color:CSS_PROP_COLOR IDENT:INHERIT COLOR:COLOR_SET
 #generic for padding_{top, bottom, left, right}.c
 padding_side:op GENERIC: IDENT:INHERIT LENGTH_UNIT:( UNIT_PX:PADDING_SET DISALLOW:unit&UNIT_ANGLE||unit&UNIT_TIME||unit&UNIT_FREQ  RANGE:<0 LENGTH_UNIT:)
 
-padding_bottom:CSS_PROP_PADDING_BOTTOM WRAP:parse_padding_side
-padding_left:CSS_PROP_PADDING_LEFT WRAP:parse_padding_side
-padding_top:CSS_PROP_PADDING_TOP WRAP:parse_padding_side
-padding_right:CSS_PROP_PADDING_RIGHT WRAP:parse_padding_side
+padding_bottom:CSS_PROP_PADDING_BOTTOM WRAP:css__parse_padding_side
+padding_left:CSS_PROP_PADDING_LEFT WRAP:css__parse_padding_side
+padding_top:CSS_PROP_PADDING_TOP WRAP:css__parse_padding_side
+padding_right:CSS_PROP_PADDING_RIGHT WRAP:css__parse_padding_side
 
 
 #generic for margin_{top, bottom, left, right}.c
 margin_side:op GENERIC IDENT:( INHERIT: AUTO:0,MARGIN_AUTO IDENT:) LENGTH_UNIT:( UNIT_PX:MARGIN_SET DISALLOW:unit&UNIT_ANGLE||unit&UNIT_TIME||unit&UNIT_FREQ LENGTH_UNIT:)
 
-margin_top:CSS_PROP_MARGIN_TOP WRAP:parse_margin_side
-margin_bottom:CSS_PROP_MARGIN_BOTTOM WRAP:parse_margin_side
-margin_left:CSS_PROP_MARGIN_LEFT WRAP:parse_margin_side
-margin_right:CSS_PROP_MARGIN_RIGHT WRAP:parse_margin_side
+margin_top:CSS_PROP_MARGIN_TOP WRAP:css__parse_margin_side
+margin_bottom:CSS_PROP_MARGIN_BOTTOM WRAP:css__parse_margin_side
+margin_left:CSS_PROP_MARGIN_LEFT WRAP:css__parse_margin_side
+margin_right:CSS_PROP_MARGIN_RIGHT WRAP:css__parse_margin_side
 
 #generic for {top, bottom, left, right}.c
 side:op GENERIC: IDENT:( INHERIT: AUTO:0,BOTTOM_AUTO IDENT:) LENGTH_UNIT:( UNIT_PX:BOTTOM_SET DISALLOW:unit&UNIT_ANGLE||unit&UNIT_TIME||unit&UNIT_FREQ LENGTH_UNIT:)
 
-top:CSS_PROP_TOP WRAP:parse_side
-bottom:CSS_PROP_BOTTOM WRAP:parse_side
-left:CSS_PROP_LEFT WRAP:parse_side
-right:CSS_PROP_RIGHT WRAP:parse_side
+top:CSS_PROP_TOP WRAP:css__parse_side
+bottom:CSS_PROP_BOTTOM WRAP:css__parse_side
+left:CSS_PROP_LEFT WRAP:css__parse_side
+right:CSS_PROP_RIGHT WRAP:css__parse_side
 
 
 #generic for border_{top, bottom, left, right}_width.c
 border_side_width:op GENERIC: IDENT:( INHERIT: THIN:0,BORDER_WIDTH_THIN MEDIUM:0,BORDER_WIDTH_MEDIUM THICK:0,BORDER_WIDTH_THICK IDENT:) LENGTH_UNIT:( UNIT_PX:BORDER_WIDTH_SET DISALLOW:unit==UNIT_PCT||unit&UNIT_ANGLE||unit&UNIT_TIME||unit&UNIT_FREQ RANGE:<0 LENGTH_UNIT:)
 
-border_top_width:CSS_PROP_BORDER_TOP_WIDTH WRAP:parse_border_side_width
-border_bottom_width:CSS_PROP_BORDER_BOTTOM_WIDTH WRAP:parse_border_side_width
-border_left_width:CSS_PROP_BORDER_LEFT_WIDTH WRAP:parse_border_side_width
-border_right_width:CSS_PROP_BORDER_RIGHT_WIDTH WRAP:parse_border_side_width
+border_top_width:CSS_PROP_BORDER_TOP_WIDTH WRAP:css__parse_border_side_width
+border_bottom_width:CSS_PROP_BORDER_BOTTOM_WIDTH WRAP:css__parse_border_side_width
+border_left_width:CSS_PROP_BORDER_LEFT_WIDTH WRAP:css__parse_border_side_width
+border_right_width:CSS_PROP_BORDER_RIGHT_WIDTH WRAP:css__parse_border_side_width
 
 
 #generic for border_{top, bottom, left, right}_style.c
 border_side_style:op GENERIC: IDENT:( INHERIT: NONE:0,BORDER_STYLE_NONE HIDDEN:0,BORDER_STYLE_HIDDEN DOTTED:0,BORDER_STYLE_DOTTED DASHED:0,BORDER_STYLE_DASHED SOLID:0,BORDER_STYLE_SOLID LIBCSS_DOUBLE:0,BORDER_STYLE_DOUBLE GROOVE:0,BORDER_STYLE_GROOVE RIDGE:0,BORDER_STYLE_RIDGE INSET:0,BORDER_STYLE_INSET OUTSET:0,BORDER_STYLE_OUTSET IDENT:)
 
-border_top_style:CSS_PROP_BORDER_TOP_STYLE WRAP:parse_border_side_style
-border_bottom_style:CSS_PROP_BORDER_BOTTOM_STYLE WRAP:parse_border_side_style
-border_left_style:CSS_PROP_BORDER_LEFT_STYLE WRAP:parse_border_side_style
-border_right_style:CSS_PROP_BORDER_RIGHT_STYLE WRAP:parse_border_side_style
+border_top_style:CSS_PROP_BORDER_TOP_STYLE WRAP:css__parse_border_side_style
+border_bottom_style:CSS_PROP_BORDER_BOTTOM_STYLE WRAP:css__parse_border_side_style
+border_left_style:CSS_PROP_BORDER_LEFT_STYLE WRAP:css__parse_border_side_style
+border_right_style:CSS_PROP_BORDER_RIGHT_STYLE WRAP:css__parse_border_side_style
 
 #generic for border_{top, bottom, left, right}_color.c
 border_side_color:op GENERIC: IDENT:( INHERIT: TRANSPARENT:0,BORDER_COLOR_TRANSPARENT IDENT:) COLOR:BORDER_COLOR_SET
 
-border_top_color:CSS_PROP_BORDER_TOP_COLOR WRAP:parse_border_side_color
-border_bottom_color:CSS_PROP_BORDER_BOTTOM_COLOR WRAP:parse_border_side_color
-border_left_color:CSS_PROP_BORDER_LEFT_COLOR WRAP:parse_border_side_color
-border_right_color:CSS_PROP_BORDER_RIGHT_COLOR WRAP:parse_border_side_color
+border_top_color:CSS_PROP_BORDER_TOP_COLOR WRAP:css__parse_border_side_color
+border_bottom_color:CSS_PROP_BORDER_BOTTOM_COLOR WRAP:css__parse_border_side_color
+border_left_color:CSS_PROP_BORDER_LEFT_COLOR WRAP:css__parse_border_side_color
+border_right_color:CSS_PROP_BORDER_RIGHT_COLOR WRAP:css__parse_border_side_color
 
 
 counter_increment:CSS_PROP_COUNTER_INCREMENT IDENT:( INHERIT: NONE:0,COUNTER_INCREMENT_NONE IDENT:) IDENT_LIST:( STRING_OPTNUM:COUNTER_INCREMENT_NAMED 1:COUNTER_INCREMENT_NONE IDENT_LIST:)
@@ -127,7 +127,7 @@ outline_color:CSS_PROP_OUTLINE_COLOR IDENT:( INHERIT: INVERT:0,OUTLINE_COLOR_INV
 
 outline_style:CSS_PROP_OUTLINE_STYLE IDENT:( INHERIT: NONE:0,BORDER_STYLE_NONE DOTTED:0,BORDER_STYLE_DOTTED DASHED:0,BORDER_STYLE_DASHED SOLID:0,BORDER_STYLE_SOLID LIBCSS_DOUBLE:0,BORDER_STYLE_DOUBLE GROOVE:0,BORDER_STYLE_GROOVE RIDGE:0,BORDER_STYLE_RIDGE INSET:0,BORDER_STYLE_INSET OUTSET:0,BORDER_STYLE_OUTSET IDENT:)
 
-outline_width:CSS_PROP_OUTLINE_WIDTH WRAP:parse_border_side_width
+outline_width:CSS_PROP_OUTLINE_WIDTH WRAP:css__parse_border_side_width
 
 overflow:CSS_PROP_OVERFLOW IDENT:( INHERIT: VISIBLE:0,OVERFLOW_VISIBLE HIDDEN:0,OVERFLOW_HIDDEN SCROLL:0,OVERFLOW_SCROLL AUTO:0,OVERFLOW_AUTO  IDENT:)
 
diff --git a/src/parse/properties/properties.h b/src/parse/properties/properties.h
index 6117387..5de344d 100644
--- a/src/parse/properties/properties.h
+++ b/src/parse/properties/properties.h
@@ -5,8 +5,8 @@
  * Copyright 2009 John-Mark Bell <jmb@netsurf-browser.org>
  */
 
-#ifndef css_parse_properties_properties_h_
-#define css_parse_properties_properties_h_
+#ifndef css_css__parse_properties_properties_h_
+#define css_css__parse_properties_properties_h_
 
 #include "stylesheet.h"
 #include "lex/lex.h"
@@ -22,349 +22,349 @@ typedef css_error (*css_prop_handler)(css_language *c,
 
 extern const css_prop_handler property_handlers[LAST_PROP + 1 - FIRST_PROP];
 
-css_error parse_azimuth(css_language *c,
+css_error css__parse_azimuth(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_background(css_language *c,
+css_error css__parse_background(css_language *c,
 		const parserutils_vector *vector, int *ctx,
 		css_style *result);
-css_error parse_background_attachment(css_language *c,
+css_error css__parse_background_attachment(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_background_color(css_language *c,
+css_error css__parse_background_color(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_background_image(css_language *c,
+css_error css__parse_background_image(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_background_position(css_language *c,
+css_error css__parse_background_position(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_background_repeat(css_language *c,
+css_error css__parse_background_repeat(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_border(css_language *c,
+css_error css__parse_border(css_language *c,
 		const parserutils_vector *vector, int *ctx,
 		css_style *result);
-css_error parse_border_bottom(css_language *c,
+css_error css__parse_border_bottom(css_language *c,
 		const parserutils_vector *vector, int *ctx,
 		css_style *result);
-css_error parse_border_bottom_color(css_language *c,
+css_error css__parse_border_bottom_color(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_border_bottom_style(css_language *c,
+css_error css__parse_border_bottom_style(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_border_bottom_width(css_language *c,
+css_error css__parse_border_bottom_width(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_border_color(css_language *c,
+css_error css__parse_border_color(css_language *c,
 		const parserutils_vector *vector, int *ctx,
 		css_style *result);
-css_error parse_border_collapse(css_language *c,
+css_error css__parse_border_collapse(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_border_left(css_language *c,
+css_error css__parse_border_left(css_language *c,
 		const parserutils_vector *vector, int *ctx,
 		css_style *result);
-css_error parse_border_left_color(css_language *c,
+css_error css__parse_border_left_color(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_border_left_style(css_language *c,
+css_error css__parse_border_left_style(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_border_left_width(css_language *c,
+css_error css__parse_border_left_width(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_border_right(css_language *c,
+css_error css__parse_border_right(css_language *c,
 		const parserutils_vector *vector, int *ctx,
 		css_style *result);
-css_error parse_border_right_color(css_language *c,
+css_error css__parse_border_right_color(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_border_right_style(css_language *c,
+css_error css__parse_border_right_style(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_border_right_width(css_language *c,
+css_error css__parse_border_right_width(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_border_spacing(css_language *c,
+css_error css__parse_border_spacing(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_border_style(css_language *c,
+css_error css__parse_border_style(css_language *c,
 		const parserutils_vector *vector, int *ctx,
 		css_style *result);
-css_error parse_border_top(css_language *c,
+css_error css__parse_border_top(css_language *c,
 		const parserutils_vector *vector, int *ctx,
 		css_style *result);
-css_error parse_border_top_color(css_language *c,
+css_error css__parse_border_top_color(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_border_top_style(css_language *c,
+css_error css__parse_border_top_style(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_border_top_width(css_language *c,
+css_error css__parse_border_top_width(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_border_width(css_language *c,
+css_error css__parse_border_width(css_language *c,
 		const parserutils_vector *vector, int *ctx,
 		css_style *result);
-css_error parse_bottom(css_language *c,
+css_error css__parse_bottom(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_caption_side(css_language *c,
+css_error css__parse_caption_side(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_clear(css_language *c,
+css_error css__parse_clear(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_clip(css_language *c,
+css_error css__parse_clip(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_color(css_language *c,
+css_error css__parse_color(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_content(css_language *c,
+css_error css__parse_content(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_counter_increment(css_language *c,
+css_error css__parse_counter_increment(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_counter_reset(css_language *c,
+css_error css__parse_counter_reset(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_cue(css_language *c,
+css_error css__parse_cue(css_language *c,
 		const parserutils_vector *vector, int *ctx,
 		css_style *result);
-css_error parse_cue_after(css_language *c,
+css_error css__parse_cue_after(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_cue_before(css_language *c,
+css_error css__parse_cue_before(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_cursor(css_language *c,
+css_error css__parse_cursor(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_direction(css_language *c,
+css_error css__parse_direction(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_display(css_language *c,
+css_error css__parse_display(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_elevation(css_language *c,
+css_error css__parse_elevation(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_empty_cells(css_language *c,
+css_error css__parse_empty_cells(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_float(css_language *c,
+css_error css__parse_float(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_font(css_language *c,
+css_error css__parse_font(css_language *c,
 		const parserutils_vector *vector, int *ctx,
 		css_style *result);
-css_error parse_font_family(css_language *c,
+css_error css__parse_font_family(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_font_size(css_language *c,
+css_error css__parse_font_size(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_font_style(css_language *c,
+css_error css__parse_font_style(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_font_variant(css_language *c,
+css_error css__parse_font_variant(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_font_weight(css_language *c,
+css_error css__parse_font_weight(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_height(css_language *c,
+css_error css__parse_height(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_left(css_language *c,
+css_error css__parse_left(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_letter_spacing(css_language *c,
+css_error css__parse_letter_spacing(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_line_height(css_language *c,
+css_error css__parse_line_height(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_list_style(css_language *c,
+css_error css__parse_list_style(css_language *c,
 		const parserutils_vector *vector, int *ctx,
 		css_style *result);
-css_error parse_list_style_image(css_language *c,
+css_error css__parse_list_style_image(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_list_style_position(css_language *c,
+css_error css__parse_list_style_position(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_list_style_type(css_language *c,
+css_error css__parse_list_style_type(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_margin(css_language *c,
+css_error css__parse_margin(css_language *c,
 		const parserutils_vector *vector, int *ctx,
 		css_style *result);
-css_error parse_margin_bottom(css_language *c,
+css_error css__parse_margin_bottom(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_margin_left(css_language *c,
+css_error css__parse_margin_left(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_margin_right(css_language *c,
+css_error css__parse_margin_right(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_margin_top(css_language *c,
+css_error css__parse_margin_top(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_max_height(css_language *c,
+css_error css__parse_max_height(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_max_width(css_language *c,
+css_error css__parse_max_width(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_min_height(css_language *c,
+css_error css__parse_min_height(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_min_width(css_language *c,
+css_error css__parse_min_width(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_orphans(css_language *c,
+css_error css__parse_orphans(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_outline(css_language *c,
+css_error css__parse_outline(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_outline_color(css_language *c,
+css_error css__parse_outline_color(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_outline_style(css_language *c,
+css_error css__parse_outline_style(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_outline_width(css_language *c,
+css_error css__parse_outline_width(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_overflow(css_language *c,
+css_error css__parse_overflow(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_padding(css_language *c,
+css_error css__parse_padding(css_language *c,
 		const parserutils_vector *vector, int *ctx,
 		css_style *result);
-css_error parse_padding_bottom(css_language *c,
+css_error css__parse_padding_bottom(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_padding_left(css_language *c,
+css_error css__parse_padding_left(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_padding_right(css_language *c,
+css_error css__parse_padding_right(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_padding_top(css_language *c,
+css_error css__parse_padding_top(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_page_break_after(css_language *c,
+css_error css__parse_page_break_after(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_page_break_before(css_language *c,
+css_error css__parse_page_break_before(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_page_break_inside(css_language *c,
+css_error css__parse_page_break_inside(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_pause(css_language *c,
+css_error css__parse_pause(css_language *c,
 		const parserutils_vector *vector, int *ctx,
 		css_style *result);
-css_error parse_pause_after(css_language *c,
+css_error css__parse_pause_after(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_pause_before(css_language *c,
+css_error css__parse_pause_before(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_pitch_range(css_language *c,
+css_error css__parse_pitch_range(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_pitch(css_language *c,
+css_error css__parse_pitch(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_play_during(css_language *c,
+css_error css__parse_play_during(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_position(css_language *c,
+css_error css__parse_position(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_quotes(css_language *c,
+css_error css__parse_quotes(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_richness(css_language *c,
+css_error css__parse_richness(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_right(css_language *c,
+css_error css__parse_right(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_speak_header(css_language *c,
+css_error css__parse_speak_header(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_speak_numeral(css_language *c,
+css_error css__parse_speak_numeral(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_speak_punctuation(css_language *c,
+css_error css__parse_speak_punctuation(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_speak(css_language *c,
+css_error css__parse_speak(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_speech_rate(css_language *c,
+css_error css__parse_speech_rate(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_stress(css_language *c,
+css_error css__parse_stress(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_table_layout(css_language *c,
+css_error css__parse_table_layout(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_text_align(css_language *c,
+css_error css__parse_text_align(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_text_decoration(css_language *c,
+css_error css__parse_text_decoration(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_text_indent(css_language *c,
+css_error css__parse_text_indent(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_text_transform(css_language *c,
+css_error css__parse_text_transform(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_top(css_language *c,
+css_error css__parse_top(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_unicode_bidi(css_language *c,
+css_error css__parse_unicode_bidi(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_vertical_align(css_language *c,
+css_error css__parse_vertical_align(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_visibility(css_language *c,
+css_error css__parse_visibility(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_voice_family(css_language *c,
+css_error css__parse_voice_family(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_volume(css_language *c,
+css_error css__parse_volume(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_white_space(css_language *c,
+css_error css__parse_white_space(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_widows(css_language *c,
+css_error css__parse_widows(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_width(css_language *c,
+css_error css__parse_width(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_word_spacing(css_language *c,
+css_error css__parse_word_spacing(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
-css_error parse_z_index(css_language *c,
+css_error css__parse_z_index(css_language *c,
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result);
 
diff --git a/src/parse/properties/quotes.c b/src/parse/properties/quotes.c
index 423046a..6d235ab 100644
--- a/src/parse/properties/quotes.c
+++ b/src/parse/properties/quotes.c
@@ -27,7 +27,7 @@
  * Post condition: \a *ctx is updated with the next token to process
  *		   If the input is invalid, then \a *ctx remains unchanged.
  */
-css_error parse_quotes(css_language *c,
+css_error css__parse_quotes(css_language *c,
 		const parserutils_vector *vector, int *ctx,
 		css_style *result)
 {
diff --git a/src/parse/properties/text_decoration.c b/src/parse/properties/text_decoration.c
index c9a91d1..2d893f4 100644
--- a/src/parse/properties/text_decoration.c
+++ b/src/parse/properties/text_decoration.c
@@ -27,7 +27,7 @@
  * Post condition: \a *ctx is updated with the next token to process
  *                 If the input is invalid, then \a *ctx remains unchanged.
  */
-css_error parse_text_decoration(css_language *c, 
+css_error css__parse_text_decoration(css_language *c, 
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result)
 {
diff --git a/src/parse/properties/utils.c b/src/parse/properties/utils.c
index 34a5225..22fdd31 100644
--- a/src/parse/properties/utils.c
+++ b/src/parse/properties/utils.c
@@ -25,7 +25,7 @@
  * \return CSS_OK on success,
  *	   CSS_INVALID if the input is not valid
  */
-css_error parse_list_style_type_value(css_language *c, const css_token *ident,
+css_error css__parse_list_style_type_value(css_language *c, const css_token *ident,
 		uint16_t *value)
 {
 	bool match;
@@ -118,7 +118,7 @@ css_error parse_list_style_type_value(css_language *c, const css_token *ident,
  * Post condition: \a *ctx is updated with the next token to process
  *		   If the input is invalid, then \a *ctx remains unchanged.
  */
-css_error parse_border_side(css_language *c,
+css_error css__parse_border_side(css_language *c,
 		const parserutils_vector *vector, int *ctx,
 		css_style *result, enum border_side_e side)
 {
@@ -181,22 +181,22 @@ css_error parse_border_side(css_language *c,
 		token = parserutils_vector_peek(vector, *ctx);
 		if (token != NULL && is_css_inherit(c, token)) {
 			error = CSS_INVALID;
-			goto parse_border_side_cleanup;
+			goto css__parse_border_side_cleanup;
 		}
 
 		/* Try each property parser in turn, but only if we
 		 * haven't already got a value for this property.
 		 */
 		if ((color) && 
-		    (error = parse_border_side_color(c, vector, ctx, 
+		    (error = css__parse_border_side_color(c, vector, ctx, 
 			     color_style, CSS_PROP_BORDER_TOP_COLOR + side)) == CSS_OK) {
 			color = false;
 		} else if ((style) && 
-			   (error = parse_border_side_style(c, vector, ctx,
+			   (error = css__parse_border_side_style(c, vector, ctx,
 				    style_style, CSS_PROP_BORDER_TOP_STYLE + side)) == CSS_OK) {
 			style = false;
 		} else if ((width) && 
-			   (error = parse_border_side_width(c, vector, ctx,
+			   (error = css__parse_border_side_width(c, vector, ctx,
 				    width_style, CSS_PROP_BORDER_TOP_WIDTH + side)) == CSS_OK) {
 			width = false;
 		} 
@@ -216,7 +216,7 @@ css_error parse_border_side(css_language *c,
 				CSS_PROP_BORDER_TOP_STYLE + side, 0, 
 				BORDER_STYLE_NONE);
 		if (error != CSS_OK)
-			goto parse_border_side_cleanup;
+			goto css__parse_border_side_cleanup;
 	}
 
 	if (width) {
@@ -224,20 +224,20 @@ css_error parse_border_side(css_language *c,
 				CSS_PROP_BORDER_TOP_WIDTH + side,
 				0, BORDER_WIDTH_MEDIUM);
 		if (error != CSS_OK)
-			goto parse_border_side_cleanup;
+			goto css__parse_border_side_cleanup;
 	}
 
 	error = css_stylesheet_merge_style(result, color_style);
 	if (error != CSS_OK)
-		goto parse_border_side_cleanup;
+		goto css__parse_border_side_cleanup;
 
 	error = css_stylesheet_merge_style(result, style_style);
 	if (error != CSS_OK)
-		goto parse_border_side_cleanup;
+		goto css__parse_border_side_cleanup;
 
 	error = css_stylesheet_merge_style(result, width_style);
 
-parse_border_side_cleanup:
+css__parse_border_side_cleanup:
 	css_stylesheet_style_destroy(color_style);
 	css_stylesheet_style_destroy(style_style);
 	css_stylesheet_style_destroy(width_style);
@@ -261,7 +261,7 @@ parse_border_side_cleanup:
  * Post condition: \a *ctx is updated with the next token to process
  *                 If the input is invalid, then \a *ctx remains unchanged.
  */
-css_error parse_colour_specifier(css_language *c,
+css_error css__parse_colour_specifier(css_language *c,
 		const parserutils_vector *vector, int *ctx,
 		uint32_t *result)
 {
@@ -292,9 +292,9 @@ css_error parse_colour_specifier(css_language *c,
 	}
 
 	if (token->type == CSS_TOKEN_IDENT) {
-		error = parse_named_colour(c, token->idata, result);
+		error = css__parse_named_colour(c, token->idata, result);
 		if (error != CSS_OK && c->sheet->quirks_allowed) {
-			error = parse_hash_colour(token->idata, result);
+			error = css__parse_hash_colour(token->idata, result);
 			if (error == CSS_OK)
 				c->sheet->quirks_used = true;
 		}
@@ -304,14 +304,14 @@ css_error parse_colour_specifier(css_language *c,
 
 		return error;
 	} else if (token->type == CSS_TOKEN_HASH) {
-		error = parse_hash_colour(token->idata, result);
+		error = css__parse_hash_colour(token->idata, result);
 		if (error != CSS_OK)
 			*ctx = orig_ctx;
 
 		return error;
 	} else if (c->sheet->quirks_allowed &&
 			token->type == CSS_TOKEN_NUMBER) {
-		error = parse_hash_colour(token->idata, result);
+		error = css__parse_hash_colour(token->idata, result);
 		if (error == CSS_OK)
 			c->sheet->quirks_used = true;
 		else
@@ -320,7 +320,7 @@ css_error parse_colour_specifier(css_language *c,
 		return error;
 	} else if (c->sheet->quirks_allowed &&
 			token->type == CSS_TOKEN_DIMENSION) {
-		error = parse_hash_colour(token->idata, result);
+		error = css__parse_hash_colour(token->idata, result);
 		if (error == CSS_OK)
 			c->sheet->quirks_used = true;
 		else
@@ -374,7 +374,7 @@ css_error parse_colour_specifier(css_language *c,
 				else
 					int_only = false;
 
-				num = number_from_lwc_string(token->idata,
+				num = css__number_from_lwc_string(token->idata,
 						int_only, &consumed);
 				if (consumed != lwc_string_length(token->idata))
 					goto invalid;
@@ -440,7 +440,7 @@ invalid:
  * \return CSS_OK      on success,
  *         CSS_INVALID if the colour name is unknown
  */
-css_error parse_named_colour(css_language *c, lwc_string *data,
+css_error css__parse_named_colour(css_language *c, lwc_string *data,
 		uint32_t *result)
 {
 	static const uint32_t colourmap[LAST_COLOUR + 1 - FIRST_COLOUR] = {
@@ -620,7 +620,7 @@ css_error parse_named_colour(css_language *c, lwc_string *data,
  * \return CSS_OK      on success,
  *         CSS_INVALID if the input is invalid
  */
-css_error parse_hash_colour(lwc_string *data, uint32_t *result)
+css_error css__parse_hash_colour(lwc_string *data, uint32_t *result)
 {
 	uint8_t r = 0, g = 0, b = 0, a = 0xff;
 	size_t len = lwc_string_length(data);
@@ -667,7 +667,7 @@ css_error parse_hash_colour(lwc_string *data, uint32_t *result)
  * Post condition: \a *ctx is updated with the next token to process
  *                 If the input is invalid, then \a *ctx remains unchanged.
  */
-css_error parse_unit_specifier(css_language *c,
+css_error css__parse_unit_specifier(css_language *c,
 		const parserutils_vector *vector, int *ctx,
 		uint32_t default_unit,
 		css_fixed *length, uint32_t *unit)
@@ -688,14 +688,14 @@ css_error parse_unit_specifier(css_language *c,
 		return CSS_INVALID;
 	}
 
-	num = number_from_lwc_string(token->idata, false, &consumed);
+	num = css__number_from_lwc_string(token->idata, false, &consumed);
 
 	if (token->type == CSS_TOKEN_DIMENSION) {
 		size_t len = lwc_string_length(token->idata);
 		const char *data = lwc_string_data(token->idata);
 		css_unit temp_unit = CSS_UNIT_PX;
 
-		error = parse_unit_keyword(data + consumed, len - consumed,
+		error = css__parse_unit_keyword(data + consumed, len - consumed,
 				&temp_unit);
 		if (error != CSS_OK) {
 			*ctx = orig_ctx;
@@ -729,7 +729,7 @@ css_error parse_unit_specifier(css_language *c,
 			/* Try to parse the unit keyword, ignoring errors */
 			token = parserutils_vector_iterate(vector, &temp_ctx);
 			if (token != NULL && token->type == CSS_TOKEN_IDENT) {
-				error = parse_unit_keyword(
+				error = css__parse_unit_keyword(
 						lwc_string_data(token->idata),
 						lwc_string_length(token->idata),
 						&temp_unit);
@@ -763,7 +763,7 @@ css_error parse_unit_specifier(css_language *c,
  * \return CSS_OK      on success,
  *         CSS_INVALID on encountering an unknown keyword
  */
-css_error parse_unit_keyword(const char *ptr, size_t len, css_unit *unit)
+css_error css__parse_unit_keyword(const char *ptr, size_t len, css_unit *unit)
 {
 	if (len == 4) {
 		if (strncasecmp(ptr, "grad", 4) == 0)
@@ -917,7 +917,7 @@ cleanup:
  * Post condition: \a *ctx is updated with the next token to process
  *                 If the input is invalid, then \a *ctx remains unchanged.
  */
-css_error comma_list_to_style(css_language *c,
+css_error css__comma_list_to_style(css_language *c,
 		const parserutils_vector *vector, int *ctx,
 		bool (*reserved)(css_language *c, const css_token *ident),
 		css_code_t (*get_value)(css_language *c, const css_token *token, bool first),
diff --git a/src/parse/properties/utils.h b/src/parse/properties/utils.h
index 66b706d..e5315bb 100644
--- a/src/parse/properties/utils.h
+++ b/src/parse/properties/utils.h
@@ -5,8 +5,8 @@
  * Copyright 2008 John-Mark Bell <jmb@netsurf-browser.org>
  */
 
-#ifndef css_parse_properties_utils_h_
-#define css_parse_properties_utils_h_
+#ifndef css_css__parse_properties_utils_h_
+#define css_css__parse_properties_utils_h_
 
 #include "parse/language.h"
 
@@ -36,7 +36,7 @@ enum border_side_e { BORDER_SIDE_TOP = 0, BORDER_SIDE_RIGHT = 1, BORDER_SIDE_BOT
  * Post condition: \a *ctx is updated with the next token to process
  *		   If the input is invalid, then \a *ctx remains unchanged.
  */
-css_error parse_border_side(css_language *c,
+css_error css__parse_border_side(css_language *c,
 		const parserutils_vector *vector, int *ctx,
 		css_style *result, enum border_side_e side);
 
@@ -55,7 +55,7 @@ css_error parse_border_side(css_language *c,
  * Post condition: \a *ctx is updated with the next token to process
  *		   If the input is invalid, then \a *ctx remains unchanged.
  */
-css_error parse_border_side_color(css_language *c,
+css_error css__parse_border_side_color(css_language *c,
 		const parserutils_vector *vector, int *ctx,
 		css_style *result, enum css_properties_e op);
 
@@ -74,7 +74,7 @@ css_error parse_border_side_color(css_language *c,
  * Post condition: \a *ctx is updated with the next token to process
  *		   If the input is invalid, then \a *ctx remains unchanged.
  */
-css_error parse_border_side_style(css_language *c,
+css_error css__parse_border_side_style(css_language *c,
 		const parserutils_vector *vector, int *ctx,
 		css_style *result, enum css_properties_e op);
 
@@ -94,7 +94,7 @@ css_error parse_border_side_style(css_language *c,
  * Post condition: \a *ctx is updated with the next token to process
  *		   If the input is invalid, then \a *ctx remains unchanged.
  */
-css_error parse_border_side_width(css_language *c,
+css_error css__parse_border_side_width(css_language *c,
 		const parserutils_vector *vector, int *ctx,
 		css_style *result, enum css_properties_e op);
 
@@ -114,7 +114,7 @@ css_error parse_border_side_width(css_language *c,
  * Post condition: \a *ctx is updated with the next token to process
  *                 If the input is invalid, then \a *ctx remains unchanged.
  */
-css_error parse_side(css_language *c,
+css_error css__parse_side(css_language *c,
 		const parserutils_vector *vector, int *ctx,
 		css_style *result, enum css_properties_e op);
 
@@ -133,7 +133,7 @@ css_error parse_side(css_language *c,
  * Post condition: \a *ctx is updated with the next token to process
  *		   If the input is invalid, then \a *ctx remains unchanged.
  */
-css_error parse_margin_side(css_language *c,
+css_error css__parse_margin_side(css_language *c,
 		const parserutils_vector *vector, int *ctx,
 		css_style *result, enum css_properties_e op);
 
@@ -151,7 +151,7 @@ css_error parse_margin_side(css_language *c,
  * Post condition: \a *ctx is updated with the next token to process
  *		   If the input is invalid, then \a *ctx remains unchanged.
  */
-css_error parse_padding_side(css_language *c,
+css_error css__parse_padding_side(css_language *c,
 		const parserutils_vector *vector, int *ctx,
 		css_style *result, enum css_properties_e op);
 
@@ -161,27 +161,27 @@ css_error parse_padding_side(css_language *c,
 
 
 
-css_error parse_list_style_type_value(css_language *c,
+css_error css__parse_list_style_type_value(css_language *c,
 		const css_token *token, uint16_t *value);
 
-css_error parse_colour_specifier(css_language *c,
+css_error css__parse_colour_specifier(css_language *c,
 		const parserutils_vector *vector, int *ctx,
 		uint32_t *result);
 
-css_error parse_named_colour(css_language *c, lwc_string *data, 
+css_error css__parse_named_colour(css_language *c, lwc_string *data, 
 		uint32_t *result);
 
-css_error parse_hash_colour(lwc_string *data, uint32_t *result);
+css_error css__parse_hash_colour(lwc_string *data, uint32_t *result);
 
-css_error parse_unit_specifier(css_language *c,
+css_error css__parse_unit_specifier(css_language *c,
 		const parserutils_vector *vector, int *ctx,
 		uint32_t default_unit,
 		css_fixed *length, uint32_t *unit);
 
-css_error parse_unit_keyword(const char *ptr, size_t len, 
+css_error css__parse_unit_keyword(const char *ptr, size_t len, 
 		css_unit *unit);
 
-css_error comma_list_to_style(css_language *c,
+css_error css__comma_list_to_style(css_language *c,
 		const parserutils_vector *vector, int *ctx,
 		bool (*reserved)(css_language *c, const css_token *ident),
 		css_code_t (*get_value)(css_language *c, const css_token *token, bool first),
diff --git a/src/parse/properties/voice_family.c b/src/parse/properties/voice_family.c
index 339d470..9ef52be 100644
--- a/src/parse/properties/voice_family.c
+++ b/src/parse/properties/voice_family.c
@@ -83,7 +83,7 @@ static css_code_t voice_family_value(css_language *c, const css_token *token, bo
  * Post condition: \a *ctx is updated with the next token to process
  *		 If the input is invalid, then \a *ctx remains unchanged.
  */
-css_error parse_voice_family(css_language *c, 
+css_error css__parse_voice_family(css_language *c, 
 		const parserutils_vector *vector, int *ctx, 
 		css_style *result)
 {
@@ -113,7 +113,7 @@ css_error parse_voice_family(css_language *c,
 	} else {
 		*ctx = orig_ctx;
 
-		error = comma_list_to_style(c, vector, ctx,
+		error = css__comma_list_to_style(c, vector, ctx,
 				voice_family_reserved, voice_family_value,
 				result);
 		if (error != CSS_OK) {