diff --git a/art/addbookm.xpm b/art/addbookm.xpm
index 18851bcdf4..7d5f69900e 100644
--- a/art/addbookm.xpm
+++ b/art/addbookm.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *addbookm_xpm[] = {
+static const char * addbookm_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 3 1",
 ". c Black",
diff --git a/art/back.xpm b/art/back.xpm
index 81b7a909f2..b48af706cc 100644
--- a/art/back.xpm
+++ b/art/back.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * back_xpm[] = {
+static const char * back_xpm[] = {
 "16 15 3 1",
 " 	c None",
 ".	c Black",
diff --git a/art/cdrom.xpm b/art/cdrom.xpm
index b43abd7f0b..b72d529e1c 100644
--- a/art/cdrom.xpm
+++ b/art/cdrom.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *cdrom_xpm[] = {
+static const char * cdrom_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 36 1",
 "= c #9BACC2",
diff --git a/art/copy.xpm b/art/copy.xpm
index 95ad44880d..aa6094f00f 100644
--- a/art/copy.xpm
+++ b/art/copy.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *copy_xpm[] = {
+static const char * copy_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 23 1",
 "o c #97C4E7",
diff --git a/art/cross.xpm b/art/cross.xpm
index b30173b398..5fe844ab75 100644
--- a/art/cross.xpm
+++ b/art/cross.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *cross_xpm[] = {
+static const char * cross_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "10 10 2 1",
 "  c Gray0",
diff --git a/art/cut.xpm b/art/cut.xpm
index 8afa8f6d15..83ff3bb955 100644
--- a/art/cut.xpm
+++ b/art/cut.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *cut_xpm[] = {
+static const char * cut_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 25 1",
 "6 c #D8BDC0",
diff --git a/art/deffile.xpm b/art/deffile.xpm
index 5442c6cc68..f08974b32c 100644
--- a/art/deffile.xpm
+++ b/art/deffile.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *deffile_xpm[] = {
+static const char * deffile_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 32 1",
 "= c #97C4E7",
diff --git a/art/delbookm.xpm b/art/delbookm.xpm
index 80a83897c4..013882327e 100644
--- a/art/delbookm.xpm
+++ b/art/delbookm.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *delbookm_xpm[] = {
+static const char * delbookm_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 3 1",
 ". c Black",
diff --git a/art/delete.xpm b/art/delete.xpm
index b7ecf3aaaa..106d38894e 100644
--- a/art/delete.xpm
+++ b/art/delete.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *delete_xpm[] = {
+static const char * delete_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 21 1",
 "2 c #A5AEBD",
diff --git a/art/dir_up.xpm b/art/dir_up.xpm
index efdf4340a8..0c2f71d092 100644
--- a/art/dir_up.xpm
+++ b/art/dir_up.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *dir_up_xpm[] = {
+static const char * dir_up_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 31 1",
 "6 c #9BACC2",
diff --git a/art/down.xpm b/art/down.xpm
index f03819e4d3..1f9cf29373 100644
--- a/art/down.xpm
+++ b/art/down.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * down_xpm[] = {
+static const char * down_xpm[] = {
 "16 15 3 1",
 " 	c None",
 ".	c Black",
diff --git a/art/exefile.xpm b/art/exefile.xpm
index 4defb732e3..7ecdec3e7b 100644
--- a/art/exefile.xpm
+++ b/art/exefile.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *exefile_xpm[] = {
+static const char * exefile_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 51 1",
 "% c #E8E8EC",
diff --git a/art/fileopen.xpm b/art/fileopen.xpm
index 50724a857c..9cf25ccc5b 100644
--- a/art/fileopen.xpm
+++ b/art/fileopen.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *fileopen_xpm[] = {
+static const char * fileopen_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 36 1",
 "6 c #9BACC2",
diff --git a/art/filesave.xpm b/art/filesave.xpm
index 5c63fcfd5d..04b7539e28 100644
--- a/art/filesave.xpm
+++ b/art/filesave.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *filesave_xpm[] = {
+static const char * filesave_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 21 1",
 "O c #FFFFFF",
diff --git a/art/filesaveas.xpm b/art/filesaveas.xpm
index 9fb5fca7a5..3c45bc808d 100644
--- a/art/filesaveas.xpm
+++ b/art/filesaveas.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *filesaveas_xpm[] = {
+static const char * filesaveas_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 23 1",
 "X c Black",
diff --git a/art/find.xpm b/art/find.xpm
index fe90d31ba8..51544e98b8 100644
--- a/art/find.xpm
+++ b/art/find.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *find_xpm[] = {
+static const char * find_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 41 1",
 "y c #A06959",
diff --git a/art/findrepl.xpm b/art/findrepl.xpm
index 13c5aa08b4..33b083b5fd 100644
--- a/art/findrepl.xpm
+++ b/art/findrepl.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *findrepl_xpm[] = {
+static const char * findrepl_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 42 1",
 "y c #A06959",
diff --git a/art/floppy.xpm b/art/floppy.xpm
index 408d8fdf7c..4d6b7d8fe3 100644
--- a/art/floppy.xpm
+++ b/art/floppy.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *floppy_xpm[] = {
+static const char * floppy_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 18 1",
 "& c #E3E4E6",
diff --git a/art/folder.xpm b/art/folder.xpm
index 638f10cd8f..60a4207884 100644
--- a/art/folder.xpm
+++ b/art/folder.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *folder_xpm[] = {
+static const char * folder_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 22 1",
 "> c #9BACC2",
diff --git a/art/folder_open.xpm b/art/folder_open.xpm
index e1253161cf..60b1e65add 100644
--- a/art/folder_open.xpm
+++ b/art/folder_open.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *folder_open_xpm[] = {
+static const char * folder_open_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 31 1",
 "6 c #9BACC2",
diff --git a/art/forward.xpm b/art/forward.xpm
index ebe75efb01..56df17bccf 100644
--- a/art/forward.xpm
+++ b/art/forward.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * forward_xpm[] = {
+static const char * forward_xpm[] = {
 "16 15 3 1",
 " 	c None",
 ".	c Black",
diff --git a/art/gtk/error.xpm b/art/gtk/error.xpm
index e77c8e9fb6..956e3549e9 100644
--- a/art/gtk/error.xpm
+++ b/art/gtk/error.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *error_xpm[] = {
+static const char * error_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "48 48 4 1",
 "  c None",
diff --git a/art/gtk/info.xpm b/art/gtk/info.xpm
index 8892f504c1..930b639cc3 100644
--- a/art/gtk/info.xpm
+++ b/art/gtk/info.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *info_xpm[] = {
+static const char * info_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "48 48 9 1",
 "$ c Black",
diff --git a/art/gtk/question.xpm b/art/gtk/question.xpm
index 8b3cb01ef5..3ea9434c2f 100644
--- a/art/gtk/question.xpm
+++ b/art/gtk/question.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *question_xpm[] = {
+static const char * question_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "48 48 21 1",
 ". c Black",
diff --git a/art/gtk/warning.xpm b/art/gtk/warning.xpm
index 92b7a70860..18135c81cb 100644
--- a/art/gtk/warning.xpm
+++ b/art/gtk/warning.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *warning_xpm[] = {
+static const char * warning_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "48 48 9 1",
 "@ c Black",
diff --git a/art/harddisk.xpm b/art/harddisk.xpm
index 7586442052..bdff0763a1 100644
--- a/art/harddisk.xpm
+++ b/art/harddisk.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *harddisk_xpm[] = {
+static const char * harddisk_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 39 1",
 "7 c #E3E4E6",
diff --git a/art/helpicon.xpm b/art/helpicon.xpm
index 1c34d8ba2f..6abce2c0dd 100644
--- a/art/helpicon.xpm
+++ b/art/helpicon.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *helpicon_xpm[] = {
+static const char * helpicon_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 6 1",
 "  c Gray0",
diff --git a/art/home.xpm b/art/home.xpm
index 5bb2d0c68b..078e7d6c65 100644
--- a/art/home.xpm
+++ b/art/home.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *home_xpm[] = {
+static const char * home_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 3 1",
 ". c Black",
diff --git a/art/htmbook.xpm b/art/htmbook.xpm
index c219b59e5c..eb343cbe3b 100644
--- a/art/htmbook.xpm
+++ b/art/htmbook.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * htmbook_xpm[] = {
+static const char * htmbook_xpm[] = {
 "16 16 6 1",
 " 	c None",
 ".	c Black",
diff --git a/art/htmfoldr.xpm b/art/htmfoldr.xpm
index d7a1c7139a..fc14e60cc7 100644
--- a/art/htmfoldr.xpm
+++ b/art/htmfoldr.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * htmfoldr_xpm[] = {
+static const char * htmfoldr_xpm[] = {
 "16 16 6 1",
 " 	c None",
 ".	c Black",
diff --git a/art/htmoptns.xpm b/art/htmoptns.xpm
index 107bc67864..8649f79398 100644
--- a/art/htmoptns.xpm
+++ b/art/htmoptns.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * htmoptns_xpm[] = {
+static const char * htmoptns_xpm[] = {
 "16 15 2 1",
 " 	c None",
 ".	c #000000",
diff --git a/art/htmpage.xpm b/art/htmpage.xpm
index 8b4e60e8a2..bf934b981b 100644
--- a/art/htmpage.xpm
+++ b/art/htmpage.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * htmpage_xpm[] = {
+static const char * htmpage_xpm[] = {
 "16 16 4 1",
 " 	c None",
 ".	c #808080",
diff --git a/art/htmsidep.xpm b/art/htmsidep.xpm
index d71129f9e2..514d7de0bb 100644
--- a/art/htmsidep.xpm
+++ b/art/htmsidep.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *htmsidep_xpm[] = {
+static const char * htmsidep_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 6 1",
 ". c Black",
diff --git a/art/listview.xpm b/art/listview.xpm
index 9d8d804c02..e17781e2f0 100644
--- a/art/listview.xpm
+++ b/art/listview.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *listview_xpm[] = {
+static const char * listview_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 4 1",
 "  c Black",
diff --git a/art/missimg.xpm b/art/missimg.xpm
index f235f6277c..ca96c3a2ef 100644
--- a/art/missimg.xpm
+++ b/art/missimg.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *missimg_xpm[] = {
+static const char * missimg_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 5 1",
 "X c Black",
diff --git a/art/motif/error.xpm b/art/motif/error.xpm
index e77c8e9fb6..956e3549e9 100644
--- a/art/motif/error.xpm
+++ b/art/motif/error.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *error_xpm[] = {
+static const char * error_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "48 48 4 1",
 "  c None",
diff --git a/art/motif/info.xpm b/art/motif/info.xpm
index 8892f504c1..930b639cc3 100644
--- a/art/motif/info.xpm
+++ b/art/motif/info.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *info_xpm[] = {
+static const char * info_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "48 48 9 1",
 "$ c Black",
diff --git a/art/motif/question.xpm b/art/motif/question.xpm
index 8b3cb01ef5..3ea9434c2f 100644
--- a/art/motif/question.xpm
+++ b/art/motif/question.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *question_xpm[] = {
+static const char * question_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "48 48 21 1",
 ". c Black",
diff --git a/art/motif/warning.xpm b/art/motif/warning.xpm
index 92b7a70860..18135c81cb 100644
--- a/art/motif/warning.xpm
+++ b/art/motif/warning.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *warning_xpm[] = {
+static const char * warning_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "48 48 9 1",
 "@ c Black",
diff --git a/art/new.xpm b/art/new.xpm
index 4c2641c663..7b6143098e 100644
--- a/art/new.xpm
+++ b/art/new.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *new_xpm[] = {
+static const char * new_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 29 1",
 "* c #97C4E7",
diff --git a/art/new_dir.xpm b/art/new_dir.xpm
index 45ff9e6583..9eebabfa05 100644
--- a/art/new_dir.xpm
+++ b/art/new_dir.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *new_dir_xpm[] = {
+static const char * new_dir_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 22 1",
 "X c Black",
diff --git a/art/paste.xpm b/art/paste.xpm
index 57e7f2a593..028fa485b7 100644
--- a/art/paste.xpm
+++ b/art/paste.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *paste_xpm[] = {
+static const char * paste_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 25 1",
 "< c #FEECE4",
diff --git a/art/print.xpm b/art/print.xpm
index a090f99931..e91d170a20 100644
--- a/art/print.xpm
+++ b/art/print.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *print_xpm[] = {
+static const char * print_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 39 1",
 "< c #E3E4E6",
diff --git a/art/quit.xpm b/art/quit.xpm
index a2e25e9c1a..659093233f 100644
--- a/art/quit.xpm
+++ b/art/quit.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *quit_xpm[] = {
+static const char * quit_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 69 1",
 "@ c Black",
diff --git a/art/redo.xpm b/art/redo.xpm
index 442c1d036b..844403e791 100644
--- a/art/redo.xpm
+++ b/art/redo.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *redo_xpm[] = {
+static const char * redo_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 37 1",
 "4 c #9BACC2",
diff --git a/art/removable.xpm b/art/removable.xpm
index 1036c8f4d3..fcc52ff810 100644
--- a/art/removable.xpm
+++ b/art/removable.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *removable_xpm[] = {
+static const char * removable_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 23 1",
 "@ c #C3C3C4",
diff --git a/art/repview.xpm b/art/repview.xpm
index 1f8f70b00e..c270f56f66 100644
--- a/art/repview.xpm
+++ b/art/repview.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *repview_xpm[] = {
+static const char * repview_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 3 1",
 "  c Black",
diff --git a/art/tick.xpm b/art/tick.xpm
index 440ecb1933..c7ee0e2c1f 100644
--- a/art/tick.xpm
+++ b/art/tick.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *tick_xpm[] = {
+static const char * tick_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "10 10 2 1",
 ". c Gray0",
diff --git a/art/tipicon.xpm b/art/tipicon.xpm
index 687fc6c390..712cf8a20f 100644
--- a/art/tipicon.xpm
+++ b/art/tipicon.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *tipicon_xpm[] = {
+static const char * tipicon_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 9 1",
 "$ c Black",
diff --git a/art/toparent.xpm b/art/toparent.xpm
index 09cfc2ca5c..7894fd087a 100644
--- a/art/toparent.xpm
+++ b/art/toparent.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * toparent_xpm[] = {
+static const char * toparent_xpm[] = {
 "16 15 3 1",
 " 	c None",
 ".	c Black",
diff --git a/art/undo.xpm b/art/undo.xpm
index 529123fc7b..e750a98ff2 100644
--- a/art/undo.xpm
+++ b/art/undo.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *undo_xpm[] = {
+static const char * undo_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 37 1",
 "4 c #9BACC2",
diff --git a/art/up.xpm b/art/up.xpm
index 57d1168837..922eb6483a 100644
--- a/art/up.xpm
+++ b/art/up.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * up_xpm[] = {
+static const char * up_xpm[] = {
 "16 15 3 1",
 " 	c None",
 ".	c Black",
diff --git a/art/wxwin16x16.xpm b/art/wxwin16x16.xpm
index c737fbb802..81b85169d2 100644
--- a/art/wxwin16x16.xpm
+++ b/art/wxwin16x16.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *wxwin16x16_xpm[] = {
+static const char * wxwin16x16_xpm[] = {
 "16 16 6 1",
 " 	c None",
 ".	c #000000",
diff --git a/art/wxwin32x32.xpm b/art/wxwin32x32.xpm
index 34b841a0e8..92829ffd12 100644
--- a/art/wxwin32x32.xpm
+++ b/art/wxwin32x32.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *wxwin32x32_xpm[] = {
+static const char * wxwin32x32_xpm[] = {
 "32 32 6 1",
 " 	c None",
 ".	c #000000",
diff --git a/contrib/include/wx/plot/plot_dwn.xpm b/contrib/include/wx/plot/plot_dwn.xpm
index 51a59d3f16..f1bc797ecf 100644
--- a/contrib/include/wx/plot/plot_dwn.xpm
+++ b/contrib/include/wx/plot/plot_dwn.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *plot_dwn_xpm[] = {
+static const char * plot_dwn_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "20 18 8 1",
 "  c Gray0",
diff --git a/contrib/include/wx/plot/plot_enl.xpm b/contrib/include/wx/plot/plot_enl.xpm
index 7e48e2c138..fc023318b7 100644
--- a/contrib/include/wx/plot/plot_enl.xpm
+++ b/contrib/include/wx/plot/plot_enl.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *plot_enl_xpm[] = {
+static const char * plot_enl_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "20 20 8 1",
 "  c Gray0",
diff --git a/contrib/include/wx/plot/plot_shr.xpm b/contrib/include/wx/plot/plot_shr.xpm
index 0918938095..32b3f07ff8 100644
--- a/contrib/include/wx/plot/plot_shr.xpm
+++ b/contrib/include/wx/plot/plot_shr.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *plot_shr_xpm[] = {
+static const char * plot_shr_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "20 20 8 1",
 "  c Gray0",
diff --git a/contrib/include/wx/plot/plot_up.xpm b/contrib/include/wx/plot/plot_up.xpm
index cafdb0b07b..2903e06f40 100644
--- a/contrib/include/wx/plot/plot_up.xpm
+++ b/contrib/include/wx/plot/plot_up.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *plot_up_xpm[] = {
+static const char * plot_up_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "20 18 8 1",
 "  c Gray0",
diff --git a/contrib/include/wx/plot/plot_zin.xpm b/contrib/include/wx/plot/plot_zin.xpm
index 27aabe85df..1345b3090d 100644
--- a/contrib/include/wx/plot/plot_zin.xpm
+++ b/contrib/include/wx/plot/plot_zin.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *plot_zin_xpm[] = {
+static const char * plot_zin_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "20 18 8 1",
 "  c Gray0",
diff --git a/contrib/include/wx/plot/plot_zot.xpm b/contrib/include/wx/plot/plot_zot.xpm
index d3a34d141f..ec3f4589ba 100644
--- a/contrib/include/wx/plot/plot_zot.xpm
+++ b/contrib/include/wx/plot/plot_zot.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *plot_zot_xpm[] = {
+static const char * plot_zot_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "20 18 8 1",
 "  c Gray0",
diff --git a/contrib/samples/gizmos/splittree/mondrian.xpm b/contrib/samples/gizmos/splittree/mondrian.xpm
index 409f27a843..b5939bb815 100644
--- a/contrib/samples/gizmos/splittree/mondrian.xpm
+++ b/contrib/samples/gizmos/splittree/mondrian.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *mondrian_xpm[] = {
+static const char * mondrian_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 6 1",
 "  c Black",
diff --git a/contrib/samples/mmedia/eject.xpm b/contrib/samples/mmedia/eject.xpm
index 890cc6b53b..b329da337b 100644
--- a/contrib/samples/mmedia/eject.xpm
+++ b/contrib/samples/mmedia/eject.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * eject_xpm[] = {
+static const char * eject_xpm[] = {
 "15 16 5 1",
 " 	c None",
 ".	c #949594",
diff --git a/contrib/samples/mmedia/mondrian.xpm b/contrib/samples/mmedia/mondrian.xpm
index 409f27a843..b5939bb815 100644
--- a/contrib/samples/mmedia/mondrian.xpm
+++ b/contrib/samples/mmedia/mondrian.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *mondrian_xpm[] = {
+static const char * mondrian_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 6 1",
 "  c Black",
diff --git a/contrib/samples/mmedia/pause.xpm b/contrib/samples/mmedia/pause.xpm
index 2283f242ab..003d516427 100644
--- a/contrib/samples/mmedia/pause.xpm
+++ b/contrib/samples/mmedia/pause.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * pause_xpm[] = {
+static const char * pause_xpm[] = {
 "13 15 5 1",
 " 	c None",
 ".	c #949594",
diff --git a/contrib/samples/mmedia/play.xpm b/contrib/samples/mmedia/play.xpm
index 5b7db49baf..d5518393f8 100644
--- a/contrib/samples/mmedia/play.xpm
+++ b/contrib/samples/mmedia/play.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * play_back_xpm[] = {
+static const char * play_back_xpm[] = {
 "13 15 5 1",
 " 	c None",
 ".	c #949594",
diff --git a/contrib/samples/mmedia/stop.xpm b/contrib/samples/mmedia/stop.xpm
index 2d159d0376..1538492020 100644
--- a/contrib/samples/mmedia/stop.xpm
+++ b/contrib/samples/mmedia/stop.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * stop_back_xpm[] = {
+static const char * stop_back_xpm[] = {
 "13 15 5 1",
 " 	c None",
 ".	c #949594",
diff --git a/contrib/samples/ogl/ogledit/bitmaps/arrow.xpm b/contrib/samples/ogl/ogledit/bitmaps/arrow.xpm
index d3807cbf4e..9857dcd163 100644
--- a/contrib/samples/ogl/ogledit/bitmaps/arrow.xpm
+++ b/contrib/samples/ogl/ogledit/bitmaps/arrow.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *arrow_xpm[] = {
+static const char * arrow_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "22 22 16 1",
 "  c Gray0",
diff --git a/contrib/samples/ogl/ogledit/bitmaps/tool1.xpm b/contrib/samples/ogl/ogledit/bitmaps/tool1.xpm
index 89a313d94c..bd6da5c9c6 100644
--- a/contrib/samples/ogl/ogledit/bitmaps/tool1.xpm
+++ b/contrib/samples/ogl/ogledit/bitmaps/tool1.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *tool1_xpm[] = {
+static const char * tool1_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "22 22 16 1",
 "  c Gray0",
diff --git a/contrib/samples/ogl/ogledit/bitmaps/tool2.xpm b/contrib/samples/ogl/ogledit/bitmaps/tool2.xpm
index 612dbf01bb..9c5953baf9 100644
--- a/contrib/samples/ogl/ogledit/bitmaps/tool2.xpm
+++ b/contrib/samples/ogl/ogledit/bitmaps/tool2.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *tool2_xpm[] = {
+static const char * tool2_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "22 22 16 1",
 "  c Gray0",
diff --git a/contrib/samples/ogl/ogledit/bitmaps/tool3.xpm b/contrib/samples/ogl/ogledit/bitmaps/tool3.xpm
index 7ba078573c..c2697432f8 100644
--- a/contrib/samples/ogl/ogledit/bitmaps/tool3.xpm
+++ b/contrib/samples/ogl/ogledit/bitmaps/tool3.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *tool3_xpm[] = {
+static const char * tool3_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "22 22 16 1",
 "  c Gray0",
diff --git a/contrib/samples/ogl/ogledit/bitmaps/tool4.xpm b/contrib/samples/ogl/ogledit/bitmaps/tool4.xpm
index 154e93b832..6122b3c6fa 100644
--- a/contrib/samples/ogl/ogledit/bitmaps/tool4.xpm
+++ b/contrib/samples/ogl/ogledit/bitmaps/tool4.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *tool4_xpm[] = {
+static const char * tool4_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "22 22 16 1",
 "  c Gray0",
diff --git a/contrib/samples/ogl/ogledit/ogl.xpm b/contrib/samples/ogl/ogledit/ogl.xpm
index 2a8c61e578..3ed8c7a12f 100644
--- a/contrib/samples/ogl/ogledit/ogl.xpm
+++ b/contrib/samples/ogl/ogledit/ogl.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * ogl_xpm[] = {
+static const char * ogl_xpm[] = {
 /* width height ncolors chars_per_pixel */
 "32 32 7 1",
 /* colors */
diff --git a/contrib/samples/ogl/studio/bitmaps/alignb.xpm b/contrib/samples/ogl/studio/bitmaps/alignb.xpm
index c3b57a5869..1eb4672365 100644
--- a/contrib/samples/ogl/studio/bitmaps/alignb.xpm
+++ b/contrib/samples/ogl/studio/bitmaps/alignb.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *alignb_xpm[] = {
+static const char * alignb_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 3 1",
 "  c None",
diff --git a/contrib/samples/ogl/studio/bitmaps/alignl.xpm b/contrib/samples/ogl/studio/bitmaps/alignl.xpm
index 6d7def92fb..3aabc2e190 100644
--- a/contrib/samples/ogl/studio/bitmaps/alignl.xpm
+++ b/contrib/samples/ogl/studio/bitmaps/alignl.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *alignl_xpm[] = {
+static const char * alignl_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 3 1",
 "  c None",
diff --git a/contrib/samples/ogl/studio/bitmaps/alignr.xpm b/contrib/samples/ogl/studio/bitmaps/alignr.xpm
index 3f873eed4e..60e234a505 100644
--- a/contrib/samples/ogl/studio/bitmaps/alignr.xpm
+++ b/contrib/samples/ogl/studio/bitmaps/alignr.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *alignr_xpm[] = {
+static const char * alignr_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 3 1",
 "  c None",
diff --git a/contrib/samples/ogl/studio/bitmaps/alignt.xpm b/contrib/samples/ogl/studio/bitmaps/alignt.xpm
index 65fc1b5ccb..31d9b8afda 100644
--- a/contrib/samples/ogl/studio/bitmaps/alignt.xpm
+++ b/contrib/samples/ogl/studio/bitmaps/alignt.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *alignt_xpm[] = {
+static const char * alignt_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 3 1",
 "  c None",
diff --git a/contrib/samples/ogl/studio/bitmaps/arrow.xpm b/contrib/samples/ogl/studio/bitmaps/arrow.xpm
index e7cab6ae18..2cce7bd8d4 100644
--- a/contrib/samples/ogl/studio/bitmaps/arrow.xpm
+++ b/contrib/samples/ogl/studio/bitmaps/arrow.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *arrow_xpm[] = {
+static const char * arrow_xpm[] = {
 /* width height num_colors chars_per_pixel */
 "    22    22        2            1",
 /* colors */
diff --git a/contrib/samples/ogl/studio/bitmaps/copy.xpm b/contrib/samples/ogl/studio/bitmaps/copy.xpm
index 00ae82e213..b14b414834 100644
--- a/contrib/samples/ogl/studio/bitmaps/copy.xpm
+++ b/contrib/samples/ogl/studio/bitmaps/copy.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *copy_xpm[] = {
+static const char * copy_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 23 1",
 "+ c #769CDA",
diff --git a/contrib/samples/ogl/studio/bitmaps/copysize.xpm b/contrib/samples/ogl/studio/bitmaps/copysize.xpm
index 4694bd4083..93e4923eb9 100644
--- a/contrib/samples/ogl/studio/bitmaps/copysize.xpm
+++ b/contrib/samples/ogl/studio/bitmaps/copysize.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *copysize_xpm[] = {
+static const char * copysize_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 3 1",
 "  c None",
diff --git a/contrib/samples/ogl/studio/bitmaps/cut.xpm b/contrib/samples/ogl/studio/bitmaps/cut.xpm
index 8afa8f6d15..83ff3bb955 100644
--- a/contrib/samples/ogl/studio/bitmaps/cut.xpm
+++ b/contrib/samples/ogl/studio/bitmaps/cut.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *cut_xpm[] = {
+static const char * cut_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 25 1",
 "6 c #D8BDC0",
diff --git a/contrib/samples/ogl/studio/bitmaps/cutpoint.xpm b/contrib/samples/ogl/studio/bitmaps/cutpoint.xpm
index 597b6b01ee..25080028ef 100644
--- a/contrib/samples/ogl/studio/bitmaps/cutpoint.xpm
+++ b/contrib/samples/ogl/studio/bitmaps/cutpoint.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *cutpoint_xpm[] = {
+static const char * cutpoint_xpm[] = {
 /* width height num_colors chars_per_pixel */
 "    16    15        3            1",
 /* colors */
diff --git a/contrib/samples/ogl/studio/bitmaps/help.xpm b/contrib/samples/ogl/studio/bitmaps/help.xpm
index 161b6b2658..5af6f74bba 100644
--- a/contrib/samples/ogl/studio/bitmaps/help.xpm
+++ b/contrib/samples/ogl/studio/bitmaps/help.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *help_xpm[] = {
+static const char * help_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 50 1",
 "j c #4E7FD0",
diff --git a/contrib/samples/ogl/studio/bitmaps/helpcs.xpm b/contrib/samples/ogl/studio/bitmaps/helpcs.xpm
index 4a3e8fcb70..a1325fc7a0 100644
--- a/contrib/samples/ogl/studio/bitmaps/helpcs.xpm
+++ b/contrib/samples/ogl/studio/bitmaps/helpcs.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *helpcs_xpm[] = {
+static const char * helpcs_xpm[] = {
 /* width height num_colors chars_per_pixel */
 "    16    15        2            1",
 /* colors */
diff --git a/contrib/samples/ogl/studio/bitmaps/horiz.xpm b/contrib/samples/ogl/studio/bitmaps/horiz.xpm
index 381e66fccf..0d572b4c3c 100644
--- a/contrib/samples/ogl/studio/bitmaps/horiz.xpm
+++ b/contrib/samples/ogl/studio/bitmaps/horiz.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *horiz_xpm[] = {
+static const char * horiz_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 3 1",
 "  c None",
diff --git a/contrib/samples/ogl/studio/bitmaps/linearrow.xpm b/contrib/samples/ogl/studio/bitmaps/linearrow.xpm
index ca554f4199..9122193f30 100644
--- a/contrib/samples/ogl/studio/bitmaps/linearrow.xpm
+++ b/contrib/samples/ogl/studio/bitmaps/linearrow.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *linearrow_xpm[] = {
+static const char * linearrow_xpm[] = {
 /* width height num_colors chars_per_pixel */
 "    16    15        3            1",
 /* colors */
diff --git a/contrib/samples/ogl/studio/bitmaps/new.xpm b/contrib/samples/ogl/studio/bitmaps/new.xpm
index 0597eebd5e..3dcdf0319b 100644
--- a/contrib/samples/ogl/studio/bitmaps/new.xpm
+++ b/contrib/samples/ogl/studio/bitmaps/new.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *new_xpm[] = {
+static const char * new_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "15 15 31 1",
 ". c #7198D9",
diff --git a/contrib/samples/ogl/studio/bitmaps/newpoint.xpm b/contrib/samples/ogl/studio/bitmaps/newpoint.xpm
index c1d9fefcce..bba10a45bc 100644
--- a/contrib/samples/ogl/studio/bitmaps/newpoint.xpm
+++ b/contrib/samples/ogl/studio/bitmaps/newpoint.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *newpoint_xpm[] = {
+static const char * newpoint_xpm[] = {
 /* width height num_colors chars_per_pixel */
 "    16    15        3            1",
 /* colors */
diff --git a/contrib/samples/ogl/studio/bitmaps/open.xpm b/contrib/samples/ogl/studio/bitmaps/open.xpm
index 36e058fc8e..8604ce5e02 100644
--- a/contrib/samples/ogl/studio/bitmaps/open.xpm
+++ b/contrib/samples/ogl/studio/bitmaps/open.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *open_xpm[] = {
+static const char * open_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 36 1",
 ", c #AAC1E8",
diff --git a/contrib/samples/ogl/studio/bitmaps/paste.xpm b/contrib/samples/ogl/studio/bitmaps/paste.xpm
index 57e7f2a593..028fa485b7 100644
--- a/contrib/samples/ogl/studio/bitmaps/paste.xpm
+++ b/contrib/samples/ogl/studio/bitmaps/paste.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *paste_xpm[] = {
+static const char * paste_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 25 1",
 "< c #FEECE4",
diff --git a/contrib/samples/ogl/studio/bitmaps/preview.xpm b/contrib/samples/ogl/studio/bitmaps/preview.xpm
index d0176b3546..0111238a46 100644
--- a/contrib/samples/ogl/studio/bitmaps/preview.xpm
+++ b/contrib/samples/ogl/studio/bitmaps/preview.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *preview_xpm[] = {
+static const char * preview_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 30 1",
 "1 c Black",
diff --git a/contrib/samples/ogl/studio/bitmaps/print.xpm b/contrib/samples/ogl/studio/bitmaps/print.xpm
index fae8103a9a..6cc757a52d 100644
--- a/contrib/samples/ogl/studio/bitmaps/print.xpm
+++ b/contrib/samples/ogl/studio/bitmaps/print.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *print_xpm[] = {
+static const char * print_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 35 1",
 "y c #EDF2FB",
diff --git a/contrib/samples/ogl/studio/bitmaps/redo.xpm b/contrib/samples/ogl/studio/bitmaps/redo.xpm
index 870449c4f1..7387ebc19d 100644
--- a/contrib/samples/ogl/studio/bitmaps/redo.xpm
+++ b/contrib/samples/ogl/studio/bitmaps/redo.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *redo_xpm[] = {
+static const char * redo_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 37 1",
 "2 c #4E7FD0",
diff --git a/contrib/samples/ogl/studio/bitmaps/save.xpm b/contrib/samples/ogl/studio/bitmaps/save.xpm
index accf1f9eb2..e4e6570344 100644
--- a/contrib/samples/ogl/studio/bitmaps/save.xpm
+++ b/contrib/samples/ogl/studio/bitmaps/save.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *save_xpm[] = {
+static const char * save_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 21 1",
 ": c #AAC1E8",
diff --git a/contrib/samples/ogl/studio/bitmaps/straight.xpm b/contrib/samples/ogl/studio/bitmaps/straight.xpm
index 12563b4703..a302d4da88 100644
--- a/contrib/samples/ogl/studio/bitmaps/straight.xpm
+++ b/contrib/samples/ogl/studio/bitmaps/straight.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *straight_xpm[] = {
+static const char * straight_xpm[] = {
 /* width height num_colors chars_per_pixel */
 "    16    15        2            1",
 /* colors */
diff --git a/contrib/samples/ogl/studio/bitmaps/texttool.xpm b/contrib/samples/ogl/studio/bitmaps/texttool.xpm
index db6308fcef..0c9fcff0c2 100644
--- a/contrib/samples/ogl/studio/bitmaps/texttool.xpm
+++ b/contrib/samples/ogl/studio/bitmaps/texttool.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *texttool_xpm[] = {
+static const char * texttool_xpm[] = {
 /* width height num_colors chars_per_pixel */
 "    22    22        2            1",
 /* colors */
diff --git a/contrib/samples/ogl/studio/bitmaps/undo.xpm b/contrib/samples/ogl/studio/bitmaps/undo.xpm
index 9266cb0e12..2638301d69 100644
--- a/contrib/samples/ogl/studio/bitmaps/undo.xpm
+++ b/contrib/samples/ogl/studio/bitmaps/undo.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *undo_xpm[] = {
+static const char * undo_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 37 1",
 "4 c #4E7FD0",
diff --git a/contrib/samples/ogl/studio/bitmaps/vert.xpm b/contrib/samples/ogl/studio/bitmaps/vert.xpm
index 0f85e23920..8ba2ac256e 100644
--- a/contrib/samples/ogl/studio/bitmaps/vert.xpm
+++ b/contrib/samples/ogl/studio/bitmaps/vert.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *vert_xpm[] = {
+static const char * vert_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 3 1",
 "  c None",
diff --git a/contrib/samples/ogl/studio/studio.xpm b/contrib/samples/ogl/studio/studio.xpm
index cd5b1cbc14..818dc276b7 100644
--- a/contrib/samples/ogl/studio/studio.xpm
+++ b/contrib/samples/ogl/studio/studio.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *studio_xpm[] = {
+static const char * studio_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 6 1",
 "  c Black",
diff --git a/contrib/samples/stc/mondrian.xpm b/contrib/samples/stc/mondrian.xpm
index 409f27a843..b5939bb815 100644
--- a/contrib/samples/stc/mondrian.xpm
+++ b/contrib/samples/stc/mondrian.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *mondrian_xpm[] = {
+static const char * mondrian_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 6 1",
 "  c Black",
diff --git a/contrib/samples/svg/SVGlogo24.xpm b/contrib/samples/svg/SVGlogo24.xpm
index 113067233a..df2f5e54b8 100644
--- a/contrib/samples/svg/SVGlogo24.xpm
+++ b/contrib/samples/svg/SVGlogo24.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *svgbitmap_xpm[] = {
+static const char * svgbitmap_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "64 48 256 2",
 "   c #550000",
diff --git a/contrib/samples/svg/bitmaps/help.xpm b/contrib/samples/svg/bitmaps/help.xpm
index 161b6b2658..5af6f74bba 100644
--- a/contrib/samples/svg/bitmaps/help.xpm
+++ b/contrib/samples/svg/bitmaps/help.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *help_xpm[] = {
+static const char * help_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 50 1",
 "j c #4E7FD0",
diff --git a/contrib/samples/svg/bitmaps/new.xpm b/contrib/samples/svg/bitmaps/new.xpm
index 0597eebd5e..3dcdf0319b 100644
--- a/contrib/samples/svg/bitmaps/new.xpm
+++ b/contrib/samples/svg/bitmaps/new.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *new_xpm[] = {
+static const char * new_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "15 15 31 1",
 ". c #7198D9",
diff --git a/contrib/samples/svg/bitmaps/save.xpm b/contrib/samples/svg/bitmaps/save.xpm
index accf1f9eb2..e4e6570344 100644
--- a/contrib/samples/svg/bitmaps/save.xpm
+++ b/contrib/samples/svg/bitmaps/save.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *save_xpm[] = {
+static const char * save_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 21 1",
 ": c #AAC1E8",
diff --git a/contrib/samples/svg/mondrian.xpm b/contrib/samples/svg/mondrian.xpm
index 409f27a843..b5939bb815 100644
--- a/contrib/samples/svg/mondrian.xpm
+++ b/contrib/samples/svg/mondrian.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *mondrian_xpm[] = {
+static const char * mondrian_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 6 1",
 "  c Black",
diff --git a/contrib/src/foldbar/icon_collapsed.old.xpm b/contrib/src/foldbar/icon_collapsed.old.xpm
index 583b47da9b..957a703172 100644
--- a/contrib/src/foldbar/icon_collapsed.old.xpm
+++ b/contrib/src/foldbar/icon_collapsed.old.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * icon_collapsed[] = {
+static const char * icon_collapsed[] = {
 "16 16 3 1",
 " 	c #00FFFF",
 ".	c None",
diff --git a/contrib/src/foldbar/icon_collapsed.xpm b/contrib/src/foldbar/icon_collapsed.xpm
index ad999be33d..098cf3eefd 100644
--- a/contrib/src/foldbar/icon_collapsed.xpm
+++ b/contrib/src/foldbar/icon_collapsed.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *icon_collapsed[] = {
+static const char * icon_collapsed[] = {
 "16 16 16 2",
 "00 c black",
 "01 c #800000",
diff --git a/contrib/src/foldbar/icon_expanded.old.xpm b/contrib/src/foldbar/icon_expanded.old.xpm
index 2d6b0130a4..d26337b365 100644
--- a/contrib/src/foldbar/icon_expanded.old.xpm
+++ b/contrib/src/foldbar/icon_expanded.old.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * icon_expanded[] = {
+static const char * icon_expanded[] = {
 "16 16 3 1",
 " 	c #00FFFF",
 ".	c None",
diff --git a/contrib/src/foldbar/icon_expanded.xpm b/contrib/src/foldbar/icon_expanded.xpm
index 33d67d2319..a46e691dab 100644
--- a/contrib/src/foldbar/icon_expanded.xpm
+++ b/contrib/src/foldbar/icon_expanded.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *icon_expanded[] = {
+static const char * icon_expanded[] = {
 "16 16 16 2",
 "00 c black",
 "01 c #800000",
diff --git a/contrib/src/foldbar/icon_theresmore.xpm b/contrib/src/foldbar/icon_theresmore.xpm
index b7cfeebd46..000aad58b5 100644
--- a/contrib/src/foldbar/icon_theresmore.xpm
+++ b/contrib/src/foldbar/icon_theresmore.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *icon_theresmore[] = {
+static const char * icon_theresmore[] = {
 "7 10 16 2",
 "00 c black",
 "01 c none",
diff --git a/contrib/src/gizmos/eldel.xpm b/contrib/src/gizmos/eldel.xpm
index 9b83bb0441..0a1d6a20e7 100644
--- a/contrib/src/gizmos/eldel.xpm
+++ b/contrib/src/gizmos/eldel.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * eldel_xpm[] = {
+static const char * eldel_xpm[] = {
 "16 16 3 1",
 " 	c None",
 ".	c #7F0000",
diff --git a/contrib/src/gizmos/eldown.xpm b/contrib/src/gizmos/eldown.xpm
index 656cb9c4f1..b02d2b1718 100644
--- a/contrib/src/gizmos/eldown.xpm
+++ b/contrib/src/gizmos/eldown.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * eldown_xpm[] = {
+static const char * eldown_xpm[] = {
 "16 16 2 1",
 " 	c None",
 ".	c #000000",
diff --git a/contrib/src/gizmos/eledit.xpm b/contrib/src/gizmos/eledit.xpm
index 4cbd05eafd..3bb084e7cb 100644
--- a/contrib/src/gizmos/eledit.xpm
+++ b/contrib/src/gizmos/eledit.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * eledit_xpm[] = {
+static const char * eledit_xpm[] = {
 "16 16 3 1",
 " 	c None",
 ".	c #000000",
diff --git a/contrib/src/gizmos/elnew.xpm b/contrib/src/gizmos/elnew.xpm
index 3d0d67f4ac..cbedc4cee1 100644
--- a/contrib/src/gizmos/elnew.xpm
+++ b/contrib/src/gizmos/elnew.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * elnew_xpm[] = {
+static const char * elnew_xpm[] = {
 "16 16 5 1",
 " 	c None",
 ".	c #7F7F7F",
diff --git a/contrib/src/gizmos/elup.xpm b/contrib/src/gizmos/elup.xpm
index 01193ed821..ea19d8ae0e 100644
--- a/contrib/src/gizmos/elup.xpm
+++ b/contrib/src/gizmos/elup.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * elup_xpm[] = {
+static const char * elup_xpm[] = {
 "16 16 2 1",
 " 	c None",
 ".	c #000000",
diff --git a/demos/bombs/bombs.xpm b/demos/bombs/bombs.xpm
index 9708aeaee5..15574f80b8 100644
--- a/demos/bombs/bombs.xpm
+++ b/demos/bombs/bombs.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *bombs_xpm[] = {
+static const char * bombs_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 6 1",
 "  c Black",
diff --git a/demos/dbbrowse/bitmaps/col.xpm b/demos/dbbrowse/bitmaps/col.xpm
index e3f1157a22..b7aa495b77 100644
--- a/demos/dbbrowse/bitmaps/col.xpm
+++ b/demos/dbbrowse/bitmaps/col.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *col_xpm[] = {
+static const char * col_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 4 1",
 "o c Black",
diff --git a/demos/dbbrowse/bitmaps/d_closed.xpm b/demos/dbbrowse/bitmaps/d_closed.xpm
index 0c88399966..36706f6ac4 100644
--- a/demos/dbbrowse/bitmaps/d_closed.xpm
+++ b/demos/dbbrowse/bitmaps/d_closed.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * DocClosed_xpm[] = {
+static const char * DocClosed_xpm[] = {
 /* width height ncolors chars_per_pixel */
 "16 16 4 1",
 /* colors */
diff --git a/demos/dbbrowse/bitmaps/d_open.xpm b/demos/dbbrowse/bitmaps/d_open.xpm
index b4af6e520a..49251805dc 100644
--- a/demos/dbbrowse/bitmaps/d_open.xpm
+++ b/demos/dbbrowse/bitmaps/d_open.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * DocOpen_xpm[] = {
+static const char * DocOpen_xpm[] = {
 /* width height ncolors chars_per_pixel */
 "16 16 4 1",
 /* colors */
diff --git a/demos/dbbrowse/bitmaps/dsn.xpm b/demos/dbbrowse/bitmaps/dsn.xpm
index a7747413df..d8a9b5ff8a 100644
--- a/demos/dbbrowse/bitmaps/dsn.xpm
+++ b/demos/dbbrowse/bitmaps/dsn.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *dsn_xpm[] = {
+static const char * dsn_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 3 1",
 ". c Black",
diff --git a/demos/dbbrowse/bitmaps/dsnclose.xpm b/demos/dbbrowse/bitmaps/dsnclose.xpm
index ae052e22cd..74240b6275 100644
--- a/demos/dbbrowse/bitmaps/dsnclose.xpm
+++ b/demos/dbbrowse/bitmaps/dsnclose.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *dsnclose_xpm[] = {
+static const char * dsnclose_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 4 1",
 "X c Black",
diff --git a/demos/dbbrowse/bitmaps/dsnopen.xpm b/demos/dbbrowse/bitmaps/dsnopen.xpm
index ee666969ff..0cbbc3d1a1 100644
--- a/demos/dbbrowse/bitmaps/dsnopen.xpm
+++ b/demos/dbbrowse/bitmaps/dsnopen.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *dsnopen_xpm[] = {
+static const char * dsnopen_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 4 1",
 "X c Black",
diff --git a/demos/dbbrowse/bitmaps/f_closed.xpm b/demos/dbbrowse/bitmaps/f_closed.xpm
index c0930b4089..05415e02b0 100644
--- a/demos/dbbrowse/bitmaps/f_closed.xpm
+++ b/demos/dbbrowse/bitmaps/f_closed.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *FolderClosed_xpm[] = {
+static const char * FolderClosed_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 112 2",
 "r  c #F7FAFD",
diff --git a/demos/dbbrowse/bitmaps/f_open.xpm b/demos/dbbrowse/bitmaps/f_open.xpm
index 3603ca3290..1fdb060e81 100644
--- a/demos/dbbrowse/bitmaps/f_open.xpm
+++ b/demos/dbbrowse/bitmaps/f_open.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *FolderOpen_xpm[] = {
+static const char * FolderOpen_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 57 1",
 "u c #83A5DD",
diff --git a/demos/dbbrowse/bitmaps/key.xpm b/demos/dbbrowse/bitmaps/key.xpm
index 5821784300..ca3d608cee 100644
--- a/demos/dbbrowse/bitmaps/key.xpm
+++ b/demos/dbbrowse/bitmaps/key.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *key_xpm[] = {
+static const char * key_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 11 1",
 "O c Black",
diff --git a/demos/dbbrowse/bitmaps/keyf.xpm b/demos/dbbrowse/bitmaps/keyf.xpm
index aba5f46f52..9981efe20e 100644
--- a/demos/dbbrowse/bitmaps/keyf.xpm
+++ b/demos/dbbrowse/bitmaps/keyf.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *keyf_xpm[] = {
+static const char * keyf_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 12 1",
 "O c Black",
diff --git a/demos/dbbrowse/bitmaps/logo.xpm b/demos/dbbrowse/bitmaps/logo.xpm
index 30ef2c565f..aaf1ebe16c 100644
--- a/demos/dbbrowse/bitmaps/logo.xpm
+++ b/demos/dbbrowse/bitmaps/logo.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *aLogo_xpm[] = {
+static const char * aLogo_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 44 1",
 "  c Black",
diff --git a/demos/dbbrowse/bitmaps/pgmctrl.xpm b/demos/dbbrowse/bitmaps/pgmctrl.xpm
index a112b8fea3..4e08e8dd0d 100644
--- a/demos/dbbrowse/bitmaps/pgmctrl.xpm
+++ b/demos/dbbrowse/bitmaps/pgmctrl.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *pgmctrl_xpm[] = {
+static const char * pgmctrl_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 4 1",
 ". c #FFFFFF",
diff --git a/demos/dbbrowse/bitmaps/tab.xpm b/demos/dbbrowse/bitmaps/tab.xpm
index d838677a8c..b41fea89b7 100644
--- a/demos/dbbrowse/bitmaps/tab.xpm
+++ b/demos/dbbrowse/bitmaps/tab.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *tab_xpm[] = {
+static const char * tab_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 5 1",
 ". c Black",
diff --git a/demos/dbbrowse/bitmaps/view.xpm b/demos/dbbrowse/bitmaps/view.xpm
index b74d65288e..23dc71cd5c 100644
--- a/demos/dbbrowse/bitmaps/view.xpm
+++ b/demos/dbbrowse/bitmaps/view.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *view_xpm[] = {
+static const char * view_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 5 1",
 "  c Black",
diff --git a/demos/forty/forty.xpm b/demos/forty/forty.xpm
index 509be0f867..ae99245820 100644
--- a/demos/forty/forty.xpm
+++ b/demos/forty/forty.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *forty_xpm[] = {
+static const char * forty_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 5 1",
 ". c Black",
diff --git a/demos/forty/pictures.xpm b/demos/forty/pictures.xpm
index 31849577c7..776d65ac81 100644
--- a/demos/forty/pictures.xpm
+++ b/demos/forty/pictures.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *Pictures[] = {
+static const char * Pictures[] = {
 /* width height num_colors chars_per_pixel */
 "   120    45        8            1",
 /* colors */
diff --git a/demos/forty/symbols.xpm b/demos/forty/symbols.xpm
index 0ab5ce4654..84cb4569f3 100644
--- a/demos/forty/symbols.xpm
+++ b/demos/forty/symbols.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *symbols_xpm[] = {
+static const char * symbols_xpm[] = {
 /* width height num_colors chars_per_pixel */
 "   117    70       16            1",
 /* colors */
diff --git a/demos/life/bitmaps/center.xpm b/demos/life/bitmaps/center.xpm
index ea2b746fc4..4e7beb2059 100644
--- a/demos/life/bitmaps/center.xpm
+++ b/demos/life/bitmaps/center.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * center_xpm[] = {
+static const char * center_xpm[] = {
 "16 16 3 1",
 " 	c None",
 ".	c Black",
diff --git a/demos/life/bitmaps/east.xpm b/demos/life/bitmaps/east.xpm
index eda3ba53d1..c0dc694949 100644
--- a/demos/life/bitmaps/east.xpm
+++ b/demos/life/bitmaps/east.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * east_xpm[] = {
+static const char * east_xpm[] = {
 "16 16 3 1",
 " 	c None",
 ".	c Black",
diff --git a/demos/life/bitmaps/info.xpm b/demos/life/bitmaps/info.xpm
index 9580464995..9cd0a5cc39 100644
--- a/demos/life/bitmaps/info.xpm
+++ b/demos/life/bitmaps/info.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *info_xpm[] = {
+static const char * info_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 2 1",
 "  c None",
diff --git a/demos/life/bitmaps/life.xpm b/demos/life/bitmaps/life.xpm
index 5e273f68da..790cdb20d2 100644
--- a/demos/life/bitmaps/life.xpm
+++ b/demos/life/bitmaps/life.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * life_xpm[] = {
+static const char * life_xpm[] = {
 "151 73 5 1",
 " 	c None",
 ".	c #808080",
diff --git a/demos/life/bitmaps/north.xpm b/demos/life/bitmaps/north.xpm
index 6d7fb40852..4831960ad4 100644
--- a/demos/life/bitmaps/north.xpm
+++ b/demos/life/bitmaps/north.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * north_xpm[] = {
+static const char * north_xpm[] = {
 "16 16 3 1",
 " 	c None",
 ".	c Black",
diff --git a/demos/life/bitmaps/open.xpm b/demos/life/bitmaps/open.xpm
index 36e058fc8e..8604ce5e02 100644
--- a/demos/life/bitmaps/open.xpm
+++ b/demos/life/bitmaps/open.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *open_xpm[] = {
+static const char * open_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 36 1",
 ", c #AAC1E8",
diff --git a/demos/life/bitmaps/play.xpm b/demos/life/bitmaps/play.xpm
index 6fddd44e56..cb297e4074 100644
--- a/demos/life/bitmaps/play.xpm
+++ b/demos/life/bitmaps/play.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *play_xpm[] = {
+static const char * play_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 2 1",
 "  c None",
diff --git a/demos/life/bitmaps/reset.xpm b/demos/life/bitmaps/reset.xpm
index e7c8450c8f..5231971393 100644
--- a/demos/life/bitmaps/reset.xpm
+++ b/demos/life/bitmaps/reset.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *reset_xpm[] = {
+static const char * reset_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 31 1",
 ". c #7198D9",
diff --git a/demos/life/bitmaps/south.xpm b/demos/life/bitmaps/south.xpm
index 6af90226b7..a46205c820 100644
--- a/demos/life/bitmaps/south.xpm
+++ b/demos/life/bitmaps/south.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * south_xpm[] = {
+static const char * south_xpm[] = {
 "16 16 3 1",
 " 	c None",
 ".	c Black",
diff --git a/demos/life/bitmaps/stop.xpm b/demos/life/bitmaps/stop.xpm
index 69d55a14cc..355b8a5125 100644
--- a/demos/life/bitmaps/stop.xpm
+++ b/demos/life/bitmaps/stop.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *stop_xpm[] = {
+static const char * stop_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 2 1",
 "  c None",
diff --git a/demos/life/bitmaps/west.xpm b/demos/life/bitmaps/west.xpm
index 0c59c715dd..f89e42cfe2 100644
--- a/demos/life/bitmaps/west.xpm
+++ b/demos/life/bitmaps/west.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * west_xpm[] = {
+static const char * west_xpm[] = {
 "16 16 3 1",
 " 	c None",
 ".	c Black",
diff --git a/demos/life/bitmaps/zoomin.xpm b/demos/life/bitmaps/zoomin.xpm
index d3e332b9ab..14ed48d87f 100644
--- a/demos/life/bitmaps/zoomin.xpm
+++ b/demos/life/bitmaps/zoomin.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * zoomin_xpm[] = {
+static const char * zoomin_xpm[] = {
 "16 16 3 1",
 "   c None",
 ".	c Black",
diff --git a/demos/life/bitmaps/zoomout.xpm b/demos/life/bitmaps/zoomout.xpm
index d214b907a2..c33fc0bc78 100644
--- a/demos/life/bitmaps/zoomout.xpm
+++ b/demos/life/bitmaps/zoomout.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * zoomout_xpm[] = {
+static const char * zoomout_xpm[] = {
 "16 16 3 1",
 "   c None",
 ".	c Black",
diff --git a/demos/life/mondrian.xpm b/demos/life/mondrian.xpm
index 409f27a843..b5939bb815 100644
--- a/demos/life/mondrian.xpm
+++ b/demos/life/mondrian.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *mondrian_xpm[] = {
+static const char * mondrian_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 6 1",
 "  c Black",
diff --git a/demos/poem/corner1.xpm b/demos/poem/corner1.xpm
index 97037e06da..200d6f68d0 100644
--- a/demos/poem/corner1.xpm
+++ b/demos/poem/corner1.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * corner1_xpm[] = {
+static const char * corner1_xpm[] = {
 /* width height ncolors chars_per_pixel */
 "32 32 4 1",
 /* colors */
diff --git a/demos/poem/corner2.xpm b/demos/poem/corner2.xpm
index ba1b1206a6..e6c17e38c6 100644
--- a/demos/poem/corner2.xpm
+++ b/demos/poem/corner2.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * corner2_xpm[] = {
+static const char * corner2_xpm[] = {
 /* width height ncolors chars_per_pixel */
 "32 32 4 1",
 /* colors */
diff --git a/demos/poem/corner3.xpm b/demos/poem/corner3.xpm
index 14c04468dd..510b83acef 100644
--- a/demos/poem/corner3.xpm
+++ b/demos/poem/corner3.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * corner3_xpm[] = {
+static const char * corner3_xpm[] = {
 /* width height ncolors chars_per_pixel */
 "32 32 4 1",
 /* colors */
diff --git a/demos/poem/corner4.xpm b/demos/poem/corner4.xpm
index f84a27a6d0..8fed26d709 100644
--- a/demos/poem/corner4.xpm
+++ b/demos/poem/corner4.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * corner4_xpm[] = {
+static const char * corner4_xpm[] = {
 /* width height ncolors chars_per_pixel */
 "32 32 4 1",
 /* colors */
diff --git a/demos/poem/wxpoem.xpm b/demos/poem/wxpoem.xpm
index 73ca05b791..13966e7499 100644
--- a/demos/poem/wxpoem.xpm
+++ b/demos/poem/wxpoem.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * wxpoem_xpm[] = {
+static const char * wxpoem_xpm[] = {
 /* width height ncolors chars_per_pixel */
 "32 32 9 1",
 /* colors */
diff --git a/samples/access/mondrian.xpm b/samples/access/mondrian.xpm
index 409f27a843..b5939bb815 100644
--- a/samples/access/mondrian.xpm
+++ b/samples/access/mondrian.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *mondrian_xpm[] = {
+static const char * mondrian_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 6 1",
 "  c Black",
diff --git a/samples/artprov/error.xpm b/samples/artprov/error.xpm
index e77c8e9fb6..956e3549e9 100644
--- a/samples/artprov/error.xpm
+++ b/samples/artprov/error.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *error_xpm[] = {
+static const char * error_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "48 48 4 1",
 "  c None",
diff --git a/samples/artprov/info.xpm b/samples/artprov/info.xpm
index 8892f504c1..930b639cc3 100644
--- a/samples/artprov/info.xpm
+++ b/samples/artprov/info.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *info_xpm[] = {
+static const char * info_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "48 48 9 1",
 "$ c Black",
diff --git a/samples/artprov/mondrian.xpm b/samples/artprov/mondrian.xpm
index 409f27a843..b5939bb815 100644
--- a/samples/artprov/mondrian.xpm
+++ b/samples/artprov/mondrian.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *mondrian_xpm[] = {
+static const char * mondrian_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 6 1",
 "  c Black",
diff --git a/samples/artprov/null.xpm b/samples/artprov/null.xpm
index abf74843b4..129cf48b5f 100644
--- a/samples/artprov/null.xpm
+++ b/samples/artprov/null.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * null_xpm[] = {
+static const char *  null_xpm[] = {
 "16 16 11 1",
 " 	c None",
 ".	c #000000",
diff --git a/samples/artprov/question.xpm b/samples/artprov/question.xpm
index 8b3cb01ef5..3ea9434c2f 100644
--- a/samples/artprov/question.xpm
+++ b/samples/artprov/question.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *question_xpm[] = {
+static const char * question_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "48 48 21 1",
 ". c Black",
diff --git a/samples/artprov/warning.xpm b/samples/artprov/warning.xpm
index 92b7a70860..18135c81cb 100644
--- a/samples/artprov/warning.xpm
+++ b/samples/artprov/warning.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *warning_xpm[] = {
+static const char * warning_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "48 48 9 1",
 "@ c Black",
diff --git a/samples/caret/mondrian.xpm b/samples/caret/mondrian.xpm
index 409f27a843..b5939bb815 100644
--- a/samples/caret/mondrian.xpm
+++ b/samples/caret/mondrian.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *mondrian_xpm[] = {
+static const char * mondrian_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 6 1",
 "  c Black",
diff --git a/samples/checklst/mondrian.xpm b/samples/checklst/mondrian.xpm
index 409f27a843..b5939bb815 100644
--- a/samples/checklst/mondrian.xpm
+++ b/samples/checklst/mondrian.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *mondrian_xpm[] = {
+static const char * mondrian_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 6 1",
 "  c Black",
diff --git a/samples/controls/icons/choice.xpm b/samples/controls/icons/choice.xpm
index c46aaf5dba..49b36d56ad 100644
--- a/samples/controls/icons/choice.xpm
+++ b/samples/controls/icons/choice.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * choice_xpm[] = {
+static const char * choice_xpm[] = {
 /* width height ncolors chars_per_pixel */
 "16 16 5 1",
 /* colors */
diff --git a/samples/controls/icons/combo.xpm b/samples/controls/icons/combo.xpm
index 554d2a2a08..44b884def3 100644
--- a/samples/controls/icons/combo.xpm
+++ b/samples/controls/icons/combo.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * combo_xpm[] = {
+static const char * combo_xpm[] = {
 /* width height ncolors chars_per_pixel */
 "16 16 5 1",
 /* colors */
diff --git a/samples/controls/icons/gauge.xpm b/samples/controls/icons/gauge.xpm
index 947bbdf024..67d94f2e08 100644
--- a/samples/controls/icons/gauge.xpm
+++ b/samples/controls/icons/gauge.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * gauge_xpm[] = {
+static const char * gauge_xpm[] = {
 /* width height ncolors chars_per_pixel */
 "16 16 5 1",
 /* colors */
diff --git a/samples/controls/icons/list.xpm b/samples/controls/icons/list.xpm
index a7da5be9c9..6a5e72fbab 100644
--- a/samples/controls/icons/list.xpm
+++ b/samples/controls/icons/list.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * list_xpm[] = {
+static const char * list_xpm[] = {
 /* width height ncolors chars_per_pixel */
 "16 16 5 1",
 /* colors */
diff --git a/samples/controls/icons/radio.xpm b/samples/controls/icons/radio.xpm
index e4695e828f..45d7d364fb 100644
--- a/samples/controls/icons/radio.xpm
+++ b/samples/controls/icons/radio.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * radio_xpm[] = {
+static const char * radio_xpm[] = {
 /* width height ncolors chars_per_pixel */
 "16 16 5 1",
 /* colors */
diff --git a/samples/controls/icons/stattext.xpm b/samples/controls/icons/stattext.xpm
index 1ff8e94d4e..779deb2cfa 100644
--- a/samples/controls/icons/stattext.xpm
+++ b/samples/controls/icons/stattext.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * stattext_xpm[] = {
+static const char * stattext_xpm[] = {
 /* width height ncolors chars_per_pixel */
 "16 16 2 1",
 /* colors */
diff --git a/samples/controls/icons/text.xpm b/samples/controls/icons/text.xpm
index f4bea54bd8..bfde6a75a0 100644
--- a/samples/controls/icons/text.xpm
+++ b/samples/controls/icons/text.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * text_xpm[] = {
+static const char * text_xpm[] = {
 /* width height ncolors chars_per_pixel */
 "16 16 5 1",
 /* colors */
diff --git a/samples/controls/mondrian.xpm b/samples/controls/mondrian.xpm
index 409f27a843..b5939bb815 100644
--- a/samples/controls/mondrian.xpm
+++ b/samples/controls/mondrian.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *mondrian_xpm[] = {
+static const char * mondrian_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 6 1",
 "  c Black",
diff --git a/samples/dataview/null.xpm b/samples/dataview/null.xpm
index abf74843b4..e6706c1aca 100644
--- a/samples/dataview/null.xpm
+++ b/samples/dataview/null.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * null_xpm[] = {
+static const char * null_xpm[] = {
 "16 16 11 1",
 " 	c None",
 ".	c #000000",
diff --git a/samples/db/db.xpm b/samples/db/db.xpm
index 3d54cd4361..5b985c0810 100644
--- a/samples/db/db.xpm
+++ b/samples/db/db.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * db_xpm[] = {
+static const char * db_xpm[] = {
 /* width height ncolors chars_per_pixel */
 "32 32 10 1",
 /* colors */
diff --git a/samples/dnd/dnd_copy.xpm b/samples/dnd/dnd_copy.xpm
index 7144747bb9..68c625139e 100644
--- a/samples/dnd/dnd_copy.xpm
+++ b/samples/dnd/dnd_copy.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * dnd_copy_xpm[] = {
+static const char * dnd_copy_xpm[] = {
 /* width height ncolors chars_per_pixel */
 "32 32 6 1",
 /* colors */
diff --git a/samples/dnd/dnd_move.xpm b/samples/dnd/dnd_move.xpm
index 9a0eaf4dcc..0ab5e5ad7a 100644
--- a/samples/dnd/dnd_move.xpm
+++ b/samples/dnd/dnd_move.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * dnd_move_xpm[] = {
+static const char * dnd_move_xpm[] = {
 /* width height ncolors chars_per_pixel */
 "32 32 5 1",
 /* colors */
diff --git a/samples/dnd/dnd_none.xpm b/samples/dnd/dnd_none.xpm
index dfd7f0cdad..5a48e79d78 100644
--- a/samples/dnd/dnd_none.xpm
+++ b/samples/dnd/dnd_none.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * dnd_none_xpm[] = {
+static const char * dnd_none_xpm[] = {
 /* width height ncolors chars_per_pixel */
 "32 32 6 1",
 /* colors */
diff --git a/samples/docview/mondrian.xpm b/samples/docview/mondrian.xpm
index 409f27a843..b5939bb815 100644
--- a/samples/docview/mondrian.xpm
+++ b/samples/docview/mondrian.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *mondrian_xpm[] = {
+static const char * mondrian_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 6 1",
 "  c Black",
diff --git a/samples/dragimag/dragicon.xpm b/samples/dragimag/dragicon.xpm
index 87a76ea3f5..7824e9a49a 100644
--- a/samples/dragimag/dragicon.xpm
+++ b/samples/dragimag/dragicon.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *dragicon_xpm[] = {
+static const char * dragicon_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 6 1",
 "  c Black",
diff --git a/samples/dragimag/mondrian.xpm b/samples/dragimag/mondrian.xpm
index 409f27a843..b5939bb815 100644
--- a/samples/dragimag/mondrian.xpm
+++ b/samples/dragimag/mondrian.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *mondrian_xpm[] = {
+static const char * mondrian_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 6 1",
 "  c Black",
diff --git a/samples/drawing/mondrian.xpm b/samples/drawing/mondrian.xpm
index 409f27a843..b5939bb815 100644
--- a/samples/drawing/mondrian.xpm
+++ b/samples/drawing/mondrian.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *mondrian_xpm[] = {
+static const char * mondrian_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 6 1",
 "  c Black",
diff --git a/samples/drawing/smile.xpm b/samples/drawing/smile.xpm
index 156d24eb0e..27858c48d4 100644
--- a/samples/drawing/smile.xpm
+++ b/samples/drawing/smile.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *smile_xpm[] = {
+static const char * smile_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 4 1",
 ". c Black",
diff --git a/samples/dynamic/mondrian.xpm b/samples/dynamic/mondrian.xpm
index 409f27a843..b5939bb815 100644
--- a/samples/dynamic/mondrian.xpm
+++ b/samples/dynamic/mondrian.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *mondrian_xpm[] = {
+static const char * mondrian_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 6 1",
 "  c Black",
diff --git a/samples/erase/mondrian.xpm b/samples/erase/mondrian.xpm
index ad2e33a2b5..64b3c267f8 100644
--- a/samples/erase/mondrian.xpm
+++ b/samples/erase/mondrian.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *mondrian_xpm[] = {
+static const char * mondrian_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 7 1",
 "  c Black",
diff --git a/samples/help/mondrian.xpm b/samples/help/mondrian.xpm
index 409f27a843..b5939bb815 100644
--- a/samples/help/mondrian.xpm
+++ b/samples/help/mondrian.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *mondrian_xpm[] = {
+static const char * mondrian_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 6 1",
 "  c Black",
diff --git a/samples/htlbox/mondrian.xpm b/samples/htlbox/mondrian.xpm
index 409f27a843..b5939bb815 100644
--- a/samples/htlbox/mondrian.xpm
+++ b/samples/htlbox/mondrian.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *mondrian_xpm[] = {
+static const char * mondrian_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 6 1",
 "  c Black",
diff --git a/samples/image/horse.xpm b/samples/image/horse.xpm
index db8d247cc7..52df092009 100644
--- a/samples/image/horse.xpm
+++ b/samples/image/horse.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * horse_xpm[] = {
+static const char * horse_xpm[] = {
 "200 200 257 2",
 "  	c None",
 ". 	c #0A0A0A",
diff --git a/samples/image/smile.xpm b/samples/image/smile.xpm
index 156d24eb0e..27858c48d4 100644
--- a/samples/image/smile.xpm
+++ b/samples/image/smile.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *smile_xpm[] = {
+static const char * smile_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 4 1",
 ". c Black",
diff --git a/samples/internat/mondrian.xpm b/samples/internat/mondrian.xpm
index 409f27a843..b5939bb815 100644
--- a/samples/internat/mondrian.xpm
+++ b/samples/internat/mondrian.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *mondrian_xpm[] = {
+static const char * mondrian_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 6 1",
 "  c Black",
diff --git a/samples/ipc/mondrian.xpm b/samples/ipc/mondrian.xpm
index 409f27a843..b5939bb815 100644
--- a/samples/ipc/mondrian.xpm
+++ b/samples/ipc/mondrian.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *mondrian_xpm[] = {
+static const char * mondrian_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 6 1",
 "  c Black",
diff --git a/samples/listctrl/bitmaps/small1.xpm b/samples/listctrl/bitmaps/small1.xpm
index 4dcfd5511f..3329954bab 100644
--- a/samples/listctrl/bitmaps/small1.xpm
+++ b/samples/listctrl/bitmaps/small1.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *small1_xpm[] = {
+static const char * small1_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 6 1",
 ". c Black",
diff --git a/samples/listctrl/bitmaps/toolbrai.xpm b/samples/listctrl/bitmaps/toolbrai.xpm
index 3c1a4db104..fc17e6b4fe 100644
--- a/samples/listctrl/bitmaps/toolbrai.xpm
+++ b/samples/listctrl/bitmaps/toolbrai.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * toolbrai_xpm[] = {
+static const char * toolbrai_xpm[] = {
 /* width height ncolors chars_per_pixel */
 "32 32 4 1",
 /* colors */
diff --git a/samples/listctrl/bitmaps/toolchar.xpm b/samples/listctrl/bitmaps/toolchar.xpm
index 13984484f9..38c630f45d 100644
--- a/samples/listctrl/bitmaps/toolchar.xpm
+++ b/samples/listctrl/bitmaps/toolchar.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *toolchar_xpm[] = {
+static const char * toolchar_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 4 1",
 ". c Black",
diff --git a/samples/listctrl/bitmaps/toolchec.xpm b/samples/listctrl/bitmaps/toolchec.xpm
index c645b929a3..7459dabd91 100644
--- a/samples/listctrl/bitmaps/toolchec.xpm
+++ b/samples/listctrl/bitmaps/toolchec.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *toolchec_xpm[] = {
+static const char * toolchec_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 16 1",
 "X c Black",
diff --git a/samples/listctrl/bitmaps/tooldata.xpm b/samples/listctrl/bitmaps/tooldata.xpm
index f2390b153f..6fb9e8f47f 100644
--- a/samples/listctrl/bitmaps/tooldata.xpm
+++ b/samples/listctrl/bitmaps/tooldata.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *tooldata_xpm[] = {
+static const char * tooldata_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 3 1",
 "  c Black",
diff --git a/samples/listctrl/bitmaps/toolgame.xpm b/samples/listctrl/bitmaps/toolgame.xpm
index 79e2ea3d79..43d2dafd2e 100644
--- a/samples/listctrl/bitmaps/toolgame.xpm
+++ b/samples/listctrl/bitmaps/toolgame.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *toolgame_xpm[] = {
+static const char * toolgame_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 3 1",
 "X c #808080",
diff --git a/samples/listctrl/bitmaps/toolnote.xpm b/samples/listctrl/bitmaps/toolnote.xpm
index 6d88428fe0..a67416339b 100644
--- a/samples/listctrl/bitmaps/toolnote.xpm
+++ b/samples/listctrl/bitmaps/toolnote.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *toolnote_xpm[] = {
+static const char * toolnote_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 5 1",
 "O c Black",
diff --git a/samples/listctrl/bitmaps/tooltime.xpm b/samples/listctrl/bitmaps/tooltime.xpm
index 64c4c4e148..8684a202f0 100644
--- a/samples/listctrl/bitmaps/tooltime.xpm
+++ b/samples/listctrl/bitmaps/tooltime.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *tooltime_xpm[] = {
+static const char * tooltime_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 4 1",
 ". c Black",
diff --git a/samples/listctrl/bitmaps/tooltodo.xpm b/samples/listctrl/bitmaps/tooltodo.xpm
index 1579b13d4e..73b9c1357f 100644
--- a/samples/listctrl/bitmaps/tooltodo.xpm
+++ b/samples/listctrl/bitmaps/tooltodo.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *tooltodo_xpm[] = {
+static const char * tooltodo_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 156 2",
 "0  c #A08020",
diff --git a/samples/listctrl/bitmaps/toolword.xpm b/samples/listctrl/bitmaps/toolword.xpm
index 7c615cdde0..26a3d43464 100644
--- a/samples/listctrl/bitmaps/toolword.xpm
+++ b/samples/listctrl/bitmaps/toolword.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * toolword_xpm[] = {
+static const char * toolword_xpm[] = {
 /* width height ncolors chars_per_pixel */
 "32 32 3 1",
 /* colors */
diff --git a/samples/listctrl/mondrian.xpm b/samples/listctrl/mondrian.xpm
index 409f27a843..b5939bb815 100644
--- a/samples/listctrl/mondrian.xpm
+++ b/samples/listctrl/mondrian.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *mondrian_xpm[] = {
+static const char * mondrian_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 6 1",
 "  c Black",
diff --git a/samples/mdi/bitmaps/copy.xpm b/samples/mdi/bitmaps/copy.xpm
index 00ae82e213..b14b414834 100644
--- a/samples/mdi/bitmaps/copy.xpm
+++ b/samples/mdi/bitmaps/copy.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *copy_xpm[] = {
+static const char * copy_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 23 1",
 "+ c #769CDA",
diff --git a/samples/mdi/bitmaps/cut.xpm b/samples/mdi/bitmaps/cut.xpm
index 8afa8f6d15..83ff3bb955 100644
--- a/samples/mdi/bitmaps/cut.xpm
+++ b/samples/mdi/bitmaps/cut.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *cut_xpm[] = {
+static const char * cut_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 25 1",
 "6 c #D8BDC0",
diff --git a/samples/mdi/bitmaps/help.xpm b/samples/mdi/bitmaps/help.xpm
index 161b6b2658..5af6f74bba 100644
--- a/samples/mdi/bitmaps/help.xpm
+++ b/samples/mdi/bitmaps/help.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *help_xpm[] = {
+static const char * help_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 50 1",
 "j c #4E7FD0",
diff --git a/samples/mdi/bitmaps/new.xpm b/samples/mdi/bitmaps/new.xpm
index 2b1aaf2e42..7402207911 100644
--- a/samples/mdi/bitmaps/new.xpm
+++ b/samples/mdi/bitmaps/new.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *new_xpm[] = {
+static const char * new_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 31 1",
 ". c #7198D9",
diff --git a/samples/mdi/bitmaps/open.xpm b/samples/mdi/bitmaps/open.xpm
index 36e058fc8e..8604ce5e02 100644
--- a/samples/mdi/bitmaps/open.xpm
+++ b/samples/mdi/bitmaps/open.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *open_xpm[] = {
+static const char * open_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 36 1",
 ", c #AAC1E8",
diff --git a/samples/mdi/bitmaps/paste.xpm b/samples/mdi/bitmaps/paste.xpm
index 57e7f2a593..028fa485b7 100644
--- a/samples/mdi/bitmaps/paste.xpm
+++ b/samples/mdi/bitmaps/paste.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *paste_xpm[] = {
+static const char * paste_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 25 1",
 "< c #FEECE4",
diff --git a/samples/mdi/bitmaps/preview.xpm b/samples/mdi/bitmaps/preview.xpm
index d0176b3546..0111238a46 100644
--- a/samples/mdi/bitmaps/preview.xpm
+++ b/samples/mdi/bitmaps/preview.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *preview_xpm[] = {
+static const char * preview_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 30 1",
 "1 c Black",
diff --git a/samples/mdi/bitmaps/print.xpm b/samples/mdi/bitmaps/print.xpm
index fae8103a9a..6cc757a52d 100644
--- a/samples/mdi/bitmaps/print.xpm
+++ b/samples/mdi/bitmaps/print.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *print_xpm[] = {
+static const char * print_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 35 1",
 "y c #EDF2FB",
diff --git a/samples/mdi/bitmaps/save.xpm b/samples/mdi/bitmaps/save.xpm
index accf1f9eb2..e4e6570344 100644
--- a/samples/mdi/bitmaps/save.xpm
+++ b/samples/mdi/bitmaps/save.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *save_xpm[] = {
+static const char * save_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 21 1",
 ": c #AAC1E8",
diff --git a/samples/mdi/chart.xpm b/samples/mdi/chart.xpm
index d0a19db02e..413c8f95c0 100644
--- a/samples/mdi/chart.xpm
+++ b/samples/mdi/chart.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *chart_xpm[] = {
+static const char * chart_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 7 1",
 "  c black",
diff --git a/samples/memcheck/mondrian.xpm b/samples/memcheck/mondrian.xpm
index 409f27a843..b5939bb815 100644
--- a/samples/memcheck/mondrian.xpm
+++ b/samples/memcheck/mondrian.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *mondrian_xpm[] = {
+static const char * mondrian_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 6 1",
 "  c Black",
diff --git a/samples/menu/copy.xpm b/samples/menu/copy.xpm
index 00ae82e213..b14b414834 100644
--- a/samples/menu/copy.xpm
+++ b/samples/menu/copy.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *copy_xpm[] = {
+static const char * copy_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 23 1",
 "+ c #769CDA",
diff --git a/samples/minifram/bitmaps/copy.xpm b/samples/minifram/bitmaps/copy.xpm
index 00ae82e213..b14b414834 100644
--- a/samples/minifram/bitmaps/copy.xpm
+++ b/samples/minifram/bitmaps/copy.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *copy_xpm[] = {
+static const char * copy_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 23 1",
 "+ c #769CDA",
diff --git a/samples/minifram/bitmaps/cut.xpm b/samples/minifram/bitmaps/cut.xpm
index 8afa8f6d15..83ff3bb955 100644
--- a/samples/minifram/bitmaps/cut.xpm
+++ b/samples/minifram/bitmaps/cut.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *cut_xpm[] = {
+static const char * cut_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 25 1",
 "6 c #D8BDC0",
diff --git a/samples/minifram/bitmaps/help.xpm b/samples/minifram/bitmaps/help.xpm
index 161b6b2658..5af6f74bba 100644
--- a/samples/minifram/bitmaps/help.xpm
+++ b/samples/minifram/bitmaps/help.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *help_xpm[] = {
+static const char * help_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 50 1",
 "j c #4E7FD0",
diff --git a/samples/minifram/bitmaps/new.xpm b/samples/minifram/bitmaps/new.xpm
index 2b1aaf2e42..7402207911 100644
--- a/samples/minifram/bitmaps/new.xpm
+++ b/samples/minifram/bitmaps/new.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *new_xpm[] = {
+static const char * new_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 31 1",
 ". c #7198D9",
diff --git a/samples/minifram/bitmaps/open.xpm b/samples/minifram/bitmaps/open.xpm
index 36e058fc8e..8604ce5e02 100644
--- a/samples/minifram/bitmaps/open.xpm
+++ b/samples/minifram/bitmaps/open.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *open_xpm[] = {
+static const char * open_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 36 1",
 ", c #AAC1E8",
diff --git a/samples/minifram/bitmaps/preview.xpm b/samples/minifram/bitmaps/preview.xpm
index d0176b3546..0111238a46 100644
--- a/samples/minifram/bitmaps/preview.xpm
+++ b/samples/minifram/bitmaps/preview.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *preview_xpm[] = {
+static const char * preview_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 30 1",
 "1 c Black",
diff --git a/samples/minifram/bitmaps/print.xpm b/samples/minifram/bitmaps/print.xpm
index fae8103a9a..6cc757a52d 100644
--- a/samples/minifram/bitmaps/print.xpm
+++ b/samples/minifram/bitmaps/print.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *print_xpm[] = {
+static const char * print_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 35 1",
 "y c #EDF2FB",
diff --git a/samples/minifram/bitmaps/save.xpm b/samples/minifram/bitmaps/save.xpm
index accf1f9eb2..e4e6570344 100644
--- a/samples/minifram/bitmaps/save.xpm
+++ b/samples/minifram/bitmaps/save.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *save_xpm[] = {
+static const char * save_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 21 1",
 ": c #AAC1E8",
diff --git a/samples/minifram/mondrian.xpm b/samples/minifram/mondrian.xpm
index 409f27a843..b5939bb815 100644
--- a/samples/minifram/mondrian.xpm
+++ b/samples/minifram/mondrian.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *mondrian_xpm[] = {
+static const char * mondrian_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 6 1",
 "  c Black",
diff --git a/samples/oleauto/mondrian.xpm b/samples/oleauto/mondrian.xpm
index 409f27a843..b5939bb815 100644
--- a/samples/oleauto/mondrian.xpm
+++ b/samples/oleauto/mondrian.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *mondrian_xpm[] = {
+static const char * mondrian_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 6 1",
 "  c Black",
diff --git a/samples/printing/folder.xpm b/samples/printing/folder.xpm
index 9f25a3c29a..40bf667c64 100644
--- a/samples/printing/folder.xpm
+++ b/samples/printing/folder.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * folder_xpm[] = {
+static const char * folder_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "33 33 42 1",
 "0 c #AAC1E8",
diff --git a/samples/printing/mondrian.xpm b/samples/printing/mondrian.xpm
index 409f27a843..b5939bb815 100644
--- a/samples/printing/mondrian.xpm
+++ b/samples/printing/mondrian.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *mondrian_xpm[] = {
+static const char * mondrian_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 6 1",
 "  c Black",
diff --git a/samples/propsize/mondrian.xpm b/samples/propsize/mondrian.xpm
index 409f27a843..b5939bb815 100644
--- a/samples/propsize/mondrian.xpm
+++ b/samples/propsize/mondrian.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *mondrian_xpm[] = {
+static const char * mondrian_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 6 1",
 "  c Black",
diff --git a/samples/richtext/bitmaps/alignleft.xpm b/samples/richtext/bitmaps/alignleft.xpm
index 78653a5de2..7fee646bbb 100644
--- a/samples/richtext/bitmaps/alignleft.xpm
+++ b/samples/richtext/bitmaps/alignleft.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *alignleft_xpm[] = {
+static const char * alignleft_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 2 1",
 ". c #4D4D4D",
diff --git a/samples/richtext/bitmaps/alignright.xpm b/samples/richtext/bitmaps/alignright.xpm
index c5008e1dbe..f0651919af 100644
--- a/samples/richtext/bitmaps/alignright.xpm
+++ b/samples/richtext/bitmaps/alignright.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *alignright_xpm[] = {
+static const char * alignright_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 2 1",
 ". c #4D4D4D",
diff --git a/samples/richtext/bitmaps/bold.xpm b/samples/richtext/bitmaps/bold.xpm
index fb25642ede..b647308591 100644
--- a/samples/richtext/bitmaps/bold.xpm
+++ b/samples/richtext/bitmaps/bold.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *bold_xpm[] = {
+static const char * bold_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 2 1",
 ". c Black",
diff --git a/samples/richtext/bitmaps/centre.xpm b/samples/richtext/bitmaps/centre.xpm
index 17ca289673..13d7043b4d 100644
--- a/samples/richtext/bitmaps/centre.xpm
+++ b/samples/richtext/bitmaps/centre.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *centre_xpm[] = {
+static const char * centre_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 2 1",
 ". c #4D4D4D",
diff --git a/samples/richtext/bitmaps/copy.xpm b/samples/richtext/bitmaps/copy.xpm
index 7115767818..1d77512e85 100644
--- a/samples/richtext/bitmaps/copy.xpm
+++ b/samples/richtext/bitmaps/copy.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *copy_xpm[] = {
+static const char * copy_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 23 1",
 "o c #97C4E7",
diff --git a/samples/richtext/bitmaps/cut.xpm b/samples/richtext/bitmaps/cut.xpm
index 8baaa03ed0..182c0ed250 100644
--- a/samples/richtext/bitmaps/cut.xpm
+++ b/samples/richtext/bitmaps/cut.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *cut_xpm[] = {
+static const char * cut_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 25 1",
 "6 c #D8BDC0",
diff --git a/samples/richtext/bitmaps/font.xpm b/samples/richtext/bitmaps/font.xpm
index 93f5991b06..213cdbb1e4 100644
--- a/samples/richtext/bitmaps/font.xpm
+++ b/samples/richtext/bitmaps/font.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *font_xpm[] = {
+static const char * font_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 3 1",
 "X c #A6A6A6",
diff --git a/samples/richtext/bitmaps/idea.xpm b/samples/richtext/bitmaps/idea.xpm
index 67b2bf7647..546a129244 100644
--- a/samples/richtext/bitmaps/idea.xpm
+++ b/samples/richtext/bitmaps/idea.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *idea_xpm[] = {
+static const char * idea_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 9 1",
 "$ c Black",
diff --git a/samples/richtext/bitmaps/indentless.xpm b/samples/richtext/bitmaps/indentless.xpm
index 422b8080ed..2efa15761b 100644
--- a/samples/richtext/bitmaps/indentless.xpm
+++ b/samples/richtext/bitmaps/indentless.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *indentless_xpm[] = {
+static const char * indentless_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 3 1",
 ". c #4D4D4D",
diff --git a/samples/richtext/bitmaps/indentmore.xpm b/samples/richtext/bitmaps/indentmore.xpm
index ac1e336667..6220c4224b 100644
--- a/samples/richtext/bitmaps/indentmore.xpm
+++ b/samples/richtext/bitmaps/indentmore.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *indentmore_xpm[] = {
+static const char * indentmore_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 3 1",
 ". c #4D4D4D",
diff --git a/samples/richtext/bitmaps/italic.xpm b/samples/richtext/bitmaps/italic.xpm
index a9be5ac863..2a23d56123 100644
--- a/samples/richtext/bitmaps/italic.xpm
+++ b/samples/richtext/bitmaps/italic.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *italic_xpm[] = {
+static const char * italic_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 3 1",
 ". c Black",
diff --git a/samples/richtext/bitmaps/open.xpm b/samples/richtext/bitmaps/open.xpm
index 9bb7394ecf..e538066a78 100644
--- a/samples/richtext/bitmaps/open.xpm
+++ b/samples/richtext/bitmaps/open.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *open_xpm[] = {
+static const char * open_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 36 1",
 "6 c #9BACC2",
diff --git a/samples/richtext/bitmaps/paste.xpm b/samples/richtext/bitmaps/paste.xpm
index 32d98be732..944e108c49 100644
--- a/samples/richtext/bitmaps/paste.xpm
+++ b/samples/richtext/bitmaps/paste.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *paste_xpm[] = {
+static const char * paste_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 25 1",
 "< c #FEECE4",
diff --git a/samples/richtext/bitmaps/redo.xpm b/samples/richtext/bitmaps/redo.xpm
index 6e8c7aad23..853d707dbf 100644
--- a/samples/richtext/bitmaps/redo.xpm
+++ b/samples/richtext/bitmaps/redo.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *redo_xpm[] = {
+static const char * redo_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 37 1",
 "4 c #9BACC2",
diff --git a/samples/richtext/bitmaps/save.xpm b/samples/richtext/bitmaps/save.xpm
index 6e3e350d8c..ff8f6c57b4 100644
--- a/samples/richtext/bitmaps/save.xpm
+++ b/samples/richtext/bitmaps/save.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *save_xpm[] = {
+static const char * save_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 21 1",
 "O c #FFFFFF",
diff --git a/samples/richtext/bitmaps/smiley.xpm b/samples/richtext/bitmaps/smiley.xpm
index 945810899f..2488c04af3 100644
--- a/samples/richtext/bitmaps/smiley.xpm
+++ b/samples/richtext/bitmaps/smiley.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *smiley_xpm[] = {
+static const char * smiley_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 4 1",
 ". c Black",
diff --git a/samples/richtext/bitmaps/underline.xpm b/samples/richtext/bitmaps/underline.xpm
index 5513b39a15..0c79a67b86 100644
--- a/samples/richtext/bitmaps/underline.xpm
+++ b/samples/richtext/bitmaps/underline.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *underline_xpm[] = {
+static const char * underline_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 3 1",
 ". c Black",
diff --git a/samples/richtext/bitmaps/undo.xpm b/samples/richtext/bitmaps/undo.xpm
index 2ce081d46c..9be0ce10c5 100644
--- a/samples/richtext/bitmaps/undo.xpm
+++ b/samples/richtext/bitmaps/undo.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *undo_xpm[] = {
+static const char * undo_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 37 1",
 "4 c #9BACC2",
diff --git a/samples/richtext/bitmaps/zebra.xpm b/samples/richtext/bitmaps/zebra.xpm
index 3f76255f24..da1cfcbb67 100644
--- a/samples/richtext/bitmaps/zebra.xpm
+++ b/samples/richtext/bitmaps/zebra.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *zebra_xpm[] = {
+static const char * zebra_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "200 167 236 2",
 "`  c #A68369",
diff --git a/samples/sample.xpm b/samples/sample.xpm
index aac05aa9aa..47b603823f 100644
--- a/samples/sample.xpm
+++ b/samples/sample.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char *sample_xpm[] = {
+static const char * sample_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 6 1",
 "  c black",
diff --git a/samples/sockets/mondrian.xpm b/samples/sockets/mondrian.xpm
index 409f27a843..b5939bb815 100644
--- a/samples/sockets/mondrian.xpm
+++ b/samples/sockets/mondrian.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *mondrian_xpm[] = {
+static const char * mondrian_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 6 1",
 "  c Black",
diff --git a/samples/splash/mobile.xpm b/samples/splash/mobile.xpm
index f03d25dd50..8c93900669 100644
--- a/samples/splash/mobile.xpm
+++ b/samples/splash/mobile.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char *mobile_xpm[] = {
+static const char * mobile_xpm[] = {
 /* columns rows colors chars-per-pixel */ 
 "144 108 129 2",
 "   c #020202",
diff --git a/samples/statbar/green.xpm b/samples/statbar/green.xpm
index 6680ef7ed2..671f7aa18c 100644
--- a/samples/statbar/green.xpm
+++ b/samples/statbar/green.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *green_xpm[] = {
+static const char * green_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 15 4 1",
 ". c Black",
diff --git a/samples/statbar/red.xpm b/samples/statbar/red.xpm
index f2c55e1cd9..863c577883 100644
--- a/samples/statbar/red.xpm
+++ b/samples/statbar/red.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *red_xpm[] = {
+static const char * red_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 15 4 1",
 ". c Black",
diff --git a/samples/taskbar/smile.xpm b/samples/taskbar/smile.xpm
index 156d24eb0e..27858c48d4 100644
--- a/samples/taskbar/smile.xpm
+++ b/samples/taskbar/smile.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *smile_xpm[] = {
+static const char * smile_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 4 1",
 ". c Black",
diff --git a/samples/text/mondrian.xpm b/samples/text/mondrian.xpm
index 409f27a843..b5939bb815 100644
--- a/samples/text/mondrian.xpm
+++ b/samples/text/mondrian.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *mondrian_xpm[] = {
+static const char * mondrian_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 6 1",
 "  c Black",
diff --git a/samples/toolbar/bitmaps/copy.xpm b/samples/toolbar/bitmaps/copy.xpm
index 00ae82e213..b14b414834 100644
--- a/samples/toolbar/bitmaps/copy.xpm
+++ b/samples/toolbar/bitmaps/copy.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *copy_xpm[] = {
+static const char * copy_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 23 1",
 "+ c #769CDA",
diff --git a/samples/toolbar/bitmaps/cut.xpm b/samples/toolbar/bitmaps/cut.xpm
index 8afa8f6d15..83ff3bb955 100644
--- a/samples/toolbar/bitmaps/cut.xpm
+++ b/samples/toolbar/bitmaps/cut.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *cut_xpm[] = {
+static const char * cut_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 25 1",
 "6 c #D8BDC0",
diff --git a/samples/toolbar/bitmaps/help.xpm b/samples/toolbar/bitmaps/help.xpm
index 161b6b2658..5af6f74bba 100644
--- a/samples/toolbar/bitmaps/help.xpm
+++ b/samples/toolbar/bitmaps/help.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *help_xpm[] = {
+static const char * help_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 50 1",
 "j c #4E7FD0",
diff --git a/samples/toolbar/bitmaps/new.xpm b/samples/toolbar/bitmaps/new.xpm
index 2b1aaf2e42..7402207911 100644
--- a/samples/toolbar/bitmaps/new.xpm
+++ b/samples/toolbar/bitmaps/new.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *new_xpm[] = {
+static const char * new_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 31 1",
 ". c #7198D9",
diff --git a/samples/toolbar/bitmaps/open.xpm b/samples/toolbar/bitmaps/open.xpm
index 36e058fc8e..8604ce5e02 100644
--- a/samples/toolbar/bitmaps/open.xpm
+++ b/samples/toolbar/bitmaps/open.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *open_xpm[] = {
+static const char * open_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 36 1",
 ", c #AAC1E8",
diff --git a/samples/toolbar/bitmaps/preview.xpm b/samples/toolbar/bitmaps/preview.xpm
index 57e7f2a593..028fa485b7 100644
--- a/samples/toolbar/bitmaps/preview.xpm
+++ b/samples/toolbar/bitmaps/preview.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *paste_xpm[] = {
+static const char * paste_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 25 1",
 "< c #FEECE4",
diff --git a/samples/toolbar/bitmaps/print.xpm b/samples/toolbar/bitmaps/print.xpm
index fae8103a9a..6cc757a52d 100644
--- a/samples/toolbar/bitmaps/print.xpm
+++ b/samples/toolbar/bitmaps/print.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *print_xpm[] = {
+static const char * print_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 35 1",
 "y c #EDF2FB",
diff --git a/samples/toolbar/bitmaps/save.xpm b/samples/toolbar/bitmaps/save.xpm
index accf1f9eb2..e4e6570344 100644
--- a/samples/toolbar/bitmaps/save.xpm
+++ b/samples/toolbar/bitmaps/save.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *save_xpm[] = {
+static const char * save_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 21 1",
 ": c #AAC1E8",
diff --git a/samples/toolbar/mondrian.xpm b/samples/toolbar/mondrian.xpm
index 409f27a843..b5939bb815 100644
--- a/samples/toolbar/mondrian.xpm
+++ b/samples/toolbar/mondrian.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *mondrian_xpm[] = {
+static const char * mondrian_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 6 1",
 "  c Black",
diff --git a/samples/treectrl/icon1.xpm b/samples/treectrl/icon1.xpm
index fbc605b5fd..e1546767bd 100644
--- a/samples/treectrl/icon1.xpm
+++ b/samples/treectrl/icon1.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *icon1_xpm[] = {
+static const char * icon1_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 41 1",
 "> c #97C4E7",
diff --git a/samples/treectrl/icon2.xpm b/samples/treectrl/icon2.xpm
index 7ae8c92cd7..c4f0795312 100644
--- a/samples/treectrl/icon2.xpm
+++ b/samples/treectrl/icon2.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *icon2_xpm[] = {
+static const char * icon2_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 15 1",
 ". c Black",
diff --git a/samples/treectrl/icon3.xpm b/samples/treectrl/icon3.xpm
index 722de6b1c1..c65e7d1e4b 100644
--- a/samples/treectrl/icon3.xpm
+++ b/samples/treectrl/icon3.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *icon3_xpm[] = {
+static const char * icon3_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 41 1",
 "6 c #EDF2FB",
diff --git a/samples/treectrl/icon4.xpm b/samples/treectrl/icon4.xpm
index a18e1a70ea..071c777351 100644
--- a/samples/treectrl/icon4.xpm
+++ b/samples/treectrl/icon4.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *icon4_xpm[] = {
+static const char * icon4_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 5 1",
 ". c Black",
diff --git a/samples/treectrl/icon5.xpm b/samples/treectrl/icon5.xpm
index 9f63c31098..5050b16c90 100644
--- a/samples/treectrl/icon5.xpm
+++ b/samples/treectrl/icon5.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *icon5_xpm[] = {
+static const char * icon5_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 41 1",
 "0 c #AAC1E8",
diff --git a/samples/typetest/mondrian.xpm b/samples/typetest/mondrian.xpm
index 409f27a843..b5939bb815 100644
--- a/samples/typetest/mondrian.xpm
+++ b/samples/typetest/mondrian.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *mondrian_xpm[] = {
+static const char * mondrian_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 6 1",
 "  c Black",
diff --git a/samples/widgets/icons/bmpbtn.xpm b/samples/widgets/icons/bmpbtn.xpm
index f14683d652..3162e3dfdd 100644
--- a/samples/widgets/icons/bmpbtn.xpm
+++ b/samples/widgets/icons/bmpbtn.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *magick[] = {
+static const char * magick[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 16 1",
 "  c Gray0",
diff --git a/samples/widgets/icons/bmpcombobox.xpm b/samples/widgets/icons/bmpcombobox.xpm
index 920f314982..a08afbbd69 100644
--- a/samples/widgets/icons/bmpcombobox.xpm
+++ b/samples/widgets/icons/bmpcombobox.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *bmpcombobox_xpm[] = {
+static const char * bmpcombobox_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 16 1",
 "  c Gray0",
diff --git a/samples/widgets/icons/button.xpm b/samples/widgets/icons/button.xpm
index d15f9a32b5..a42c243c41 100644
--- a/samples/widgets/icons/button.xpm
+++ b/samples/widgets/icons/button.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *button_xpm[] = {
+static const char * button_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 16 1",
 "  c Gray0",
diff --git a/samples/widgets/icons/checkbox.xpm b/samples/widgets/icons/checkbox.xpm
index 2abb0b4e77..b500834965 100644
--- a/samples/widgets/icons/checkbox.xpm
+++ b/samples/widgets/icons/checkbox.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *checkbox_xpm[] = {
+static const char * checkbox_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 16 1",
 "  c Gray0",
diff --git a/samples/widgets/icons/choicebk.xpm b/samples/widgets/icons/choicebk.xpm
index 62a68068e3..1d3600302e 100644
--- a/samples/widgets/icons/choicebk.xpm
+++ b/samples/widgets/icons/choicebk.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *choicebk_xpm[] = {
+static const char * choicebk_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 16 1",
 "  c Gray0",
diff --git a/samples/widgets/icons/clrpicker.xpm b/samples/widgets/icons/clrpicker.xpm
index f5398983fc..0025e42243 100644
--- a/samples/widgets/icons/clrpicker.xpm
+++ b/samples/widgets/icons/clrpicker.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *clrpicker_xpm[]={
+static const char * clrpicker_xpm[]={
 "32 32 158 2",
 "   c None",
 "** c Black",
diff --git a/samples/widgets/icons/combobox.xpm b/samples/widgets/icons/combobox.xpm
index 216561f567..1967bc8c3d 100644
--- a/samples/widgets/icons/combobox.xpm
+++ b/samples/widgets/icons/combobox.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *combobox_xpm[] = {
+static const char * combobox_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 16 1",
 "  c Gray0",
diff --git a/samples/widgets/icons/datepick.xpm b/samples/widgets/icons/datepick.xpm
index bcc6a656ed..bd41e429aa 100644
--- a/samples/widgets/icons/datepick.xpm
+++ b/samples/widgets/icons/datepick.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *datepick_xpm[] = {
+static const char * datepick_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 163 2",
 "   c None",
diff --git a/samples/widgets/icons/dirctrl.xpm b/samples/widgets/icons/dirctrl.xpm
index e362dfe0d4..2d5bc792c9 100644
--- a/samples/widgets/icons/dirctrl.xpm
+++ b/samples/widgets/icons/dirctrl.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *dirctrl_xpm[] = {
+static const char * dirctrl_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 16 1",
 "  c Gray0",
diff --git a/samples/widgets/icons/dirpicker.xpm b/samples/widgets/icons/dirpicker.xpm
index 687ea88a16..7718560c40 100644
--- a/samples/widgets/icons/dirpicker.xpm
+++ b/samples/widgets/icons/dirpicker.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *dirpicker_xpm[]={
+static const char * dirpicker_xpm[]={
 "32 32 178 2",
 "   c None",
 "f6 c #9BACC2",
diff --git a/samples/widgets/icons/filepicker.xpm b/samples/widgets/icons/filepicker.xpm
index 9a53077a61..0198dc2c6f 100644
--- a/samples/widgets/icons/filepicker.xpm
+++ b/samples/widgets/icons/filepicker.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *filepicker_xpm[]={
+static const char * filepicker_xpm[]={
 "32 32 179 2",
 "   c None",
 "f= c #97C4E7",
diff --git a/samples/widgets/icons/fontpicker.xpm b/samples/widgets/icons/fontpicker.xpm
index 87734963c0..b515ba8e84 100644
--- a/samples/widgets/icons/fontpicker.xpm
+++ b/samples/widgets/icons/fontpicker.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *fontpicker_xpm[]={
+static const char * fontpicker_xpm[]={
 "32 32 150 2",
 "   c None",
 "BB c Black",
diff --git a/samples/widgets/icons/gauge.xpm b/samples/widgets/icons/gauge.xpm
index 4f4a5c0dc3..db880bde8e 100644
--- a/samples/widgets/icons/gauge.xpm
+++ b/samples/widgets/icons/gauge.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *gauge_xpm[] = {
+static const char * gauge_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 16 1",
 "  c Gray0",
diff --git a/samples/widgets/icons/hyperlnk.xpm b/samples/widgets/icons/hyperlnk.xpm
index 80fb159805..30a55193de 100644
--- a/samples/widgets/icons/hyperlnk.xpm
+++ b/samples/widgets/icons/hyperlnk.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *hyperlnk_xpm[] = {
+static const char * hyperlnk_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 16 1",
 "  c Gray0",
diff --git a/samples/widgets/icons/listbook.xpm b/samples/widgets/icons/listbook.xpm
index 12b7d6a43d..2d5bd93dc3 100644
--- a/samples/widgets/icons/listbook.xpm
+++ b/samples/widgets/icons/listbook.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *listbook_xpm[] = {
+static const char * listbook_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 16 1",
 "  c Gray0",
diff --git a/samples/widgets/icons/listbox.xpm b/samples/widgets/icons/listbox.xpm
index 80253d5447..3922426ddf 100644
--- a/samples/widgets/icons/listbox.xpm
+++ b/samples/widgets/icons/listbox.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *listbox_xpm[] = {
+static const char * listbox_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 16 1",
 "  c Gray0",
diff --git a/samples/widgets/icons/notebook.xpm b/samples/widgets/icons/notebook.xpm
index 1e9ac57d4f..9a931f210c 100644
--- a/samples/widgets/icons/notebook.xpm
+++ b/samples/widgets/icons/notebook.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *notebook_xpm[] = {
+static const char * notebook_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 16 1",
 "  c Gray0",
diff --git a/samples/widgets/icons/odcombobox.xpm b/samples/widgets/icons/odcombobox.xpm
index 0be66bcc3a..9c4a29bf8f 100644
--- a/samples/widgets/icons/odcombobox.xpm
+++ b/samples/widgets/icons/odcombobox.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *odcombobox_xpm[] = {
+static const char * odcombobox_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 16 1",
 "  c Gray0",
diff --git a/samples/widgets/icons/radiobox.xpm b/samples/widgets/icons/radiobox.xpm
index b8e2fa2800..fbe7b13b75 100644
--- a/samples/widgets/icons/radiobox.xpm
+++ b/samples/widgets/icons/radiobox.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *radio_xpm[] = {
+static const char * radio_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 16 1",
 "  c Gray0",
diff --git a/samples/widgets/icons/scrolbar.xpm b/samples/widgets/icons/scrolbar.xpm
index b354f754c6..ef310f3d7e 100644
--- a/samples/widgets/icons/scrolbar.xpm
+++ b/samples/widgets/icons/scrolbar.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *magick[] = {
+static const char * magick[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 16 1",
 "  c Gray0",
diff --git a/samples/widgets/icons/slider.xpm b/samples/widgets/icons/slider.xpm
index c5fac27cb9..6332db5720 100644
--- a/samples/widgets/icons/slider.xpm
+++ b/samples/widgets/icons/slider.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *slider_xpm[] = {
+static const char * slider_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 16 1",
 "  c Gray0",
diff --git a/samples/widgets/icons/spinbtn.xpm b/samples/widgets/icons/spinbtn.xpm
index 02624db5cb..ff9a64dc25 100644
--- a/samples/widgets/icons/spinbtn.xpm
+++ b/samples/widgets/icons/spinbtn.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *spinbtn_xpm[] = {
+static const char * spinbtn_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 2 1",
 "$ c None",
diff --git a/samples/widgets/icons/statbox.xpm b/samples/widgets/icons/statbox.xpm
index 8292756e05..707b4d617e 100644
--- a/samples/widgets/icons/statbox.xpm
+++ b/samples/widgets/icons/statbox.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *statbox_xpm[] = {
+static const char * statbox_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 16 1",
 "  c Gray0",
diff --git a/samples/widgets/icons/stattext.xpm b/samples/widgets/icons/stattext.xpm
index 4357ed115d..1b8ca10918 100644
--- a/samples/widgets/icons/stattext.xpm
+++ b/samples/widgets/icons/stattext.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *stattext_xpm[] = {
+static const char * stattext_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 16 1",
 "  c Gray0",
diff --git a/samples/widgets/icons/text.xpm b/samples/widgets/icons/text.xpm
index d5b8430101..7f0d7c50b9 100644
--- a/samples/widgets/icons/text.xpm
+++ b/samples/widgets/icons/text.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *text_xpm[] = {
+static const char * text_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 16 1",
 "  c Gray0",
diff --git a/samples/widgets/icons/toggle.xpm b/samples/widgets/icons/toggle.xpm
index 5b0c6ad90d..276a5f38eb 100644
--- a/samples/widgets/icons/toggle.xpm
+++ b/samples/widgets/icons/toggle.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *toggle_xpm[] = {
+static const char * toggle_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 16 1",
 "  c Gray0",
diff --git a/samples/widgets/notebook.cpp b/samples/widgets/notebook.cpp
index 116ee5d91b..64b5e51a64 100644
--- a/samples/widgets/notebook.cpp
+++ b/samples/widgets/notebook.cpp
@@ -86,7 +86,7 @@ enum Orient
 class BookWidgetsPage : public WidgetsPage
 {
 public:
-    BookWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist, char* icon[]);
+    BookWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist, const char* icon[]);
     virtual ~BookWidgetsPage();
 
     virtual wxControl *GetWidget() const { return m_book; }
@@ -192,7 +192,7 @@ END_EVENT_TABLE()
 // implementation
 // ============================================================================
 
-BookWidgetsPage::BookWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist, char* icon[])
+BookWidgetsPage::BookWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist, const char* icon[])
                 :WidgetsPage(book, imaglist, icon)
 {
     // init everything
diff --git a/samples/widgets/widgets.cpp b/samples/widgets/widgets.cpp
index fde4f53272..2f52f890bf 100644
--- a/samples/widgets/widgets.cpp
+++ b/samples/widgets/widgets.cpp
@@ -921,7 +921,7 @@ WidgetsPageInfo *WidgetsPage::ms_widgetPages = NULL;
 
 WidgetsPage::WidgetsPage(WidgetsBookCtrl *book,
                          wxImageList *imaglist,
-                         char* icon[])
+                         const char* icon[])
            : wxPanel(book, wxID_ANY,
                      wxDefaultPosition, wxDefaultSize,
                      wxNO_FULL_REPAINT_ON_RESIZE |
diff --git a/samples/widgets/widgets.h b/samples/widgets/widgets.h
index 4b78dfad83..9caf430757 100644
--- a/samples/widgets/widgets.h
+++ b/samples/widgets/widgets.h
@@ -91,7 +91,7 @@ class WidgetsPage : public wxPanel
 public:
     WidgetsPage(WidgetsBookCtrl *book,
                 wxImageList *imaglist,
-                char* icon[]);
+                const char* icon[]);
 
     // return the control shown by this page
     virtual wxControl *GetWidget() const = 0;
diff --git a/samples/wizard/wiztest.xpm b/samples/wizard/wiztest.xpm
index b5dea90800..df27f79c7f 100644
--- a/samples/wizard/wiztest.xpm
+++ b/samples/wizard/wiztest.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *wiztest_xpm[] = {
+static const char * wiztest_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "116 260 29 1",
 ". c Black",
diff --git a/samples/wizard/wiztest2.xpm b/samples/wizard/wiztest2.xpm
index 617c70fd0a..19b7401cfe 100644
--- a/samples/wizard/wiztest2.xpm
+++ b/samples/wizard/wiztest2.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *wiztest2_xpm[] = {
+static const char * wiztest2_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "116 260 236 2",
 "1  c Black",
diff --git a/samples/xrc/rc/appicon.xpm b/samples/xrc/rc/appicon.xpm
index 7c61a99318..c924c37daf 100644
--- a/samples/xrc/rc/appicon.xpm
+++ b/samples/xrc/rc/appicon.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * appicon_xpm[] = {
+static const char * appicon_xpm[] = {
 "32 32 17 1",
 " 	c None",
 ".	c #000000",
diff --git a/samples/xrc/rc/artprov.xpm b/samples/xrc/rc/artprov.xpm
index 55e204881b..1fe9ab38f4 100644
--- a/samples/xrc/rc/artprov.xpm
+++ b/samples/xrc/rc/artprov.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * artprov_xpm[] = {
+static const char * artprov_xpm[] = {
 "16 16 4 1",
 " 	c None",
 ".	c #000000",
diff --git a/samples/xrc/rc/basicdlg.xpm b/samples/xrc/rc/basicdlg.xpm
index 19054822ba..e8269be982 100644
--- a/samples/xrc/rc/basicdlg.xpm
+++ b/samples/xrc/rc/basicdlg.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * basicdlg_xpm[] = {
+static const char * basicdlg_xpm[] = {
 "16 16 5 1",
 " 	c None",
 ".	c #000000",
diff --git a/samples/xrc/rc/controls.xpm b/samples/xrc/rc/controls.xpm
index 2bbdd34857..988eb7e077 100644
--- a/samples/xrc/rc/controls.xpm
+++ b/samples/xrc/rc/controls.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * controls_xpm[] = {
+static const char * controls_xpm[] = {
 "16 16 6 1",
 " 	c None",
 ".	c #000000",
diff --git a/samples/xrc/rc/custclas.xpm b/samples/xrc/rc/custclas.xpm
index 49e82d4587..180393047b 100644
--- a/samples/xrc/rc/custclas.xpm
+++ b/samples/xrc/rc/custclas.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * custclas_xpm[] = {
+static const char * custclas_xpm[] = {
 "16 16 7 1",
 " 	c None",
 ".	c #EBF70E",
diff --git a/samples/xrc/rc/derivdlg.xpm b/samples/xrc/rc/derivdlg.xpm
index ed1978b7f2..30ac071e66 100644
--- a/samples/xrc/rc/derivdlg.xpm
+++ b/samples/xrc/rc/derivdlg.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * derivdlg_xpm[] = {
+static const char * derivdlg_xpm[] = {
 "16 16 6 1",
 " 	c None",
 ".	c #EBF70E",
diff --git a/samples/xrc/rc/platform.xpm b/samples/xrc/rc/platform.xpm
index 3737055fe7..d2df2b14e3 100644
--- a/samples/xrc/rc/platform.xpm
+++ b/samples/xrc/rc/platform.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *platform_xpm[] = {
+static const char * platform_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 6 1",
 ". c Black",
diff --git a/samples/xrc/rc/stop.xpm b/samples/xrc/rc/stop.xpm
index 7c26312696..50050b65f1 100644
--- a/samples/xrc/rc/stop.xpm
+++ b/samples/xrc/rc/stop.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * stop_xpm[] = {
+static const char * stop_xpm[] = {
 "32 32 129 2",
 "  	c None",
 ". 	c #C9CBC8",
diff --git a/samples/xrc/rc/uncenter.xpm b/samples/xrc/rc/uncenter.xpm
index 103b1cb301..31c8d2df60 100644
--- a/samples/xrc/rc/uncenter.xpm
+++ b/samples/xrc/rc/uncenter.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * uncenter_xpm[] = {
+static const char * uncenter_xpm[] = {
 "16 16 5 1",
 " 	c None",
 ".	c #000000",
diff --git a/samples/xrc/rc/variable.xpm b/samples/xrc/rc/variable.xpm
index 3e95bd869d..70dad162ac 100644
--- a/samples/xrc/rc/variable.xpm
+++ b/samples/xrc/rc/variable.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * variable_xpm[] = {
+static const char * variable_xpm[] = {
 "16 16 2 1",
 " 	c None",
 ".	c #0E2CEF",
diff --git a/src/common/artstd.cpp b/src/common/artstd.cpp
index c3e4fe994b..ad34da92d5 100644
--- a/src/common/artstd.cpp
+++ b/src/common/artstd.cpp
@@ -88,8 +88,6 @@ protected:
 // XPMs with the art
 // ----------------------------------------------------------------------------
 
-// XPM hack: make the arrays const
-#define static static const
 
 #if defined(__WXGTK__)
     #include "../../art/gtk/info.xpm"
@@ -153,7 +151,6 @@ protected:
 #include "../../art/findrepl.xpm"
 
 
-#undef static
 
 wxBitmap wxDefaultArtProvider_CreateBitmap(const wxArtID& id)
 {
diff --git a/utils/emulator/src/emulator.xpm b/utils/emulator/src/emulator.xpm
index 229a896699..a38b68fd3d 100644
--- a/utils/emulator/src/emulator.xpm
+++ b/utils/emulator/src/emulator.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * emulator_xpm[] = {
+static const char * emulator_xpm[] = {
 "32 32 17 1",
 "( 	c #000000",
 ".	c #000000",
diff --git a/utils/emulator/src/mondrian.xpm b/utils/emulator/src/mondrian.xpm
index 409f27a843..b5939bb815 100644
--- a/utils/emulator/src/mondrian.xpm
+++ b/utils/emulator/src/mondrian.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *mondrian_xpm[] = {
+static const char * mondrian_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 6 1",
 "  c Black",
diff --git a/utils/helpview/src/bitmaps/helpback.xpm b/utils/helpview/src/bitmaps/helpback.xpm
index 5f7a80b4c9..f66d90b0ef 100644
--- a/utils/helpview/src/bitmaps/helpback.xpm
+++ b/utils/helpview/src/bitmaps/helpback.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * helpback_xpm[] = {
+static const char * helpback_xpm[] = {
 "16 15 3 1",
 " 	c None",
 ".	c Black",
diff --git a/utils/helpview/src/bitmaps/helpbook.xpm b/utils/helpview/src/bitmaps/helpbook.xpm
index d410934c41..b48ef2b77b 100644
--- a/utils/helpview/src/bitmaps/helpbook.xpm
+++ b/utils/helpview/src/bitmaps/helpbook.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * helpbook_xpm[] = {
+static const char * helpbook_xpm[] = {
 "16 16 6 1",
 " 	c None",
 ".	c Black",
diff --git a/utils/helpview/src/bitmaps/helpdown.xpm b/utils/helpview/src/bitmaps/helpdown.xpm
index 8cdd875908..68d53b9a22 100644
--- a/utils/helpview/src/bitmaps/helpdown.xpm
+++ b/utils/helpview/src/bitmaps/helpdown.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * helpdown_xpm[] = {
+static const char * helpdown_xpm[] = {
 "16 15 3 1",
 " 	c None",
 ".	c Black",
diff --git a/utils/helpview/src/bitmaps/helpforward.xpm b/utils/helpview/src/bitmaps/helpforward.xpm
index 4004569562..e02c5d4b1c 100644
--- a/utils/helpview/src/bitmaps/helpforward.xpm
+++ b/utils/helpview/src/bitmaps/helpforward.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * helpforward_xpm[] = {
+static const char * helpforward_xpm[] = {
 "16 15 3 1",
 " 	c None",
 ".	c Black",
diff --git a/utils/helpview/src/bitmaps/helpicon.xpm b/utils/helpview/src/bitmaps/helpicon.xpm
index 0e116f2fba..6b3b90d248 100644
--- a/utils/helpview/src/bitmaps/helpicon.xpm
+++ b/utils/helpview/src/bitmaps/helpicon.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * helpicon_xpm[] = {
+static const char * helpicon_xpm[] = {
 "32 32 6 1",
 " 	c None",
 ".	c #808080",
diff --git a/utils/helpview/src/bitmaps/helpopen.xpm b/utils/helpview/src/bitmaps/helpopen.xpm
index 70572e95ab..3b933ec5a9 100644
--- a/utils/helpview/src/bitmaps/helpopen.xpm
+++ b/utils/helpview/src/bitmaps/helpopen.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *helpopen_xpm[] = {
+static const char * helpopen_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 15 36 1",
 ", c #AAC1E8",
diff --git a/utils/helpview/src/bitmaps/helpoptions.xpm b/utils/helpview/src/bitmaps/helpoptions.xpm
index df7f054d3e..1e30a31a0f 100644
--- a/utils/helpview/src/bitmaps/helpoptions.xpm
+++ b/utils/helpview/src/bitmaps/helpoptions.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * helpoptions_xpm[] = {
+static const char * helpoptions_xpm[] = {
 "16 16 2 1",
 " 	c None",
 ".	c #000000",
diff --git a/utils/helpview/src/bitmaps/helppage.xpm b/utils/helpview/src/bitmaps/helppage.xpm
index eec32d1b35..018db1650f 100644
--- a/utils/helpview/src/bitmaps/helppage.xpm
+++ b/utils/helpview/src/bitmaps/helppage.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * helppage_xpm[] = {
+static const char * helppage_xpm[] = {
 "16 16 4 1",
 " 	c None",
 ".	c #808080",
diff --git a/utils/helpview/src/bitmaps/helpsidepanel.xpm b/utils/helpview/src/bitmaps/helpsidepanel.xpm
index ffac7c4228..ca76bc3d77 100644
--- a/utils/helpview/src/bitmaps/helpsidepanel.xpm
+++ b/utils/helpview/src/bitmaps/helpsidepanel.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * helpsidepanel_xpm[] = {
+static const char * helpsidepanel_xpm[] = {
 "16 15 17 1",
 " 	c None",
 ".	c #000000",
diff --git a/utils/helpview/src/bitmaps/helpup.xpm b/utils/helpview/src/bitmaps/helpup.xpm
index 5170b50fcb..022719a506 100644
--- a/utils/helpview/src/bitmaps/helpup.xpm
+++ b/utils/helpview/src/bitmaps/helpup.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * helpup_xpm[] = {
+static const char * helpup_xpm[] = {
 "16 15 3 1",
 " 	c None",
 ".	c Black",
diff --git a/utils/helpview/src/bitmaps/helpuplevel.xpm b/utils/helpview/src/bitmaps/helpuplevel.xpm
index 5334a6d6cd..cb02ca8b36 100644
--- a/utils/helpview/src/bitmaps/helpuplevel.xpm
+++ b/utils/helpview/src/bitmaps/helpuplevel.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * helpuplevel_xpm[] = {
+static const char * helpuplevel_xpm[] = {
 "16 15 3 1",
 " 	c None",
 ".	c Black",
diff --git a/utils/tex2rtf/src/tex2rtf.xpm b/utils/tex2rtf/src/tex2rtf.xpm
index 20e566f048..e22157489a 100644
--- a/utils/tex2rtf/src/tex2rtf.xpm
+++ b/utils/tex2rtf/src/tex2rtf.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *tex2rtf_xpm[] = {
+static const char * tex2rtf_xpm[] = {
 /* width height num_colors chars_per_pixel */
 "    32    32        3            1",
 /* colors */
diff --git a/utils/wxOLE/samples/servlet/mondrian.xpm b/utils/wxOLE/samples/servlet/mondrian.xpm
index 409f27a843..b5939bb815 100644
--- a/utils/wxOLE/samples/servlet/mondrian.xpm
+++ b/utils/wxOLE/samples/servlet/mondrian.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char *mondrian_xpm[] = {
+static const char * mondrian_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "32 32 6 1",
 "  c Black",