diff -Nurd gpaint-2-0.3.0-pre5-orig/src/about.c gpaint-2-0.3.0-pre5/src/about.c
--- gpaint-2-0.3.0-pre5-orig/src/about.c	2004-12-29 03:44:02.000000000 +0100
+++ gpaint-2-0.3.0-pre5/src/about.c	2006-05-26 01:52:15.000000000 +0200
@@ -25,6 +25,7 @@
 
 #include <gtk/gtk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
+#include <libgnome/gnome-url.h>
 #include "ui.h"
 #include "version.h"
 #include "about.h"
@@ -100,7 +101,8 @@
 on_about_gnome_activate                (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
-    gnome_url_show("http://www.gnome.org/");
+    GError *error;
+	gnome_url_show("http://www.gnome.org/", &error);
 }
 
 
@@ -114,7 +116,8 @@
 on_about_gnu_activate                  (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
-    gnome_url_show("http://www.gnu.org/");
+    GError *error;
+	gnome_url_show("http://www.gnu.org/", &error);
 }
 
 /*
diff -Nurd gpaint-2-0.3.0-pre5-orig/src/brush.c gpaint-2-0.3.0-pre5/src/brush.c
--- gpaint-2-0.3.0-pre5-orig/src/brush.c	2004-12-25 05:41:58.000000000 +0100
+++ gpaint-2-0.3.0-pre5/src/brush.c	2006-05-26 01:53:29.000000000 +0200
@@ -291,9 +291,6 @@
 static void 
 brush_interpolate(gpaint_brush *brush, int x, int y)
 {
-    int    initial_x = x;
-    int    initial_y = y;
-
     double dx;         /* delta x */
     double dy;         /* delta y */
     double moved;      /* mouse movement */       
diff -Nurd gpaint-2-0.3.0-pre5-orig/src/canvas.c gpaint-2-0.3.0-pre5/src/canvas.c
--- gpaint-2-0.3.0-pre5-orig/src/canvas.c	2005-01-07 03:50:52.000000000 +0100
+++ gpaint-2-0.3.0-pre5/src/canvas.c	2006-05-26 01:56:19.000000000 +0200
@@ -34,7 +34,7 @@
 #include "image.h"
 #include "image_processing.h"
 #include "paste.h"
-
+#include "selection.h"
 
 /* Single clipboard to share selections between canvases. */
 static gpaint_clipboard *clipboard = NULL;
