Index: libxfcegui4/xfce_decortoggle.c
===================================================================
--- libxfcegui4/xfce_decortoggle.c	(revision 21893)
+++ libxfcegui4/xfce_decortoggle.c	(working copy)
@@ -32,51 +32,51 @@
 #define decortoggle_WIDTH  10
 #define decortoggle_HEIGHT 10
 
-static unsigned char arrow_up_dark_bits[] = {
+static const unsigned char arrow_up_dark_bits[] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x18, 0x00, 0x0c, 0x00,
     0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
-static unsigned char arrow_up_mid_bits[] = {
+static const unsigned char arrow_up_mid_bits[] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x70, 0x00,
     0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
-static unsigned char arrow_up_light_bits[] = {
+static const unsigned char arrow_up_light_bits[] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0xfc, 0x01, 0x00, 0x00, 0x00, 0x00,
 };
-static unsigned char arrow_down_dark_bits[] = {
+static const unsigned char arrow_down_dark_bits[] = {
     0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
-static unsigned char arrow_down_mid_bits[] = {
+static const unsigned char arrow_down_mid_bits[] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x00, 0x38, 0x00, 0x10, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
-static unsigned char arrow_down_light_bits[] = {
+static const unsigned char arrow_down_light_bits[] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x01, 0xc0, 0x00, 0x60, 0x00,
     0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
-static unsigned char arrow_left_dark_bits[] = {
+static const unsigned char arrow_left_dark_bits[] = {
     0x00, 0x00, 0x20, 0x00, 0x30, 0x00, 0x18, 0x00, 0x0c, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
-static unsigned char arrow_left_mid_bits[] = {
+static const unsigned char arrow_left_mid_bits[] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x30, 0x00, 0x38, 0x00,
     0x30, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
-static unsigned char arrow_left_light_bits[] = {
+static const unsigned char arrow_left_light_bits[] = {
     0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x40, 0x00, 0x40, 0x00, 0x40, 0x00,
     0x40, 0x00, 0x40, 0x00, 0x40, 0x00, 0x00, 0x00,
 };
-static unsigned char arrow_right_dark_bits[] = {
+static const unsigned char arrow_right_dark_bits[] = {
     0x00, 0x00, 0x08, 0x00, 0x08, 0x00, 0x08, 0x00, 0x08, 0x00, 0x08, 0x00,
     0x08, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
-static unsigned char arrow_right_mid_bits[] = {
+static const unsigned char arrow_right_mid_bits[] = {
     0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x30, 0x00, 0x70, 0x00, 0x30, 0x00,
     0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
-static unsigned char arrow_right_light_bits[] = {
+static const unsigned char arrow_right_light_bits[] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00,
     0x60, 0x00, 0x30, 0x00, 0x10, 0x00, 0x00, 0x00,
 };
Index: libxfcegui4/gtk_style.c
===================================================================
--- libxfcegui4/gtk_style.c	(revision 21893)
+++ libxfcegui4/gtk_style.c	(working copy)
@@ -34,11 +34,11 @@
 
 #include <libxfce4util/libxfce4util.h>
 
-char *states[] = {
+static const char *states[] = {
     "normal", "active", "prelight", "selected", "insensitive", NULL
 };
 
-char *names[] = {
+static const char *names[] = {
     "fg", "bg", "text", "base", "light", "dark", "mid", NULL
 };
 
Index: libxfcegui4/xfce_movehandler.c
===================================================================
--- libxfcegui4/xfce_movehandler.c	(revision 21893)
+++ libxfcegui4/xfce_movehandler.c	(working copy)
@@ -41,9 +41,9 @@
 
 #define XFCE_MOVEHANDLER_DEFAULT_SIZE 2*DECOR_WIDTH
 
-static unsigned char dark_bits[] = { 0x00, 0x0e, 0x02, 0x02, 0x00, 0x00, };
-static unsigned char light_bits[] = { 0x00, 0x00, 0x10, 0x10, 0x1c, 0x00, };
-static unsigned char mid_bits[] = { 0x00, 0x00, 0x0c, 0x0c, 0x00, 0x00, };
+static const unsigned char dark_bits[] = { 0x00, 0x0e, 0x02, 0x02, 0x00, 0x00, };
+static const unsigned char light_bits[] = { 0x00, 0x00, 0x10, 0x10, 0x1c, 0x00, };
+static const unsigned char mid_bits[] = { 0x00, 0x00, 0x0c, 0x0c, 0x00, 0x00, };
 
 enum
 {
Index: libxfcegui4/xfce_decorbutton.c
===================================================================
--- libxfcegui4/xfce_decorbutton.c	(revision 21893)
+++ libxfcegui4/xfce_decorbutton.c	(working copy)
@@ -29,27 +29,27 @@
 #define DECORBUTTON_WIDTH  10
 #define DECORBUTTON_HEIGHT 10
 
-static unsigned char close_dark_bits[] = {
+static const unsigned char close_dark_bits[] = {
     0x00, 0x00, 0xc6, 0x00, 0x62, 0x00, 0x20, 0x00, 0x00, 0x00, 0x0c, 0x00,
     0x06, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
-static unsigned char close_mid_bits[] = {
+static const unsigned char close_mid_bits[] = {
     0x00, 0x00, 0x00, 0x00, 0x8c, 0x00, 0x5c, 0x00, 0x38, 0x00, 0x70, 0x00,
     0xe8, 0x00, 0xc4, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
-static unsigned char close_light_bits[] = {
+static const unsigned char close_light_bits[] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x80, 0x01, 0xc0, 0x00, 0x00, 0x00,
     0x10, 0x00, 0x18, 0x01, 0x8c, 0x01, 0x00, 0x00,
 };
-static unsigned char hide_light_bits[] = {
+static const unsigned char hide_light_bits[] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x01, 0xc0, 0x00, 0x60, 0x00,
     0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
-static unsigned char hide_mid_bits[] = {
+static const unsigned char hide_mid_bits[] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x00, 0x38, 0x00, 0x10, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
-static unsigned char hide_dark_bits[] = {
+static const unsigned char hide_dark_bits[] = {
     0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };