Index: g_all_guis.c
===================================================================
--- g_all_guis.c	(revision 10407)
+++ g_all_guis.c	(working copy)
@@ -12,7 +12,7 @@
 #include <ctype.h>
 #include "m_pd.h"
 #include "g_canvas.h"
-#include "t_tk.h"
+
 #include "g_all_guis.h"
 #include <math.h>
 
Index: g_bang.c
===================================================================
--- g_bang.c	(revision 10407)
+++ g_bang.c	(working copy)
@@ -12,7 +12,7 @@
 #include <ctype.h>
 #include "m_pd.h"
 #include "g_canvas.h"
-#include "t_tk.h"
+
 #include "g_all_guis.h"
 #include <math.h>
 
Index: g_editor.c
===================================================================
--- g_editor.c	(revision 10407)
+++ g_editor.c	(working copy)
@@ -1247,7 +1247,7 @@
     }
 }
 
-void canvas_mousedown(t_canvas *x, t_floatarg xpos, t_floatarg ypos,
+void canvas_mouse(t_canvas *x, t_floatarg xpos, t_floatarg ypos,
     t_floatarg which, t_floatarg mod)
 {
     canvas_doclick(x, xpos, ypos, which, mod, 1);
@@ -2435,7 +2435,7 @@
 void g_editor_setup(void)
 {
 /* ------------------------ events ---------------------------------- */
-    class_addmethod(canvas_class, (t_method)canvas_mousedown, gensym("mouse"),
+    class_addmethod(canvas_class, (t_method)canvas_mouse, gensym("mouse"),
         A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_NULL);
     class_addmethod(canvas_class, (t_method)canvas_mouseup, gensym("mouseup"),
         A_FLOAT, A_FLOAT, A_FLOAT, A_NULL);
Index: g_graph.c
===================================================================
--- g_graph.c	(revision 10407)
+++ g_graph.c	(working copy)
@@ -8,7 +8,7 @@
 
 #include <stdlib.h>
 #include "m_pd.h"
-#include "t_tk.h"
+
 #include "g_canvas.h"
 #include "s_stuff.h"    /* for sys_hostfontsize */
 #include <stdio.h>
Index: g_hdial.c
===================================================================
--- g_hdial.c	(revision 10407)
+++ g_hdial.c	(working copy)
@@ -14,7 +14,7 @@
 #include <ctype.h>
 #include "m_pd.h"
 #include "g_canvas.h"
-#include "t_tk.h"
+
 #include "g_all_guis.h"
 #include <math.h>
 
Index: g_hslider.c
===================================================================
--- g_hslider.c	(revision 10407)
+++ g_hslider.c	(working copy)
@@ -12,7 +12,7 @@
 #include <ctype.h>
 #include "m_pd.h"
 #include "g_canvas.h"
-#include "t_tk.h"
+
 #include "g_all_guis.h"
 #include <math.h>
 
Index: g_mycanvas.c
===================================================================
--- g_mycanvas.c	(revision 10407)
+++ g_mycanvas.c	(working copy)
@@ -12,7 +12,7 @@
 #include <ctype.h>
 #include "m_pd.h"
 #include "g_canvas.h"
-#include "t_tk.h"
+
 #include "g_all_guis.h"
 #include <math.h>
 
Index: g_numbox.c
===================================================================
--- g_numbox.c	(revision 10407)
+++ g_numbox.c	(working copy)
@@ -10,7 +10,7 @@
 #include <ctype.h>
 #include "m_pd.h"
 #include "g_canvas.h"
-#include "t_tk.h"
+
 #include "g_all_guis.h"
 #include <math.h>
 
Index: g_rtext.c
===================================================================
--- g_rtext.c	(revision 10407)
+++ g_rtext.c	(working copy)
@@ -13,8 +13,8 @@
 #include "m_pd.h"
 #include "s_stuff.h"
 #include "g_canvas.h"
-#include "t_tk.h"
 
+
 #define LMARGIN 2
 #define RMARGIN 2
 /* for some reason, it draws text 1 pixel lower on Mac OS X (& linux too?) */
Index: g_text.c
===================================================================
--- g_text.c	(revision 10407)
+++ g_text.c	(working copy)
@@ -10,7 +10,7 @@
 #include "m_pd.h"
 #include "m_imp.h"
 #include "s_stuff.h"
-#include "t_tk.h"
+
 #include "g_canvas.h"
 #include <stdio.h>
 #include <string.h>
Index: g_toggle.c
===================================================================
--- g_toggle.c	(revision 10407)
+++ g_toggle.c	(working copy)
@@ -12,7 +12,7 @@
 #include <ctype.h>
 #include "m_pd.h"
 #include "g_canvas.h"
-#include "t_tk.h"
+
 #include "g_all_guis.h"
 #include <math.h>
 
Index: g_vdial.c
===================================================================
--- g_vdial.c	(revision 10407)
+++ g_vdial.c	(working copy)
@@ -13,7 +13,7 @@
 #include <ctype.h>
 #include "m_pd.h"
 #include "g_canvas.h"
-#include "t_tk.h"
+
 #include "g_all_guis.h"
 #include <math.h>
 
Index: g_vslider.c
===================================================================
--- g_vslider.c	(revision 10407)
+++ g_vslider.c	(working copy)
@@ -12,7 +12,7 @@
 #include <ctype.h>
 #include "m_pd.h"
 #include "g_canvas.h"
-#include "t_tk.h"
+
 #include "g_all_guis.h"
 #include <math.h>
 
Index: g_vumeter.c
===================================================================
--- g_vumeter.c	(revision 10407)
+++ g_vumeter.c	(working copy)
@@ -12,7 +12,7 @@
 #include <ctype.h>
 #include "m_pd.h"
 #include "g_canvas.h"
-#include "t_tk.h"
+
 #include "g_all_guis.h"
 #include <math.h>
 
Index: s_inter.c
===================================================================
--- s_inter.c	(revision 10407)
+++ s_inter.c	(working copy)
@@ -1079,7 +1079,7 @@
 #else
             sprintf(cmdbuf,
                 "TCL_LIBRARY=\"%s/tcl/library\" TK_LIBRARY=\"%s/tk/library\" \
-                 \"%s/pd-gui\" %d\n",
+                 wish \"%s/pd.tk\" %d\n",
                  sys_libdir->s_name, sys_libdir->s_name, guidir, portno);
 #endif
             sys_guicmd = cmdbuf;