7 files changed, 6 insertions, 11 deletions
diff --git a/framebuffer/fbtk/bitmap.c b/framebuffer/fbtk/bitmap.c
index 052d629b8..1f147be00 100644
--- a/framebuffer/fbtk/bitmap.c
+++ b/framebuffer/fbtk/bitmap.c
@@ -28,7 +28,6 @@
 
 #include "framebuffer/gui.h"
 #include "framebuffer/fbtk.h"
-#include "framebuffer/bitmap.h"
 #include "framebuffer/image_data.h"
 
 #include "widget.h"
@@ -70,7 +69,7 @@ fb_redraw_bitmap(fbtk_widget_t *widget, fbtk_callback_info *cbi)
 
 /* exported function documented in fbtk.h */
 void
-fbtk_set_bitmap(fbtk_widget_t *widget, struct bitmap *image)
+fbtk_set_bitmap(fbtk_widget_t *widget, struct fbtk_bitmap *image)
 {
 	if ((widget == NULL) || (widget->type != FB_WIDGET_TYPE_BITMAP))
 		return;
@@ -88,7 +87,7 @@ fbtk_create_bitmap(fbtk_widget_t *parent,
 		   int width,
 		   int height,
 		   colour c,
-		   struct bitmap *image)
+		   struct fbtk_bitmap *image)
 {
 	fbtk_widget_t *neww;
 
@@ -111,7 +110,7 @@ fbtk_create_button(fbtk_widget_t *parent,
 		   int width,
 		   int height,
 		   colour c,
-		   struct bitmap *image,
+		   struct fbtk_bitmap *image,
 		   fbtk_callback click,
 		   void *pw)
 {
diff --git a/framebuffer/fbtk/event.c b/framebuffer/fbtk/event.c
index d108af193..051afb1f6 100644
--- a/framebuffer/fbtk/event.c
+++ b/framebuffer/fbtk/event.c
@@ -37,7 +37,6 @@
 
 #include "framebuffer/gui.h"
 #include "framebuffer/fbtk.h"
-#include "framebuffer/bitmap.h"
 #include "framebuffer/image_data.h"
 
 #include "widget.h"
diff --git a/framebuffer/fbtk/fbtk.c b/framebuffer/fbtk/fbtk.c
index f38f6adda..db298ebdc 100644
--- a/framebuffer/fbtk/fbtk.c
+++ b/framebuffer/fbtk/fbtk.c
@@ -38,7 +38,6 @@
 
 #include "framebuffer/gui.h"
 #include "framebuffer/fbtk.h"
-#include "framebuffer/bitmap.h"
 #include "framebuffer/image_data.h"
 
 #include "widget.h"
@@ -337,7 +336,7 @@ int
 fbtk_set_ptr(fbtk_widget_t *widget, fbtk_callback_info *cbi)
 {
 	fbtk_widget_t *root = fbtk_get_root_widget(widget);
-	struct bitmap *bm = cbi->context;
+	struct fbtk_bitmap *bm = cbi->context;
 
 	nsfb_cursor_set(root->u.root.fb,
 			(nsfb_colour_t *)bm->pixdata,
diff --git a/framebuffer/fbtk/osk.c b/framebuffer/fbtk/osk.c
index 8e6ee5185..02c9e4510 100644
--- a/framebuffer/fbtk/osk.c
+++ b/framebuffer/fbtk/osk.c
@@ -31,7 +31,6 @@
 
 #include "framebuffer/gui.h"
 #include "framebuffer/fbtk.h"
-#include "framebuffer/bitmap.h"
 #include "framebuffer/image_data.h"
 
 #include "widget.h"
diff --git a/framebuffer/fbtk/scroll.c b/framebuffer/fbtk/scroll.c
index 356fd11c7..0434f6d09 100644
--- a/framebuffer/fbtk/scroll.c
+++ b/framebuffer/fbtk/scroll.c
@@ -30,7 +30,6 @@
 
 #include "framebuffer/gui.h"
 #include "framebuffer/fbtk.h"
-#include "framebuffer/bitmap.h"
 #include "framebuffer/image_data.h"
 
 #include "widget.h"
diff --git a/framebuffer/fbtk/user.c b/framebuffer/fbtk/user.c
index 7a06a69a8..5be0f380f 100644
--- a/framebuffer/fbtk/user.c
+++ b/framebuffer/fbtk/user.c
@@ -19,7 +19,7 @@
  */
 
 #include <stdlib.h>
-
+#include <stdbool.h>
 #include <libnsfb.h>
 
 #include "desktop/plotters.h"
diff --git a/framebuffer/fbtk/widget.h b/framebuffer/fbtk/widget.h
index 75a2a646d..084a44047 100644
--- a/framebuffer/fbtk/widget.h
+++ b/framebuffer/fbtk/widget.h
@@ -165,7 +165,7 @@ struct fbtk_widget_s {
 
 		/* bitmap */
 		struct {
-			struct bitmap *bitmap;
+			struct fbtk_bitmap *bitmap;
 		} bitmap;
 
 		/* text */