Index: /branches/eam_branches/ipp-20100823/Ohana/src/kapa2/include/buttons.h
===================================================================
--- /branches/eam_branches/ipp-20100823/Ohana/src/kapa2/include/buttons.h	(revision 29219)
+++ /branches/eam_branches/ipp-20100823/Ohana/src/kapa2/include/buttons.h	(revision 29220)
@@ -1,5 +1,5 @@
 #define PS_width 25
 #define PS_height 25
-char PS_bits[] = {
+static char PS_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x81, 0x3f, 0x00,
    0x82, 0x67, 0x60, 0x00, 0x02, 0x26, 0x40, 0x00, 0x02, 0x24, 0x40, 0x00,
@@ -13,5 +13,5 @@
 #define grey_width 25
 #define grey_height 25
-char grey_bits[] = {
+static char grey_bits[] = {
    0x90, 0x40, 0xf7, 0x01, 0x04, 0xaa, 0xad, 0x01, 0x68, 0xd5, 0xfe, 0x01,
    0x82, 0x28, 0xdb, 0x01, 0x10, 0xd2, 0x75, 0x01, 0x40, 0xad, 0xee, 0x01,
@@ -25,5 +25,5 @@
 #define rainbow_width 25
 #define rainbow_height 25
-char rainbow_bits[] = {
+static char rainbow_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
    0x00, 0x80, 0xff, 0x00, 0x00, 0x70, 0x00, 0x01, 0x00, 0x0c, 0x7f, 0x00,
@@ -37,5 +37,5 @@
 #define recenter_width 25
 #define recenter_height 25
-char recenter_bits[] = {
+static char recenter_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00,
    0x80, 0xef, 0x03, 0x00, 0xe0, 0x00, 0x0e, 0x00, 0x30, 0x00, 0x18, 0x00,
@@ -49,5 +49,5 @@
 #define heat_width 25
 #define heat_height 25
-char heat_bits[] = {
+static char heat_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x07, 0xd8, 0x01,
    0x00, 0x0c, 0x37, 0x00, 0xf8, 0xc9, 0x6f, 0x00, 0x0c, 0xde, 0xf0, 0x00,
@@ -61,5 +61,5 @@
 #define red_width 25
 #define red_height 25
-char red_bits[] = {
+static char red_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0xfc, 0x03, 0x00,
    0x20, 0x07, 0x06, 0x00, 0xe0, 0x00, 0x0c, 0x00, 0x20, 0x00, 0x08, 0x00,
@@ -73,5 +73,5 @@
 #define green_width 25
 #define green_height 25
-char green_bits[] = {
+static char green_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x07, 0x00,
    0x00, 0x06, 0x04, 0x00, 0x80, 0x03, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00,
@@ -85,5 +85,5 @@
 #define blue_width 25
 #define blue_height 25
-char blue_bits[] = {
+static char blue_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xfe, 0x00, 0x00,
    0xc0, 0x83, 0x07, 0x00, 0xc0, 0x00, 0x0c, 0x00, 0x40, 0x00, 0x08, 0x00,
@@ -97,5 +97,5 @@
 #define yellow_width 25
 #define yellow_height 25
-char yellow_bits[] = {
+static char yellow_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x18, 0x00,
    0x80, 0x01, 0x0c, 0x00, 0x00, 0x03, 0x06, 0x00, 0x00, 0x02, 0x02, 0x00,
@@ -109,5 +109,5 @@
 #define flipx_width 25
 #define flipx_height 25
-char flipx_bits[] = {
+static char flipx_bits[] = {
    0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00,
    0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x01, 0x00, 0x80, 0x10, 0x02, 0x00,
@@ -121,5 +121,5 @@
 #define flipy_width 25
 #define flipy_height 25
-char flipy_bits[] = {
+static char flipy_bits[] = {
    0x00, 0x10, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x44, 0x00, 0x00,
    0x00, 0x82, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x80, 0x00, 0x02, 0x00,
@@ -131,21 +131,7 @@
    0x00, 0x82, 0x00, 0x00, 0x00, 0x44, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00,
    0x00, 0x10, 0x00, 0x00 };
-#define hms_width 25
-#define hms_height 12
-char hms_bits[] = {
-   0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
-   0x02, 0x00, 0x00, 0x00, 0x02, 0x01, 0xf0, 0x00, 0x1e, 0xef, 0x89, 0x00,
-   0x22, 0x11, 0x09, 0x00, 0x22, 0x11, 0x71, 0x00, 0x22, 0x11, 0x81, 0x00,
-   0x22, 0x11, 0x89, 0x00, 0x22, 0x01, 0x79, 0x00, 0x00, 0x00, 0x00, 0x00};
-#define ddd_width 25
-#define ddd_height 12
-char ddd_bits[] = {
-   0x40, 0x80, 0x80, 0x00, 0x40, 0x80, 0x80, 0x00, 0x40, 0x80, 0x80, 0x00,
-   0x40, 0x80, 0x80, 0x00, 0x40, 0x80, 0x80, 0x00, 0x5c, 0xb8, 0xb8, 0x00,
-   0x62, 0xc4, 0xc4, 0x00, 0x42, 0x84, 0x84, 0x00, 0x42, 0x84, 0x84, 0x00,
-   0x62, 0xc4, 0xc4, 0x00, 0x5c, 0xb9, 0xb8, 0x00, 0x00, 0x00, 0x00, 0x00};
 #define hex_width 25
 #define hex_height 12
-char hex_bits[] = {
+static char hex_bits[] = {
    0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
    0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0xf0, 0x00, 0x1e, 0x00, 0x88, 0x00,
Index: /branches/eam_branches/ipp-20100823/Ohana/src/kapa2/include/hms_buttons.h
===================================================================
--- /branches/eam_branches/ipp-20100823/Ohana/src/kapa2/include/hms_buttons.h	(revision 29220)
+++ /branches/eam_branches/ipp-20100823/Ohana/src/kapa2/include/hms_buttons.h	(revision 29220)
@@ -0,0 +1,14 @@
+#define hms_width 25
+#define hms_height 12
+static char hms_bits[] = {
+   0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+   0x02, 0x00, 0x00, 0x00, 0x02, 0x01, 0xf0, 0x00, 0x1e, 0xef, 0x89, 0x00,
+   0x22, 0x11, 0x09, 0x00, 0x22, 0x11, 0x71, 0x00, 0x22, 0x11, 0x81, 0x00,
+   0x22, 0x11, 0x89, 0x00, 0x22, 0x01, 0x79, 0x00, 0x00, 0x00, 0x00, 0x00};
+#define ddd_width 25
+#define ddd_height 12
+static char ddd_bits[] = {
+   0x40, 0x80, 0x80, 0x00, 0x40, 0x80, 0x80, 0x00, 0x40, 0x80, 0x80, 0x00,
+   0x40, 0x80, 0x80, 0x00, 0x40, 0x80, 0x80, 0x00, 0x5c, 0xb8, 0xb8, 0x00,
+   0x62, 0xc4, 0xc4, 0x00, 0x42, 0x84, 0x84, 0x00, 0x42, 0x84, 0x84, 0x00,
+   0x62, 0xc4, 0xc4, 0x00, 0x5c, 0xb9, 0xb8, 0x00, 0x00, 0x00, 0x00, 0x00};
Index: /branches/eam_branches/ipp-20100823/Ohana/src/kapa2/src/ButtonFunctions.c
===================================================================
--- /branches/eam_branches/ipp-20100823/Ohana/src/kapa2/src/ButtonFunctions.c	(revision 29219)
+++ /branches/eam_branches/ipp-20100823/Ohana/src/kapa2/src/ButtonFunctions.c	(revision 29220)
@@ -1,4 +1,4 @@
 # include "Ximage.h"
-# include "buttons.h"
+# include "hms_buttons.h"
 
 int PSfunction (Graphic *graphic, KapaImageWidget *image) {
Index: /branches/eam_branches/ipp-20100823/Ohana/src/kapa2/src/Image.c
===================================================================
--- /branches/eam_branches/ipp-20100823/Ohana/src/kapa2/src/Image.c	(revision 29219)
+++ /branches/eam_branches/ipp-20100823/Ohana/src/kapa2/src/Image.c	(revision 29220)
@@ -1,4 +1,5 @@
 # include "Ximage.h"
 # include "buttons.h"
+# include "hms_buttons.h"
 
 int InitImageChannel (KapaImageChannel *channel) {