diff --git a/3d-viewer/bitmaps3d/axis3d.xpm b/3d-viewer/bitmaps3d/axis3d.xpm
index 21211e9f69..135097b061 100644
--- a/3d-viewer/bitmaps3d/axis3d.xpm
+++ b/3d-viewer/bitmaps3d/axis3d.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPM_3D_MAIN
-extern char * axis3d_xpm[];
+extern const char * axis3d_xpm[];
 
 #else
-char * axis3d_xpm[] = {
+const char * axis3d_xpm[] = {
 "16 15 3 1",
 "   c None",
 ".	c Blue",
diff --git a/3d-viewer/bitmaps3d/axis3d_back.xpm b/3d-viewer/bitmaps3d/axis3d_back.xpm
index 686feb3d08..35cf561b1e 100644
--- a/3d-viewer/bitmaps3d/axis3d_back.xpm
+++ b/3d-viewer/bitmaps3d/axis3d_back.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPM_3D_MAIN
-extern char * axis3d_back_xpm[];
+extern const char * axis3d_back_xpm[];
 
 #else
-char * axis3d_back_xpm[] = {
+const char * axis3d_back_xpm[] = {
 "16 15 3 1",
 "   c None",
 ".	c Blue",
diff --git a/3d-viewer/bitmaps3d/axis3d_bottom.xpm b/3d-viewer/bitmaps3d/axis3d_bottom.xpm
index ed28eee9e5..6753543ba7 100644
--- a/3d-viewer/bitmaps3d/axis3d_bottom.xpm
+++ b/3d-viewer/bitmaps3d/axis3d_bottom.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPM_3D_MAIN
-extern char * axis3d_bottom_xpm[];
+extern const char * axis3d_bottom_xpm[];
 
 #else
-char * axis3d_bottom_xpm[] = {
+const char * axis3d_bottom_xpm[] = {
 "16 15 3 1",
 "   c None",
 ".	c Blue",
diff --git a/3d-viewer/bitmaps3d/axis3d_front.xpm b/3d-viewer/bitmaps3d/axis3d_front.xpm
index e68084daf8..cdd23ea3cb 100644
--- a/3d-viewer/bitmaps3d/axis3d_front.xpm
+++ b/3d-viewer/bitmaps3d/axis3d_front.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPM_3D_MAIN
-extern char * axis3d_front_xpm[];
+extern const char * axis3d_front_xpm[];
 
 #else
-char * axis3d_front_xpm[] = {
+const char * axis3d_front_xpm[] = {
 "16 15 3 1",
 "   c None",
 ".	c Blue",
diff --git a/3d-viewer/bitmaps3d/axis3d_left.xpm b/3d-viewer/bitmaps3d/axis3d_left.xpm
index c776ca1fb5..093ff8b6e0 100644
--- a/3d-viewer/bitmaps3d/axis3d_left.xpm
+++ b/3d-viewer/bitmaps3d/axis3d_left.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPM_3D_MAIN
-extern char * axis3d_left_xpm[];
+extern const char * axis3d_left_xpm[];
 
 #else
-char * axis3d_left_xpm[] = {
+const char * axis3d_left_xpm[] = {
 "16 15 3 1",
 "   c None",
 ".	c Blue",
diff --git a/3d-viewer/bitmaps3d/axis3d_right.xpm b/3d-viewer/bitmaps3d/axis3d_right.xpm
index 9c31ef8f9c..641431c5cf 100644
--- a/3d-viewer/bitmaps3d/axis3d_right.xpm
+++ b/3d-viewer/bitmaps3d/axis3d_right.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPM_3D_MAIN
-extern char * axis3d_right_xpm[];
+extern const char * axis3d_right_xpm[];
 
 #else
-char * axis3d_right_xpm[] = {
+const char * axis3d_right_xpm[] = {
 "16 15 3 1",
 "   c None",
 ".	c Blue",
diff --git a/3d-viewer/bitmaps3d/axis3d_top.xpm b/3d-viewer/bitmaps3d/axis3d_top.xpm
index c824afa2a4..4a56b6464e 100644
--- a/3d-viewer/bitmaps3d/axis3d_top.xpm
+++ b/3d-viewer/bitmaps3d/axis3d_top.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPM_3D_MAIN
-extern char * axis3d_top_xpm[];
+extern const char * axis3d_top_xpm[];
 
 #else
-char * axis3d_top_xpm[] = {
+const char * axis3d_top_xpm[] = {
 "16 15 3 1",
 "   c None",
 ".	c Blue",
diff --git a/3d-viewer/bitmaps3d/import3d.xpm b/3d-viewer/bitmaps3d/import3d.xpm
index 1e7dd0b984..2b92d5f9b1 100644
--- a/3d-viewer/bitmaps3d/import3d.xpm
+++ b/3d-viewer/bitmaps3d/import3d.xpm
@@ -1,10 +1,10 @@
 /* XPM */
 #ifndef XPM_3D_MAIN
-extern char *import3d_xpm[];
+extern const char *import3d_xpm[];
 
 #else
-char *import3d_xpm[] = {
-/* columns rows colors chars-per-pixel */
+const char *import3d_xpm[] = {
+/* columns rows colors const chars-per-pixel */
 "16 15 3 1",
 "- c Black",
 "X c None",
diff --git a/3d-viewer/bitmaps3d/rotate+x.xpm b/3d-viewer/bitmaps3d/rotate+x.xpm
index 00c14a0801..382026229c 100644
--- a/3d-viewer/bitmaps3d/rotate+x.xpm
+++ b/3d-viewer/bitmaps3d/rotate+x.xpm
@@ -1,10 +1,10 @@
 /* XPM */
 #ifndef XPM_3D_MAIN
-extern char *rotate_pos_X_xpm[];
+extern const char *rotate_pos_X_xpm[];
 
 #else
-char *rotate_pos_X_xpm[] = {
-/* width height num_colors chars_per_pixel */
+const char *rotate_pos_X_xpm[] = {
+/* width height num_colors const chars_per_pixel */
 "    16    15        4            1",
 /* colors */
 ". c #000080",
diff --git a/3d-viewer/bitmaps3d/rotate+y.xpm b/3d-viewer/bitmaps3d/rotate+y.xpm
index 3c29b0e929..1fda769bf4 100644
--- a/3d-viewer/bitmaps3d/rotate+y.xpm
+++ b/3d-viewer/bitmaps3d/rotate+y.xpm
@@ -1,10 +1,10 @@
 /* XPM */
 #ifndef XPM_3D_MAIN
-extern char *rotate_pos_Y_xpm[];
+extern const char *rotate_pos_Y_xpm[];
 
 #else
-char *rotate_pos_Y_xpm[] = {
-/* width height num_colors chars_per_pixel */
+const char *rotate_pos_Y_xpm[] = {
+/* width height num_colors const chars_per_pixel */
 "    16    15        4            1",
 /* colors */
 ". c #000080",
diff --git a/3d-viewer/bitmaps3d/rotate+z.xpm b/3d-viewer/bitmaps3d/rotate+z.xpm
index 47f93b0e63..bb315c59b4 100644
--- a/3d-viewer/bitmaps3d/rotate+z.xpm
+++ b/3d-viewer/bitmaps3d/rotate+z.xpm
@@ -1,10 +1,10 @@
 /* XPM */
 #ifndef XPM_3D_MAIN
-extern char *rotate_pos_Z_xpm[];
+extern const char *rotate_pos_Z_xpm[];
 
 #else
-char *rotate_pos_Z_xpm[] = {
-/* width height num_colors chars_per_pixel */
+const char *rotate_pos_Z_xpm[] = {
+/* width height num_colors const chars_per_pixel */
 "    16    15        4            1",
 /* colors */
 ". c #000080",
diff --git a/3d-viewer/bitmaps3d/rotate-x.xpm b/3d-viewer/bitmaps3d/rotate-x.xpm
index c56951ed0e..373048e32c 100644
--- a/3d-viewer/bitmaps3d/rotate-x.xpm
+++ b/3d-viewer/bitmaps3d/rotate-x.xpm
@@ -1,10 +1,10 @@
 /* XPM */
 #ifndef XPM_3D_MAIN
-extern char *rotate_neg_X_xpm[];
+extern const char *rotate_neg_X_xpm[];
 
 #else
-char *rotate_neg_X_xpm[] = {
-/* width height num_colors chars_per_pixel */
+const char *rotate_neg_X_xpm[] = {
+/* width height num_colors const chars_per_pixel */
 "    16    15        4            1",
 /* colors */
 ". c #000080",
diff --git a/3d-viewer/bitmaps3d/rotate-y.xpm b/3d-viewer/bitmaps3d/rotate-y.xpm
index 4390188a9f..6ed13d1607 100644
--- a/3d-viewer/bitmaps3d/rotate-y.xpm
+++ b/3d-viewer/bitmaps3d/rotate-y.xpm
@@ -1,10 +1,10 @@
 /* XPM */
 #ifndef XPM_3D_MAIN
-extern char *rotate_neg_Y_xpm[];
+extern const char *rotate_neg_Y_xpm[];
 
 #else
-char *rotate_neg_Y_xpm[] = {
-/* width height num_colors chars_per_pixel */
+const char *rotate_neg_Y_xpm[] = {
+/* width height num_colors const chars_per_pixel */
 "    16    15        4            1",
 /* colors */
 ". c #000080",
diff --git a/3d-viewer/bitmaps3d/rotate-z.xpm b/3d-viewer/bitmaps3d/rotate-z.xpm
index e2aedea8ab..4ecb70494f 100644
--- a/3d-viewer/bitmaps3d/rotate-z.xpm
+++ b/3d-viewer/bitmaps3d/rotate-z.xpm
@@ -1,10 +1,10 @@
 /* XPM */
 #ifndef XPM_3D_MAIN
-extern char *rotate_neg_Z_xpm[];
+extern const char *rotate_neg_Z_xpm[];
 
 #else
-char *rotate_neg_Z_xpm[] = {
-/* width height num_colors chars_per_pixel */
+const char *rotate_neg_Z_xpm[] = {
+/* width height num_colors const chars_per_pixel */
 "    16    15        4            1",
 /* colors */
 ". c #000080",
diff --git a/3d-viewer/bitmaps3d/zoomoins3d.xpm b/3d-viewer/bitmaps3d/zoomoins3d.xpm
index 66b0da5264..b3638a6e64 100644
--- a/3d-viewer/bitmaps3d/zoomoins3d.xpm
+++ b/3d-viewer/bitmaps3d/zoomoins3d.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char * zoomoins3d_xpm[];
+extern const char * zoomoins3d_xpm[];
 
 #else
-char * zoomoins3d_xpm[] = {
+const char * zoomoins3d_xpm[] = {
 "16 16 3 1",
 "   c None",
 ".	c Black",
diff --git a/3d-viewer/bitmaps3d/zoompage3d.xpm b/3d-viewer/bitmaps3d/zoompage3d.xpm
index bcabc1f8ff..aa4632fdd9 100644
--- a/3d-viewer/bitmaps3d/zoompage3d.xpm
+++ b/3d-viewer/bitmaps3d/zoompage3d.xpm
@@ -1,10 +1,10 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char * zoompage3d_xpm[];
+extern const char * zoompage3d_xpm[];
 
 #else
-char *zoompage3d_xpm[] = {
-/* columns rows colors chars-per-pixel */
+const char *zoompage3d_xpm[] = {
+/* columns rows colors const chars-per-pixel */
 "16 15 5 1",
 "  c Black",
 ". c None",
diff --git a/3d-viewer/bitmaps3d/zoomplus3d.xpm b/3d-viewer/bitmaps3d/zoomplus3d.xpm
index 6b69681073..b7ca0d77dd 100644
--- a/3d-viewer/bitmaps3d/zoomplus3d.xpm
+++ b/3d-viewer/bitmaps3d/zoomplus3d.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char * zoomplus3d_xpm[];
+extern const char * zoomplus3d_xpm[];
 
 #else
-char * zoomplus3d_xpm[] = {
+const char * zoomplus3d_xpm[] = {
 "16 16 3 1",
 "   c None",
 ".	c Black",
diff --git a/3d-viewer/bitmaps3d/zoomrefr3d.xpm b/3d-viewer/bitmaps3d/zoomrefr3d.xpm
index a38d62d9f8..c51ebfe64f 100644
--- a/3d-viewer/bitmaps3d/zoomrefr3d.xpm
+++ b/3d-viewer/bitmaps3d/zoomrefr3d.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char * zoomrefr3d_xpm[];
+extern const char * zoomrefr3d_xpm[];
 
 #else
-char * zoomrefr3d_xpm[] = {
+const char * zoomrefr3d_xpm[] = {
 "16 16 3 1",
 "   c None",
 ".	c #0000A0",
diff --git a/bitmaps/3d.xpm b/bitmaps/3d.xpm
index 15b99565a5..c7792fb628 100644
--- a/bitmaps/3d.xpm
+++ b/bitmaps/3d.xpm
@@ -1,10 +1,10 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *show_3d_xpm[];
+extern const char *show_3d_xpm[];
 
 #else
-char *show_3d_xpm[] = {
-/* columns rows colors chars-per-pixel */
+const char *show_3d_xpm[] = {
+/* columns rows colors const chars-per-pixel */
 "16 15 3 1",
 "J c #FF0000",
 "x c #0000FF",
diff --git a/bitmaps/Add_Arc.xpm b/bitmaps/Add_Arc.xpm
index 80fdcfc2cc..25fed4c8e8 100644
--- a/bitmaps/Add_Arc.xpm
+++ b/bitmaps/Add_Arc.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *add_arc_xpm[];
+extern const char *add_arc_xpm[];
 
 #else
-char * add_arc_xpm[] = {
+const char * add_arc_xpm[] = {
 "16 16 48 1",
 " 	c None",
 ".	c #222224",
diff --git a/bitmaps/Add_Circle.xpm b/bitmaps/Add_Circle.xpm
index b0cd523890..4f508bc970 100644
--- a/bitmaps/Add_Circle.xpm
+++ b/bitmaps/Add_Circle.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *add_circle_xpm[];
+extern const char *add_circle_xpm[];
 
 #else
-char * add_circle_xpm[] = {
+const char * add_circle_xpm[] = {
 "16 16 36 1",
 " 	c None",
 ".	c #00009B",
diff --git a/bitmaps/Add_Component.xpm b/bitmaps/Add_Component.xpm
index 786f54131b..01bf0b01dd 100644
--- a/bitmaps/Add_Component.xpm
+++ b/bitmaps/Add_Component.xpm
@@ -1,9 +1,9 @@
 /* XPM */ 
 #ifndef XPMMAIN
-extern char *add_component_xpm[];
+extern const char *add_component_xpm[];
 
 #else
-char * add_component_xpm[] = {
+const char * add_component_xpm[] = {
 "16 16 67 1",
 " 	c None",
 "!	c black",
diff --git a/bitmaps/Add_Dashed_Line.xpm b/bitmaps/Add_Dashed_Line.xpm
index 443873397e..603fe6f668 100644
--- a/bitmaps/Add_Dashed_Line.xpm
+++ b/bitmaps/Add_Dashed_Line.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *add_dashed_line_xpm[];
+extern const char *add_dashed_line_xpm[];
 
 #else
-char * add_dashed_line_xpm[] = {
+const char * add_dashed_line_xpm[] = {
 "16 16 15 1",
 " 	c None",
 ".	c #03039B",
diff --git a/bitmaps/Add_Entry.xpm b/bitmaps/Add_Entry.xpm
index bb838bd89e..92547a3b83 100644
--- a/bitmaps/Add_Entry.xpm
+++ b/bitmaps/Add_Entry.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *add_entry_xpm[];
+extern const char *add_entry_xpm[];
 
 #else
-char * add_entry_xpm[] = {
+const char * add_entry_xpm[] = {
 "16 16 10 1",
 " 	c None",
 ".	c #006800",
diff --git a/bitmaps/Add_GLabel.xpm b/bitmaps/Add_GLabel.xpm
index 2108cbc81c..40f53896d0 100644
--- a/bitmaps/Add_GLabel.xpm
+++ b/bitmaps/Add_GLabel.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *add_glabel_xpm[];
+extern const char *add_glabel_xpm[];
 
 #else
-char * add_glabel_xpm[] = {
+const char * add_glabel_xpm[] = {
 "16 16 54 1",
 " 	c None",
 ".	c #695F00",
diff --git a/bitmaps/Add_Junction.xpm b/bitmaps/Add_Junction.xpm
index ddfa7b7b5d..818da15017 100644
--- a/bitmaps/Add_Junction.xpm
+++ b/bitmaps/Add_Junction.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *add_junction_xpm[];
+extern const char *add_junction_xpm[];
 
 #else
-char * add_junction_xpm[] = {
+const char * add_junction_xpm[] = {
 "16 16 60 1",
 " 	c None",
 ".	c #007D00",
diff --git a/bitmaps/Add_Line.xpm b/bitmaps/Add_Line.xpm
index 78af9b9d07..0090806970 100644
--- a/bitmaps/Add_Line.xpm
+++ b/bitmaps/Add_Line.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *add_line_xpm[];
+extern const char *add_line_xpm[];
 
 #else
-char * add_line_xpm[] = {
+const char * add_line_xpm[] = {
 "16 16 3 1",
 " 	c None",
 ".	c #006900",
diff --git a/bitmaps/Add_Line_Label.xpm b/bitmaps/Add_Line_Label.xpm
index 87e6a4e1a5..037e985be3 100644
--- a/bitmaps/Add_Line_Label.xpm
+++ b/bitmaps/Add_Line_Label.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *add_line_label_xpm[];
+extern const char *add_line_label_xpm[];
 
 #else
-char * add_line_label_xpm[] = {
+const char * add_line_label_xpm[] = {
 "16 16 24 1",
 " 	c None",
 ".	c #000000",
diff --git a/bitmaps/Add_Polygon.xpm b/bitmaps/Add_Polygon.xpm
index 0e8203fd35..799d936acc 100644
--- a/bitmaps/Add_Polygon.xpm
+++ b/bitmaps/Add_Polygon.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *add_polygon_xpm[];
+extern const char *add_polygon_xpm[];
 
 #else
-char * add_polygon_xpm[] = {
+const char * add_polygon_xpm[] = {
 "16 16 54 1",
 " 	c None",
 ".	c #161616",
diff --git a/bitmaps/Add_Rectangle.xpm b/bitmaps/Add_Rectangle.xpm
index f509f77a0a..4ad115b8a6 100644
--- a/bitmaps/Add_Rectangle.xpm
+++ b/bitmaps/Add_Rectangle.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *add_rectangle_xpm[];
+extern const char *add_rectangle_xpm[];
 
 #else
-char * add_rectangle_xpm[] = {
+const char * add_rectangle_xpm[] = {
 "16 16 24 1",
 " 	c None",
 ".	c #161616",
diff --git a/bitmaps/Add_Text.xpm b/bitmaps/Add_Text.xpm
index 327a9e15cc..e12c5f5740 100644
--- a/bitmaps/Add_Text.xpm
+++ b/bitmaps/Add_Text.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *add_text_xpm[];
+extern const char *add_text_xpm[];
 
 #else
-char * add_text_xpm[] = {
+const char * add_text_xpm[] = {
 "16 16 4 1",
 " 	c None",
 ".	c #00009B",
diff --git a/bitmaps/Apply.xpm b/bitmaps/Apply.xpm
index 5cdd84ff92..6eb61acbac 100644
--- a/bitmaps/Apply.xpm
+++ b/bitmaps/Apply.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *apply_xpm[];
+extern const char *apply_xpm[];
 
 #else
-char * apply_xpm[] = {
+const char * apply_xpm[] = {
 "16 16 16 1",
 " 	c None",
 ".	c #000000",
diff --git a/bitmaps/Cancel.xpm b/bitmaps/Cancel.xpm
index e9e8b67922..9a49707d77 100644
--- a/bitmaps/Cancel.xpm
+++ b/bitmaps/Cancel.xpm
@@ -1,9 +1,9 @@
 /* XPM */ 
 #ifndef XPMMAIN
-extern char *cancel_xpm[];
+extern const char *cancel_xpm[];
 
 #else
-char * cancel_xpm[] = {
+const char * cancel_xpm[] = {
 "16 16 103 2",
 "  	c None",
 "! 	c black",
diff --git a/bitmaps/CopyBlock.xpm b/bitmaps/CopyBlock.xpm
index bcf667d7fa..a2fa230ace 100644
--- a/bitmaps/CopyBlock.xpm
+++ b/bitmaps/CopyBlock.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *copyblock_xpm[];
+extern const char *copyblock_xpm[];
 
 #else
-char * copyblock_xpm[] = {
+const char * copyblock_xpm[] = {
 "16 16 18 1",
 " 	c None",
 ".	c #000000",
diff --git a/bitmaps/Cursor_Shape.xpm b/bitmaps/Cursor_Shape.xpm
index 90a35fcbdd..8a9977b777 100644
--- a/bitmaps/Cursor_Shape.xpm
+++ b/bitmaps/Cursor_Shape.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *cursor_shape_xpm[];
+extern const char *cursor_shape_xpm[];
 
 #else
-char * cursor_shape_xpm[] = {
+const char * cursor_shape_xpm[] = {
 "16 16 53 1",
 " 	c None",
 ".	c #373737",
diff --git a/bitmaps/Datasheet.xpm b/bitmaps/Datasheet.xpm
index 0ed7b8bc0e..9f6da724c4 100644
--- a/bitmaps/Datasheet.xpm
+++ b/bitmaps/Datasheet.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *datasheet_xpm[];
+extern const char *datasheet_xpm[];
 
 #else
-char * datasheet_xpm[] = {
+const char * datasheet_xpm[] = {
 "16 16 22 1",
 " 	c None",
 ".	c #000000",
diff --git a/bitmaps/Delete_Arc.xpm b/bitmaps/Delete_Arc.xpm
index 4cd6284f50..18eb72c62c 100644
--- a/bitmaps/Delete_Arc.xpm
+++ b/bitmaps/Delete_Arc.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *delete_arc_xpm[];
+extern const char *delete_arc_xpm[];
 
 #else
-char * delete_arc_xpm[] = {
+const char * delete_arc_xpm[] = {
 "16 16 138 2",
 "  	c None",
 ". 	c #00009B",
diff --git a/bitmaps/Delete_Circle.xpm b/bitmaps/Delete_Circle.xpm
index fc8098c454..03c8146056 100644
--- a/bitmaps/Delete_Circle.xpm
+++ b/bitmaps/Delete_Circle.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *delete_circle_xpm[];
+extern const char *delete_circle_xpm[];
 
 #else
-char * delete_circle_xpm[] = {
+const char * delete_circle_xpm[] = {
 "16 16 126 2",
 "  	c None",
 ". 	c #00009B",
diff --git a/bitmaps/Delete_Cotation.xpm b/bitmaps/Delete_Cotation.xpm
index c8f618dc35..06e8095099 100644
--- a/bitmaps/Delete_Cotation.xpm
+++ b/bitmaps/Delete_Cotation.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *delete_cotation_xpm[];
+extern const char *delete_cotation_xpm[];
 
 #else
-char * delete_cotation_xpm[] = {
+const char * delete_cotation_xpm[] = {
 "16 16 110 2",
 "  	c None",
 ". 	c #000000",
diff --git a/bitmaps/Delete_Field.xpm b/bitmaps/Delete_Field.xpm
index ff82e1c57d..09e5b4b4a7 100644
--- a/bitmaps/Delete_Field.xpm
+++ b/bitmaps/Delete_Field.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *delete_field_xpm[];
+extern const char *delete_field_xpm[];
 
 #else
-char * delete_field_xpm[] = {
+const char * delete_field_xpm[] = {
 "16 16 124 2",
 "  	c None",
 ". 	c #D2D2D2",
diff --git a/bitmaps/Delete_Line.xpm b/bitmaps/Delete_Line.xpm
index 1c7051d68a..599b3fb575 100644
--- a/bitmaps/Delete_Line.xpm
+++ b/bitmaps/Delete_Line.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *delete_line_xpm[];
+extern const char *delete_line_xpm[];
 
 #else
-char * delete_line_xpm[] = {
+const char * delete_line_xpm[] = {
 "16 16 131 2",
 "  	c None",
 ". 	c #007D00",
diff --git a/bitmaps/Delete_Polygon.xpm b/bitmaps/Delete_Polygon.xpm
index 919475bdd0..a3878eecb0 100644
--- a/bitmaps/Delete_Polygon.xpm
+++ b/bitmaps/Delete_Polygon.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *Delete_Polygon_xpm[];
+extern const char *Delete_Polygon_xpm[];
 
 #else
-char * Delete_Polygon_xpm[] = {
+const char * Delete_Polygon_xpm[] = {
 "16 16 120 2",
 "  	c None",
 ". 	c #00009B",
diff --git a/bitmaps/Delete_Rectangle.xpm b/bitmaps/Delete_Rectangle.xpm
index 23fab8137c..3118690aef 100644
--- a/bitmaps/Delete_Rectangle.xpm
+++ b/bitmaps/Delete_Rectangle.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *delete_rectangle_xpm[];
+extern const char *delete_rectangle_xpm[];
 
 #else
-char * delete_rectangle_xpm[] = {
+const char * delete_rectangle_xpm[] = {
 "16 16 114 2",
 "  	c None",
 ". 	c #00009B",
diff --git a/bitmaps/Delete_Segment.xpm b/bitmaps/Delete_Segment.xpm
index caf811ccc8..092064a88b 100644
--- a/bitmaps/Delete_Segment.xpm
+++ b/bitmaps/Delete_Segment.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *delete_segment_xpm[];
+extern const char *delete_segment_xpm[];
 
 #else
-char * delete_segment_xpm[] = {
+const char * delete_segment_xpm[] = {
 "16 16 111 2",
 "  	c None",
 ". 	c #007D00",
diff --git a/bitmaps/Delete_Text.xpm b/bitmaps/Delete_Text.xpm
index b36cab09a8..91498ca0ca 100644
--- a/bitmaps/Delete_Text.xpm
+++ b/bitmaps/Delete_Text.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *delete_text_xpm[];
+extern const char *delete_text_xpm[];
 
 #else
-char * delete_text_xpm[] = {
+const char * delete_text_xpm[] = {
 "16 16 114 2",
 "  	c None",
 ". 	c #00009B",
diff --git a/bitmaps/Display_Options.xpm b/bitmaps/Display_Options.xpm
index d7d8026cc9..23b643b0ad 100644
--- a/bitmaps/Display_Options.xpm
+++ b/bitmaps/Display_Options.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *display_options_xpm[];
+extern const char *display_options_xpm[];
 
 #else
-char * display_options_xpm[] = {
+const char * display_options_xpm[] = {
 "16 16 90 1",
 " 	c None",
 ".	c #000000",
diff --git a/bitmaps/Edit.xpm b/bitmaps/Edit.xpm
index 32740bee5f..3568860825 100644
--- a/bitmaps/Edit.xpm
+++ b/bitmaps/Edit.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *edit_xpm[];
+extern const char *edit_xpm[];
 
 #else
-char * edit_xpm[] = {
+const char * edit_xpm[] = {
 "16 16 28 1",
 " 	c None",
 ".	c #000000",
diff --git a/bitmaps/Edit_Text.xpm b/bitmaps/Edit_Text.xpm
index 08430ddc31..bed8d9fbe5 100644
--- a/bitmaps/Edit_Text.xpm
+++ b/bitmaps/Edit_Text.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *edit_text_xpm[];
+extern const char *edit_text_xpm[];
 
 #else
-char * edit_text_xpm[] = {
+const char * edit_text_xpm[] = {
 "16 16 8 1",
 " 	c None",
 ".	c #1D2E40",
diff --git a/bitmaps/Editor.xpm b/bitmaps/Editor.xpm
index 404e10606d..89cc6b511d 100644
--- a/bitmaps/Editor.xpm
+++ b/bitmaps/Editor.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *editor_xpm[];
+extern const char *editor_xpm[];
 
 #else
-char * editor_xpm[] = {
+const char * editor_xpm[] = {
 "16 16 60 1",
 " 	c None",
 ".	c #000000",
diff --git a/bitmaps/Exit.xpm b/bitmaps/Exit.xpm
index 7168d93bd6..819dad4870 100644
--- a/bitmaps/Exit.xpm
+++ b/bitmaps/Exit.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *exit_xpm[];
+extern const char *exit_xpm[];
 
 #else
-char * exit_xpm[] = {
+const char * exit_xpm[] = {
 "16 16 63 1",
 " 	c None",
 ".	c #000000",
diff --git a/bitmaps/File_FootPrint.xpm b/bitmaps/File_FootPrint.xpm
index 0615c1f08c..c421a9947d 100644
--- a/bitmaps/File_FootPrint.xpm
+++ b/bitmaps/File_FootPrint.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *file_footprint_xpm[];
+extern const char *file_footprint_xpm[];
 
 #else
-char * file_footprint_xpm[] = {
+const char * file_footprint_xpm[] = {
 "16 16 38 1",
 " 	c None",
 ".	c #000000",
diff --git a/bitmaps/Footprint_Text.xpm b/bitmaps/Footprint_Text.xpm
index 43668f7bf3..762026dd7e 100644
--- a/bitmaps/Footprint_Text.xpm
+++ b/bitmaps/Footprint_Text.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *footprint_text_xpm[];
+extern const char *footprint_text_xpm[];
 
 #else
-char * footprint_text_xpm[] = {
+const char * footprint_text_xpm[] = {
 "16 16 4 1",
 " 	c None",
 ".	c #009B9B",
diff --git a/bitmaps/Info.xpm b/bitmaps/Info.xpm
index caf1d4ed1c..ebd86a30ce 100644
--- a/bitmaps/Info.xpm
+++ b/bitmaps/Info.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *info_xpm[];
+extern const char *info_xpm[];
 
 #else
-char * info_xpm[] = {
+const char * info_xpm[] = {
 "16 16 63 1",
 " 	c None",
 ".	c #000000",
diff --git a/bitmaps/Mirror_H.xpm b/bitmaps/Mirror_H.xpm
index ba809e7f22..1170243491 100644
--- a/bitmaps/Mirror_H.xpm
+++ b/bitmaps/Mirror_H.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *mirror_H_xpm[];
+extern const char *mirror_H_xpm[];
 
 #else
-char * mirror_H_xpm[] = {
+const char * mirror_H_xpm[] = {
 "16 16 29 1",
 " 	c None",
 ".	c #000000",
diff --git a/bitmaps/Mirror_V.xpm b/bitmaps/Mirror_V.xpm
index 380dec1a61..467532054a 100644
--- a/bitmaps/Mirror_V.xpm
+++ b/bitmaps/Mirror_V.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *mirror_V_xpm[];
+extern const char *mirror_V_xpm[];
 
 #else
-char * mirror_V_xpm[] = {
+const char * mirror_V_xpm[] = {
 "16 16 30 1",
 " 	c None",
 ".	c #000000",
diff --git a/bitmaps/Morgan1.xpm b/bitmaps/Morgan1.xpm
index 26d091ae90..e3be0b2031 100644
--- a/bitmaps/Morgan1.xpm
+++ b/bitmaps/Morgan1.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *morgan1_xpm[];
+extern const char *morgan1_xpm[];
 
 #else
-char * morgan1_xpm[] = {
+const char * morgan1_xpm[] = {
 "16 16 79 1",
 " 	c None",
 ".	c #6361D1",
diff --git a/bitmaps/Morgan2.xpm b/bitmaps/Morgan2.xpm
index 069b9e98c1..7aeb468d24 100644
--- a/bitmaps/Morgan2.xpm
+++ b/bitmaps/Morgan2.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *morgan2_xpm[];
+extern const char *morgan2_xpm[];
 
 #else
-char * morgan2_xpm[] = {
+const char * morgan2_xpm[] = {
 "16 16 77 1",
 " 	c None",
 ".	c #6361D1",
diff --git a/bitmaps/Move.xpm b/bitmaps/Move.xpm
index 93cc555995..7b27350510 100644
--- a/bitmaps/Move.xpm
+++ b/bitmaps/Move.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *move_xpm[];
+extern const char *move_xpm[];
 
 #else
-char * move_xpm[] = {
+const char * move_xpm[] = {
 "16 16 48 1",
 " 	c None",
 ".	c #000000",
diff --git a/bitmaps/Move_Arc.xpm b/bitmaps/Move_Arc.xpm
index e90e548fc3..78f2c5076e 100644
--- a/bitmaps/Move_Arc.xpm
+++ b/bitmaps/Move_Arc.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *move_arc_xpm[];
+extern const char *move_arc_xpm[];
 
 #else
-char * move_arc_xpm[] = {
+const char * move_arc_xpm[] = {
 "16 16 56 1",
 " 	c None",
 ".	c #00009B",
diff --git a/bitmaps/Move_Circle.xpm b/bitmaps/Move_Circle.xpm
index b48dab817a..5f8a16bf0a 100644
--- a/bitmaps/Move_Circle.xpm
+++ b/bitmaps/Move_Circle.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *move_circle_xpm[];
+extern const char *move_circle_xpm[];
 
 #else
-char * move_circle_xpm[] = {
+const char * move_circle_xpm[] = {
 "16 16 49 1",
 " 	c None",
 ".	c #00009B",
diff --git a/bitmaps/Move_Field.xpm b/bitmaps/Move_Field.xpm
index c51c7fd184..61fe0be63c 100644
--- a/bitmaps/Move_Field.xpm
+++ b/bitmaps/Move_Field.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *move_field_xpm[];
+extern const char *move_field_xpm[];
 
 #else
-char * move_field_xpm[] = {
+const char * move_field_xpm[] = {
 "16 16 62 1",
 " 	c None",
 ".	c #D2D2D2",
diff --git a/bitmaps/Move_Line.xpm b/bitmaps/Move_Line.xpm
index ab5a08ae72..b0da4b0700 100644
--- a/bitmaps/Move_Line.xpm
+++ b/bitmaps/Move_Line.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *move_line_xpm[];
+extern const char *move_line_xpm[];
 
 #else
-char * move_line_xpm[] = {
+const char * move_line_xpm[] = {
 "16 16 48 1",
 " 	c None",
 ".	c #00009B",
diff --git a/bitmaps/Move_Polygon.xpm b/bitmaps/Move_Polygon.xpm
index c9cb6a8693..24f3caa364 100644
--- a/bitmaps/Move_Polygon.xpm
+++ b/bitmaps/Move_Polygon.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *move_polygon_xpm[];
+extern const char *move_polygon_xpm[];
 
 #else
-char * move_polygon_xpm[] = {
+const char * move_polygon_xpm[] = {
 "16 16 46 1",
 " 	c None",
 ".	c #00009B",
diff --git a/bitmaps/Move_Rectangle.xpm b/bitmaps/Move_Rectangle.xpm
index 10d077d53d..72024fcdec 100644
--- a/bitmaps/Move_Rectangle.xpm
+++ b/bitmaps/Move_Rectangle.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *move_rectangle_xpm[];
+extern const char *move_rectangle_xpm[];
 
 #else
-char * move_rectangle_xpm[] = {
+const char * move_rectangle_xpm[] = {
 "16 16 40 1",
 " 	c None",
 ".	c #00009B",
diff --git a/bitmaps/Move_Text.xpm b/bitmaps/Move_Text.xpm
index 222c824444..f623362d8a 100644
--- a/bitmaps/Move_Text.xpm
+++ b/bitmaps/Move_Text.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *move_text_xpm[];
+extern const char *move_text_xpm[];
 
 #else
-char * move_text_xpm[] = {
+const char * move_text_xpm[] = {
 "16 16 46 1",
 " 	c None",
 ".	c #00009B",
diff --git a/bitmaps/New_Library.xpm b/bitmaps/New_Library.xpm
index a6190a10b0..792391bb67 100644
--- a/bitmaps/New_Library.xpm
+++ b/bitmaps/New_Library.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *new_library_xpm[];
+extern const char *new_library_xpm[];
 
 #else
-char * new_library_xpm[] = {
+const char * new_library_xpm[] = {
 "16 16 133 2",
 "  	c None",
 ". 	c #060708",
diff --git a/bitmaps/Open_Library.xpm b/bitmaps/Open_Library.xpm
index b690916b2d..88ad971141 100644
--- a/bitmaps/Open_Library.xpm
+++ b/bitmaps/Open_Library.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef  XPMMAIN
-extern char *open_library_xpm[];
+extern const char *open_library_xpm[];
 
 #else
-char * open_library_xpm[] = {
+const char * open_library_xpm[] = {
 "16 16 135 2",
 "  	c None",
 ". 	c #060708",
diff --git a/bitmaps/Options_Arc.xpm b/bitmaps/Options_Arc.xpm
index 276c06a381..8fd91190fe 100644
--- a/bitmaps/Options_Arc.xpm
+++ b/bitmaps/Options_Arc.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *options_arc_xpm[];
+extern const char *options_arc_xpm[];
 
 #else
-char * options_arc_xpm[] = {
+const char * options_arc_xpm[] = {
 "16 16 49 1",
 " 	c None",
 ".	c #00009B",
diff --git a/bitmaps/Options_Circle.xpm b/bitmaps/Options_Circle.xpm
index 96c9815ad1..c2cb00905f 100644
--- a/bitmaps/Options_Circle.xpm
+++ b/bitmaps/Options_Circle.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *options_circle_xpm[];
+extern const char *options_circle_xpm[];
 
 #else
-char * options_circle_xpm[] = {
+const char * options_circle_xpm[] = {
 "16 16 54 1",
 " 	c None",
 ".	c #00009B",
diff --git a/bitmaps/Options_New_Pad.xpm b/bitmaps/Options_New_Pad.xpm
index b80271fa01..b9feadfb90 100644
--- a/bitmaps/Options_New_Pad.xpm
+++ b/bitmaps/Options_New_Pad.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *options_new_pad_xpm[];
+extern const char *options_new_pad_xpm[];
 
 #else
-char * options_new_pad_xpm[] = {
+const char * options_new_pad_xpm[] = {
 "16 16 53 1",
 " 	c None",
 ".	c #000000",
diff --git a/bitmaps/Options_Pad.xpm b/bitmaps/Options_Pad.xpm
index 63e48d9ade..7592386513 100644
--- a/bitmaps/Options_Pad.xpm
+++ b/bitmaps/Options_Pad.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *options_pad_xpm[];
+extern const char *options_pad_xpm[];
 
 #else
-char * options_pad_xpm[] = {
+const char * options_pad_xpm[] = {
 "16 16 33 1",
 " 	c None",
 ".	c #000000",
diff --git a/bitmaps/Options_Rectangle.xpm b/bitmaps/Options_Rectangle.xpm
index 63b736107c..99ab0fc401 100644
--- a/bitmaps/Options_Rectangle.xpm
+++ b/bitmaps/Options_Rectangle.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *options_rectangle_xpm[];
+extern const char *options_rectangle_xpm[];
 
 #else
-char * options_rectangle_xpm[] = {
+const char * options_rectangle_xpm[] = {
 "16 16 44 1",
 " 	c None",
 ".	c #00009B",
diff --git a/bitmaps/Options_Segment.xpm b/bitmaps/Options_Segment.xpm
index ff5ec318a9..bbe9141261 100644
--- a/bitmaps/Options_Segment.xpm
+++ b/bitmaps/Options_Segment.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *options_segment_xpm[];
+extern const char *options_segment_xpm[];
 
 #else
-char * options_segment_xpm[] = {
+const char * options_segment_xpm[] = {
 "16 16 31 1",
 " 	c None",
 ".	c #007D00",
diff --git a/bitmaps/Options_Text.xpm b/bitmaps/Options_Text.xpm
index 4ed9f5df55..ada985f3a0 100644
--- a/bitmaps/Options_Text.xpm
+++ b/bitmaps/Options_Text.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *options_text_xpm[];
+extern const char *options_text_xpm[];
 
 #else
-char * options_text_xpm[] = {
+const char * options_text_xpm[] = {
 "16 16 40 1",
 " 	c None",
 ".	c #00009B",
diff --git a/bitmaps/Orient.xpm b/bitmaps/Orient.xpm
index ea9f6f418f..a19191d896 100644
--- a/bitmaps/Orient.xpm
+++ b/bitmaps/Orient.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *orient_xpm[];
+extern const char *orient_xpm[];
 
 #else
-char * orient_xpm[] = {
+const char * orient_xpm[] = {
 "16 16 114 2",
 "  	c None",
 ". 	c #000000",
diff --git a/bitmaps/Pad_Sketch.xpm b/bitmaps/Pad_Sketch.xpm
index d4cb630d24..4fc011f806 100644
--- a/bitmaps/Pad_Sketch.xpm
+++ b/bitmaps/Pad_Sketch.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *pad_sketch_xpm[];
+extern const char *pad_sketch_xpm[];
 
 #else
-char * pad_sketch_xpm[] = {
+const char * pad_sketch_xpm[] = {
 "16 16 3 1",
 " 	c None",
 ".	c #007D00",
diff --git a/bitmaps/Read_SetUp.xpm b/bitmaps/Read_SetUp.xpm
index 08d68a73cf..a135a56374 100644
--- a/bitmaps/Read_SetUp.xpm
+++ b/bitmaps/Read_SetUp.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *read_setup_xpm[];
+extern const char *read_setup_xpm[];
 
 #else
-char * read_setup_xpm[] = {
+const char * read_setup_xpm[] = {
 "16 16 85 1",
 " 	c None",
 ".	c #000000",
diff --git a/bitmaps/Reload.xpm b/bitmaps/Reload.xpm
index 9f9d7af613..b5ae82bd10 100644
--- a/bitmaps/Reload.xpm
+++ b/bitmaps/Reload.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char * reload_xpm[];
+extern const char * reload_xpm[];
 
 #else
-char * reload_xpm[] = {
+const char * reload_xpm[] = {
 "16 16 110 2",
 "  	c None",
 ". 	c #000000",
diff --git a/bitmaps/Repaint.xpm b/bitmaps/Repaint.xpm
index 78527b07d3..bcefa410cc 100644
--- a/bitmaps/Repaint.xpm
+++ b/bitmaps/Repaint.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char * repaint_xpm[];
+extern const char * repaint_xpm[];
 
 #else
-char * repaint_xpm[] = {
+const char * repaint_xpm[] = {
 "16 16 78 1",
 " 	c None",
 ".	c #000000",
diff --git a/bitmaps/Rotate+.xpm b/bitmaps/Rotate+.xpm
index 782dc497d8..ac50e9cd2f 100644
--- a/bitmaps/Rotate+.xpm
+++ b/bitmaps/Rotate+.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *rotate_pos_xpm[];
+extern const char *rotate_pos_xpm[];
 
 #else
-char * rotate_pos_xpm[] = {
+const char * rotate_pos_xpm[] = {
 "16 16 96 2",
 "  	c None",
 ". 	c #000000",
diff --git a/bitmaps/Rotate-.xpm b/bitmaps/Rotate-.xpm
index 56f8146dc0..025b50eb47 100644
--- a/bitmaps/Rotate-.xpm
+++ b/bitmaps/Rotate-.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *rotate_neg_xpm[];
+extern const char *rotate_neg_xpm[];
 
 #else
-char * rotate_neg_xpm[] = {
+const char * rotate_neg_xpm[] = {
 "16 16 93 2",
 "  	c None",
 ". 	c #202020",
diff --git a/bitmaps/Rotate_Field.xpm b/bitmaps/Rotate_Field.xpm
index 5c332d010c..07329fec1c 100644
--- a/bitmaps/Rotate_Field.xpm
+++ b/bitmaps/Rotate_Field.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *rotate_field_xpm[];
+extern const char *rotate_field_xpm[];
 
 #else
-char * rotate_field_xpm[] = {
+const char * rotate_field_xpm[] = {
 "16 16 76 1",
 " 	c None",
 ".	c #D2D2D2",
diff --git a/bitmaps/Save_CmpStuff.xpm b/bitmaps/Save_CmpStuff.xpm
index 6b448d85f7..062b1c81da 100644
--- a/bitmaps/Save_CmpStuff.xpm
+++ b/bitmaps/Save_CmpStuff.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *save_cmpstuff_xpm[];
+extern const char *save_cmpstuff_xpm[];
 
 #else
-char * save_cmpstuff_xpm[] = {
+const char * save_cmpstuff_xpm[] = {
 "16 16 99 2",
 "  	c None",
 ". 	c #160A00",
diff --git a/bitmaps/Save_Library.xpm b/bitmaps/Save_Library.xpm
index b26af95611..b1f8951aae 100644
--- a/bitmaps/Save_Library.xpm
+++ b/bitmaps/Save_Library.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *save_library_xpm[];
+extern const char *save_library_xpm[];
 
 #else
-char * save_library_xpm[] = {
+const char * save_library_xpm[] = {
 "16 16 99 2",
 "  	c None",
 ". 	c #070809",
diff --git a/bitmaps/Save_NetList.xpm b/bitmaps/Save_NetList.xpm
index d3de9ebfed..8c36cec5ee 100644
--- a/bitmaps/Save_NetList.xpm
+++ b/bitmaps/Save_NetList.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *save_netlist_xpm[];
+extern const char *save_netlist_xpm[];
 
 #else
-char * save_netlist_xpm[] = {
+const char * save_netlist_xpm[] = {
 "16 16 91 1",
 " 	c None",
 ".	c #000000",
diff --git a/bitmaps/Save_Project.xpm b/bitmaps/Save_Project.xpm
index b9a5b1d3c6..85442d086d 100644
--- a/bitmaps/Save_Project.xpm
+++ b/bitmaps/Save_Project.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *save_project_xpm[];
+extern const char *save_project_xpm[];
 
 #else
-char * save_project_xpm[] = {
+const char * save_project_xpm[] = {
 "16 16 63 1",
 " 	c None",
 ".	c #000000",
diff --git a/bitmaps/Save_SetUp.xpm b/bitmaps/Save_SetUp.xpm
index 1fe6afa43b..cdc4192390 100644
--- a/bitmaps/Save_SetUp.xpm
+++ b/bitmaps/Save_SetUp.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *save_setup_xpm[];
+extern const char *save_setup_xpm[];
 
 #else
-char * save_setup_xpm[] = {
+const char * save_setup_xpm[] = {
 "16 16 74 1",
 " 	c None",
 ".	c #000000",
diff --git a/bitmaps/Text_Sketch.xpm b/bitmaps/Text_Sketch.xpm
index 1e093993eb..b597b42b27 100644
--- a/bitmaps/Text_Sketch.xpm
+++ b/bitmaps/Text_Sketch.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *text_sketch_xpm[];
+extern const char *text_sketch_xpm[];
 
 #else
-char * text_sketch_xpm[] = {
+const char * text_sketch_xpm[] = {
 "16 16 2 1",
 " 	c None",
 ".	c #00009B",
diff --git a/bitmaps/Zoom_1.xpm b/bitmaps/Zoom_1.xpm
index a8d68e46c1..5da4d2470d 100644
--- a/bitmaps/Zoom_1.xpm
+++ b/bitmaps/Zoom_1.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * zoom_1_xpm[] = {
+static const char * zoom_1_xpm[] = {
 "16 16 36 1",
 " 	c None",
 ".	c #000000",
diff --git a/bitmaps/Zoom_Center.xpm b/bitmaps/Zoom_Center.xpm
index 0627854bfd..a448fcb9f6 100644
--- a/bitmaps/Zoom_Center.xpm
+++ b/bitmaps/Zoom_Center.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char * zoom_center_xpm[];
+extern const char * zoom_center_xpm[];
 
 #else
-char * zoom_center_xpm[] = {
+const char * zoom_center_xpm[] = {
 "16 16 4 1",
 "   c None",
 ".	c Black",
diff --git a/bitmaps/Zoom_In.xpm b/bitmaps/Zoom_In.xpm
index d7e7a41c3d..76c51320fb 100644
--- a/bitmaps/Zoom_In.xpm
+++ b/bitmaps/Zoom_In.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char * zoom_in_xpm[];
+extern const char * zoom_in_xpm[];
 
 #else
-char * zoom_in_xpm[] = {
+const char * zoom_in_xpm[] = {
 "16 16 42 1",
 " 	c None",
 ".	c #000000",
diff --git a/bitmaps/Zoom_Optimal.xpm b/bitmaps/Zoom_Optimal.xpm
index 77e5f815c1..98dbd81204 100644
--- a/bitmaps/Zoom_Optimal.xpm
+++ b/bitmaps/Zoom_Optimal.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char * zoom_optimal_xpm[];
+extern const char * zoom_optimal_xpm[];
 
 #else
-char * zoom_optimal_xpm[] = {
+const char * zoom_optimal_xpm[] = {
 "16 16 83 1",
 " 	c None",
 ".	c #000000",
diff --git a/bitmaps/Zoom_Out.xpm b/bitmaps/Zoom_Out.xpm
index 25606670af..808be129e6 100644
--- a/bitmaps/Zoom_Out.xpm
+++ b/bitmaps/Zoom_Out.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char * zoom_out_xpm[];
+extern const char * zoom_out_xpm[];
 
 #else
-char * zoom_out_xpm[] = {
+const char * zoom_out_xpm[] = {
 "16 16 40 1",
 " 	c None",
 ".	c #000000",
diff --git a/bitmaps/Zoom_Page.xpm b/bitmaps/Zoom_Page.xpm
index a5eeb6e794..376fbacb3c 100644
--- a/bitmaps/Zoom_Page.xpm
+++ b/bitmaps/Zoom_Page.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char * zoom_page_xpm[];
+extern const char * zoom_page_xpm[];
 
 #else
-char * zoom_page_xpm[] = {
+const char * zoom_page_xpm[] = {
 "16 16 68 1",
 " 	c None",
 ".	c #000000",
diff --git a/bitmaps/Zoom_Select.xpm b/bitmaps/Zoom_Select.xpm
index b32ce63827..efe60daaed 100644
--- a/bitmaps/Zoom_Select.xpm
+++ b/bitmaps/Zoom_Select.xpm
@@ -1,9 +1,9 @@
-/* XPM */ 
+/* XPM */
 #ifndef XPMMAIN
-extern char * zoom_select_xpm[];
+extern const char * zoom_select_xpm[];
 
 #else
-char * zoom_select_xpm[] = {
+const char * zoom_select_xpm[] = {
 "16 16 39 1",
 " 	c None",
 "!	c black",
diff --git a/bitmaps/Zoom_Selected.xpm b/bitmaps/Zoom_Selected.xpm
index 674ae7e3a1..91d07b22cf 100644
--- a/bitmaps/Zoom_Selected.xpm
+++ b/bitmaps/Zoom_Selected.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char * zoom_selected_xpm[];
+extern const char * zoom_selected_xpm[];
 
 #else
-char * zoom_selected_xpm[] = {
+const char * zoom_selected_xpm[] = {
 "16 16 38 1",
 " 	c None",
 ".	c #000000",
diff --git a/bitmaps/anchor.xpm b/bitmaps/anchor.xpm
index c01d44ef9e..3c4b3a3c06 100644
--- a/bitmaps/anchor.xpm
+++ b/bitmaps/anchor.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *anchor_xpm[];
+extern const char *anchor_xpm[];
 
 #else
-char * anchor_xpm[] = {
+const char * anchor_xpm[] = {
 "16 16 2 1",
 " 	c None",
 ".	c #000000",
diff --git a/bitmaps/annotate.xpm b/bitmaps/annotate.xpm
index 842836bfa1..fbbce6d4a3 100644
--- a/bitmaps/annotate.xpm
+++ b/bitmaps/annotate.xpm
@@ -1,10 +1,10 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *annotate_xpm[];
+extern const char *annotate_xpm[];
 
 #else
-char *annotate_xpm[] = {
-/* columns rows colors chars-per-pixel */
+const char *annotate_xpm[] = {
+/* columns rows colors const chars-per-pixel */
 "16 16 93 2",
 "  	c None",
 ". 	c #000000",
diff --git a/bitmaps/auto_associe.xpm b/bitmaps/auto_associe.xpm
index 37e081c040..1bc850177c 100644
--- a/bitmaps/auto_associe.xpm
+++ b/bitmaps/auto_associe.xpm
@@ -1,10 +1,10 @@
 /* XPM */
 #ifndef  XPMMAIN
-extern char *auto_associe_xpm[];
+extern const char *auto_associe_xpm[];
 
 #else
-char *auto_associe_xpm[] = {
-/* width height num_colors chars_per_pixel */
+const char *auto_associe_xpm[] = {
+/* width height num_colors const chars_per_pixel */
 "16 16 124 2",
 "  	c None",
 ". 	c #160A00",
diff --git a/bitmaps/book.xpm b/bitmaps/book.xpm
index 9eb855b4ec..56c8a08d70 100644
--- a/bitmaps/book.xpm
+++ b/bitmaps/book.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char * book_xpm[];
+extern const char * book_xpm[];
 
 #else
-char * book_xpm[] = {
+const char * book_xpm[] = {
 "16 16 21 1",
 " 	c None",
 ".	c #007F7F",
diff --git a/bitmaps/cancel_tool.xpm b/bitmaps/cancel_tool.xpm
index 9796bc2682..49238216b3 100644
--- a/bitmaps/cancel_tool.xpm
+++ b/bitmaps/cancel_tool.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *cancel_tool_xpm[];
+extern const char *cancel_tool_xpm[];
 
 #else
-char * cancel_tool_xpm[] = {
+const char * cancel_tool_xpm[] = {
 "16 16 99 2",
 "  	c None",
 ". 	c #411F18",
diff --git a/bitmaps/config.xpm b/bitmaps/config.xpm
index 9f5e2c7229..dc3c4c6de7 100644
--- a/bitmaps/config.xpm
+++ b/bitmaps/config.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *config_xpm[];
+extern const char *config_xpm[];
 
 #else
-char * config_xpm[] = {
+const char * config_xpm[] = {
 "16 16 55 1",
 " 	c None",
 ".	c #000000",
diff --git a/bitmaps/copy.xpm b/bitmaps/copy.xpm
index 5fb3a6903c..87ce699514 100644
--- a/bitmaps/copy.xpm
+++ b/bitmaps/copy.xpm
@@ -1,10 +1,10 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *copy_button[];
+extern const char *copy_button[];
 
 #else
-char *copy_button[] = {
-/* columns rows colors chars-per-pixel */
+const char *copy_button[] = {
+/* columns rows colors const chars-per-pixel */
 "16 15 4 1",
 "  c None",
 ". c Black",
diff --git a/bitmaps/cursor.xpm b/bitmaps/cursor.xpm
index 0c3cdd1852..522e226c6b 100644
--- a/bitmaps/cursor.xpm
+++ b/bitmaps/cursor.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *cursor_xpm[];
+extern const char *cursor_xpm[];
 
 #else
-char * cursor_xpm[] = {
+const char * cursor_xpm[] = {
 "16 16 73 1",
 " 	c None",
 ".	c #000000",
diff --git a/bitmaps/cut.xpm b/bitmaps/cut.xpm
index c245c02b5c..19e69a0959 100644
--- a/bitmaps/cut.xpm
+++ b/bitmaps/cut.xpm
@@ -1,10 +1,10 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *cut_button[];
+extern const char *cut_button[];
 
 #else
-char *cut_button[] = {
-/* columns rows colors chars-per-pixel */
+const char *cut_button[] = {
+/* columns rows colors const chars-per-pixel */
 "16 15 3 1",
 "  c None",
 ". c Black",
diff --git a/bitmaps/dashline.xpm b/bitmaps/dashline.xpm
index a9e7d918b0..e911d3003e 100644
--- a/bitmaps/dashline.xpm
+++ b/bitmaps/dashline.xpm
@@ -1,10 +1,10 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *dashedline_xpm[];
+extern const char *dashedline_xpm[];
 
 #else
-char *dashedline_xpm[] = {
-/* columns rows colors chars-per-pixel */
+const char *dashedline_xpm[] = {
+/* columns rows colors const chars-per-pixel */
 "16 16 2 1",
 "- c Red",
 "  c None",
diff --git a/bitmaps/del_body.xpm b/bitmaps/del_body.xpm
index 0b49b91394..e0e9f21586 100644
--- a/bitmaps/del_body.xpm
+++ b/bitmaps/del_body.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char * delete_body_xpm[];
+extern const char * delete_body_xpm[];
 
 #else
-char * delete_body_xpm[] =
+const char * delete_body_xpm[] =
 {
 "16 15 13 1",
 "X c Black",
diff --git a/bitmaps/del_track.xpm b/bitmaps/del_track.xpm
index ecc8e5b9f3..74393de29a 100644
--- a/bitmaps/del_track.xpm
+++ b/bitmaps/del_track.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char * auto_delete_track_xpm[];
+extern const char * auto_delete_track_xpm[];
 
 #else
-char * auto_delete_track_xpm[] =
+const char * auto_delete_track_xpm[] =
 {
 "16 15 14 1",
 "X c Black",
diff --git a/bitmaps/delete.xpm b/bitmaps/delete.xpm
index 763870d095..cdc62d3309 100644
--- a/bitmaps/delete.xpm
+++ b/bitmaps/delete.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *delete_xpm[];
+extern const char *delete_xpm[];
 
 #else
-char * delete_xpm[] = {
+const char * delete_xpm[] = {
 "16 16 152 2",
 "  	c None",
 ". 	c #0E0E0E",
diff --git a/bitmaps/directory.xpm b/bitmaps/directory.xpm
index 465c5edd68..4f3daec240 100644
--- a/bitmaps/directory.xpm
+++ b/bitmaps/directory.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char * directory_xpm[];
+extern const char * directory_xpm[];
 
 #else
-char * directory_xpm[] = {
+const char * directory_xpm[] = {
 "16 16 136 2",
 "  	c None",
 ". 	c #469FFF",
diff --git a/bitmaps/down.xpm b/bitmaps/down.xpm
index 77a5f1e8eb..a671076ec3 100644
--- a/bitmaps/down.xpm
+++ b/bitmaps/down.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *down_xpm[];
+extern const char *down_xpm[];
 
 #else
-char * down_xpm[] = {
+const char * down_xpm[] = {
 "16 16 25 1",
 " 	c None",
 ".	c #000000",
diff --git a/bitmaps/drc.xpm b/bitmaps/drc.xpm
index b5397ee587..031c534c6f 100644
--- a/bitmaps/drc.xpm
+++ b/bitmaps/drc.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *drc_xpm[];
+extern const char *drc_xpm[];
 
 #else
-char *drc_xpm[] = {
+const char *drc_xpm[] = {
 "16 16 87 1",
 " 	c None",
 ".	c #000000",
diff --git a/bitmaps/drc_off.xpm b/bitmaps/drc_off.xpm
index 1d0063e0d1..1563868bdd 100644
--- a/bitmaps/drc_off.xpm
+++ b/bitmaps/drc_off.xpm
@@ -1,9 +1,9 @@
 /* XPM */ 
 #ifndef XPMMAIN
-extern char *drc_off_xpm[];
+extern const char *drc_off_xpm[];
 
 #else
-char * drc_off_xpm[] = {
+const char * drc_off_xpm[] = {
 "16 16 80 1",
 " 	c None",
 "!	c #FF0000",
diff --git a/bitmaps/eeschema.xpm b/bitmaps/eeschema.xpm
index c2f8a0d5a9..759bbd2b92 100644
--- a/bitmaps/eeschema.xpm
+++ b/bitmaps/eeschema.xpm
@@ -1,10 +1,10 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *eeschema_xpm[];
+extern const char *eeschema_xpm[];
 
 #else
-char *eeschema_xpm[] = {
-/* columns rows colors chars-per-pixel */
+const char *eeschema_xpm[] = {
+/* columns rows colors const chars-per-pixel */
 "16 16 76 1",
 " 	c None",
 ".	c #000000",
diff --git a/bitmaps/erc.xpm b/bitmaps/erc.xpm
index 933e347bf6..8ba471453f 100644
--- a/bitmaps/erc.xpm
+++ b/bitmaps/erc.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *erc_xpm[];
+extern const char *erc_xpm[];
 
 #else
-char *erc_xpm[] = {
+const char *erc_xpm[] = {
 "16 16 100 2",
 "  	c None",
 ". 	c #000000",
diff --git a/bitmaps/ercerr.xpm b/bitmaps/ercerr.xpm
index bcc4647a6f..f89f006f7f 100644
--- a/bitmaps/ercerr.xpm
+++ b/bitmaps/ercerr.xpm
@@ -1,6 +1,6 @@
 /* XPM */
-static char *error_xpm[] = {
-/* columns rows colors chars-per-pixel */
+static const char *error_xpm[] = {
+/* columns rows colors const chars-per-pixel */
 "11 11 2 1",
 "- c Black",
 "X c Red",
diff --git a/bitmaps/ercgreen.xpm b/bitmaps/ercgreen.xpm
index 88b21e34f2..3c8e434fcd 100644
--- a/bitmaps/ercgreen.xpm
+++ b/bitmaps/ercgreen.xpm
@@ -1,6 +1,6 @@
 /* XPM */
-static char *green_xpm[] = {
-/* columns rows colors chars-per-pixel */
+static const char *green_xpm[] = {
+/* columns rows colors const chars-per-pixel */
 "11 11 2 1",
 "- c Black",
 "X c Green",
diff --git a/bitmaps/ercwarn.xpm b/bitmaps/ercwarn.xpm
index 8fb073106b..bb911ac442 100644
--- a/bitmaps/ercwarn.xpm
+++ b/bitmaps/ercwarn.xpm
@@ -1,6 +1,6 @@
 /* XPM */
-static char *warning_xpm[] = {
-/* columns rows colors chars-per-pixel */
+static const char *warning_xpm[] = {
+/* columns rows colors const chars-per-pixel */
 "11 11 2 1",
 "- c Black",
 "X c Yellow",
diff --git a/bitmaps/export.xpm b/bitmaps/export.xpm
index 21d43cb37e..43c5ba2025 100644
--- a/bitmaps/export.xpm
+++ b/bitmaps/export.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *export_xpm[];
+extern const char *export_xpm[];
 
 #else
-char * export_xpm[] = {
+const char * export_xpm[] = {
 "16 16 43 1",
 " 	c None",
 ".	c #000000",
diff --git a/bitmaps/find.xpm b/bitmaps/find.xpm
index 3c82a8d5ef..33463f8a3f 100644
--- a/bitmaps/find.xpm
+++ b/bitmaps/find.xpm
@@ -1,10 +1,10 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *find_xpm[];
+extern const char *find_xpm[];
 
 #else
-char *find_xpm[] = {
-/* columns rows colors chars-per-pixel */
+const char *find_xpm[] = {
+/* columns rows colors const chars-per-pixel */
 "16 15 6 1",
 
 "E c #404040",
diff --git a/bitmaps/general_deletions.xpm b/bitmaps/general_deletions.xpm
index 3ba794e6c1..119221a9dc 100644
--- a/bitmaps/general_deletions.xpm
+++ b/bitmaps/general_deletions.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *general_deletions_xpm[];
+extern const char *general_deletions_xpm[];
 
 #else
-char * general_deletions_xpm[] = {
+const char * general_deletions_xpm[] = {
 "16 16 158 2",
 "  	c None",
 ". 	c #0D0D0D",
diff --git a/bitmaps/general_ratsnet.xpm b/bitmaps/general_ratsnet.xpm
index 0efce84c62..c29c26148f 100644
--- a/bitmaps/general_ratsnet.xpm
+++ b/bitmaps/general_ratsnet.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *general_ratsnet_xpm[];
+extern const char *general_ratsnet_xpm[];
 
 #else
-char * general_ratsnet_xpm[] = {
+const char * general_ratsnet_xpm[] = {
 "16 16 41 1",
 " 	c None",
 ".	c #FFFFFF",
diff --git a/bitmaps/green.xpm b/bitmaps/green.xpm
index 59c3784a34..4ed77074e7 100644
--- a/bitmaps/green.xpm
+++ b/bitmaps/green.xpm
@@ -1,10 +1,10 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *green_xpm[];
+extern const char *green_xpm[];
 
 #else
-char *green_xpm[] = {
-/* columns rows colors chars-per-pixel */
+const char *green_xpm[] = {
+/* columns rows colors const chars-per-pixel */
 "16 15 6 1",
 "  c Gray0",
 "X c #7b7b7b7b7b7b",
diff --git a/bitmaps/grid.xpm b/bitmaps/grid.xpm
index 70a9816cc6..334e29b421 100644
--- a/bitmaps/grid.xpm
+++ b/bitmaps/grid.xpm
@@ -1,10 +1,10 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *grid_xpm[];
+extern const char *grid_xpm[];
 
 #else
-char * grid_xpm[] = {
-/* columns rows colors chars-per-pixel */
+const char * grid_xpm[] = {
+/* columns rows colors const chars-per-pixel */
 "16 15 2 1",
 "X c None",
 "o c Black",
diff --git a/bitmaps/grid_select.xpm b/bitmaps/grid_select.xpm
index 3497b02974..bebd99c3d9 100644
--- a/bitmaps/grid_select.xpm
+++ b/bitmaps/grid_select.xpm
@@ -1,10 +1,10 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *grid_select_xpm[];
+extern const char *grid_select_xpm[];
 
 #else
-char *grid_select_xpm[] = {
-/* columns rows colors chars-per-pixel */
+const char *grid_select_xpm[] = {
+/* columns rows colors const chars-per-pixel */
 "16 16 8 1",
 " 	c Black",
 ".	c none",
diff --git a/bitmaps/hammer.xpm b/bitmaps/hammer.xpm
index ff8fb981fb..812511a373 100644
--- a/bitmaps/hammer.xpm
+++ b/bitmaps/hammer.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char * hammer_xpm[];
+extern const char * hammer_xpm[];
 
 #else
-char * hammer_xpm[] = {
+const char * hammer_xpm[] = {
 "16 15 6 1",
 " 	c none",
 ".	c #444244",
diff --git a/bitmaps/help.xpm b/bitmaps/help.xpm
index e29eef208f..977138c583 100644
--- a/bitmaps/help.xpm
+++ b/bitmaps/help.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *help_xpm[];
+extern const char *help_xpm[];
 
 #else
-char * help_xpm[] = {
+const char * help_xpm[] = {
 "16 16 106 2",
 "  	c None",
 ". 	c #000000",
diff --git a/bitmaps/icon_3d.xpm b/bitmaps/icon_3d.xpm
index 3323cbb7e0..063c042c3d 100644
--- a/bitmaps/icon_3d.xpm
+++ b/bitmaps/icon_3d.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char * icon_w3d_xpm[];
+extern const char * icon_w3d_xpm[];
 
 #else
-char * icon_w3d_xpm[] =
+const char * icon_w3d_xpm[] =
 {
 "32 32 3 1",
 "J c #FF0000",
diff --git a/bitmaps/icon_cvpcb.xpm b/bitmaps/icon_cvpcb.xpm
index eb1885066e..53633f1eee 100644
--- a/bitmaps/icon_cvpcb.xpm
+++ b/bitmaps/icon_cvpcb.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char * icon_cvpcb_xpm[];
+extern const char * icon_cvpcb_xpm[];
 
 #else
-char * icon_cvpcb_xpm[] = {
+const char * icon_cvpcb_xpm[] = {
 "32 32 372 2",
 "  	c None",
 ". 	c #FF7800",
diff --git a/bitmaps/icon_eeschema.xpm b/bitmaps/icon_eeschema.xpm
index f44b4c7cfe..51c4b0694d 100644
--- a/bitmaps/icon_eeschema.xpm
+++ b/bitmaps/icon_eeschema.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char * icon_eeschema_xpm[];
+extern const char * icon_eeschema_xpm[];
 
 #else
-char * icon_eeschema_xpm[] = {
+const char * icon_eeschema_xpm[] = {
 "32 32 200 2",
 "  	c None",
 ". 	c #000000",
diff --git a/bitmaps/icon_gerbview.xpm b/bitmaps/icon_gerbview.xpm
index a9be0d3e6e..8e28282a32 100644
--- a/bitmaps/icon_gerbview.xpm
+++ b/bitmaps/icon_gerbview.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char * icon_gerbview_xpm[];
+extern const char * icon_gerbview_xpm[];
 
 #else
-char * icon_gerbview_xpm[] = {
+const char * icon_gerbview_xpm[] = {
 "32 32 318 2",
 "  	c None",
 ". 	c #030100",
diff --git a/bitmaps/icon_kicad.xpm b/bitmaps/icon_kicad.xpm
index 193a866b28..f196044841 100644
--- a/bitmaps/icon_kicad.xpm
+++ b/bitmaps/icon_kicad.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *kicad_icon_xpm[];
+extern const char *kicad_icon_xpm[];
 
 #else
-char * kicad_icon_xpm[] =
+const char * kicad_icon_xpm[] =
 {
 "32 32 16 1",
 " 	c none",
diff --git a/bitmaps/icon_modedit.xpm b/bitmaps/icon_modedit.xpm
index 1f1bbf75db..8f7f6bd72a 100644
--- a/bitmaps/icon_modedit.xpm
+++ b/bitmaps/icon_modedit.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *icon_modedit_xpm[];
+extern const char *icon_modedit_xpm[];
 
 #else
-char * icon_modedit_xpm[] = {
+const char * icon_modedit_xpm[] = {
 "32 32 346 2",
 "  	c None",
 ". 	c #2C2C37",
diff --git a/bitmaps/icon_pcbnew.xpm b/bitmaps/icon_pcbnew.xpm
index 6f923cc104..f6edb8a271 100644
--- a/bitmaps/icon_pcbnew.xpm
+++ b/bitmaps/icon_pcbnew.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *a_icon_pcbnew_xpm[];
+extern const char *a_icon_pcbnew_xpm[];
 
 #else
-char * a_icon_pcbnew_xpm[] = {
+const char * a_icon_pcbnew_xpm[] = {
 "32 32 136 2",
 "  	c None",
 ". 	c #040200",
diff --git a/bitmaps/icon_python.xpm b/bitmaps/icon_python.xpm
index 0189e4c66f..599cd98dea 100644
--- a/bitmaps/icon_python.xpm
+++ b/bitmaps/icon_python.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char * icon_python_xpm[];
+extern const char * icon_python_xpm[];
 
 #else
-char * icon_python_xpm[] = {
+const char * icon_python_xpm[] = {
 "32 32 72 1",
 " 	c None",
 ".	c #7EA5C6",
diff --git a/bitmaps/icon_python_small.xpm b/bitmaps/icon_python_small.xpm
index 0fbf00bebe..dd8fbeaaa6 100644
--- a/bitmaps/icon_python_small.xpm
+++ b/bitmaps/icon_python_small.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char * icon_python_small_xpm[];
+extern const char * icon_python_small_xpm[];
 
 #else
-char *icon_python_small_xpm[] = {
+const char *icon_python_small_xpm[] = {
 "16 16 98 2",
 "  	c None",
 ". 	c #5490C0",
diff --git a/bitmaps/icon_txt.xpm b/bitmaps/icon_txt.xpm
index 3ee1803ebf..718680b4b4 100644
--- a/bitmaps/icon_txt.xpm
+++ b/bitmaps/icon_txt.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char * icon_txt_xpm[];
+extern const char * icon_txt_xpm[];
 
 #else
-char * icon_txt_xpm[] = {
+const char * icon_txt_xpm[] = {
 "16 16 100 2",
 "  	c None",
 ". 	c #AFAFAF",
diff --git a/bitmaps/import.xpm b/bitmaps/import.xpm
index df8083689d..7f8409fa6b 100644
--- a/bitmaps/import.xpm
+++ b/bitmaps/import.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *import_xpm[];
+extern const char *import_xpm[];
 
 #else
-char * import_xpm[] = {
+const char * import_xpm[] = {
 "16 16 52 1",
 " 	c None",
 ".	c #000000",
diff --git a/bitmaps/jigsaw.xpm b/bitmaps/jigsaw.xpm
index aea08ee315..65a878014e 100644
--- a/bitmaps/jigsaw.xpm
+++ b/bitmaps/jigsaw.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char * jigsaw_xpm[];
+extern const char * jigsaw_xpm[];
 
 #else
-char * jigsaw_xpm[] = {
+const char * jigsaw_xpm[] = {
 "16 15 5 1",
 " 	c none",
 ".	c #645264",
diff --git a/bitmaps/kicad_icon_small.xpm b/bitmaps/kicad_icon_small.xpm
index 109c92c514..bc8e25f819 100644
--- a/bitmaps/kicad_icon_small.xpm
+++ b/bitmaps/kicad_icon_small.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char * kicad_icon_small_xpm[];
+extern const char * kicad_icon_small_xpm[];
 
 #else
-char * kicad_icon_small_xpm[] = {
+const char * kicad_icon_small_xpm[] = {
 "16 16 16 1",
 " 	c none",
 ".	c #634931",
diff --git a/bitmaps/label.xpm b/bitmaps/label.xpm
index 31dbcd997b..06678a7e47 100644
--- a/bitmaps/label.xpm
+++ b/bitmaps/label.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *label_xpm[];
+extern const char *label_xpm[];
 
 #else
-char * label_xpm[] = {
+const char * label_xpm[] = {
 "16 15 3 1",
 " 	c None",
 ".	c Black",
diff --git a/bitmaps/left.xpm b/bitmaps/left.xpm
index ea72bdbf54..f55d5f1f6c 100644
--- a/bitmaps/left.xpm
+++ b/bitmaps/left.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *left_xpm[];
+extern const char *left_xpm[];
 
 #else
-char * left_xpm[] = {
+const char * left_xpm[] = {
 "16 16 26 1",
 " 	c None",
 ".	c #000000",
diff --git a/bitmaps/libedprt.xpm b/bitmaps/libedprt.xpm
index 2129812706..646cb4ba40 100644
--- a/bitmaps/libedprt.xpm
+++ b/bitmaps/libedprt.xpm
@@ -1,10 +1,10 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *libedit_part_xpm[];
+extern const char *libedit_part_xpm[];
 
 #else
-char *libedit_part_xpm[] = {
-/* columns rows colors chars-per-pixel */
+const char *libedit_part_xpm[] = {
+/* columns rows colors const chars-per-pixel */
 
 "16 15 3 1",
 "- c Red",
diff --git a/bitmaps/library.xpm b/bitmaps/library.xpm
index c7102c7a4e..31fa2cc8ec 100644
--- a/bitmaps/library.xpm
+++ b/bitmaps/library.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char * library_xpm[];
+extern const char * library_xpm[];
 
 #else
-char * library_xpm[] = {
+const char * library_xpm[] = {
 "16 15 6 1",
 "X c Black",
 ". c None",
diff --git a/bitmaps/library_update.xpm b/bitmaps/library_update.xpm
index 7c7d8181e6..dbbaba5552 100644
--- a/bitmaps/library_update.xpm
+++ b/bitmaps/library_update.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char * library_update_xpm[];
+extern const char * library_update_xpm[];
 
 #else
-char * library_update_xpm[] = {
+const char * library_update_xpm[] = {
 "16 15 6 1",
 "X c Black",
 ". c None",
diff --git a/bitmaps/libsavem.xpm b/bitmaps/libsavem.xpm
index a578a9daaf..4a01ed39ce 100644
--- a/bitmaps/libsavem.xpm
+++ b/bitmaps/libsavem.xpm
@@ -1,10 +1,10 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *save_part_in_mem_xpm[];
+extern const char *save_part_in_mem_xpm[];
 
 #else
-char *save_part_in_mem_xpm[] = {
-/* columns rows colors chars-per-pixel */
+const char *save_part_in_mem_xpm[] = {
+/* columns rows colors const chars-per-pixel */
 "16 15 5 1",
 "  c None",
 ". c Black",
diff --git a/bitmaps/libview.xpm b/bitmaps/libview.xpm
index 9dacf03b4a..c15a366328 100644
--- a/bitmaps/libview.xpm
+++ b/bitmaps/libview.xpm
@@ -1,10 +1,10 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char * libview_xpm[];
+extern const char * libview_xpm[];
 
 #else
-char *libview_xpm[] = {
-/* columns rows colors chars-per-pixel */
+const char *libview_xpm[] = {
+/* columns rows colors const chars-per-pixel */
 "16 15 10 1",
 "Q c Black",
 ". c None",
diff --git a/bitmaps/mirepcb.xpm b/bitmaps/mirepcb.xpm
index f19e059a6c..52817588bf 100644
--- a/bitmaps/mirepcb.xpm
+++ b/bitmaps/mirepcb.xpm
@@ -1,10 +1,10 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *mirepcb_xpm[];
+extern const char *mirepcb_xpm[];
 
 #else
-char *mirepcb_xpm[] = {
-/* columns rows colors chars-per-pixel */
+const char *mirepcb_xpm[] = {
+/* columns rows colors const chars-per-pixel */
 "16 15 3 1",
 "- c Blue",
 ". c Red",
diff --git a/bitmaps/modedit.xpm b/bitmaps/modedit.xpm
index 451d7711d8..3a54dbad99 100644
--- a/bitmaps/modedit.xpm
+++ b/bitmaps/modedit.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *modedit_xpm[];
+extern const char *modedit_xpm[];
 
 #else
-char * modedit_xpm[] = {
+const char * modedit_xpm[] = {
 "16 16 90 1",
 " 	c None",
 ".	c #FF7800",
diff --git a/bitmaps/modratsnest.xpm b/bitmaps/modratsnest.xpm
index fe254d09d2..30a94ec66e 100644
--- a/bitmaps/modratsnest.xpm
+++ b/bitmaps/modratsnest.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char * mod_ratsnest_xpm[];
+extern const char * mod_ratsnest_xpm[];
 
 #else
-char * mod_ratsnest_xpm[] = {
+const char * mod_ratsnest_xpm[] = {
 "16 15 5 1",
 "X c Red",
 ". c None",
diff --git a/bitmaps/module.xpm b/bitmaps/module.xpm
index bbc6520c0b..f8c08b03e4 100644
--- a/bitmaps/module.xpm
+++ b/bitmaps/module.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char * module_xpm[];
+extern const char * module_xpm[];
 
 #else
-char * module_xpm[] = {
+const char * module_xpm[] = {
 "16 15 4 1",
 "X c Red",
 ". c None",
diff --git a/bitmaps/netlist.xpm b/bitmaps/netlist.xpm
index feef0c38b6..469e9b15a3 100644
--- a/bitmaps/netlist.xpm
+++ b/bitmaps/netlist.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *netlist_xpm[];
+extern const char *netlist_xpm[];
 
 #else
-char * netlist_xpm[] = {
+const char * netlist_xpm[] = {
 "16 16 44 1",
 " 	c None",
 ".	c #000000",
diff --git a/bitmaps/new.xpm b/bitmaps/new.xpm
index 5947e7c9e4..78da032c37 100644
--- a/bitmaps/new.xpm
+++ b/bitmaps/new.xpm
@@ -1,9 +1,9 @@
 /* XPM */ 
 #ifndef XPMMAIN
-extern char *new_xpm[];
+extern const char *new_xpm[];
 
 #else
-char * new_xpm[] = {
+const char * new_xpm[] = {
 "16 16 23 1",
 " 	c None",
 "!	c black",
diff --git a/bitmaps/new_txt.xpm b/bitmaps/new_txt.xpm
index 609dc757d8..b903b79d49 100644
--- a/bitmaps/new_txt.xpm
+++ b/bitmaps/new_txt.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char * new_txt_xpm[];
+extern const char * new_txt_xpm[];
 
 #else
-char * new_txt_xpm[] = {
+const char * new_txt_xpm[] = {
 "16 16 78 1",
 " 	c None",
 ".	c #000000",
diff --git a/bitmaps/noconn.xpm b/bitmaps/noconn.xpm
index ae20cfb77b..4795e150d4 100644
--- a/bitmaps/noconn.xpm
+++ b/bitmaps/noconn.xpm
@@ -1,10 +1,10 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *noconn_button[];
+extern const char *noconn_button[];
 
 #else
-char *noconn_button[] = {
-/* columns rows colors chars-per-pixel */
+const char *noconn_button[] = {
+/* columns rows colors const chars-per-pixel */
 "16 15 2 1",
 "  c None",
 "- c Blue",
diff --git a/bitmaps/open.xpm b/bitmaps/open.xpm
index 2a34b02771..7324351ee5 100644
--- a/bitmaps/open.xpm
+++ b/bitmaps/open.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *open_xpm[];
+extern const char *open_xpm[];
 
 #else
-char * open_xpm[] = {
+const char * open_xpm[] = {
 "16 16 64 1",
 " 	c None",
 ".	c #000000",
diff --git a/bitmaps/pad.xpm b/bitmaps/pad.xpm
index c94231e65d..2510d1926b 100644
--- a/bitmaps/pad.xpm
+++ b/bitmaps/pad.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *pad_xpm[];
+extern const char *pad_xpm[];
 
 #else
-char * pad_xpm[] = {
+const char * pad_xpm[] = {
 "16 15 3 1",
 "- c green",
 "  c None",
diff --git a/bitmaps/palette.xpm b/bitmaps/palette.xpm
index 86e39d75a7..c1730ed6dd 100644
--- a/bitmaps/palette.xpm
+++ b/bitmaps/palette.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *palette_xpm[];
+extern const char *palette_xpm[];
 
 #else
-char * palette_xpm[] = {
+const char * palette_xpm[] = {
 "16 15 14 1",
 " 	c #c0c0c0",
 ".	c #808080",
diff --git a/bitmaps/paste.xpm b/bitmaps/paste.xpm
index 59b262e1e3..9ba98f2767 100644
--- a/bitmaps/paste.xpm
+++ b/bitmaps/paste.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *paste_xpm[];
+extern const char *paste_xpm[];
 
 #else
-char * paste_xpm[] = {
+const char * paste_xpm[] = {
 "16 16 54 1",
 " 	c None",
 ".	c #000000",
diff --git a/bitmaps/pcbnew.xpm b/bitmaps/pcbnew.xpm
index d77de122b8..e6322832c0 100644
--- a/bitmaps/pcbnew.xpm
+++ b/bitmaps/pcbnew.xpm
@@ -1,10 +1,10 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *pcbnew_xpm[];
+extern const char *pcbnew_xpm[];
 
 #else
-char *pcbnew_xpm[] = {
-/* columns rows colors chars-per-pixel */
+const char *pcbnew_xpm[] = {
+/* columns rows colors const chars-per-pixel */
 "16 16 54 1",
 " 	c None",
 ".	c #000000",
diff --git a/bitmaps/pin.xpm b/bitmaps/pin.xpm
index d3b7de4499..6e14699ab1 100644
--- a/bitmaps/pin.xpm
+++ b/bitmaps/pin.xpm
@@ -1,10 +1,10 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *pin_xpm[];
+extern const char *pin_xpm[];
 
 #else
-char *pin_xpm[] = {
-/* columns rows colors chars-per-pixel */
+const char *pin_xpm[] = {
+/* columns rows colors const chars-per-pixel */
 "16 15 4 1",
 "- c Black",
 "o c Red",
diff --git a/bitmaps/plot.xpm b/bitmaps/plot.xpm
index e757283a4e..3fc749f776 100644
--- a/bitmaps/plot.xpm
+++ b/bitmaps/plot.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *plot_xpm[];
+extern const char *plot_xpm[];
 
 #else
-char * plot_xpm[] = {
+const char * plot_xpm[] = {
 "16 16 12 1",
 " 	c None",
 ".	c #000000",
diff --git a/bitmaps/plot_HPG.xpm b/bitmaps/plot_HPG.xpm
index 85f53cc872..38d7d6b484 100644
--- a/bitmaps/plot_HPG.xpm
+++ b/bitmaps/plot_HPG.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *plot_HPG_xpm[];
+extern const char *plot_HPG_xpm[];
 
 #else
-char * plot_HPG_xpm[] = {
+const char * plot_HPG_xpm[] = {
 "16 16 17 1",
 " 	c None",
 ".	c #000000",
diff --git a/bitmaps/plot_PS.xpm b/bitmaps/plot_PS.xpm
index 6fb3788091..a1bdd5150c 100644
--- a/bitmaps/plot_PS.xpm
+++ b/bitmaps/plot_PS.xpm
@@ -1,9 +1,9 @@
 /* XPM */ 
 #ifndef XPMMAIN
-extern char *plot_PS_xpm[];
+extern const char *plot_PS_xpm[];
 
 #else
-char * plot_PS_xpm[] = {
+const char * plot_PS_xpm[] = {
 "16 16 14 1",
 " 	c None",
 "!	c black",
diff --git a/bitmaps/preference.xpm b/bitmaps/preference.xpm
index ff6b0d7613..2a02404469 100644
--- a/bitmaps/preference.xpm
+++ b/bitmaps/preference.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *preference_xpm[];
+extern const char *preference_xpm[];
 
 #else
-char * preference_xpm[] = {
+const char * preference_xpm[] = {
 "16 15 7 1",
 " 	c None",
 ".	c #808000",
diff --git a/bitmaps/print.xpm b/bitmaps/print.xpm
index 5cdd526ca4..6b60817c39 100644
--- a/bitmaps/print.xpm
+++ b/bitmaps/print.xpm
@@ -1,10 +1,10 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *print_button[];
+extern const char *print_button[];
 
 #else
-char *print_button[] = {
-/* columns rows colors chars-per-pixel */
+const char *print_button[] = {
+/* columns rows colors const chars-per-pixel */
 "16 15 5 1",
 "  c None",
 ". c Black",
diff --git a/bitmaps/ratsnest.xpm b/bitmaps/ratsnest.xpm
index e193bc3e60..4ba2cd372a 100644
--- a/bitmaps/ratsnest.xpm
+++ b/bitmaps/ratsnest.xpm
@@ -1,10 +1,10 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *ratsnest_xpm[];
+extern const char *ratsnest_xpm[];
 
 #else
-char *ratsnest_xpm[] = {
-/* columns rows colors chars-per-pixel */
+const char *ratsnest_xpm[] = {
+/* columns rows colors const chars-per-pixel */
 "16 16 3 1",
 "- c White",
 "o c Red",
diff --git a/bitmaps/red.xpm b/bitmaps/red.xpm
index e3a8b5ee34..78de821f5a 100644
--- a/bitmaps/red.xpm
+++ b/bitmaps/red.xpm
@@ -1,10 +1,10 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *red_xpm[];
+extern const char *red_xpm[];
 
 #else
-char *red_xpm[] = {
-/* columns rows colors chars-per-pixel */
+const char *red_xpm[] = {
+/* columns rows colors const chars-per-pixel */
 "16 15 6 1",
 "  c Gray0",
 "X c #7b7b7b7b7b7b",
diff --git a/bitmaps/redo.xpm b/bitmaps/redo.xpm
index c5f7ae4b9e..c54d0963aa 100644
--- a/bitmaps/redo.xpm
+++ b/bitmaps/redo.xpm
@@ -1,10 +1,10 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *redo_xpm[];
+extern const char *redo_xpm[];
 
 #else
-char *redo_xpm[] = {
-/* width height num_colors chars_per_pixel */
+const char *redo_xpm[] = {
+/* width height num_colors const chars_per_pixel */
 "16 16 4 1",
 /* colors */
 "  c None",
diff --git a/bitmaps/right.xpm b/bitmaps/right.xpm
index f45afce8a0..6ee334b186 100644
--- a/bitmaps/right.xpm
+++ b/bitmaps/right.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *right_xpm[];
+extern const char *right_xpm[];
 
 #else
-char * right_xpm[] = {
+const char * right_xpm[] = {
 "16 16 25 1",
 " 	c None",
 ".	c #000000",
diff --git a/bitmaps/save.xpm b/bitmaps/save.xpm
index 549c1d4ab8..2745939f0c 100644
--- a/bitmaps/save.xpm
+++ b/bitmaps/save.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *save_xpm[];
+extern const char *save_xpm[];
 
 #else
-char * save_xpm[] = {
+const char * save_xpm[] = {
 "16 16 83 1",
 " 	c None",
 ".	c #000000",
diff --git a/bitmaps/save_as.xpm b/bitmaps/save_as.xpm
index e3133b8f50..fe71362aa2 100644
--- a/bitmaps/save_as.xpm
+++ b/bitmaps/save_as.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *save_as_xpm[];
+extern const char *save_as_xpm[];
 
 #else
-char * save_as_xpm[] = {
+const char * save_as_xpm[] = {
 "16 16 111 2",
 "  	c None",
 ". 	c #000000",
diff --git a/bitmaps/schematic.xpm b/bitmaps/schematic.xpm
index c84baf91db..e7d6f6fca9 100644
--- a/bitmaps/schematic.xpm
+++ b/bitmaps/schematic.xpm
@@ -1,11 +1,11 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char * schematic_xpm[];
+extern const char * schematic_xpm[];
 
 #else
-char *schematic_xpm[] = {
+const char *schematic_xpm[] = {
 
-/* columns rows colors chars-per-pixel */
+/* columns rows colors const chars-per-pixel */
 "16 15 6 1",
 "  c None",
 ". c Black",
diff --git a/bitmaps/select_grid.xpm b/bitmaps/select_grid.xpm
index 5e91927842..1ae8466e13 100644
--- a/bitmaps/select_grid.xpm
+++ b/bitmaps/select_grid.xpm
@@ -1,10 +1,10 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *select_grid_xpm[];
+extern const char *select_grid_xpm[];
 
 #else
-char *select_grid_xpm[] = {
-/* columns rows colors chars-per-pixel */
+const char *select_grid_xpm[] = {
+/* columns rows colors const chars-per-pixel */
 "16 16 5 1",
 " 	c #ffffff",
 ".	c none",
diff --git a/bitmaps/sheetset.xpm b/bitmaps/sheetset.xpm
index f1a5af4b4f..fbd133031f 100644
--- a/bitmaps/sheetset.xpm
+++ b/bitmaps/sheetset.xpm
@@ -1,10 +1,10 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *sheetset_xpm[];
+extern const char *sheetset_xpm[];
 
 #else
-char *sheetset_xpm[] = {
-/* columns rows colors chars-per-pixel */
+const char *sheetset_xpm[] = {
+/* columns rows colors const chars-per-pixel */
 "16 15 4 1",
 "  c None",
 ". c Black",
diff --git a/bitmaps/showdcode.xpm b/bitmaps/showdcode.xpm
index e5ae3a333c..b3de081f68 100644
--- a/bitmaps/showdcode.xpm
+++ b/bitmaps/showdcode.xpm
@@ -1,10 +1,10 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *show_dcodenumber_xpm[];
+extern const char *show_dcodenumber_xpm[];
 
 #else
-char * show_dcodenumber_xpm[] = {
-/* columns rows colors chars-per-pixel */
+const char * show_dcodenumber_xpm[] = {
+/* columns rows colors const chars-per-pixel */
 "16 15 3 1",
 "- c Red",
 "X c None",
diff --git a/bitmaps/showmodedge.xpm b/bitmaps/showmodedge.xpm
index 3c0cc3276e..a385cbeeaf 100644
--- a/bitmaps/showmodedge.xpm
+++ b/bitmaps/showmodedge.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char * show_mod_edge_xpm[];
+extern const char * show_mod_edge_xpm[];
 
 #else
-char * show_mod_edge_xpm[] = {
+const char * show_mod_edge_xpm[] = {
 "16 15 4 1",
 "X c Red",
 ". c None",
diff --git a/bitmaps/showtrack.xpm b/bitmaps/showtrack.xpm
index a4f939ebc1..e01c294aff 100644
--- a/bitmaps/showtrack.xpm
+++ b/bitmaps/showtrack.xpm
@@ -1,10 +1,10 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *showtrack_xpm[];
+extern const char *showtrack_xpm[];
 
 #else
-char *showtrack_xpm[] = {
-/* columns rows colors chars per pixel */
+const char *showtrack_xpm[] = {
+/* columns rows colors const chars per pixel */
 "16 15 3 1",
 "= c Red",
 ": c #008000",
diff --git a/bitmaps/tools.xpm b/bitmaps/tools.xpm
index 8821d5b910..d0cc9dcc9a 100644
--- a/bitmaps/tools.xpm
+++ b/bitmaps/tools.xpm
@@ -1,10 +1,10 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *tools_xpm[];
+extern const char *tools_xpm[];
 
 #else
-char *tools_xpm[] = {
-/* columns rows colors chars-per-pixel */
+const char *tools_xpm[] = {
+/* columns rows colors const chars-per-pixel */
 "16 15 3 1",
 "- c Blue",
 "X c Gray100",
diff --git a/bitmaps/transistor.xpm b/bitmaps/transistor.xpm
index 66f666ce61..9756490efd 100644
--- a/bitmaps/transistor.xpm
+++ b/bitmaps/transistor.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *transistor_xpm[];
+extern const char *transistor_xpm[];
 
 #else
-char * transistor_xpm[] =
+const char * transistor_xpm[] =
 {
 "16 15 16 1",
 " 	c none",
diff --git a/bitmaps/treensel.xpm b/bitmaps/treensel.xpm
index cd8e86e7e4..a5735898cd 100644
--- a/bitmaps/treensel.xpm
+++ b/bitmaps/treensel.xpm
@@ -1,10 +1,10 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *tree_nosel_xpm[];
+extern const char *tree_nosel_xpm[];
 
 #else
-char *tree_nosel_xpm[] = {
-/* columns rows colors chars-per-pixel */
+const char *tree_nosel_xpm[] = {
+/* columns rows colors const chars-per-pixel */
 "16 15 6 1",
 "  c Gray0",
 "X c #7b7b7b",
diff --git a/bitmaps/treesel.xpm b/bitmaps/treesel.xpm
index 197f354b92..2ac6c754c5 100644
--- a/bitmaps/treesel.xpm
+++ b/bitmaps/treesel.xpm
@@ -1,6 +1,6 @@
 /* XPM */
-static char *tree_sel_xpm[] = {
-/* columns rows colors chars-per-pixel */
+static const char *tree_sel_xpm[] = {
+/* columns rows colors const chars-per-pixel */
 "16 15 6 1",
 "  c Gray0",
 "X c #7b7b7b",
diff --git a/bitmaps/undelete.xpm b/bitmaps/undelete.xpm
index e4923d14a7..d9a0acd44e 100644
--- a/bitmaps/undelete.xpm
+++ b/bitmaps/undelete.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *undelete_xpm[];
+extern const char *undelete_xpm[];
 
 #else
-char * undelete_xpm[] = {
+const char * undelete_xpm[] = {
 "16 16 93 2",
 "  	c None",
 ". 	c #000000",
diff --git a/bitmaps/undo.xpm b/bitmaps/undo.xpm
index 1c1008b83c..6c68edef4a 100644
--- a/bitmaps/undo.xpm
+++ b/bitmaps/undo.xpm
@@ -1,10 +1,10 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *undo_xpm[];
+extern const char *undo_xpm[];
 
 #else
-char *undo_xpm[] = {
-/* width height num_colors chars_per_pixel */
+const char *undo_xpm[] = {
+/* width height num_colors const chars_per_pixel */
 "16 16 4 1",
 /* colors */
 "  c None",
diff --git a/bitmaps/unit_inch.xpm b/bitmaps/unit_inch.xpm
index 90ae48346d..513b31cb4d 100644
--- a/bitmaps/unit_inch.xpm
+++ b/bitmaps/unit_inch.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *unit_inch_xpm[];
+extern const char *unit_inch_xpm[];
 
 #else
-char * unit_inch_xpm[] = {
+const char * unit_inch_xpm[] = {
 "16 16 19 1",
 " 	c None",
 ".	c #3F3F9B",
diff --git a/bitmaps/unit_mm.xpm b/bitmaps/unit_mm.xpm
index 83f57f3ca4..2f79c4b048 100644
--- a/bitmaps/unit_mm.xpm
+++ b/bitmaps/unit_mm.xpm
@@ -1,9 +1,9 @@
 /* XPM */ 
 #ifndef XPMMAIN
-extern char *unit_mm_xpm[];
+extern const char *unit_mm_xpm[];
 
 #else
-char * unit_mm_xpm[] = {
+const char * unit_mm_xpm[] = {
 "16 16 23 1",
 " 	c None",
 "!	c black",
diff --git a/bitmaps/up.xpm b/bitmaps/up.xpm
index 461a0b747a..d117b968f2 100644
--- a/bitmaps/up.xpm
+++ b/bitmaps/up.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char *up_xpm[];
+extern const char *up_xpm[];
 
 #else
-char * up_xpm[] = {
+const char * up_xpm[] = {
 "16 16 26 1",
 " 	c None",
 ".	c #1C2D3D",
diff --git a/bitmaps/zoom.xpm b/bitmaps/zoom.xpm
index 4aaaeb1a38..0fb748fd75 100644
--- a/bitmaps/zoom.xpm
+++ b/bitmaps/zoom.xpm
@@ -1,9 +1,9 @@
 /* XPM */
 #ifndef XPMMAIN
-extern char * zoom_xpm[];
+extern const char * zoom_xpm[];
 
 #else
-char * zoom_xpm[] = {
+const char * zoom_xpm[] = {
 "16 16 3 1",
 "   c None",
 ".	c #00A000",
diff --git a/change_log.txt b/change_log.txt
index f4eebfbed1..79b2b4abd9 100644
--- a/change_log.txt
+++ b/change_log.txt
@@ -4,6 +4,14 @@ Started 2007-June-11
 Please add newer entries at the top, list the date and your name with 
 email address.
 
+
+2007-Oct-31 UPDATE  Jean-Pierre Charras <jean-pierre.charras@inpg.fr>
+================================================================================
++all:
+	gcc 4.2.1 compatibility: change char * to const char * whenever it was necessary,
+	mainly in .xpm files
+
+
 2007-Oct-30 UPDATE   Dick Hollenbeck <dick@softplc.com>
 ================================================================================
 + pcbnew
diff --git a/common/bitmaps/Lang_Catalan.xpm b/common/bitmaps/Lang_Catalan.xpm
index b4d06fffa4..e8603c44b7 100644
--- a/common/bitmaps/Lang_Catalan.xpm
+++ b/common/bitmaps/Lang_Catalan.xpm
@@ -1,6 +1,6 @@
 /* XPM */
-static char *lang_catalan_xpm[] = {
-/* columns rows colors chars-per-pixel */
+static const char *lang_catalan_xpm[] = {
+/* columns rows colors const chars-per-pixel */
 "16 16 14 1",
 "* c #E40E04",
 "@ c #F4C20C",
diff --git a/common/bitmaps/Lang_De.xpm b/common/bitmaps/Lang_De.xpm
index e427309315..4b95b1f245 100644
--- a/common/bitmaps/Lang_De.xpm
+++ b/common/bitmaps/Lang_De.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * lang_de_xpm[] = {
+static const char * lang_de_xpm[] = {
 "16 16 5 1",
 " 	c None",
 ".	c #000000",
diff --git a/common/bitmaps/Lang_Default.xpm b/common/bitmaps/Lang_Default.xpm
index d4b1692222..a1dd62dcd2 100644
--- a/common/bitmaps/Lang_Default.xpm
+++ b/common/bitmaps/Lang_Default.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * lang_def_xpm[] = {
+static const char * lang_def_xpm[] = {
 "16 16 52 1",
 " 	c None",
 ".	c #000000",
diff --git a/common/bitmaps/Lang_En.xpm b/common/bitmaps/Lang_En.xpm
index aa46d71735..f4543f0630 100644
--- a/common/bitmaps/Lang_En.xpm
+++ b/common/bitmaps/Lang_En.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * lang_en_xpm[] = {
+static const char * lang_en_xpm[] = {
 "16 16 21 1",
 " 	c None",
 ".	c #000000",
diff --git a/common/bitmaps/Lang_Es.xpm b/common/bitmaps/Lang_Es.xpm
index 783caab775..df4e941240 100644
--- a/common/bitmaps/Lang_Es.xpm
+++ b/common/bitmaps/Lang_Es.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * lang_es_xpm[] = {
+static const char * lang_es_xpm[] = {
 "16 16 5 1",
 " 	c None",
 ".	c #000000",
diff --git a/common/bitmaps/Lang_Fr.xpm b/common/bitmaps/Lang_Fr.xpm
index 9eee843e2f..9625b66c22 100644
--- a/common/bitmaps/Lang_Fr.xpm
+++ b/common/bitmaps/Lang_Fr.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * lang_fr_xpm[] = {
+static const char * lang_fr_xpm[] = {
 "16 16 5 1",
 " 	c None",
 ".	c #000000",
diff --git a/common/bitmaps/Lang_Hu.xpm b/common/bitmaps/Lang_Hu.xpm
index 65a19aafeb..d82605a3f8 100644
--- a/common/bitmaps/Lang_Hu.xpm
+++ b/common/bitmaps/Lang_Hu.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * lang_hu_xpm[] = {
+static const char * lang_hu_xpm[] = {
 "16 16 5 1",
 " 	c None",
 ".	c #000000",
diff --git a/common/bitmaps/Lang_It.xpm b/common/bitmaps/Lang_It.xpm
index 9734fb1b32..b2d98e1773 100644
--- a/common/bitmaps/Lang_It.xpm
+++ b/common/bitmaps/Lang_It.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * lang_it_xpm[] = {
+static const char * lang_it_xpm[] = {
 "16 16 5 1",
 " 	c None",
 ".	c #000000",
diff --git a/common/bitmaps/Lang_Ko.xpm b/common/bitmaps/Lang_Ko.xpm
index 1a8707a71b..59804e7a76 100644
--- a/common/bitmaps/Lang_Ko.xpm
+++ b/common/bitmaps/Lang_Ko.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * lang_ko_xpm[] =
+static const char * lang_ko_xpm[] =
 {
 "16 16 17 1",
 
diff --git a/common/bitmaps/Lang_Po.xpm b/common/bitmaps/Lang_Po.xpm
index 015d043635..f184987805 100644
--- a/common/bitmaps/Lang_Po.xpm
+++ b/common/bitmaps/Lang_Po.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * lang_po_xpm[] = {
+static const char * lang_po_xpm[] = {
 "16 16 4 1",
 " 	c None",
 ".	c #000000",
diff --git a/common/bitmaps/Lang_Pt.xpm b/common/bitmaps/Lang_Pt.xpm
index 44c75dafcf..ad7aeb5314 100644
--- a/common/bitmaps/Lang_Pt.xpm
+++ b/common/bitmaps/Lang_Pt.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * lang_pt_xpm[] = {
+static const char * lang_pt_xpm[] = {
 "16 16 16 1",
 " 	c None",
 ".	c #000000",
diff --git a/common/bitmaps/Lang_Ru.xpm b/common/bitmaps/Lang_Ru.xpm
index 66ce175ed2..eb6d6f5c87 100644
--- a/common/bitmaps/Lang_Ru.xpm
+++ b/common/bitmaps/Lang_Ru.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * lang_ru_xpm[] = {
+static const char * lang_ru_xpm[] = {
 "16 16 5 1",
 " 	c None",
 ".	c #000000",
diff --git a/common/bitmaps/Lang_Sl.xpm b/common/bitmaps/Lang_Sl.xpm
index 5b425e0346..a7e21ee238 100644
--- a/common/bitmaps/Lang_Sl.xpm
+++ b/common/bitmaps/Lang_Sl.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * lang_sl_xpm[] = {
+static const char * lang_sl_xpm[] = {
 "16 16 5 1",
 " 	c None",
 ".	c #000000",
diff --git a/common/bitmaps/Language.xpm b/common/bitmaps/Language.xpm
index c8ed09afda..44e5065c89 100644
--- a/common/bitmaps/Language.xpm
+++ b/common/bitmaps/Language.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * language_xpm[] = {
+static const char * language_xpm[] = {
 "16 16 92 2",
 "  	c None",
 ". 	c #000000",
diff --git a/common/hotkeys_basic.cpp b/common/hotkeys_basic.cpp
index c078fb7f3b..e51b41c5e0 100644
--- a/common/hotkeys_basic.cpp
+++ b/common/hotkeys_basic.cpp
@@ -31,7 +31,7 @@ Ki_HotkeyInfo::Ki_HotkeyInfo( const wxChar* infomsg, int idcommand, int keycode,
  */
 struct hotkey_name_descr
 {
-    wxChar* m_Name;
+    const wxChar* m_Name;
     int     m_KeyCode;
 };
 
diff --git a/cvpcb/bitmaps/delete_association.xpm b/cvpcb/bitmaps/delete_association.xpm
index 5a5874d997..b756d44c07 100644
--- a/cvpcb/bitmaps/delete_association.xpm
+++ b/cvpcb/bitmaps/delete_association.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * delete_association_xpm[] = {
+static const char * delete_association_xpm[] = {
 "16 16 148 2",
 "  	c None",
 ". 	c #160A00",
diff --git a/cvpcb/bitmaps/module_filtered_list.xpm b/cvpcb/bitmaps/module_filtered_list.xpm
index 32db7e5993..dd356f705e 100644
--- a/cvpcb/bitmaps/module_filtered_list.xpm
+++ b/cvpcb/bitmaps/module_filtered_list.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-char * module_filtered_list_xpm[] = {
+const char * module_filtered_list_xpm[] = {
 "16 15 5 1",
 "X c #808080",
 "  c None",
diff --git a/cvpcb/bitmaps/module_full_list.xpm b/cvpcb/bitmaps/module_full_list.xpm
index 043f8f6732..da6dd7357c 100644
--- a/cvpcb/bitmaps/module_full_list.xpm
+++ b/cvpcb/bitmaps/module_full_list.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-char * module_full_list_xpm[] = {
+const char * module_full_list_xpm[] = {
 "16 15 5 1",
 "X c #808080",
 "  c None",
diff --git a/eeschema/bitmaps/AddBus2Bus.xpm b/eeschema/bitmaps/AddBus2Bus.xpm
index 2527fb61b8..9e19b085dc 100644
--- a/eeschema/bitmaps/AddBus2Bus.xpm
+++ b/eeschema/bitmaps/AddBus2Bus.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * AddBus2Bus_xpm[] = {
+static const char * AddBus2Bus_xpm[] = {
 "16 16 28 1",
 " 	c None",
 ".	c #9B9BFF",
diff --git a/eeschema/bitmaps/AddLine2Bus.xpm b/eeschema/bitmaps/AddLine2Bus.xpm
index 637cb259f0..f8aebb5570 100644
--- a/eeschema/bitmaps/AddLine2Bus.xpm
+++ b/eeschema/bitmaps/AddLine2Bus.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * AddLine2Bus_xpm[] = {
+static const char * AddLine2Bus_xpm[] = {
 "16 16 29 1",
 " 	c None",
 ".	c #9B9BFF",
diff --git a/eeschema/bitmaps/Add_Bus2Bus.xpm b/eeschema/bitmaps/Add_Bus2Bus.xpm
index 8fef846d0e..e9bc600953 100644
--- a/eeschema/bitmaps/Add_Bus2Bus.xpm
+++ b/eeschema/bitmaps/Add_Bus2Bus.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * add_bus2bus_xpm[] = {
+static const char * add_bus2bus_xpm[] = {
 "16 16 38 1",
 " 	c None",
 ".	c #AFAFFF",
diff --git a/eeschema/bitmaps/Add_GLabel.xpm b/eeschema/bitmaps/Add_GLabel.xpm
index 78cc3e03ae..cd08439cbc 100644
--- a/eeschema/bitmaps/Add_GLabel.xpm
+++ b/eeschema/bitmaps/Add_GLabel.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * add_glabel_xpm[] = {
+static const char * add_glabel_xpm[] = {
 "16 16 54 1",
 " 	c None",
 ".	c #695F00",
diff --git a/eeschema/bitmaps/Add_Junction.xpm b/eeschema/bitmaps/Add_Junction.xpm
index 2c7b0aa0b4..84f86716d8 100644
--- a/eeschema/bitmaps/Add_Junction.xpm
+++ b/eeschema/bitmaps/Add_Junction.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * add_junction_xpm[] = {
+static const char * add_junction_xpm[] = {
 "16 16 60 1",
 " 	c None",
 ".	c #007D00",
diff --git a/eeschema/bitmaps/Add_Line_Label.xpm b/eeschema/bitmaps/Add_Line_Label.xpm
index 441ac3cdfc..53510542dd 100644
--- a/eeschema/bitmaps/Add_Line_Label.xpm
+++ b/eeschema/bitmaps/Add_Line_Label.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * add_line_label_xpm[] = {
+static const char * add_line_label_xpm[] = {
 "16 16 24 1",
 " 	c None",
 ".	c #000000",
diff --git a/eeschema/bitmaps/Add_Power.xpm b/eeschema/bitmaps/Add_Power.xpm
index 9b2ff8056a..bff660bb17 100644
--- a/eeschema/bitmaps/Add_Power.xpm
+++ b/eeschema/bitmaps/Add_Power.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * add_power_xpm[] = {
+static const char * add_power_xpm[] = {
 "16 16 26 1",
 " 	c None",
 ".	c #D72D2D",
diff --git a/eeschema/bitmaps/Break_Bus.xpm b/eeschema/bitmaps/Break_Bus.xpm
index f48b72bb4e..3d8f30c0d7 100644
--- a/eeschema/bitmaps/Break_Bus.xpm
+++ b/eeschema/bitmaps/Break_Bus.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * break_bus_xpm[] = {
+static const char * break_bus_xpm[] = {
 "16 16 36 1",
 " 	c None",
 ".	c #D72E2E",
diff --git a/eeschema/bitmaps/Break_Line.xpm b/eeschema/bitmaps/Break_Line.xpm
index f7527c486f..43ffe0636b 100644
--- a/eeschema/bitmaps/Break_Line.xpm
+++ b/eeschema/bitmaps/Break_Line.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * break_line_xpm[] = {
+static const char * break_line_xpm[] = {
 "16 16 34 1",
 " 	c None",
 ".	c #D72E2E",
diff --git a/eeschema/bitmaps/Delete_Bus.xpm b/eeschema/bitmaps/Delete_Bus.xpm
index aae199557d..9e81037f52 100644
--- a/eeschema/bitmaps/Delete_Bus.xpm
+++ b/eeschema/bitmaps/Delete_Bus.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * delete_bus_xpm[] = {
+static const char * delete_bus_xpm[] = {
 "16 16 130 2",
 "  	c None",
 ". 	c #0000C3",
diff --git a/eeschema/bitmaps/Delete_Connection.xpm b/eeschema/bitmaps/Delete_Connection.xpm
index c526cfc798..dce0c6683e 100644
--- a/eeschema/bitmaps/Delete_Connection.xpm
+++ b/eeschema/bitmaps/Delete_Connection.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * delete_connection_xpm[] = {
+static const char * delete_connection_xpm[] = {
 "16 16 157 2",
 "  	c None",
 ". 	c #000000",
diff --git a/eeschema/bitmaps/Delete_GLabel.xpm b/eeschema/bitmaps/Delete_GLabel.xpm
index 2b5bd4399b..ed82aa7691 100644
--- a/eeschema/bitmaps/Delete_GLabel.xpm
+++ b/eeschema/bitmaps/Delete_GLabel.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * delete_glabel_xpm[] = {
+static const char * delete_glabel_xpm[] = {
 "16 16 133 2",
 "  	c None",
 ". 	c #695F00",
diff --git a/eeschema/bitmaps/Delete_Node.xpm b/eeschema/bitmaps/Delete_Node.xpm
index bcb7737290..9c7280da83 100644
--- a/eeschema/bitmaps/Delete_Node.xpm
+++ b/eeschema/bitmaps/Delete_Node.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * delete_node_xpm[] = {
+static const char * delete_node_xpm[] = {
 "16 16 132 2",
 "  	c None",
 ". 	c #007D00",
diff --git a/eeschema/bitmaps/Delete_Pin.xpm b/eeschema/bitmaps/Delete_Pin.xpm
index b5533f56c3..0a13b5b5b6 100644
--- a/eeschema/bitmaps/Delete_Pin.xpm
+++ b/eeschema/bitmaps/Delete_Pin.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * delete_pin_xpm[] = {
+static const char * delete_pin_xpm[] = {
 "16 16 129 2",
 "  	c None",
 ". 	c #D72E2E",
diff --git a/eeschema/bitmaps/Delete_Pinsheet.xpm b/eeschema/bitmaps/Delete_Pinsheet.xpm
index 3380b778f9..ac1621b207 100644
--- a/eeschema/bitmaps/Delete_Pinsheet.xpm
+++ b/eeschema/bitmaps/Delete_Pinsheet.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * delete_pinsheet_xpm[] = {
+static const char * delete_pinsheet_xpm[] = {
 "16 16 159 2",
 "  	c None",
 ". 	c #6F6500",
diff --git a/eeschema/bitmaps/Delete_Sheet.xpm b/eeschema/bitmaps/Delete_Sheet.xpm
index 4758c29c51..7e4a6ed026 100644
--- a/eeschema/bitmaps/Delete_Sheet.xpm
+++ b/eeschema/bitmaps/Delete_Sheet.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * delete_sheet_xpm[] = {
+static const char * delete_sheet_xpm[] = {
 "16 16 134 2",
 "  	c None",
 ". 	c #000000",
diff --git a/eeschema/bitmaps/Edit_Comp_Ref.xpm b/eeschema/bitmaps/Edit_Comp_Ref.xpm
index 072a2dd801..aa5516c009 100644
--- a/eeschema/bitmaps/Edit_Comp_Ref.xpm
+++ b/eeschema/bitmaps/Edit_Comp_Ref.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * edit_comp_ref_xpm[] = {
+static const char * edit_comp_ref_xpm[] = {
 "16 16 72 1",
 " 	c None",
 ".	c #000000",
diff --git a/eeschema/bitmaps/Edit_Comp_Value.xpm b/eeschema/bitmaps/Edit_Comp_Value.xpm
index 9f6b8babb4..1a4090bfee 100644
--- a/eeschema/bitmaps/Edit_Comp_Value.xpm
+++ b/eeschema/bitmaps/Edit_Comp_Value.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * edit_comp_value_xpm[] = {
+static const char * edit_comp_value_xpm[] = {
 "16 16 73 1",
 " 	c None",
 ".	c #000000",
diff --git a/eeschema/bitmaps/Edit_Component.xpm b/eeschema/bitmaps/Edit_Component.xpm
index 467da55ac7..1941654766 100644
--- a/eeschema/bitmaps/Edit_Component.xpm
+++ b/eeschema/bitmaps/Edit_Component.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * edit_component_xpm[] = {
+static const char * edit_component_xpm[] = {
 "16 16 80 1",
 " 	c None",
 ".	c #000000",
diff --git a/eeschema/bitmaps/Edit_Part.xpm b/eeschema/bitmaps/Edit_Part.xpm
index d637ce370c..ff112174cc 100644
--- a/eeschema/bitmaps/Edit_Part.xpm
+++ b/eeschema/bitmaps/Edit_Part.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * Edit_Part_xpm[] = {
+static const char * Edit_Part_xpm[] = {
 "16 16 82 1",
 " 	c None",
 ".	c #000000",
diff --git a/eeschema/bitmaps/Edit_Sheet.xpm b/eeschema/bitmaps/Edit_Sheet.xpm
index 814ad8e892..8a28a4e46b 100644
--- a/eeschema/bitmaps/Edit_Sheet.xpm
+++ b/eeschema/bitmaps/Edit_Sheet.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * edit_sheet_xpm[] = {
+static const char * edit_sheet_xpm[] = {
 "16 16 49 1",
 " 	c None",
 ".	c #000000",
diff --git a/eeschema/bitmaps/GL_Change.xpm b/eeschema/bitmaps/GL_Change.xpm
index 3eff67a8b5..d17eafec70 100644
--- a/eeschema/bitmaps/GL_Change.xpm
+++ b/eeschema/bitmaps/GL_Change.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * gl_change_xpm[] = {
+static const char * gl_change_xpm[] = {
 "16 16 30 1",
 " 	c None",
 ".	c #695F00",
diff --git a/eeschema/bitmaps/GLabel2Label.xpm b/eeschema/bitmaps/GLabel2Label.xpm
index e3806852a6..06a274616d 100644
--- a/eeschema/bitmaps/GLabel2Label.xpm
+++ b/eeschema/bitmaps/GLabel2Label.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * glabel2label_xpm[] = {
+static const char * glabel2label_xpm[] = {
 "16 16 30 1",
 " 	c None",
 ".	c #695F00",
diff --git a/eeschema/bitmaps/GLabel2Text.xpm b/eeschema/bitmaps/GLabel2Text.xpm
index 759ab01d0b..8f58a3841c 100644
--- a/eeschema/bitmaps/GLabel2Text.xpm
+++ b/eeschema/bitmaps/GLabel2Text.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * glabel2text_xpm[] = {
+static const char * glabel2text_xpm[] = {
 "16 16 42 1",
 " 	c None",
 ".	c #695F00",
diff --git a/eeschema/bitmaps/Hidden_Pin.xpm b/eeschema/bitmaps/Hidden_Pin.xpm
index c29e9a3e0e..8c55e3cf2c 100644
--- a/eeschema/bitmaps/Hidden_Pin.xpm
+++ b/eeschema/bitmaps/Hidden_Pin.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * hidden_pin_xpm[] = {
+static const char * hidden_pin_xpm[] = {
 "16 16 133 2",
 "  	c None",
 ". 	c #030303",
diff --git a/eeschema/bitmaps/Hierarchy_Nav.xpm b/eeschema/bitmaps/Hierarchy_Nav.xpm
index f200e19c8f..a96a3de686 100644
--- a/eeschema/bitmaps/Hierarchy_Nav.xpm
+++ b/eeschema/bitmaps/Hierarchy_Nav.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * hierarchy_nav_xpm[] = {
+static const char * hierarchy_nav_xpm[] = {
 "16 16 7 1",
 " 	c None",
 ".	c #000000",
diff --git a/eeschema/bitmaps/Hierarchy_cursor.xpm b/eeschema/bitmaps/Hierarchy_cursor.xpm
index 2fefcdbcbe..4b16b6df09 100644
--- a/eeschema/bitmaps/Hierarchy_cursor.xpm
+++ b/eeschema/bitmaps/Hierarchy_cursor.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * hierarchy_cursor_xpm[] = {
+static const char * hierarchy_cursor_xpm[] = {
 "16 16 61 1",
 " 	c None",
 ".	c #000000",
diff --git a/eeschema/bitmaps/Import_GLabel.xpm b/eeschema/bitmaps/Import_GLabel.xpm
index 74ffcd604e..39d220a352 100644
--- a/eeschema/bitmaps/Import_GLabel.xpm
+++ b/eeschema/bitmaps/Import_GLabel.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * import_glabel_xpm[] = {
+static const char * import_glabel_xpm[] = {
 "16 16 92 2",
 "  	c None",
 ". 	c #000000",
diff --git a/eeschema/bitmaps/Label2GLabel.xpm b/eeschema/bitmaps/Label2GLabel.xpm
index 40a11f2ec7..5941bea83e 100644
--- a/eeschema/bitmaps/Label2GLabel.xpm
+++ b/eeschema/bitmaps/Label2GLabel.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * label2glabel_xpm[] = {
+static const char * label2glabel_xpm[] = {
 "16 16 34 1",
 " 	c None",
 ".	c #000000",
diff --git a/eeschema/bitmaps/Label2Text.xpm b/eeschema/bitmaps/Label2Text.xpm
index 128ef6a0e4..7774e75a87 100644
--- a/eeschema/bitmaps/Label2Text.xpm
+++ b/eeschema/bitmaps/Label2Text.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * label2text_xpm[] = {
+static const char * label2text_xpm[] = {
 "16 16 35 1",
 " 	c None",
 ".	c #000000",
diff --git a/eeschema/bitmaps/Leave_Sheet.xpm b/eeschema/bitmaps/Leave_Sheet.xpm
index 6a07aeb165..e7fac931da 100644
--- a/eeschema/bitmaps/Leave_Sheet.xpm
+++ b/eeschema/bitmaps/Leave_Sheet.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * leave_sheet_xpm[] = {
+static const char * leave_sheet_xpm[] = {
 "16 16 58 1",
 " 	c None",
 ".	c #000000",
diff --git a/eeschema/bitmaps/Lib_next.xpm b/eeschema/bitmaps/Lib_next.xpm
index c40cd00ed1..90414bd768 100644
--- a/eeschema/bitmaps/Lib_next.xpm
+++ b/eeschema/bitmaps/Lib_next.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * lib_next_xpm[] = {
+static const char * lib_next_xpm[] = {
 "16 16 63 1",
 " 	c None",
 ".	c #000000",
diff --git a/eeschema/bitmaps/Lib_previous.xpm b/eeschema/bitmaps/Lib_previous.xpm
index a19c7a20a5..694eb74293 100644
--- a/eeschema/bitmaps/Lib_previous.xpm
+++ b/eeschema/bitmaps/Lib_previous.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * lib_previous_xpm[] = {
+static const char * lib_previous_xpm[] = {
 "16 16 64 1",
 " 	c None",
 ".	c #000000",
diff --git a/eeschema/bitmaps/Lines90.xpm b/eeschema/bitmaps/Lines90.xpm
index 0735a1f355..545dc1f9c8 100644
--- a/eeschema/bitmaps/Lines90.xpm
+++ b/eeschema/bitmaps/Lines90.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * lines90_xpm[] = {
+static const char * lines90_xpm[] = {
 "16 16 24 1",
 " 	c None",
 ".	c #000000",
diff --git a/eeschema/bitmaps/Mirror_H.xpm b/eeschema/bitmaps/Mirror_H.xpm
index 93e8b0a2a8..36288336b6 100644
--- a/eeschema/bitmaps/Mirror_H.xpm
+++ b/eeschema/bitmaps/Mirror_H.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * mirror_H_xpm[] = {
+static const char * mirror_H_xpm[] = {
 "16 16 29 1",
 " 	c None",
 ".	c #000000",
diff --git a/eeschema/bitmaps/Mirror_V.xpm b/eeschema/bitmaps/Mirror_V.xpm
index 535e035fea..617029ef68 100644
--- a/eeschema/bitmaps/Mirror_V.xpm
+++ b/eeschema/bitmaps/Mirror_V.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * mirror_V_xpm[] = {
+static const char * mirror_V_xpm[] = {
 "16 16 30 1",
 " 	c None",
 ".	c #000000",
diff --git a/eeschema/bitmaps/Move_GLabel.xpm b/eeschema/bitmaps/Move_GLabel.xpm
index 69651bb759..fdddfdbd34 100644
--- a/eeschema/bitmaps/Move_GLabel.xpm
+++ b/eeschema/bitmaps/Move_GLabel.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * move_glabel_xpm[] = {
+static const char * move_glabel_xpm[] = {
 "16 16 66 1",
 " 	c None",
 ".	c #695F00",
diff --git a/eeschema/bitmaps/Move_Pinsheet.xpm b/eeschema/bitmaps/Move_Pinsheet.xpm
index 3c4c38f000..6723c120b9 100644
--- a/eeschema/bitmaps/Move_Pinsheet.xpm
+++ b/eeschema/bitmaps/Move_Pinsheet.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * move_pinsheet_xpm[] = {
+static const char * move_pinsheet_xpm[] = {
 "16 16 81 1",
 " 	c None",
 ".	c #6F6500",
diff --git a/eeschema/bitmaps/Move_Sheet.xpm b/eeschema/bitmaps/Move_Sheet.xpm
index 35ca0e257d..0d9174f44f 100644
--- a/eeschema/bitmaps/Move_Sheet.xpm
+++ b/eeschema/bitmaps/Move_Sheet.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * move_sheet_xpm[] = {
+static const char * move_sheet_xpm[] = {
 "16 16 68 1",
 " 	c None",
 ".	c #000000",
diff --git a/eeschema/bitmaps/Normal.xpm b/eeschema/bitmaps/Normal.xpm
index 4305a46321..96429ce868 100644
--- a/eeschema/bitmaps/Normal.xpm
+++ b/eeschema/bitmaps/Normal.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * normal_xpm[] = {
+static const char * normal_xpm[] = {
 "16 16 107 2",
 "  	c None",
 ". 	c #000000",
diff --git a/eeschema/bitmaps/Options_Pin.xpm b/eeschema/bitmaps/Options_Pin.xpm
index 88c144eb2c..72fcdc7f80 100644
--- a/eeschema/bitmaps/Options_Pin.xpm
+++ b/eeschema/bitmaps/Options_Pin.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * options_pin_xpm[] = {
+static const char * options_pin_xpm[] = {
 "16 16 48 1",
 " 	c None",
 ".	c #D72E2E",
diff --git a/eeschema/bitmaps/Options_Pinsheet.xpm b/eeschema/bitmaps/Options_Pinsheet.xpm
index 2b88835c07..8a847dd080 100644
--- a/eeschema/bitmaps/Options_Pinsheet.xpm
+++ b/eeschema/bitmaps/Options_Pinsheet.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * options_pinsheet_xpm[] = {
+static const char * options_pinsheet_xpm[] = {
 "16 16 78 1",
 " 	c None",
 ".	c #6F6500",
diff --git a/eeschema/bitmaps/Pin_Name_to.xpm b/eeschema/bitmaps/Pin_Name_to.xpm
index 31f7a7e28b..95d8730564 100644
--- a/eeschema/bitmaps/Pin_Name_to.xpm
+++ b/eeschema/bitmaps/Pin_Name_to.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * pin_name_to_xpm[] = {
+static const char * pin_name_to_xpm[] = {
 "16 16 58 1",
 " 	c None",
 ".	c #D72E2E",
diff --git a/eeschema/bitmaps/Pin_Number_to.xpm b/eeschema/bitmaps/Pin_Number_to.xpm
index c4bfafbfcd..3e59ffc3bc 100644
--- a/eeschema/bitmaps/Pin_Number_to.xpm
+++ b/eeschema/bitmaps/Pin_Number_to.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * pin_number_to_xpm[] = {
+static const char * pin_number_to_xpm[] = {
 "16 16 58 1",
 " 	c None",
 ".	c #D72E2E",
diff --git a/eeschema/bitmaps/Pin_Size_to.xpm b/eeschema/bitmaps/Pin_Size_to.xpm
index 4e81c9a43d..febef38f91 100644
--- a/eeschema/bitmaps/Pin_Size_to.xpm
+++ b/eeschema/bitmaps/Pin_Size_to.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * pin_size_to_xpm[] = {
+static const char * pin_size_to_xpm[] = {
 "16 16 53 1",
 " 	c None",
 ".	c #D72E2E",
diff --git a/eeschema/bitmaps/Pin_to.xpm b/eeschema/bitmaps/Pin_to.xpm
index 5f8a506c05..b87e0a0492 100644
--- a/eeschema/bitmaps/Pin_to.xpm
+++ b/eeschema/bitmaps/Pin_to.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * pin_to_xpm[] = {
+static const char * pin_to_xpm[] = {
 "16 16 48 1",
 " 	c None",
 ".	c #D72E2E",
diff --git a/eeschema/bitmaps/Resize_Sheet.xpm b/eeschema/bitmaps/Resize_Sheet.xpm
index 629b489637..8b0b4fd780 100644
--- a/eeschema/bitmaps/Resize_Sheet.xpm
+++ b/eeschema/bitmaps/Resize_Sheet.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * resize_sheet_xpm[] = {
+static const char * resize_sheet_xpm[] = {
 "16 16 15 1",
 " 	c None",
 ".	c #000000",
diff --git a/eeschema/bitmaps/Rotate_GLabel.xpm b/eeschema/bitmaps/Rotate_GLabel.xpm
index cb00b79c45..eabdaecab9 100644
--- a/eeschema/bitmaps/Rotate_GLabel.xpm
+++ b/eeschema/bitmaps/Rotate_GLabel.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * rotate_glabel_xpm[] = {
+static const char * rotate_glabel_xpm[] = {
 "16 16 91 1",
 " 	c None",
 ".	c #695F00",
diff --git a/eeschema/bitmaps/Rotate_Pin.xpm b/eeschema/bitmaps/Rotate_Pin.xpm
index 228a1f5e2f..649afd9091 100644
--- a/eeschema/bitmaps/Rotate_Pin.xpm
+++ b/eeschema/bitmaps/Rotate_Pin.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * Rotate_Pin_xpm[] = {
+static const char * Rotate_Pin_xpm[] = {
 "16 16 72 1",
 " 	c None",
 ".	c #D72E2E",
diff --git a/eeschema/bitmaps/add_hierar_pin.xpm b/eeschema/bitmaps/add_hierar_pin.xpm
index 015add5222..688df5d417 100644
--- a/eeschema/bitmaps/add_hierar_pin.xpm
+++ b/eeschema/bitmaps/add_hierar_pin.xpm
@@ -1,4 +1,4 @@
-/* XPM */ 
+/* XPM */
 static const char * add_hierar_pin_xpm[] = {
 "16 16 37 1",
 " 	c None",
diff --git a/eeschema/bitmaps/cvpcb.xpm b/eeschema/bitmaps/cvpcb.xpm
index 8145b3656b..4e3b025576 100644
--- a/eeschema/bitmaps/cvpcb.xpm
+++ b/eeschema/bitmaps/cvpcb.xpm
@@ -1,6 +1,6 @@
 /* XPM */
-static char *cvpcb_xpm[] = {
-/* columns rows colors chars-per-pixel */
+static const char *cvpcb_xpm[] = {
+/* columns rows colors const chars-per-pixel */
 "16 16 46 1",
 " 	c None",
 ".	c #160A00",
diff --git a/eeschema/bitmaps/libedit.xpm b/eeschema/bitmaps/libedit.xpm
index 9c8976d8cf..11ec237c18 100644
--- a/eeschema/bitmaps/libedit.xpm
+++ b/eeschema/bitmaps/libedit.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * libedit_xpm[] = {
+static const char * libedit_xpm[] = {
 "16 16 130 2",
 "  	c None",
 ". 	c #070809",
diff --git a/eeschema/bitmaps/libedit_icon.xpm b/eeschema/bitmaps/libedit_icon.xpm
index 209cc645b2..561d95b54d 100644
--- a/eeschema/bitmaps/libedit_icon.xpm
+++ b/eeschema/bitmaps/libedit_icon.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * libedit_icon_xpm[] = {
+static const char * libedit_icon_xpm[] = {
 "32 32 112 2",
 "  	c None",
 ". 	c #000000",
diff --git a/eeschema/bitmaps/library_browse.xpm b/eeschema/bitmaps/library_browse.xpm
index 76fc7355e4..3ed97a4fa7 100644
--- a/eeschema/bitmaps/library_browse.xpm
+++ b/eeschema/bitmaps/library_browse.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * library_browse_xpm[] = {
+static const char * library_browse_xpm[] = {
 "16 16 130 2",
 "  	c None",
 ". 	c #070809",
diff --git a/eeschema/bitmaps/part_properties.xpm b/eeschema/bitmaps/part_properties.xpm
index c77184c908..f331908e87 100644
--- a/eeschema/bitmaps/part_properties.xpm
+++ b/eeschema/bitmaps/part_properties.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * part_properties_xpm[] = {
+static const char * part_properties_xpm[] = {
 "16 16 85 1",
 " 	c None",
 ".	c #000000",
diff --git a/eeschema/bitmaps/pin2pin.xpm b/eeschema/bitmaps/pin2pin.xpm
index 7d424c2fa3..546370d7e7 100644
--- a/eeschema/bitmaps/pin2pin.xpm
+++ b/eeschema/bitmaps/pin2pin.xpm
@@ -1,6 +1,6 @@
 /* XPM */
-static char *pin2pin_xpm[] = {
-/* columns rows colors chars-per-pixel */
+static const char *pin2pin_xpm[] = {
+/* columns rows colors const chars-per-pixel */
 "16 16 61 1",
 " 	c None",
 ".	c #000000",
diff --git a/eeschema/bitmaps/viewlibs_icon.xpm b/eeschema/bitmaps/viewlibs_icon.xpm
index 0a6fbb1f2a..d7a4ba7ca8 100644
--- a/eeschema/bitmaps/viewlibs_icon.xpm
+++ b/eeschema/bitmaps/viewlibs_icon.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * viewlibs_icon_xpm[] = {
+static const char * viewlibs_icon_xpm[] = {
 "32 32 345 2",
 "  	c None",
 ". 	c #0C0C0E",
diff --git a/eeschema/erc.cpp b/eeschema/erc.cpp
index 3e4045d33c..16482420da 100644
--- a/eeschema/erc.cpp
+++ b/eeschema/erc.cpp
@@ -475,7 +475,7 @@ void WinEDA_ErcFrame::ChangeErrorLevel( wxCommandEvent& event )
 {
     int             id, level, ii, x, y;
     wxBitmapButton* Butt;
-    char**          new_bitmap_xpm = NULL;
+    const char**          new_bitmap_xpm = NULL;
     wxPoint         pos;
 
     id   = event.GetId();
diff --git a/include/worksheet.h b/include/worksheet.h
index 3330ad5c13..48f0bf96a7 100644
--- a/include/worksheet.h
+++ b/include/worksheet.h
@@ -45,8 +45,8 @@ public:
 	Ki_WorkSheetData * Pnext;
 	int m_Posx, m_Posy;		/* position de l'element ou point de depart du segment */
 	int m_Endx, m_Endy;		/* extremite d'un element type segment ou cadre */
-	wxChar * m_Legende;		/* Pour m_Textes: texte a afficher avant le texte lui meme */
-	wxChar * m_Text;		/* Pour m_Textes:pointeur sur le texte a afficher */
+	const wxChar * m_Legende;		/* Pour m_Textes: texte a afficher avant le texte lui meme */
+	const wxChar * m_Text;		/* Pour m_Textes:pointeur sur le texte a afficher */
 };
 
 /* Type des descriptions Ki_WorkSheetData */
diff --git a/kicad/bitmaps/Browse_Files.xpm b/kicad/bitmaps/Browse_Files.xpm
index d86dbe6bb9..ae37935253 100644
--- a/kicad/bitmaps/Browse_Files.xpm
+++ b/kicad/bitmaps/Browse_Files.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * browse_files_xpm[] = {
+static const char * browse_files_xpm[] = {
 "16 16 66 1",
 " 	c None",
 ".	c #000000",
diff --git a/kicad/bitmaps/Fonts.xpm b/kicad/bitmaps/Fonts.xpm
index 6bba4a6851..ee4c2a4698 100644
--- a/kicad/bitmaps/Fonts.xpm
+++ b/kicad/bitmaps/Fonts.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * fonts_xpm[] = {
+static const char * fonts_xpm[] = {
 "16 16 46 1",
 " 	c None",
 ".	c #70653B",
diff --git a/kicad/bitmaps/New_Project.xpm b/kicad/bitmaps/New_Project.xpm
index 42a20c1a0f..1b7113b97b 100644
--- a/kicad/bitmaps/New_Project.xpm
+++ b/kicad/bitmaps/New_Project.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * new_project_xpm[] = {
+static const char * new_project_xpm[] = {
 "16 16 30 1",
 " 	c None",
 ".	c #000000",
diff --git a/kicad/bitmaps/Save_Project.xpm b/kicad/bitmaps/Save_Project.xpm
index 61569a9d78..405371813d 100644
--- a/kicad/bitmaps/Save_Project.xpm
+++ b/kicad/bitmaps/Save_Project.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * save_project_xpm[] = {
+static const char * save_project_xpm[] = {
 "16 16 63 1",
 " 	c None",
 ".	c #000000",
diff --git a/kicad/bitmaps/icon_cvpcb_small.xpm b/kicad/bitmaps/icon_cvpcb_small.xpm
index db7caa963b..22b1f0341e 100644
--- a/kicad/bitmaps/icon_cvpcb_small.xpm
+++ b/kicad/bitmaps/icon_cvpcb_small.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * icon_cvpcb_small_xpm[] = {
+static const char * icon_cvpcb_small_xpm[] = {
 "16 16 132 2",
 "  	c None",
 ". 	c #FF7800",
diff --git a/kicad/bitmaps/icon_gerbview_small.xpm b/kicad/bitmaps/icon_gerbview_small.xpm
index e4c36c5c8c..77ec2c3a66 100644
--- a/kicad/bitmaps/icon_gerbview_small.xpm
+++ b/kicad/bitmaps/icon_gerbview_small.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * icon_gerbview_small_xpm[] = {
+static const char * icon_gerbview_small_xpm[] = {
 "16 16 166 2",
 "  	c None",
 ". 	c #424040",
diff --git a/kicad/bitmaps/new_cvpcb.xpm b/kicad/bitmaps/new_cvpcb.xpm
index 0fc44270c2..18564f3eb5 100644
--- a/kicad/bitmaps/new_cvpcb.xpm
+++ b/kicad/bitmaps/new_cvpcb.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * new_cvpcb_xpm[] = {
+static const char * new_cvpcb_xpm[] = {
 "16 16 87 1",
 " 	c None",
 ".	c #000000",
diff --git a/kicad/bitmaps/new_gerb.xpm b/kicad/bitmaps/new_gerb.xpm
index 43621aefeb..88f4d5981c 100644
--- a/kicad/bitmaps/new_gerb.xpm
+++ b/kicad/bitmaps/new_gerb.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * new_gerb_xpm[] = {
+static const char * new_gerb_xpm[] = {
 "16 16 78 1",
 " 	c None",
 ".	c #000000",
diff --git a/kicad/bitmaps/new_pcb.xpm b/kicad/bitmaps/new_pcb.xpm
index 389641e1ee..0d9550f3da 100644
--- a/kicad/bitmaps/new_pcb.xpm
+++ b/kicad/bitmaps/new_pcb.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * new_pcb_xpm[] = {
+static const char * new_pcb_xpm[] = {
 "16 16 35 1",
 " 	c None",
 ".	c #000000",
diff --git a/kicad/bitmaps/new_python.xpm b/kicad/bitmaps/new_python.xpm
index 94fd1e0f7b..cbb3147a31 100644
--- a/kicad/bitmaps/new_python.xpm
+++ b/kicad/bitmaps/new_python.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * new_python_xpm[] = {
+static const char * new_python_xpm[] = {
 "16 16 112 2",
 "  	c None",
 ". 	c #000000",
diff --git a/kicad/bitmaps/new_sch.xpm b/kicad/bitmaps/new_sch.xpm
index 0ee2b9d2c1..39d7498e0b 100644
--- a/kicad/bitmaps/new_sch.xpm
+++ b/kicad/bitmaps/new_sch.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * new_sch_xpm[] = {
+static const char * new_sch_xpm[] = {
 "16 16 66 1",
 " 	c None",
 ".	c #000000",
diff --git a/kicad/bitmaps/reload.xpm b/kicad/bitmaps/reload.xpm
index 45c687b7d0..661883003a 100644
--- a/kicad/bitmaps/reload.xpm
+++ b/kicad/bitmaps/reload.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * reload_xpm[] = {
+static const char * reload_xpm[] = {
 "16 16 152 2",
 "  	c None",
 ". 	c #3ACF73",
diff --git a/kicad/bitmaps/unknown.xpm b/kicad/bitmaps/unknown.xpm
index 9ea2b42fff..0a398a7101 100644
--- a/kicad/bitmaps/unknown.xpm
+++ b/kicad/bitmaps/unknown.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * unknown_xpm[] = {
+static const char * unknown_xpm[] = {
 "16 16 49 1",
 " 	c None",
 ".	c #C6C6D5",
diff --git a/kicad/bitmaps/unzip.xpm b/kicad/bitmaps/unzip.xpm
index ac64b0cf65..c9b1bad4a5 100644
--- a/kicad/bitmaps/unzip.xpm
+++ b/kicad/bitmaps/unzip.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * unzip_xpm[] = {
+static const char * unzip_xpm[] = {
 "16 16 16 1",
 " 	c none",
 ".	c #060304",
diff --git a/kicad/bitmaps/zip.xpm b/kicad/bitmaps/zip.xpm
index d14d377800..fb44d7a9a1 100644
--- a/kicad/bitmaps/zip.xpm
+++ b/kicad/bitmaps/zip.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * zip_xpm[] = {
+static const char * zip_xpm[] = {
 "16 16 16 1",
 " 	c none",
 ".	c #060304",
diff --git a/kicad/bitmaps/zip_tool.xpm b/kicad/bitmaps/zip_tool.xpm
index 6e0e80401f..9b67e08d8b 100644
--- a/kicad/bitmaps/zip_tool.xpm
+++ b/kicad/bitmaps/zip_tool.xpm
@@ -1,6 +1,6 @@
 /* XPM */
-static char *zip_tool_xpm[] = {
-/* width height num_colors chars_per_pixel */
+static const char *zip_tool_xpm[] = {
+/* width height num_colors const chars_per_pixel */
 "16 15 16 1",
 "A c #040604",
 "B c #9C9A04",
diff --git a/pcbnew/bitmaps/Add_Mires.xpm b/pcbnew/bitmaps/Add_Mires.xpm
index 6c64fc168b..30c3e30076 100644
--- a/pcbnew/bitmaps/Add_Mires.xpm
+++ b/pcbnew/bitmaps/Add_Mires.xpm
@@ -1,5 +1,5 @@
 /* XPM */ 
-static char * add_mires_xpm[] = {
+static const char * add_mires_xpm[] = {
 "16 16 64 1",
 " 	c None",
 "!	c black",
diff --git a/pcbnew/bitmaps/Add_Tracks.xpm b/pcbnew/bitmaps/Add_Tracks.xpm
index 253f660a62..0863bcf7bc 100644
--- a/pcbnew/bitmaps/Add_Tracks.xpm
+++ b/pcbnew/bitmaps/Add_Tracks.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * add_tracks_xpm[] = {
+static const char * add_tracks_xpm[] = {
 "16 16 16 1",
 " 	c None",
 ".	c #007D00",
diff --git a/pcbnew/bitmaps/Add_Zone.xpm b/pcbnew/bitmaps/Add_Zone.xpm
index 2f9c7dbfe6..34a3edc667 100644
--- a/pcbnew/bitmaps/Add_Zone.xpm
+++ b/pcbnew/bitmaps/Add_Zone.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * add_zone_xpm[] = {
+static const char * add_zone_xpm[] = {
 "16 16 3 1",
 " 	c None",
 ".	c #007D00",
diff --git a/pcbnew/bitmaps/Break_Line.xpm b/pcbnew/bitmaps/Break_Line.xpm
index 1a53c39554..9c2965f764 100644
--- a/pcbnew/bitmaps/Break_Line.xpm
+++ b/pcbnew/bitmaps/Break_Line.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * Break_Line_xpm[] = {
+static const char * Break_Line_xpm[] = {
 "16 16 34 1",
 " 	c None",
 ".	c #D72E2E",
diff --git a/pcbnew/bitmaps/Delete_Line.xpm b/pcbnew/bitmaps/Delete_Line.xpm
index 1ef25bd8e6..3e41b45752 100644
--- a/pcbnew/bitmaps/Delete_Line.xpm
+++ b/pcbnew/bitmaps/Delete_Line.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * Delete_Line_xpm[] = {
+static const char * Delete_Line_xpm[] = {
 "16 16 131 2",
 "  	c None",
 ". 	c #007D00",
diff --git a/pcbnew/bitmaps/Delete_Module.xpm b/pcbnew/bitmaps/Delete_Module.xpm
index ea6599038d..f49e2470b5 100644
--- a/pcbnew/bitmaps/Delete_Module.xpm
+++ b/pcbnew/bitmaps/Delete_Module.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * Delete_Module_xpm[] = {
+static const char * Delete_Module_xpm[] = {
 "16 16 129 2",
 "  	c None",
 ". 	c #000000",
diff --git a/pcbnew/bitmaps/Delete_Net.xpm b/pcbnew/bitmaps/Delete_Net.xpm
index aaa3154b69..5b10ac6c48 100644
--- a/pcbnew/bitmaps/Delete_Net.xpm
+++ b/pcbnew/bitmaps/Delete_Net.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * Delete_Net_xpm[] = {
+static const char * Delete_Net_xpm[] = {
 "16 16 128 2",
 "  	c None",
 ". 	c #005900",
diff --git a/pcbnew/bitmaps/Delete_Node.xpm b/pcbnew/bitmaps/Delete_Node.xpm
index 176f6133f5..e7f3d67b6e 100644
--- a/pcbnew/bitmaps/Delete_Node.xpm
+++ b/pcbnew/bitmaps/Delete_Node.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * Delete_Node_xpm[] = {
+static const char * Delete_Node_xpm[] = {
 "16 16 132 2",
 "  	c None",
 ". 	c #007D00",
diff --git a/pcbnew/bitmaps/Delete_Pad.xpm b/pcbnew/bitmaps/Delete_Pad.xpm
index 536ba41daf..280ad10652 100644
--- a/pcbnew/bitmaps/Delete_Pad.xpm
+++ b/pcbnew/bitmaps/Delete_Pad.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * Delete_Pad_xpm[] = {
+static const char * Delete_Pad_xpm[] = {
 "16 16 120 2",
 "  	c None",
 ". 	c #000000",
diff --git a/pcbnew/bitmaps/Delete_Track.xpm b/pcbnew/bitmaps/Delete_Track.xpm
index 2361f3dcbf..659929f404 100644
--- a/pcbnew/bitmaps/Delete_Track.xpm
+++ b/pcbnew/bitmaps/Delete_Track.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * Delete_Track_xpm[] = {
+static const char * Delete_Track_xpm[] = {
 "16 16 115 2",
 "  	c None",
 ". 	c #007D00",
diff --git a/pcbnew/bitmaps/Drag_Module.xpm b/pcbnew/bitmaps/Drag_Module.xpm
index 425e8fbaa5..53a9bf90c2 100644
--- a/pcbnew/bitmaps/Drag_Module.xpm
+++ b/pcbnew/bitmaps/Drag_Module.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * Drag_Module_xpm[] = {
+static const char * Drag_Module_xpm[] = {
 "16 16 63 1",
 " 	c None",
 ".	c #000000",
diff --git a/pcbnew/bitmaps/Drag_Pad.xpm b/pcbnew/bitmaps/Drag_Pad.xpm
index 6aff3cfe6f..8cc8f05ffd 100644
--- a/pcbnew/bitmaps/Drag_Pad.xpm
+++ b/pcbnew/bitmaps/Drag_Pad.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * drag_pad_xpm[] = {
+static const char * drag_pad_xpm[] = {
 "16 16 48 1",
 " 	c None",
 ".	c #000000",
diff --git a/pcbnew/bitmaps/Edges_Sketch.xpm b/pcbnew/bitmaps/Edges_Sketch.xpm
index b6aaf79c87..ce838664bd 100644
--- a/pcbnew/bitmaps/Edges_Sketch.xpm
+++ b/pcbnew/bitmaps/Edges_Sketch.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * Edges_Sketch_xpm[] = {
+static const char * Edges_Sketch_xpm[] = {
 "16 16 3 1",
 " 	c None",
 ".	c #D72E2E",
diff --git a/pcbnew/bitmaps/Edit_Module.xpm b/pcbnew/bitmaps/Edit_Module.xpm
index adbee3e675..d36e703ba2 100644
--- a/pcbnew/bitmaps/Edit_Module.xpm
+++ b/pcbnew/bitmaps/Edit_Module.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * Edit_Module_xpm[] = {
+static const char * Edit_Module_xpm[] = {
 "16 16 48 1",
 " 	c None",
 ".	c #000000",
diff --git a/pcbnew/bitmaps/Export_Module.xpm b/pcbnew/bitmaps/Export_Module.xpm
index 1db603b325..e5e394bdf2 100644
--- a/pcbnew/bitmaps/Export_Module.xpm
+++ b/pcbnew/bitmaps/Export_Module.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * export_module_xpm[] = {
+static const char * export_module_xpm[] = {
 "16 16 86 1",
 " 	c None",
 ".	c #000000",
diff --git a/pcbnew/bitmaps/Export_Options_Pad.xpm b/pcbnew/bitmaps/Export_Options_Pad.xpm
index 87c147eb3b..87f64a2a86 100644
--- a/pcbnew/bitmaps/Export_Options_Pad.xpm
+++ b/pcbnew/bitmaps/Export_Options_Pad.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * Export_Options_Pad_xpm[] = {
+static const char * Export_Options_Pad_xpm[] = {
 "16 16 71 1",
 " 	c None",
 ".	c #000000",
diff --git a/pcbnew/bitmaps/Flag.xpm b/pcbnew/bitmaps/Flag.xpm
index c461602ec7..8455fc3005 100644
--- a/pcbnew/bitmaps/Flag.xpm
+++ b/pcbnew/bitmaps/Flag.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * Flag_xpm[] = {
+static const char * Flag_xpm[] = {
 "16 16 24 1",
 " 	c None",
 ".	c #000000",
diff --git a/pcbnew/bitmaps/Global_Options_Pad.xpm b/pcbnew/bitmaps/Global_Options_Pad.xpm
index 9044e9fbd1..0b9cf96f5e 100644
--- a/pcbnew/bitmaps/Global_Options_Pad.xpm
+++ b/pcbnew/bitmaps/Global_Options_Pad.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * global_options_pad_xpm[] = {
+static const char * global_options_pad_xpm[] = {
 "16 16 81 1",
 " 	c None",
 ".	c #000000",
diff --git a/pcbnew/bitmaps/Import_Module.xpm b/pcbnew/bitmaps/Import_Module.xpm
index f3c7ea6738..68115273c6 100644
--- a/pcbnew/bitmaps/Import_Module.xpm
+++ b/pcbnew/bitmaps/Import_Module.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * import_module_xpm[] = {
+static const char * import_module_xpm[] = {
 "16 16 79 1",
 " 	c None",
 ".	c #000000",
diff --git a/pcbnew/bitmaps/Insert_Module_Board.xpm b/pcbnew/bitmaps/Insert_Module_Board.xpm
index d7573f81fa..63396ade3c 100644
--- a/pcbnew/bitmaps/Insert_Module_Board.xpm
+++ b/pcbnew/bitmaps/Insert_Module_Board.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * insert_module_board_xpm[] = {
+static const char * insert_module_board_xpm[] = {
 "16 16 49 1",
 " 	c None",
 ".	c #000000",
diff --git a/pcbnew/bitmaps/Invert_Module.xpm b/pcbnew/bitmaps/Invert_Module.xpm
index 821177a3e7..3773c76556 100644
--- a/pcbnew/bitmaps/Invert_Module.xpm
+++ b/pcbnew/bitmaps/Invert_Module.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * invert_module_xpm[] = {
+static const char * invert_module_xpm[] = {
 "16 16 31 1",
 " 	c None",
 ".	c #000000",
diff --git a/pcbnew/bitmaps/Load_Module_Board.xpm b/pcbnew/bitmaps/Load_Module_Board.xpm
index c5c6a47f5f..0ab0c62e10 100644
--- a/pcbnew/bitmaps/Load_Module_Board.xpm
+++ b/pcbnew/bitmaps/Load_Module_Board.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * load_module_board_xpm[] = {
+static const char * load_module_board_xpm[] = {
 "16 16 80 1",
 " 	c None",
 ".	c #000000",
diff --git a/pcbnew/bitmaps/Load_Module_Lib.xpm b/pcbnew/bitmaps/Load_Module_Lib.xpm
index 6b452f8369..7d2606e75a 100644
--- a/pcbnew/bitmaps/Load_Module_Lib.xpm
+++ b/pcbnew/bitmaps/Load_Module_Lib.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * Load_Module_Lib_xpm[] = {
+static const char * Load_Module_Lib_xpm[] = {
 "16 16 143 2",
 "  	c None",
 ". 	c #050607",
diff --git a/pcbnew/bitmaps/Locked.xpm b/pcbnew/bitmaps/Locked.xpm
index b05b3c0c4b..f0db29257d 100644
--- a/pcbnew/bitmaps/Locked.xpm
+++ b/pcbnew/bitmaps/Locked.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * Locked_xpm[] = {
+static const char * Locked_xpm[] = {
 "16 16 90 1",
 " 	c None",
 ".	c #000000",
diff --git a/pcbnew/bitmaps/Mode_Module.xpm b/pcbnew/bitmaps/Mode_Module.xpm
index a6da8a1f80..ef5dd3e8bf 100644
--- a/pcbnew/bitmaps/Mode_Module.xpm
+++ b/pcbnew/bitmaps/Mode_Module.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * mode_module_xpm[] = {
+static const char * mode_module_xpm[] = {
 "16 16 96 2",
 "  	c None",
 ". 	c #D72E2E",
diff --git a/pcbnew/bitmaps/Mode_Track.xpm b/pcbnew/bitmaps/Mode_Track.xpm
index 0b87362b33..42bc9d5ae1 100644
--- a/pcbnew/bitmaps/Mode_Track.xpm
+++ b/pcbnew/bitmaps/Mode_Track.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * mode_track_xpm[] = {
+static const char * mode_track_xpm[] = {
 "16 16 42 1",
 " 	c None",
 ".	c #007D00",
diff --git a/pcbnew/bitmaps/Modul_Edit.xpm b/pcbnew/bitmaps/Modul_Edit.xpm
index 8d608c7a17..82d122bdd8 100644
--- a/pcbnew/bitmaps/Modul_Edit.xpm
+++ b/pcbnew/bitmaps/Modul_Edit.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * Modul_Edit_xpm[] = {
+static const char * Modul_Edit_xpm[] = {
 "16 16 37 1",
 " 	c None",
 ".	c #FF7800",
diff --git a/pcbnew/bitmaps/Module_Check.xpm b/pcbnew/bitmaps/Module_Check.xpm
index 7e9bee9b72..dfd501ad66 100644
--- a/pcbnew/bitmaps/Module_Check.xpm
+++ b/pcbnew/bitmaps/Module_Check.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * module_check_xpm[] = {
+static const char * module_check_xpm[] = {
 "16 16 129 2",
 "  	c None",
 ". 	c #D72E2E",
diff --git a/pcbnew/bitmaps/Module_Ratsnet.xpm b/pcbnew/bitmaps/Module_Ratsnet.xpm
index 445a815b6f..307372ede4 100644
--- a/pcbnew/bitmaps/Module_Ratsnet.xpm
+++ b/pcbnew/bitmaps/Module_Ratsnet.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * Module_Ratsnet_xpm[] = {
+static const char * Module_Ratsnet_xpm[] = {
 "16 16 39 1",
 " 	c None",
 ".	c #FFFFFF",
diff --git a/pcbnew/bitmaps/Move_Field.xpm b/pcbnew/bitmaps/Move_Field.xpm
index c04d2e6d57..363fd8ee36 100644
--- a/pcbnew/bitmaps/Move_Field.xpm
+++ b/pcbnew/bitmaps/Move_Field.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * Move_Field_xpm[] = {
+static const char * Move_Field_xpm[] = {
 "16 16 62 1",
 " 	c None",
 ".	c #D2D2D2",
diff --git a/pcbnew/bitmaps/Move_Module.xpm b/pcbnew/bitmaps/Move_Module.xpm
index bbc3149ab5..708281cca3 100644
--- a/pcbnew/bitmaps/Move_Module.xpm
+++ b/pcbnew/bitmaps/Move_Module.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * Move_Module_xpm[] = {
+static const char * Move_Module_xpm[] = {
 "16 16 55 1",
 " 	c None",
 ".	c #000000",
diff --git a/pcbnew/bitmaps/Move_Pad.xpm b/pcbnew/bitmaps/Move_Pad.xpm
index 3edd5f00b8..f8d815f411 100644
--- a/pcbnew/bitmaps/Move_Pad.xpm
+++ b/pcbnew/bitmaps/Move_Pad.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * move_pad_xpm[] = {
+static const char * move_pad_xpm[] = {
 "16 16 44 1",
 " 	c None",
 ".	c #000000",
diff --git a/pcbnew/bitmaps/Move_Pin.xpm b/pcbnew/bitmaps/Move_Pin.xpm
index 570571a684..aa1a542ccc 100644
--- a/pcbnew/bitmaps/Move_Pin.xpm
+++ b/pcbnew/bitmaps/Move_Pin.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * Move_Pin_xpm[] = {
+static const char * Move_Pin_xpm[] = {
 "16 16 56 1",
 " 	c None",
 ".	c #D72E2E",
diff --git a/pcbnew/bitmaps/Move_Track.xpm b/pcbnew/bitmaps/Move_Track.xpm
index 39edb487cb..0df7056e2a 100644
--- a/pcbnew/bitmaps/Move_Track.xpm
+++ b/pcbnew/bitmaps/Move_Track.xpm
@@ -57,4 +57,4 @@ static const char * move_track_xpm[] = {
 "       !FGH!!   ",
 "        CIJ!    ",
 "         !      ",
-"                "};
\ No newline at end of file
+"                "};
diff --git a/pcbnew/bitmaps/Net_HighLight.xpm b/pcbnew/bitmaps/Net_HighLight.xpm
index 92c2b1af96..27e4077ad9 100644
--- a/pcbnew/bitmaps/Net_HighLight.xpm
+++ b/pcbnew/bitmaps/Net_HighLight.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * Net_HighLight_xpm[] = {
+static const char * Net_HighLight_xpm[] = {
 "16 16 74 1",
 " 	c None",
 ".	c #46FF00",
diff --git a/pcbnew/bitmaps/Net_Locked.xpm b/pcbnew/bitmaps/Net_Locked.xpm
index 74cc12002e..da150bfc57 100644
--- a/pcbnew/bitmaps/Net_Locked.xpm
+++ b/pcbnew/bitmaps/Net_Locked.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * Net_Locked_xpm[] = {
+static const char * Net_Locked_xpm[] = {
 "16 16 90 1",
 " 	c None",
 ".	c #007D00",
diff --git a/pcbnew/bitmaps/Net_UnLocked.xpm b/pcbnew/bitmaps/Net_UnLocked.xpm
index b33534df4c..a26b83d1b7 100644
--- a/pcbnew/bitmaps/Net_UnLocked.xpm
+++ b/pcbnew/bitmaps/Net_UnLocked.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * Net_UnLocked_xpm[] = {
+static const char * Net_UnLocked_xpm[] = {
 "16 16 90 1",
 " 	c None",
 ".	c #007D00",
diff --git a/pcbnew/bitmaps/New_FootPrint.xpm b/pcbnew/bitmaps/New_FootPrint.xpm
index 65fbc1d352..506b73c556 100644
--- a/pcbnew/bitmaps/New_FootPrint.xpm
+++ b/pcbnew/bitmaps/New_FootPrint.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * new_footprint_xpm[] = {
+static const char * new_footprint_xpm[] = {
 "16 16 15 1",
 " 	c None",
 ".	c #FFF500",
diff --git a/pcbnew/bitmaps/New_Module.xpm b/pcbnew/bitmaps/New_Module.xpm
index 85123e4f23..d0eeca54e7 100644
--- a/pcbnew/bitmaps/New_Module.xpm
+++ b/pcbnew/bitmaps/New_Module.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * New_Module_xpm[] = {
+static const char * New_Module_xpm[] = {
 "16 16 73 1",
 " 	c None",
 ".	c #FFF500",
diff --git a/pcbnew/bitmaps/Options_All_Tracks&Vias.xpm b/pcbnew/bitmaps/Options_All_Tracks&Vias.xpm
index b9b651440c..e330070378 100644
--- a/pcbnew/bitmaps/Options_All_Tracks&Vias.xpm
+++ b/pcbnew/bitmaps/Options_All_Tracks&Vias.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * options_all_tracks_and_vias_xpm[] = {
+static const char * options_all_tracks_and_vias_xpm[] = {
 "16 16 49 1",
 " 	c None",
 ".	c #007D00",
diff --git a/pcbnew/bitmaps/Options_All_Tracks.xpm b/pcbnew/bitmaps/Options_All_Tracks.xpm
index 7eaa06bd28..d6e1610ba7 100644
--- a/pcbnew/bitmaps/Options_All_Tracks.xpm
+++ b/pcbnew/bitmaps/Options_All_Tracks.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * Options_All_Tracks_xpm[] = {
+static const char * Options_All_Tracks_xpm[] = {
 "16 16 39 1",
 " 	c None",
 ".	c #007D00",
diff --git a/pcbnew/bitmaps/Options_All_Vias.xpm b/pcbnew/bitmaps/Options_All_Vias.xpm
index 1d89b15494..a80d3cddd0 100644
--- a/pcbnew/bitmaps/Options_All_Vias.xpm
+++ b/pcbnew/bitmaps/Options_All_Vias.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * Options_All_Vias_xpm[] = {
+static const char * Options_All_Vias_xpm[] = {
 "16 16 56 1",
 " 	c None",
 ".	c #D72E2E",
diff --git a/pcbnew/bitmaps/Options_Module.xpm b/pcbnew/bitmaps/Options_Module.xpm
index 432f92020d..d8458eda9f 100644
--- a/pcbnew/bitmaps/Options_Module.xpm
+++ b/pcbnew/bitmaps/Options_Module.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * Options_Module_xpm[] = {
+static const char * Options_Module_xpm[] = {
 "16 16 53 1",
 " 	c None",
 ".	c #000000",
diff --git a/pcbnew/bitmaps/Options_Track.xpm b/pcbnew/bitmaps/Options_Track.xpm
index f74bdde3ae..7b9f8dee6f 100644
--- a/pcbnew/bitmaps/Options_Track.xpm
+++ b/pcbnew/bitmaps/Options_Track.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * Options_Track_xpm[] = {
+static const char * Options_Track_xpm[] = {
 "16 16 45 1",
 " 	c None",
 ".	c #007D00",
diff --git a/pcbnew/bitmaps/Options_Tracks.xpm b/pcbnew/bitmaps/Options_Tracks.xpm
index 6b4a69444d..ebcaf28166 100644
--- a/pcbnew/bitmaps/Options_Tracks.xpm
+++ b/pcbnew/bitmaps/Options_Tracks.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * Options_Tracks_xpm[] = {
+static const char * Options_Tracks_xpm[] = {
 "16 16 36 1",
 " 	c None",
 ".	c #007D00",
diff --git a/pcbnew/bitmaps/Options_Vias.xpm b/pcbnew/bitmaps/Options_Vias.xpm
index 8b6b165b67..4e3f0c82a4 100644
--- a/pcbnew/bitmaps/Options_Vias.xpm
+++ b/pcbnew/bitmaps/Options_Vias.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * Options_Vias_xpm[] = {
+static const char * Options_Vias_xpm[] = {
 "16 16 44 1",
 " 	c None",
 ".	c #000000",
diff --git a/pcbnew/bitmaps/PcbOffset.xpm b/pcbnew/bitmaps/PcbOffset.xpm
index d43b100273..5ad7c2f26e 100644
--- a/pcbnew/bitmaps/PcbOffset.xpm
+++ b/pcbnew/bitmaps/PcbOffset.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * pcb_offset_xpm[] = {
+static const char * pcb_offset_xpm[] = {
 "16 16 7 1",
 " 	c None",
 ".	c #000000",
diff --git a/pcbnew/bitmaps/Post_Compo.xpm b/pcbnew/bitmaps/Post_Compo.xpm
index de2e11e292..d8d9b110da 100644
--- a/pcbnew/bitmaps/Post_Compo.xpm
+++ b/pcbnew/bitmaps/Post_Compo.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * post_compo_xpm[] = {
+static const char * post_compo_xpm[] = {
 "16 16 62 1",
 " 	c None",
 ".	c #000000",
diff --git a/pcbnew/bitmaps/Post_Drill.xpm b/pcbnew/bitmaps/Post_Drill.xpm
index e4cb38ac2d..094770b77d 100644
--- a/pcbnew/bitmaps/Post_Drill.xpm
+++ b/pcbnew/bitmaps/Post_Drill.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * post_drill_xpm[] = {
+static const char * post_drill_xpm[] = {
 "16 16 35 1",
 " 	c None",
 ".	c #000000",
diff --git a/pcbnew/bitmaps/Post_Module.xpm b/pcbnew/bitmaps/Post_Module.xpm
index b8fde86728..dad5c564a8 100644
--- a/pcbnew/bitmaps/Post_Module.xpm
+++ b/pcbnew/bitmaps/Post_Module.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * Post_Module_xpm[] = {
+static const char * Post_Module_xpm[] = {
 "16 16 52 1",
 " 	c None",
 ".	c #000000",
diff --git a/pcbnew/bitmaps/Rotate_Field.xpm b/pcbnew/bitmaps/Rotate_Field.xpm
index b294448128..a62bb7a83b 100644
--- a/pcbnew/bitmaps/Rotate_Field.xpm
+++ b/pcbnew/bitmaps/Rotate_Field.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * Rotate_Field_xpm[] = {
+static const char * Rotate_Field_xpm[] = {
 "16 16 76 1",
 " 	c None",
 ".	c #D2D2D2",
diff --git a/pcbnew/bitmaps/Rotate_Module+.xpm b/pcbnew/bitmaps/Rotate_Module+.xpm
index f676d4bcfe..163be503b0 100644
--- a/pcbnew/bitmaps/Rotate_Module+.xpm
+++ b/pcbnew/bitmaps/Rotate_Module+.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * rotate_module_pos_xpm[] = {
+static const char * rotate_module_pos_xpm[] = {
 "16 16 77 1",
 " 	c None",
 ".	c #000000",
diff --git a/pcbnew/bitmaps/Rotate_Module-.xpm b/pcbnew/bitmaps/Rotate_Module-.xpm
index 019d52192d..3694ac8289 100644
--- a/pcbnew/bitmaps/Rotate_Module-.xpm
+++ b/pcbnew/bitmaps/Rotate_Module-.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * rotate_module_neg_xpm[] = {
+static const char * rotate_module_neg_xpm[] = {
 "16 16 89 1",
 " 	c None",
 ".	c #000000",
diff --git a/pcbnew/bitmaps/Select_Layer_Pair.xpm b/pcbnew/bitmaps/Select_Layer_Pair.xpm
index d41b001617..b03876aeb9 100644
--- a/pcbnew/bitmaps/Select_Layer_Pair.xpm
+++ b/pcbnew/bitmaps/Select_Layer_Pair.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * select_layer_pair_xpm[] = {
+static const char * select_layer_pair_xpm[] = {
 "16 16 75 1",
 " 	c None",
 ".	c #000000",
diff --git a/pcbnew/bitmaps/Select_W_Layer.xpm b/pcbnew/bitmaps/Select_W_Layer.xpm
index abe6f7a9b7..de1a40eb97 100644
--- a/pcbnew/bitmaps/Select_W_Layer.xpm
+++ b/pcbnew/bitmaps/Select_W_Layer.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * Select_W_Layer_xpm[] = {
+static const char * Select_W_Layer_xpm[] = {
 "16 16 24 1",
 " 	c None",
 ".	c #000000",
diff --git a/pcbnew/bitmaps/Show_Zone.xpm b/pcbnew/bitmaps/Show_Zone.xpm
index 98da548bd4..8f5be7b432 100644
--- a/pcbnew/bitmaps/Show_Zone.xpm
+++ b/pcbnew/bitmaps/Show_Zone.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * show_zone_xpm[] = {
+static const char * show_zone_xpm[] = {
 "16 16 71 1",
 " 	c None",
 ".	c #007D00",
diff --git a/pcbnew/bitmaps/Swap_Layer.xpm b/pcbnew/bitmaps/Swap_Layer.xpm
index be16080fb9..ca567932b0 100644
--- a/pcbnew/bitmaps/Swap_Layer.xpm
+++ b/pcbnew/bitmaps/Swap_Layer.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * swap_layer_xpm[] = {
+static const char * swap_layer_xpm[] = {
 "16 16 6 1",
 " 	c None",
 ".	c #B70000",
diff --git a/pcbnew/bitmaps/Track_Locked.xpm b/pcbnew/bitmaps/Track_Locked.xpm
index 58d4d7cac1..a5e6fdfd63 100644
--- a/pcbnew/bitmaps/Track_Locked.xpm
+++ b/pcbnew/bitmaps/Track_Locked.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * Track_Locked_xpm[] = {
+static const char * Track_Locked_xpm[] = {
 "16 16 89 1",
 " 	c None",
 ".	c #007D00",
diff --git a/pcbnew/bitmaps/Track_Sketch.xpm b/pcbnew/bitmaps/Track_Sketch.xpm
index 9b6a1cfaab..0c021a006d 100644
--- a/pcbnew/bitmaps/Track_Sketch.xpm
+++ b/pcbnew/bitmaps/Track_Sketch.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * Track_Sketch_xpm[] = {
+static const char * Track_Sketch_xpm[] = {
 "16 16 5 1",
 " 	c None",
 ".	c #007D00",
diff --git a/pcbnew/bitmaps/Track_UnLocked.xpm b/pcbnew/bitmaps/Track_UnLocked.xpm
index 80df146ecc..9bc3785b22 100644
--- a/pcbnew/bitmaps/Track_UnLocked.xpm
+++ b/pcbnew/bitmaps/Track_UnLocked.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * Track_UnLocked_xpm[] = {
+static const char * Track_UnLocked_xpm[] = {
 "16 16 81 1",
 " 	c None",
 ".	c #007D00",
diff --git a/pcbnew/bitmaps/Unlocked.xpm b/pcbnew/bitmaps/Unlocked.xpm
index cf9108ac56..0e452491b3 100644
--- a/pcbnew/bitmaps/Unlocked.xpm
+++ b/pcbnew/bitmaps/Unlocked.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * Unlocked_xpm[] = {
+static const char * Unlocked_xpm[] = {
 "16 16 88 1",
 " 	c None",
 ".	c #000000",
diff --git a/pcbnew/bitmaps/Update_Module_Board.xpm b/pcbnew/bitmaps/Update_Module_Board.xpm
index b2698eed30..76089df5c4 100644
--- a/pcbnew/bitmaps/Update_Module_Board.xpm
+++ b/pcbnew/bitmaps/Update_Module_Board.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * update_module_board_xpm[] = {
+static const char * update_module_board_xpm[] = {
 "16 16 81 1",
 " 	c None",
 ".	c #000000",
diff --git a/pcbnew/bitmaps/Width_Track.xpm b/pcbnew/bitmaps/Width_Track.xpm
index c2cd5824c2..2f66584513 100644
--- a/pcbnew/bitmaps/Width_Track.xpm
+++ b/pcbnew/bitmaps/Width_Track.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * width_track_xpm[] = {
+static const char * width_track_xpm[] = {
 "16 16 9 1",
 " 	c None",
 ".	c #000000",
diff --git a/pcbnew/bitmaps/add_cotation.xpm b/pcbnew/bitmaps/add_cotation.xpm
index cf8376c91d..85a38c3b6b 100644
--- a/pcbnew/bitmaps/add_cotation.xpm
+++ b/pcbnew/bitmaps/add_cotation.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * add_cotation_xpm[] = {
+static const char * add_cotation_xpm[] = {
 "16 16 14 1",
 " 	c None",
 ".	c #000000",
diff --git a/pcbnew/bitmaps/local_ratsnet.xpm b/pcbnew/bitmaps/local_ratsnet.xpm
index 9961459212..e18846d9a7 100644
--- a/pcbnew/bitmaps/local_ratsnet.xpm
+++ b/pcbnew/bitmaps/local_ratsnet.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * local_ratsnet_xpm[] = {
+static const char * local_ratsnet_xpm[] = {
 "16 16 61 1",
 " 	c None",
 ".	c #FFFFFF",
diff --git a/pcbnew/bitmaps/module_options.xpm b/pcbnew/bitmaps/module_options.xpm
index ec138468f1..33c7557ab1 100644
--- a/pcbnew/bitmaps/module_options.xpm
+++ b/pcbnew/bitmaps/module_options.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * module_options_xpm[] = {
+static const char * module_options_xpm[] = {
 "16 16 65 1",
 " 	c None",
 ".	c #D72E2E",
diff --git a/pcbnew/bitmaps/mw_Add_Gap.xpm b/pcbnew/bitmaps/mw_Add_Gap.xpm
index f0aaf1e5c5..b987ae556a 100644
--- a/pcbnew/bitmaps/mw_Add_Gap.xpm
+++ b/pcbnew/bitmaps/mw_Add_Gap.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * mw_Add_Gap_xpm[] = {
+static const char * mw_Add_Gap_xpm[] = {
 "16 16 13 1",
 " 	c None",
 ".	c #D72E2E",
diff --git a/pcbnew/bitmaps/mw_Add_Line.xpm b/pcbnew/bitmaps/mw_Add_Line.xpm
index 37ce051467..e1f3538eb1 100644
--- a/pcbnew/bitmaps/mw_Add_Line.xpm
+++ b/pcbnew/bitmaps/mw_Add_Line.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * mw_Add_Line_xpm[] = {
+static const char * mw_Add_Line_xpm[] = {
 "16 16 6 1",
 " 	c None",
 ".	c #D72E2E",
diff --git a/pcbnew/bitmaps/mw_Add_Shape.xpm b/pcbnew/bitmaps/mw_Add_Shape.xpm
index c64966e11b..ad5df4bb26 100644
--- a/pcbnew/bitmaps/mw_Add_Shape.xpm
+++ b/pcbnew/bitmaps/mw_Add_Shape.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * mw_Add_Shape_xpm[] = {
+static const char * mw_Add_Shape_xpm[] = {
 "16 16 21 1",
 " 	c None",
 ".	c #D72E2E",
diff --git a/pcbnew/bitmaps/mw_Add_Stub.xpm b/pcbnew/bitmaps/mw_Add_Stub.xpm
index caf85cbc41..4d656fa386 100644
--- a/pcbnew/bitmaps/mw_Add_Stub.xpm
+++ b/pcbnew/bitmaps/mw_Add_Stub.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * mw_Add_Stub_xpm[] = {
+static const char * mw_Add_Stub_xpm[] = {
 "16 16 14 1",
 " 	c None",
 ".	c #D72E2E",
diff --git a/pcbnew/bitmaps/mw_Add_stub_arc.xpm b/pcbnew/bitmaps/mw_Add_stub_arc.xpm
index 416231f859..23abcfd77b 100644
--- a/pcbnew/bitmaps/mw_Add_stub_arc.xpm
+++ b/pcbnew/bitmaps/mw_Add_stub_arc.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * mw_Add_stub_arc_xpm[] = {
+static const char * mw_Add_stub_arc_xpm[] = {
 "16 16 55 1",
 " 	c None",
 ".	c #000000",
diff --git a/pcbnew/bitmaps/mw_toolbar.xpm b/pcbnew/bitmaps/mw_toolbar.xpm
index 0e2a3f8ede..9a9d9f1442 100644
--- a/pcbnew/bitmaps/mw_toolbar.xpm
+++ b/pcbnew/bitmaps/mw_toolbar.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * mw_toolbar_xpm[] = {
+static const char * mw_toolbar_xpm[] = {
 "16 16 67 1",
 " 	c None",
 ".	c #000000",
diff --git a/pcbnew/bitmaps/net_hightlight.xpm b/pcbnew/bitmaps/net_hightlight.xpm
index a288c79112..b8c1861bda 100644
--- a/pcbnew/bitmaps/net_hightlight.xpm
+++ b/pcbnew/bitmaps/net_hightlight.xpm
@@ -1,6 +1,6 @@
 /* XPM */
-char *net_hightlight_xpm[] = {
-/* columns rows colors chars-per-pixel */
+const char *net_hightlight_xpm[] = {
+/* columns rows colors const chars-per-pixel */
 "16 16 3 1",
 "- c #008000",
 ". c #00FF00",
diff --git a/pcbnew/bitmaps/tool_ratsnet.xpm b/pcbnew/bitmaps/tool_ratsnet.xpm
index 890db6a562..40a9f821f3 100644
--- a/pcbnew/bitmaps/tool_ratsnet.xpm
+++ b/pcbnew/bitmaps/tool_ratsnet.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * tool_ratsnet_xpm[] = {
+static const char * tool_ratsnet_xpm[] = {
 "16 16 53 1",
 " 	c None",
 ".	c #FFFFFF",
diff --git a/pcbnew/class_board_item.cpp b/pcbnew/class_board_item.cpp
index 28b85d6532..69da04c762 100644
--- a/pcbnew/class_board_item.cpp
+++ b/pcbnew/class_board_item.cpp
@@ -230,7 +230,7 @@ const char** BOARD_ITEM::MenuIcon() const
  * @return an icon pointer (can be NULL)
  */
 {
-    char**            xpm;
+    const char**            xpm;
     const BOARD_ITEM* item = this;
 
     switch( item->Type() )
diff --git a/pcbnew/gen_modules_placefile.cpp b/pcbnew/gen_modules_placefile.cpp
index ca6793dc56..ccef1ab6e5 100644
--- a/pcbnew/gen_modules_placefile.cpp
+++ b/pcbnew/gen_modules_placefile.cpp
@@ -346,7 +346,8 @@ void WinEDA_PcbFrame::GenModuleReport( wxCommandEvent& event )
 
             sprintf( Line, "orientation  %.2f\n", (float) (pad->m_Orient - Module->m_Orient) / 10 );
             fputs( Line, rptfile );
-            char* shape_name[6] = { "??? ", "Circ", "Rect", "Oval", "trap", "spec" };
+            const char* shape_name[6] =
+				{ "??? ", "Circ", "Rect", "Oval", "trap", "spec" };
             sprintf( Line, "Shape  %s\n", shape_name[pad->m_PadShape] );
             fputs( Line, rptfile );