diff --git a/src/session.c b/src/session.c
index 92dd789a..541dd685 100644
--- a/src/session.c
+++ b/src/session.c
@@ -41,7 +41,7 @@ static Window       new_init_win_ext = None;
 #endif
 
 /* True if we are saving state for a doExit("restart") */
-static int          restarting = False;
+static char         restarting = 0;
 
 #if USE_SM
 
@@ -491,7 +491,7 @@ doSMExit(int mode, const char *params)
    if (EDebug(EDBUG_TYPE_SESSION))
       Eprintf("doSMExit: mode=%d prm=%p\n", mode, params);
 
-   restarting = True;
+   restarting = 1;
 
    SessionSave(1);
 
@@ -563,7 +563,7 @@ doSMExit(int mode, const char *params)
 	break;
      }
 
-   restarting = False;
+   restarting = 0;
    SoundPlay(SOUND_EXIT);
    EExit(0);
 }
diff --git a/src/x.c b/src/x.c
index 2705017e..d8aaa6bf 100644
--- a/src/x.c
+++ b/src/x.c
@@ -1178,7 +1178,7 @@ EWarpPointer(Win win, int x, int y)
    EXWarpPointer(win ? win->xwin : None, x, y);
 }
 
-Bool
+int
 EXQueryPointer(Window xwin, int *px, int *py, Window * pchild,
 	       unsigned int *pmask)
 {
@@ -1202,7 +1202,7 @@ EXQueryPointer(Window xwin, int *px, int *py, Window * pchild,
 			pmask);
 }
 
-Bool
+int
 EQueryPointer(Win win, int *px, int *py, Window * pchild, unsigned int *pmask)
 {
    Window              xwin;
diff --git a/src/xwin.h b/src/xwin.h
index 03a2e43c..1464b4ef 100644
--- a/src/xwin.h
+++ b/src/xwin.h
@@ -223,7 +223,7 @@ Pixmap              EWindowGetShapePixmap(Win win);
 Pixmap              EWindowGetShapePixmapInverted(Win win);
 
 void                EWarpPointer(Win win, int x, int y);
-Bool                EQueryPointer(Win win, int *px, int *py,
+int                 EQueryPointer(Win win, int *px, int *py,
 				  Window * pchild, unsigned int *pmask);
 
 unsigned int        EAllocColor(Colormap cmap, unsigned int argb);
@@ -264,7 +264,7 @@ void                EXCopyAreaTiled(Drawable src, Pixmap mask, Drawable dst,
 				    int dx, int dy);
 
 void                EXWarpPointer(Window xwin, int x, int y);
-Bool                EXQueryPointer(Window xwin, int *px, int *py,
+int                 EXQueryPointer(Window xwin, int *px, int *py,
 				   Window * pchild, unsigned int *pmask);
 
 Pixmap              EXCreatePixmapCopy(Pixmap src, unsigned int w,