diff --git a/wiring/wireOps.c b/wiring/wireOps.c
index 4b8fb249..9fcec85a 100644
--- a/wiring/wireOps.c
+++ b/wiring/wireOps.c
@@ -81,12 +81,12 @@ wireFindRootWindow(
 				 */
 {
     MagWindow *mw;
-    extern int wireFindRootFunc();
+    extern int wireFindRootFunc(MagWindow *window, ClientData cdata); /* forward declaration cb_windows_search_t (MagWindow **) */
 
     mw = NULL;
     wireDesiredDef = rootDef;
     (void) WindSearch(DBWclientID, (ClientData) NULL, (Rect *) NULL,
-	    wireFindRootFunc, (ClientData) &mw);
+	    wireFindRootFunc, PTR2CD(&mw));
     return mw;
 }
 
@@ -99,8 +99,9 @@ wireFindRootWindow(
 int
 wireFindRootFunc(
     MagWindow *window,		/* A layout window. */
-    MagWindow **mwPtr)		/* Copy layout window pointer to this */
+    ClientData cdata)		/* Copy layout window pointer to this */
 {
+    MagWindow **mwPtr = (MagWindow **)CD2PTR(cdata);
     CellUse *use;
 
     use = (CellUse *) window->w_surfaceID;
diff --git a/wiring/wireUndo.c b/wiring/wireUndo.c
index 719a530e..e554c6e4 100644
--- a/wiring/wireUndo.c
+++ b/wiring/wireUndo.c
@@ -82,7 +82,8 @@ static int wireOldDir = GEO_NORTH;		/* Last direction */
 void
 WireUndoInit(void)
 {
-    extern void WireUndoForw(), WireUndoBack();
+    extern void WireUndoForw(WireUndoEvent *wue); /* forward declaration */
+    extern void WireUndoBack(WireUndoEvent *wue); /* forward declaration */
 
     WireUndoClientID = UndoAddClient((void (*)()) NULL, (void (*)()) NULL,
 	    (UndoEvent *(*)()) NULL, (int (*)()) NULL, WireUndoForw,