Index: trunk/Ohana/src/kii/overlay/bDrawColormap.c
===================================================================
--- trunk/Ohana/src/kii/overlay/bDrawColormap.c	(revision 5700)
+++ trunk/Ohana/src/kii/overlay/bDrawColormap.c	(revision 5852)
@@ -1,4 +1,3 @@
 # include "Ximage.h"
-# include "bDraw.h"
 
 /* this list must match the one in mana/include/package.h, and equiv
Index: trunk/Ohana/src/kii/overlay/bDrawFrame.c
===================================================================
--- trunk/Ohana/src/kii/overlay/bDrawFrame.c	(revision 5700)
+++ trunk/Ohana/src/kii/overlay/bDrawFrame.c	(revision 5852)
@@ -1,4 +1,3 @@
 # include "Ximage.h"
-# include "bDraw.h"
 
 int bDrawFrame (Layout *layout) {
Index: trunk/Ohana/src/kii/overlay/bDrawFuncs.c
===================================================================
--- trunk/Ohana/src/kii/overlay/bDrawFuncs.c	(revision 5700)
+++ trunk/Ohana/src/kii/overlay/bDrawFuncs.c	(revision 5852)
@@ -1,4 +1,3 @@
 # include "Ximage.h"
-# include "bDraw.h"
 
 static int bWeight;
Index: trunk/Ohana/src/kii/overlay/bDrawOverlay.c
===================================================================
--- trunk/Ohana/src/kii/overlay/bDrawOverlay.c	(revision 5700)
+++ trunk/Ohana/src/kii/overlay/bDrawOverlay.c	(revision 5852)
@@ -1,4 +1,3 @@
 # include "Ximage.h"
-# include "bDraw.h"
 # define INFRONT 4
 
@@ -14,5 +13,5 @@
  
   /* translate color to bDrawColors : layout[0].overlay[N].color */
-  color = GetColorByName (name[N]);
+  color = KapaColorByName (name[N]);
   bDrawSetStyle (color, 0, 0);
   
Index: trunk/Ohana/src/kii/overlay/bDrawRotFont.c
===================================================================
--- trunk/Ohana/src/kii/overlay/bDrawRotFont.c	(revision 5700)
+++ trunk/Ohana/src/kii/overlay/bDrawRotFont.c	(revision 5852)
@@ -1,4 +1,3 @@
 # include "Ximage.h"
-# include "bDraw.h"
 
 # define NROTCHARS 256