@@ -95,7 +95,6 @@
         gint width,
         gint height)
 {
-    gpaint_canvas *canvas;
     GtkWidget     *scrolledwindow;
     GtkWidget     *viewport;
     GtkWidget     *drawing_area;
@@ -304,7 +303,6 @@
                                         GdkEventFocus   *event,
                                         gpointer         user_data)
 {
-    gpaint_tool *tool = ACTIVE_TOOL(user_data);
     gpaint_canvas *canvas = CANVAS(user_data);
     debug_fn1("canvas=%p", canvas);
     canvas_focus_gained(canvas);
@@ -319,7 +317,6 @@
                                         GdkEventFocus   *event,
                                         gpointer         user_data)
 {
-    gpaint_tool *tool = ACTIVE_TOOL(user_data);
     gpaint_canvas *canvas = CANVAS(user_data);
     debug_fn1("canvas=%p", canvas);
     canvas_focus_lost(canvas);
@@ -643,7 +640,6 @@
 void
 canvas_clear(gpaint_canvas *canvas)
 {
-    GdkRectangle rect;
     if (canvas_has_selection(canvas))
     {
         selection_disable_flash(canvas->selection);
diff -Nurd gpaint-2-0.3.0-pre5-orig/src/drawing.c gpaint-2-0.3.0-pre5/src/drawing.c
--- gpaint-2-0.3.0-pre5-orig/src/drawing.c	2005-01-27 03:48:45.000000000 +0100
+++ gpaint-2-0.3.0-pre5/src/drawing.c	2006-05-26 01:58:10.000000000 +0200
@@ -26,6 +26,10 @@
 #  include <config.h>
 #endif
 
+#ifdef HAVE_STRING_H
+#  include <string.h>
+#endif
+
 #include "drawing.h"
 #include "image.h"
 #include "image_processing.h"
@@ -93,7 +97,6 @@
 {
     gpaint_drawing *drawing = (gpaint_drawing*)g_new0(gpaint_drawing, 1);
     GtkWidget *widget = GTK_WIDGET(drawing_area); 
-    GtkWidget *top_level = gtk_widget_get_toplevel(widget);
     gpaint_image *image;
 
     g_assert(drawing);
@@ -135,7 +138,6 @@
 {
     gpaint_drawing *drawing = (gpaint_drawing*)g_new0(gpaint_drawing, 1);
     GtkWidget *widget = GTK_WIDGET(drawing_area); 
-    GtkWidget *top_level = gtk_widget_get_toplevel(widget);
     gpaint_image *image;
 
     g_assert(drawing);
diff -Nurd gpaint-2-0.3.0-pre5-orig/src/file.c gpaint-2-0.3.0-pre5/src/file.c
--- gpaint-2-0.3.0-pre5-orig/src/file.c	2005-01-27 03:54:37.000000000 +0100
+++ gpaint-2-0.3.0-pre5/src/file.c	2006-05-26 01:59:49.000000000 +0200
@@ -51,7 +51,6 @@
 {
     gpaint_canvas *canvas;
     const gchar *filename;
-    gpaint_image* image;
     
     debug_fn();
     filename = gtk_file_selection_get_filename(GTK_FILE_SELECTION(dialog));
@@ -94,7 +93,6 @@
 static void 
 on_open_filename_selected(GtkFileSelection *dialog)
 {
-    GdkRectangle drawable_rect;
     gpaint_canvas *canvas = (gpaint_canvas*)gtk_object_get_user_data(GTK_OBJECT(dialog));
     gpaint_drawing *new_drawing;
 
diff -Nurd gpaint-2-0.3.0-pre5-orig/src/image.c gpaint-2-0.3.0-pre5/src/image.c
--- gpaint-2-0.3.0-pre5-orig/src/image.c	2005-02-01 03:42:50.000000000 +0100
+++ gpaint-2-0.3.0-pre5/src/image.c	2006-05-26 02:01:01.000000000 +0200
@@ -23,6 +23,10 @@
 #  include <config.h>
 #endif
 
+#ifdef HAVE_STDLIB_H
+#  include <stdlib.h>
+#endif
+
 #include "image.h"
 #include "debug.h"
 #include <math.h>     
diff -Nurd gpaint-2-0.3.0-pre5-orig/src/image_processing.c gpaint-2-0.3.0-pre5/src/image_processing.c
--- gpaint-2-0.3.0-pre5-orig/src/image_processing.c	2004-03-13 04:49:19.000000000 +0100
+++ gpaint-2-0.3.0-pre5/src/image_processing.c	2006-05-26 02:20:53.000000000 +0200
@@ -39,6 +39,10 @@
 #  include <config.h>
 #endif
 
+#ifdef HAVE_STRING_H
+#  include <string.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
@@ -83,22 +87,22 @@
 gpaint_image_effect;
 
 const gpaint_image_effect effect_table[] = {
-    "sharpen", ImageSharpen,
-    "smooth", ImageSmooth,
-    "directional_smooth", ImageDirectionalFilter,
-    "despeckle", ImageDespeckle,
-    "edge_detect", ImageEdge,
-    "emboss", ImageEmbose,
-    "oil_paint", ImageOilPaint,
-    "add_noise", ImageAddNoise,
-    "spread", ImageSpread,
-    "pixelize", ImagePixelize,
-    "blend", ImageBlend,
-    "solarize", ImageSolarize,
-    "normalize_contrast", ImageNormContrast,
-    "quantize_color", ImageQuantize,
-    "convert_to_greyscale", ImageGrey,
-    0, NULL                     /* end sentinel */
+    {"sharpen", ImageSharpen},
+    {"smooth", ImageSmooth},
+    {"directional_smooth", ImageDirectionalFilter},
+    {"despeckle", ImageDespeckle},
+    {"edge_detect", ImageEdge},
+    {"emboss", ImageEmbose},
+    {"oil_paint", ImageOilPaint},
+    {"add_noise", ImageAddNoise},
+    {"spread", ImageSpread},
+    {"pixelize", ImagePixelize},
+    {"blend", ImageBlend},
+    {"solarize", ImageSolarize},
+    {"normalize_contrast", ImageNormContrast},
+    {"quantize_color", ImageQuantize},
+    {"convert_to_greyscale", ImageGrey},
+    {0, NULL}                     /* end sentinel */
         /*
          * TODO: Add the following functions.
          *   ImageInvert
diff -Nurd gpaint-2-0.3.0-pre5-orig/src/menu.c gpaint-2-0.3.0-pre5/src/menu.c
--- gpaint-2-0.3.0-pre5-orig/src/menu.c	2005-01-27 03:54:21.000000000 +0100
+++ gpaint-2-0.3.0-pre5/src/menu.c	2006-05-26 02:23:29.000000000 +0200
@@ -31,6 +31,8 @@
 #include "image.h"
 #include "image_processing.h"
 #include "tool_palette.h"
+#include "print.h"
+#include "file.h"
 
 #include <gnome.h>
 
@@ -200,12 +202,12 @@
     if (preview)
     {
         debug("starting do_print_preview()");
-        do_print_preview(image, image, drawing->filename);
+        do_print_preview(image, drawing->filename->str);
         debug("done do_print_preview()");
     }
     else
     {
-        do_print(image, image, drawing->filename);
+        do_print(image, drawing->filename->str);
     }
     image_free(image);
     canvas_end_busy_cursor(canvas);
diff -Nurd gpaint-2-0.3.0-pre5-orig/src/paste.c gpaint-2-0.3.0-pre5/src/paste.c
--- gpaint-2-0.3.0-pre5-orig/src/paste.c	2005-01-27 03:50:09.000000000 +0100
+++ gpaint-2-0.3.0-pre5/src/paste.c	2006-05-26 02:11:31.000000000 +0200
@@ -28,6 +28,7 @@
 
 #include "paste.h"
 #include "debug.h"
+#include "selection.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
@@ -148,7 +149,6 @@
 paste_motion(gpaint_tool * tool, int x, int y)
 {
     gpaint_paste *paste = GPAINT_PASTE(tool);
-    int x1, y1;
     debug_fn();
     
     /*  Drag the image to be pasted into place. */
@@ -166,8 +166,6 @@
 static void
 paste_key_release(gpaint_tool *tool, GdkEventKey *keyevent)
 {
-    gpaint_paste *paste = GPAINT_PASTE(tool);
-    int x1, y1;
     debug_fn();
     switch (keyevent->keyval)
     {
diff -Nurd gpaint-2-0.3.0-pre5-orig/src/print.c gpaint-2-0.3.0-pre5/src/print.c
--- gpaint-2-0.3.0-pre5-orig/src/print.c	2004-12-29 03:44:02.000000000 +0100
+++ gpaint-2-0.3.0-pre5/src/print.c	2006-05-26 02:28:50.000000000 +0200
@@ -106,8 +106,6 @@
 int
 do_print_preview(gpaint_image * image, const gchar * name)
 {
-    GtkWidget *toplevel, *canvas, *sw;
-    GnomePrintContext *pc = 0;
     GnomePrintConfig *cfg = NULL;
     GnomePrintJob *job = NULL;
     GnomePrintJobPreview *pmp = NULL;
diff -Nurd gpaint-2-0.3.0-pre5-orig/src/selection.c gpaint-2-0.3.0-pre5/src/selection.c
--- gpaint-2-0.3.0-pre5-orig/src/selection.c	2004-11-22 03:59:53.000000000 +0100
+++ gpaint-2-0.3.0-pre5/src/selection.c	2006-05-26 02:13:22.000000000 +0200
@@ -26,6 +26,10 @@
 #  include <config.h>
 #endif
 
+#ifdef HAVE_STRING_H
+#  include <string.h>
+#endif
+
 #include "selection.h"
 #include "debug.h"
 
diff -Nurd gpaint-2-0.3.0-pre5-orig/src/selection.h gpaint-2-0.3.0-pre5/src/selection.h
--- gpaint-2-0.3.0-pre5-orig/src/selection.h	2004-03-13 04:32:27.000000000 +0100
+++ gpaint-2-0.3.0-pre5/src/selection.h	2006-05-26 02:14:49.000000000 +0200
@@ -85,5 +85,7 @@
 void selection_move(gpaint_selection *selection, int x, int y);
 void selection_clear_flash(gpaint_selection *selection);
 void selection_draw_flash(gpaint_selection *selection);
+void selection_enable_flash(gpaint_selection *selection);
+void selection_disable_flash(gpaint_selection *selection);
 
 #endif
diff -Nurd gpaint-2-0.3.0-pre5-orig/src/text.c gpaint-2-0.3.0-pre5/src/text.c
--- gpaint-2-0.3.0-pre5-orig/src/text.c	2005-01-27 03:53:01.000000000 +0100
+++ gpaint-2-0.3.0-pre5/src/text.c	2006-05-26 02:15:32.000000000 +0200
@@ -26,6 +26,10 @@
 #  include <config.h>
 #endif
 
+#ifdef HAVE_STRING_H
+#  include <string.h>
+#endif
+
 #include "text.h"
 #include "debug.h"
 #include <gdk/gdkkeysyms.h>
diff -Nurd gpaint-2-0.3.0-pre5-orig/src/tool_palette.c gpaint-2-0.3.0-pre5/src/tool_palette.c
--- gpaint-2-0.3.0-pre5-orig/src/tool_palette.c	2004-11-22 03:59:53.000000000 +0100
+++ gpaint-2-0.3.0-pre5/src/tool_palette.c	2006-05-26 02:16:13.000000000 +0200
@@ -264,7 +264,6 @@
     g_assert(tb);
     if (tb->tool) 
     {
-        GtkWidget *widget;
         gpaint_tool *tool = tb->tool;
         g_assert(tool->name);
         g_assert(tool->destroy);