diff --git a/graphics/graphics.h b/graphics/graphics.h
index c3410654..64b50137 100644
--- a/graphics/graphics.h
+++ b/graphics/graphics.h
@@ -60,7 +60,7 @@ extern bool GrPutText(const char *, int, Point *, int, int, bool, Rect *, Rect *
 extern void GrFillPolygon();
 extern void (*GrDrawGlyphPtr)();
 extern void (*GrBitBltPtr)();
-extern int  (*GrReadPixelPtr)();
+extern int  (*GrReadPixelPtr)(MagWindow *, int, int);
 extern void (*GrFlushPtr)();
 
 /* Tablet routines */
@@ -83,7 +83,8 @@ extern bool GrDrawGlyphNum();
 #define GrFastBox(x)	GrDrawFastBox(x, 0)
 
 /* external color map routines */
-extern bool GrReadCMap(), GrSaveCMap();
+extern bool GrReadCMap(char *, char *, char *, char *, char *);
+extern bool GrSaveCMap(char *, char *, char *, char *, char *);
 extern bool GrGetColor(int, int *, int *, int *), GrPutColor(int, int, int, int);
 extern int  GrNameToColor();
 extern void GrPutManyColors();
diff --git a/windows/windows.h b/windows/windows.h
index a4a577be..faa6ce04 100644
--- a/windows/windows.h
+++ b/windows/windows.h
@@ -251,7 +251,7 @@ extern void WindOutToIn();
 extern void WindInToOut();
 extern void WindSetWindowAreas(MagWindow *);
 extern void windFixSurfaceArea();
-extern int WindExecute();
+extern int WindExecute(MagWindow *, WindClient, TxCommand *);
 extern void WindAddCommand(WindClient, char *, void (*)(), bool);
 extern int WindReplaceCommand();
 extern const char * const *WindGetCommandTable();
@@ -259,7 +259,7 @@ extern int windCheckOnlyWindow(MagWindow **, WindClient);
 
 
 /* searching procs */
-extern int WindSearch();
+extern int WindSearch(WindClient, ClientData, Rect *, int (*)(), ClientData);
 extern MagWindow *WindSearchWid();
 extern MagWindow *WindSearchData();
 
@@ -282,7 +282,7 @@ extern void WindFullScreen();
 
 extern void WindScreenToSurface();
 extern void WindSurfaceToScreen(MagWindow *, const Rect *, Rect *);
-extern void WindPointToSurface();
+extern void WindPointToSurface(MagWindow *, Point *, Point *, Rect *);
 extern void WindPointToScreen();
 extern void WindSurfaceToScreenNoClip(MagWindow *, Rect *, Rect *);