diff --git a/cde/lib/DtSvc/DtUtil2/ChkpntClient.c b/cde/lib/DtSvc/DtUtil2/ChkpntClient.c
index 4b7ebb8ed..f7e8d8c33 100644
--- a/cde/lib/DtSvc/DtUtil2/ChkpntClient.c
+++ b/cde/lib/DtSvc/DtUtil2/ChkpntClient.c
@@ -110,7 +110,7 @@ myDtChkpntMsgSend(char *message, char *type)
     struct timezone time_zone;
     XTextProperty   tp;
     Status          status;
-    Bool            bool;
+    Bool            hasEvent;
     XEvent          event;
 
     /* Check to see if checkpoint is actually on */
@@ -153,9 +153,9 @@ myDtChkpntMsgSend(char *message, char *type)
 	timestamp = oldtime;
     }
     else {		     /* Check event queue */
-	bool = XCheckIfEvent(dtcp_info.display, &event,
+	hasEvent = XCheckIfEvent(dtcp_info.display, &event,
 			 myCheckClientEvent, NULL);
-	if (bool == True) {
+	if (hasEvent == True) {
 	    if (event.type == PropertyNotify)
 		 timestamp = event.xproperty.time; 
 	    else timestamp = event.xselection.time;
@@ -190,12 +190,12 @@ myDtChkpntMsgSend(char *message, char *type)
      */
     oldtime = INVALID_TIME;
     do {
-	bool = XCheckIfEvent(dtcp_info.display, &event,
+	hasEvent = XCheckIfEvent(dtcp_info.display, &event,
 			     myCheckClientEvent, NULL);
 	if (event.type == PropertyNotify) /* Save timestamp for recycling */
 	     oldtime = event.xproperty.time;
 	else oldtime = event.xselection.time;
-    } while(bool == True);
+    } while(hasEvent == True);
 
     /*
      * Increment the property and message counters
diff --git a/cde/lib/DtSvc/DtUtil2/ChkpntListen.c b/cde/lib/DtSvc/DtUtil2/ChkpntListen.c
index 2f5124e32..0bbfc4cb6 100644
--- a/cde/lib/DtSvc/DtUtil2/ChkpntListen.c
+++ b/cde/lib/DtSvc/DtUtil2/ChkpntListen.c
@@ -158,7 +158,7 @@ static Bool myCheckSelectionEvent(Display *display, XEvent *event, char *args)
 Bool _DtPerfChkpntMsgReceive(DtChkpntMsg *dtcp_msg, Bool bBlock)
 {
     XEvent        event;
-    Bool          bool=True;
+    Bool          hasEvent=True;
     XTextProperty tp;
     int 	  i;
     static char   **Stringlist;
@@ -178,10 +178,10 @@ Bool _DtPerfChkpntMsgReceive(DtChkpntMsg *dtcp_msg, Bool bBlock)
     if (bBlock == True)
 	XIfEvent(dtsvc_info.display, &event, myCheckSelectionEvent, NULL);
     else
-	bool = XCheckIfEvent(dtsvc_info.display, &event,
+	hasEvent = XCheckIfEvent(dtsvc_info.display, &event,
 				myCheckSelectionEvent, NULL);
     
-    if (bool == True) {
+    if (hasEvent == True) {
 	switch (event.type) {
 	    case SelectionRequest:	/* Message received from a client */
 		/* Is this a Checkpoint request ?*/
@@ -213,10 +213,10 @@ Bool _DtPerfChkpntMsgReceive(DtChkpntMsg *dtcp_msg, Bool bBlock)
 	    case SelectionClear:	/* We no longer own the selection */
 	    default:
 		fprintf(stderr,"\t** Chkpnt listener: Warning - loss of Selection ownership **\n");
-		bool = False;
+		hasEvent = False;
 		break;
 	}
     }
     _DtSvcProcessUnlock();
-    return(bool);
+    return(hasEvent);
 }
diff --git a/cde/programs/dtcm/server/tree.c b/cde/programs/dtcm/server/tree.c
index d29bdfed5..bf2006405 100644
--- a/cde/programs/dtcm/server/tree.c
+++ b/cde/programs/dtcm/server/tree.c
@@ -591,7 +591,7 @@ assert(int p)
 	return(p);
 }
 
-typedef struct {caddr_t max; int i; boolean_t bool;} Rec;
+typedef struct {caddr_t max; int i; boolean_t b;} Rec;
 
 static void
 check1(Tree_node *x, caddr_t max, Tree_node *z, Rec *rec, Private *private)
@@ -602,14 +602,14 @@ check1(Tree_node *x, caddr_t max, Tree_node *z, Rec *rec, Private *private)
 	if (x == z) {
 		rec->max = max;
 	  	rec->i = 0;
-	  	rec->bool = B_FALSE;
+	  	rec->b = B_FALSE;
 	  	return;
 	}
 	check1(x->llink, max, z, localp, private);
 	if (private->status == rb_badtable) return;
 	max = localp->max;
 	dl = localp->i;
-	redchild = localp->bool;
+	redchild = localp->b;
 	if (!assert (!(redchild && (x->color == red)))) {
 		private->status = rb_badtable;
 	  	return;
@@ -624,7 +624,7 @@ check1(Tree_node *x, caddr_t max, Tree_node *z, Rec *rec, Private *private)
 	if (private->status == rb_badtable) return;
 	max = localp->max;
 	dr = localp->i;
-	redchild = localp->bool;
+	redchild = localp->b;
 	if (!assert (!(redchild && (x->color == red)))) {
 		private->status = rb_badtable;
 	  	return;
@@ -635,7 +635,7 @@ check1(Tree_node *x, caddr_t max, Tree_node *z, Rec *rec, Private *private)
 	}
 	rec->max = max;
 	rec->i = dl + ((x->color == black) ? 1 : 0);
-	rec->bool = ((x->color == red) ? B_TRUE : B_FALSE);
+	rec->b = ((x->color == red) ? B_TRUE : B_FALSE);
 }
 
 static void
diff --git a/cde/programs/dtimsstart/xims.h b/cde/programs/dtimsstart/xims.h
index ed3315225..d68d5aa1c 100644
--- a/cde/programs/dtimsstart/xims.h
+++ b/cde/programs/dtimsstart/xims.h
@@ -41,6 +41,7 @@
 
 #include	<stdio.h>
 #include	<stdlib.h>
+#include	<stdbool.h>
 #include	<unistd.h>
 #include	<string.h>
 #include	<sys/param.h>
@@ -172,8 +173,6 @@
 #define	ACTION_MASK		0xf0
 
 
-typedef	short		bool;
-
     /* operation states */
 typedef enum {
     State_None = 0,