diff --git a/graphics/graphics.h b/graphics/graphics.h
index 331681c5..9df732dd 100644
--- a/graphics/graphics.h
+++ b/graphics/graphics.h
@@ -50,13 +50,13 @@ extern int (*GrTextSizePtr)();
  *    You must call GrLock() before using these, and
  *    call GrUnlock() afterwards.
  */
-extern void (*GrLockPtr)();
-extern void (*GrUnlockPtr)();
+extern void (*GrLockPtr)(MagWindow *, bool);
+extern void (*GrUnlockPtr)(MagWindow *);
 extern bool GrHaveLock();
 extern void GrClipTo();
-extern void GrClipBox();
+extern void GrClipBox(Rect *, int);
 extern void GrClipLine();
-extern bool GrPutText();
+extern bool GrPutText(char *, int, Point *, int, int, bool, Rect *, Rect *);
 extern void GrFillPolygon();
 extern void (*GrDrawGlyphPtr)();
 extern void (*GrBitBltPtr)();
@@ -84,7 +84,7 @@ extern bool GrDrawGlyphNum();
 
 /* external color map routines */
 extern bool GrReadCMap(), GrSaveCMap();
-extern bool GrGetColor(), GrPutColor();
+extern bool GrGetColor(int, int *, int *, int *), GrPutColor(int, int, int, int);
 extern int  GrNameToColor();
 extern void GrPutManyColors();
 extern void (*GrSetCMapPtr)();
diff --git a/windows/windows.h b/windows/windows.h
index cd1b2c09..eb48631e 100644
--- a/windows/windows.h
+++ b/windows/windows.h
@@ -239,17 +239,19 @@ typedef struct WIND_S1 {
 extern MagWindow *WindCreate();
 extern WindClient WindGetClient();
 extern WindClient WindNextClient();
-extern WindClient WindAddClient();
+extern WindClient WindAddClient(char *, bool (*)(), bool (*)(), void (*)(),
+				void (*)(), void (*)(), bool (*)(),
+				void (*)(), void (*)());
 extern char *WindGetClientName();
 extern void WindInit();
 extern void WindUpdate();
 extern void WindDrawBorder();
 extern void WindOutToIn();
 extern void WindInToOut();
-extern void WindSetWindowAreas();
+extern void WindSetWindowAreas(MagWindow *);
 extern void windFixSurfaceArea();
 extern int WindExecute();
-extern void WindAddCommand();
+extern void WindAddCommand(WindClient, char *, void (*)(), bool);
 extern int WindReplaceCommand();
 extern const char * const *WindGetCommandTable();
 extern int windCheckOnlyWindow(MagWindow **, WindClient);
@@ -263,7 +265,7 @@ extern MagWindow *WindSearchData();
 
 /* procs for moving the surface inside of a window (changing the view) */
 extern void WindZoom();
-extern void WindMove();
+extern void WindMove(MagWindow *, Rect *);
 extern void WindView();
 extern void WindScroll();
 
@@ -278,14 +280,14 @@ extern void WindFullScreen();
 /* procs to transform into and out of screen coordinates */
 
 extern void WindScreenToSurface();
-extern void WindSurfaceToScreen();
+extern void WindSurfaceToScreen(MagWindow *, Rect *, Rect *);
 extern void WindPointToSurface();
 extern void WindPointToScreen();
-extern void WindSurfaceToScreenNoClip();
+extern void WindSurfaceToScreenNoClip(MagWindow *, Rect *, Rect *);
 
 /* procs to change things or inform the window manager about changes */
-extern void WindCaption();
-extern void WindAreaChanged();
+extern void WindCaption(MagWindow *, char *);
+extern void WindAreaChanged(MagWindow *, Rect *);
 extern void WindIconChanged();
 extern bool WindLoad();
 extern void WindSeparateRedisplay();