diff --git a/demos/dragger.tcl b/demos/dragger.tcl
old mode 100644
new mode 100755
index 9646177..1563660
--- a/demos/dragger.tcl
+++ b/demos/dragger.tcl
@@ -32,9 +32,11 @@
 # $Id: demo.tcl,v 1.1 1997/09/17 21:10:23 donal Exp donal $
 
 # Now we make cunning use of the backslash/shell trick \
-[ -x `dirname $0`/../shapewish ] && exec `dirname $0`/../shapewish $0 ${1+"$@"} || exec wish8.0 $0 ${1+"$@"} || { echo "`basename $0`: couldn't start wish" >&2 ; exit 1; }
+[ -x `dirname $0`/../shapewish ] && exec `dirname $0`/../shapewish $0 ${1+"$@"} || exec wish $0 ${1+"$@"} || { echo "`basename $0`: couldn't start wish" >&2 ; exit 1; }
 
-set dir [file join [pwd] [file dirname [info script]] ..]
+set dir [file join [pwd] [file dirname [info script]] .]
+package ifneeded Shape 0.4 "package require Tk 8\n\
+        [list tclPkgSetup "$dir/../unix/" Shape 0.4 {{libshape04.so.1.0 load shape}}]"
 lappend auto_path [file join $dir ..]
 package require Shape
 
diff --git a/demos/fancytext.tcl b/demos/fancytext.tcl
old mode 100644
new mode 100755
index a0bee3b..3cada9f
--- a/demos/fancytext.tcl
+++ b/demos/fancytext.tcl
@@ -1,8 +1,9 @@
 #!/bin/sh
 
-# dragger.tcl ---
+# fancytext.tcl ---
 #
-#	Quick demo using the shape library to provide a coloured cursor
+#	Make a piece of text look interesting by suggesting the shape of the
+#	letters
 #
 # Copyright (c) 1997 by Donal K. Fellows
 #
@@ -32,9 +33,11 @@
 # $Id: demo.tcl,v 1.1 1997/09/17 21:10:23 donal Exp donal $
 
 # Now we make cunning use of the backslash/shell trick \
-[ -x `dirname $0`/../shapewish ] && exec `dirname $0`/../shapewish $0 ${1+"$@"} || exec wish8.0 $0 ${1+"$@"} || { echo "`basename $0`: couldn't start wish" >&2 ; exit 1; }
+[ -x `dirname $0`/../shapewish ] && exec `dirname $0`/../shapewish $0 ${1+"$@"} || exec wish $0 ${1+"$@"} || { echo "`basename $0`: couldn't start wish" >&2 ; exit 1; }
 
-set dir [file join [pwd] [file dirname [info script]] ..]
+set dir [file join [pwd] [file dirname [info script]] .]
+package ifneeded Shape 0.4 "package require Tk 8\n\
+        [list tclPkgSetup "$dir/../unix/" Shape 0.4 {{libshape04.so.1.0 load shape}}]"
 lappend auto_path [file join $dir ..]
 package require Shape
 
diff --git a/demos/fingerprint.tcl b/demos/fingerprint.tcl
old mode 100644
new mode 100755
index 84151ac..79ef1fb
--- a/demos/fingerprint.tcl
+++ b/demos/fingerprint.tcl
@@ -5,9 +5,11 @@
 # a little in order to increase its effectiveness.
 
 # Now we make cunning use of the backslash/shell trick \
-[ -x `dirname $0`/../shapewish ] && exec `dirname $0`/../shapewish $0 ${1+"$@"} || exec wish8.0 $0 ${1+"$@"} || { echo "`basename $0`: couldn't start wish" >&2 ; exit 1; }
+[ -x `dirname $0`/../shapewish ] && exec `dirname $0`/../shapewish $0 ${1+"$@"} || exec wish $0 ${1+"$@"} || { echo "`basename $0`: couldn't start wish" >&2 ; exit 1; }
 
-set dir [file join [pwd] [file dirname [info script]] ..]
+set dir [file join [pwd] [file dirname [info script]] .]
+package ifneeded Shape 0.4 "package require Tk 8\n\
+        [list tclPkgSetup "$dir/../unix/" Shape 0.4 {{libshape04.so.1.0 load shape}}]"
 lappend auto_path [file join $dir ..]
 package require Shape
 
diff --git a/generic/shape.c b/generic/shape.c
index 845c3d8..2ada898 100644
--- a/generic/shape.c
+++ b/generic/shape.c
@@ -428,7 +428,7 @@ shapePhoto(
 static int
 shapeSetUpdateOps(
     Tk_Window tkwin0,
-    Tcl_Interp *interp;
+    Tcl_Interp *interp,
     int opnum,
     int objc,
     Tcl_Obj *const objv[])
diff --git a/include/panic.h b/include/panic.h
index 02385b2..4eaf365 100644
--- a/include/panic.h
+++ b/include/panic.h
@@ -2,7 +2,7 @@
 #define PANIC_H
 
 #ifdef __GNUC__
-EXTERN void	panic(char *message, ...) __attribute__((__noreturn__ , __format__(printf,1,2)));
+/* EXTERN void	panic(char *message, ...) __attribute__((__noreturn__ , __format__(printf,1,2))); */
 #else
 EXTERN void	panic(char *message, ...);
 #endif
diff --git a/unix/shapeUnixImpl.c b/unix/shapeUnixImpl.c
index 6cfd2f0..5f86839 100644
--- a/unix/shapeUnixImpl.c
+++ b/unix/shapeUnixImpl.c
@@ -13,7 +13,7 @@
 #include <tk.h>				/* Includes conventional X stuff. */
 #include <X11/Xutil.h>			/* For Region declaration. */
 #include <X11/extensions/shape.h>
-#include "shape.h"
+#include "shapeInt.h"
 
 #ifdef DKF_SHAPE_DEBUGGING
 static int
@@ -364,11 +364,11 @@ int
 Shape_CombineWindow(
     Tcl_Interp *interp,
     Tk_Window tkwin,
-    Tk_Window srcwin,
     int kind,
     int op,
     int x,
-    int y)
+    int y,
+    Tk_Window srcwin)
 {
     Display *dpy  = Tk_Display(tkwin);
     Display *sdpy = Tk_Display(srcwin);