diff --git a/pd/src/g_editor.c b/pd/src/g_editor.c
index 5e30db534613c65e74e9f73fd82fb8c96fb41fe1..285f1e160da9bd0d2c9539e66a50bbefd078fd53 100644
--- a/pd/src/g_editor.c
+++ b/pd/src/g_editor.c
@@ -2223,6 +2223,8 @@ static void do_rename_light(t_gobj *z, t_glist *glist, const char *text)
     glist->gl_editor->e_onmotion = MA_NONE; //necessary?
 }
 
+int binbuf_match(t_binbuf *inbuf, t_binbuf *searchbuf, int wholeword);
+
 /* traverses the whole subtree of the given canvas/patch, replacing all subpatches identical to the
     given one with an abstraction */
 static int do_replace_subpatches(t_canvas *x, const char* label, t_binbuf *original)
@@ -2393,9 +2395,9 @@ static void abstracthandler_dialog(t_abstracthandler *x, t_floatarg val)
         int edi = 0;
         if(!owner->gl_editor) { canvas_create_editor(owner); edi = 1; }
         glist_noselect(owner);
-        glist_select(owner, x->tarjet);
-        do_rename_light(x->tarjet, owner, x->path);
-        glist_deselect(owner, x->tarjet);
+        glist_select(owner, &x->tarjet->gl_gobj);
+        do_rename_light(&x->tarjet->gl_gobj, owner, x->path);
+        glist_deselect(owner, &x->tarjet->gl_gobj);
         if(edi) canvas_destroy_editor(owner);
 
         /* select '[args]' slice
@@ -2415,7 +2417,8 @@ static void abstracthandler_dialog(t_abstracthandler *x, t_floatarg val)
 void abstracthandler_setup(void)
 {
     abstracthandler_class = class_new(gensym("abstracthandler"), 0,
-                                        abstracthandler_free, sizeof(t_abstracthandler),
+                                        (t_method)abstracthandler_free,
+                                        sizeof(t_abstracthandler),
                                         CLASS_NOINLET, 0);
     class_addmethod(abstracthandler_class, (t_method)abstracthandler_callback,
                         gensym("callback"), A_SYMBOL, 0);
@@ -3341,11 +3344,13 @@ void canvas_done_popup(t_canvas *x, t_float which, t_float xpos,
                 else if(which == 5)    /* saveas */
                 {
                     t_abstracthandler *ah = abstracthandler_new();
-                    ah->tarjet = y;
+                    ah->tarjet = (t_canvas *)y;
                     ah->dialog = x;
 
                     char buf[MAXPDSTRING];
-                    sprintf(buf, "%s/%s.pd", canvas_getdir(canvas_getrootfor(y))->s_name, ((t_canvas *)y)->gl_name->s_name);
+                    sprintf(buf, "%s/%s.pd",
+                        canvas_getdir(canvas_getrootfor((t_canvas *)y))->s_name,
+                        ((t_canvas *)y)->gl_name->s_name);
 
                     gui_vmess("gui_savepanel", "xss",
                         x,
@@ -6035,7 +6040,6 @@ static void canvas_menufont(t_canvas *x, t_floatarg newsize)
 
 static int canvas_find_index1, canvas_find_index2, canvas_find_wholeword;
 static t_binbuf *canvas_findbuf;
-int binbuf_match(t_binbuf *inbuf, t_binbuf *searchbuf, int wholeword);
 
     /* find an atom or string of atoms */
 static int canvas_dofind(t_canvas *x, int *myindex1p)
@@ -6583,7 +6587,7 @@ static void canvas_cut(t_canvas *x)
 
 typedef struct _xletholder
 {
-    t_gobj *xlh_addr;
+    void *xlh_addr;
     int xlh_seln;
     int xlh_xletn;
     int xlh_type;
@@ -6655,7 +6659,7 @@ static void canvas_dofancycopy(t_canvas *x, t_binbuf **object, t_binbuf **connec
         else if(s1 && !s2)
         {
             /* if we continue in the same outlet, we add the object and inlet number to the list and skip */
-            if (lastoutlet && lastoutlet->xlh_addr == t.tr_outlet)
+            if (lastoutlet && lastoutlet->xlh_addr == (void *)t.tr_outlet)
             {
                 binbuf_addv(lastoutlet->xlh_conn, "ii", glist_selectionindex(x, &t.tr_ob2->ob_g, 0), t.tr_inno);
                 continue;
@@ -6663,7 +6667,7 @@ static void canvas_dofancycopy(t_canvas *x, t_binbuf **object, t_binbuf **connec
 
             /* create and fill outlet handling structure */
             t_xletholder *newoutlet = (t_xletholder *)getbytes(sizeof(t_xletholder));
-            newoutlet->xlh_addr = t.tr_outlet;
+            newoutlet->xlh_addr = (void *)t.tr_outlet;
             newoutlet->xlh_seln = glist_selectionindex(x, &t.tr_ob->ob_g, 1);
             newoutlet->xlh_xletn = t.tr_outno;
             newoutlet->xlh_type = obj_issignaloutlet(t.tr_ob, t.tr_outno);
@@ -6692,7 +6696,7 @@ static void canvas_dofancycopy(t_canvas *x, t_binbuf **object, t_binbuf **connec
             t_xletholder *it;
             for(it = inlets; it && !alr; )
             {
-                alr = ((t.tr_inno ? t.tr_inlet : t.tr_ob2) == it->xlh_addr);
+                alr = ((t.tr_inno ? (void *)t.tr_inlet : (void *)t.tr_ob2) == it->xlh_addr);
                 if(!alr) it = it->xlh_next;
             }
 
@@ -6707,7 +6711,7 @@ static void canvas_dofancycopy(t_canvas *x, t_binbuf **object, t_binbuf **connec
 
             /* create and fill inlet handling structure */
             t_xletholder *newinlet = (t_xletholder *)getbytes(sizeof(t_xletholder));
-            newinlet->xlh_addr = (t.tr_inno ? t.tr_inlet : t.tr_ob2);
+            newinlet->xlh_addr = (t.tr_inno ? (void *)t.tr_inlet : (void *)t.tr_ob2);
             newinlet->xlh_seln = glist_selectionindex(x, &t.tr_ob2->ob_g, 1);
             newinlet->xlh_xletn = t.tr_inno;
             newinlet->xlh_type = type;
diff --git a/pd/src/m_pd.h b/pd/src/m_pd.h
index c8603b7a86d35e4fba7f794b79856bf0f951f5cc..5d12b3e4151b39fb0f9122e49be6666e53c3960d 100644
--- a/pd/src/m_pd.h
+++ b/pd/src/m_pd.h
@@ -557,6 +557,7 @@ EXTERN int sys_isreadablefile(const char *name);
 EXTERN int sys_isabsolutepath(const char *dir);
 EXTERN void sys_bashfilename(const char *from, char *to);
 EXTERN void sys_unbashfilename(const char *from, char *to);
+EXTERN int sys_relativizepath(const char *from, const char *to, char *result);
 EXTERN int open_via_path(const char *name, const char *ext, const char *dir,
     char *dirresult, char **nameresult, unsigned int size, int bin);
 EXTERN int sched_geteventno(void);