diff --git a/ChangeLog b/ChangeLog
index 5de483aaf..585a3f42b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-07-31  Richard Henderson  <rth@twiddle.net>
+
+	* src/cairo_color.c (CAIRO_COLOR_DEFAULT): Mark const.
+	* src/cairo_matrix.c (CAIRO_MATRIX_IDENTITY): Likewise.
+	* src/cairo_path.c (num_args): Likewise.
+	* src/cairo_path_bounds.c (_cairo_path_bounds): Likewise for cb.
+
 2003-07-31  Richard Henderson  <rth@twiddle.net>
 
 	* cairo.pc.in: Depend on slim.
diff --git a/src/cairo-color.c b/src/cairo-color.c
index 9ba5846dc..9fe6365d4 100644
--- a/src/cairo-color.c
+++ b/src/cairo-color.c
@@ -27,7 +27,7 @@
 
 #include "cairoint.h"
 
-static cairo_color_t CAIRO_COLOR_DEFAULT = {
+static cairo_color_t const CAIRO_COLOR_DEFAULT = {
     1.0, 1.0, 1.0, 1.0,
     0xffff, 0xffff, 0xffff, 0xffff
 };
diff --git a/src/cairo-matrix.c b/src/cairo-matrix.c
index 9d5bba14d..1e85a6878 100644
--- a/src/cairo-matrix.c
+++ b/src/cairo-matrix.c
@@ -30,7 +30,7 @@
 
 #include "cairoint.h"
 
-static cairo_matrix_t CAIRO_MATRIX_IDENTITY = {
+static cairo_matrix_t const CAIRO_MATRIX_IDENTITY = {
     {
 	{1, 0},
 	{0, 1},
diff --git a/src/cairo-path-bounds.c b/src/cairo-path-bounds.c
index 2335b1d90..27361f736 100644
--- a/src/cairo-path-bounds.c
+++ b/src/cairo-path-bounds.c
@@ -141,7 +141,7 @@ cairo_status_t
 _cairo_path_bounds (cairo_path_t *path, double *x1, double *y1, double *x2, double *y2)
 {
     cairo_status_t status;
-    static cairo_path_callbacks_t cb = {
+    static cairo_path_callbacks_t const cb = {
 	_cairo_path_bounder_add_edge,
 	_cairo_path_bounder_add_spline,
 	_cairo_path_bounder_done_sub_path,
diff --git a/src/cairo-path.c b/src/cairo-path.c
index 6421429c5..268d024c5 100644
--- a/src/cairo-path.c
+++ b/src/cairo-path.c
@@ -311,7 +311,7 @@ _cairo_path_arg_buf_add (cairo_path_arg_buf_t *arg, cairo_point_t *pts, int num_
 
 #define CAIRO_PATH_OP_MAX_ARGS 3
 
-static int num_args[] = 
+static int const num_args[] = 
 {
     1, /* cairo_path_move_to */
     1, /* cairo_path_op_line_to */
diff --git a/src/cairo_color.c b/src/cairo_color.c
index 9ba5846dc..9fe6365d4 100644
--- a/src/cairo_color.c
+++ b/src/cairo_color.c
@@ -27,7 +27,7 @@
 
 #include "cairoint.h"
 
-static cairo_color_t CAIRO_COLOR_DEFAULT = {
+static cairo_color_t const CAIRO_COLOR_DEFAULT = {
     1.0, 1.0, 1.0, 1.0,
     0xffff, 0xffff, 0xffff, 0xffff
 };
diff --git a/src/cairo_matrix.c b/src/cairo_matrix.c
index 9d5bba14d..1e85a6878 100644
--- a/src/cairo_matrix.c
+++ b/src/cairo_matrix.c
@@ -30,7 +30,7 @@
 
 #include "cairoint.h"
 
-static cairo_matrix_t CAIRO_MATRIX_IDENTITY = {
+static cairo_matrix_t const CAIRO_MATRIX_IDENTITY = {
     {
 	{1, 0},
 	{0, 1},
diff --git a/src/cairo_path.c b/src/cairo_path.c
index 6421429c5..268d024c5 100644
--- a/src/cairo_path.c
+++ b/src/cairo_path.c
@@ -311,7 +311,7 @@ _cairo_path_arg_buf_add (cairo_path_arg_buf_t *arg, cairo_point_t *pts, int num_
 
 #define CAIRO_PATH_OP_MAX_ARGS 3
 
-static int num_args[] = 
+static int const num_args[] = 
 {
     1, /* cairo_path_move_to */
     1, /* cairo_path_op_line_to */
diff --git a/src/cairo_path_bounds.c b/src/cairo_path_bounds.c
index 2335b1d90..27361f736 100644
--- a/src/cairo_path_bounds.c
+++ b/src/cairo_path_bounds.c
@@ -141,7 +141,7 @@ cairo_status_t
 _cairo_path_bounds (cairo_path_t *path, double *x1, double *y1, double *x2, double *y2)
 {
     cairo_status_t status;
-    static cairo_path_callbacks_t cb = {
+    static cairo_path_callbacks_t const cb = {
 	_cairo_path_bounder_add_edge,
 	_cairo_path_bounder_add_spline,
 	_cairo_path_bounder_done_sub_path,