diff --git a/gtk/gtk_gui.c b/gtk/gtk_gui.c
index 6e995c99f..c249e1c25 100644
--- a/gtk/gtk_gui.c
+++ b/gtk/gtk_gui.c
@@ -12,6 +12,7 @@
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 #include "netsurf/content/content.h"
+#include "netsurf/desktop/401login.h"
 #include "netsurf/desktop/browser.h"
 #include "netsurf/desktop/gui.h"
 #include "netsurf/desktop/netsurf.h"
@@ -98,18 +99,6 @@ void warn_user(const char *warning, const char *detail)
 {
 }
 
-
-void html_add_instance(struct content *c, struct browser_window *bw,
-		struct content *page, struct box *box,
-		struct object_params *params, void **state) {}
-void html_reshape_instance(struct content *c, struct browser_window *bw,
-		struct content *page, struct box *box,
-		struct object_params *params, void **state) {}
-void html_remove_instance(struct content *c, struct browser_window *bw,
-		struct content *page, struct box *box,
-		struct object_params *params, void **state) {}
-
-
 void die(const char * const error)
 {
 	fprintf(stderr, error);
@@ -123,7 +112,8 @@ void hotlist_visited(struct content *content)
 
 
 struct history *history_create(void) { return 0; }
-void history_add(struct history *history, struct content *content) {}
+void history_add(struct history *history, struct content *content,
+	char *frag_id) {}
 void history_update(struct history *history, struct content *content) {}
 void history_destroy(struct history *history) {}
 void history_back(struct browser_window *bw, struct history *history) {}
diff --git a/gtk/gtk_window.c b/gtk/gtk_window.c
index 2a70925b8..8e336df5f 100644
--- a/gtk/gtk_window.c
+++ b/gtk/gtk_window.c
@@ -16,6 +16,7 @@
 #include "netsurf/desktop/gui.h"
 #include "netsurf/desktop/netsurf.h"
 #include "netsurf/render/box.h"
+#include "netsurf/render/font.h"
 #include "netsurf/render/form.h"
 #include "netsurf/utils/messages.h"
 #include "netsurf/utils/utils.h"
@@ -171,7 +172,7 @@ gboolean gui_window_expose_event(GtkWidget *widget,
 			event->area.y,
 			event->area.x + event->area.width,
 			event->area.y + event->area.height,
-			1.0);
+			1.0, 0xFFFFFF);
 
 	g_object_unref(current_gc);
 
@@ -330,12 +331,13 @@ void gui_window_new_content(struct gui_window *g)
 }
 
 
-void html_redraw(struct content *c, int x, int y,
+bool html_redraw(struct content *c, int x, int y,
 		int width, int height,
 		int clip_x0, int clip_y0, int clip_x1, int clip_y1,
-		float scale)
+		float scale, unsigned long background_colour)
 {
 	html_redraw_box(c, c->data.html.layout->children, x, y);
+	return true;
 }
 
 
@@ -397,7 +399,7 @@ void html_redraw_box(struct content *content, struct box *box,
 
 	if (box->object) {
 		content_redraw(box->object, x + padding_left, y - padding_top,
-				width, height, x0, y0, x1, y1, 1.0);
+				width, height, x0, y0, x1, y1, 1.0, 0xFFFFFF);
 
 	} else if (box->gadget && box->gadget->type == GADGET_CHECKBOX) {
 
@@ -418,7 +420,8 @@ void html_redraw_box(struct content *content, struct box *box,
 
 		context = gtk_widget_get_pango_context(current_widget);
 		layout = pango_layout_new(context);
-		pango_layout_set_font_description(layout, box->font->id);
+		pango_layout_set_font_description(layout,
+				(const PangoFontDescription *)box->font->id);
 		pango_layout_set_text(layout, box->text, box->length);
 
 		gdk_draw_layout_with_colors(current_drawable, current_gc,