diff --git a/cde/lib/csa/cm.x b/cde/lib/csa/cm.x
index 3aa0953ac..dcc9ecda7 100644
--- a/cde/lib/csa/cm.x
+++ b/cde/lib/csa/cm.x
@@ -317,7 +317,7 @@ struct cms_reminder_res {
 % */
 struct cms_reminder_args {
 	cms_name	cal;
-	long		tick;
+	time_t		tick;
 	CSA_uint32	num_names;
 	cms_attr_name	*names;
 };
diff --git a/cde/lib/csa/rtable2.h b/cde/lib/csa/rtable2.h
index 2253f24c6..f9cff654f 100644
--- a/cde/lib/csa/rtable2.h
+++ b/cde/lib/csa/rtable2.h
@@ -153,7 +153,7 @@ typedef struct Apptid_2 Apptid_2;
 
 struct Reminder_2 {
 	struct Id_2 appt_id;
-	long tick;
+	time_t tick;
 	Attribute_2 attr;
 	struct Reminder_2 *next;
 };
@@ -215,8 +215,8 @@ struct Access_Args_2 {
 typedef struct Access_Args_2 Access_Args_2;
 
 struct Range_2 {
-	long key1;
-	long key2;
+	time_t key1;
+	time_t key2;
 	struct Range_2 *next;
 };
 typedef struct Range_2 Range_2;
@@ -233,7 +233,7 @@ typedef enum Table_Args_Type_2 Table_Args_Type_2;
 struct Args_2 {
 	Table_Args_Type_2 tag;
 	union {
-		long tick;
+		time_t tick;
 		Apptid_2 apptid;
 		Uid_2 *key;
 		Appt_2 *appt;
diff --git a/cde/lib/csa/rtable2.x b/cde/lib/csa/rtable2.x
index aa92bb9f0..162c230bb 100644
--- a/cde/lib/csa/rtable2.x
+++ b/cde/lib/csa/rtable2.x
@@ -84,7 +84,7 @@ struct Apptid_2 {
 
 struct Reminder_2 {
 	struct Id_2	appt_id;	/* actual appt. key */
-	long		tick;		/* the happening tick */
+	time_t		tick;		/* the happening tick */
 	Attribute_2	attr;		/* (attr, value) */
 	struct Reminder_2	*next;
 };
@@ -139,8 +139,8 @@ struct Access_Args_2 {
 };
 
 struct Range_2 {
-	long key1;		/* lower bound tick */
-	long key2;		/* upper bound tick */
+	time_t key1;		/* lower bound tick */
+	time_t key2;		/* upper bound tick */
 	struct Range_2 *next;
 };
 
diff --git a/cde/lib/csa/rtable3.h b/cde/lib/csa/rtable3.h
index b00100902..122d96bce 100644
--- a/cde/lib/csa/rtable3.h
+++ b/cde/lib/csa/rtable3.h
@@ -130,7 +130,7 @@ typedef struct Except_3 Except_3;
 typedef Except_3 *Exception_3;
 
 struct Id_3 {
-	long tick;
+	time_t tick;
 	long key;
 };
 typedef struct Id_3 Id_3;
@@ -188,7 +188,7 @@ typedef struct Apptid_3 Apptid_3;
 
 struct Reminder_3 {
 	struct Id_3 appt_id;
-	long tick;
+	time_t tick;
 	Attribute_3 attr;
 	struct Reminder_3 *next;
 };
@@ -249,16 +249,16 @@ struct Access_Args_3 {
 typedef struct Access_Args_3 Access_Args_3;
 
 struct Range_3 {
-	long key1;
-	long key2;
+	time_t key1;
+	time_t key2;
 	struct Range_3 *next;
 };
 typedef struct Range_3 Range_3;
 
 struct Keyrange_3 {
 	long key;
-	long tick1;
-	long tick2;
+	time_t tick1;
+	time_t tick2;
 	struct Keyrange_3 *next;
 };
 typedef struct Keyrange_3 Keyrange_3;
@@ -276,7 +276,7 @@ typedef enum Table_Args_Type_3 Table_Args_Type_3;
 struct Args_3 {
 	Table_Args_Type_3 tag;
 	union {
-		long tick;
+		time_t tick;
 		Apptid_3 apptid;
 		Uid_3 *key;
 		Appt_3 *appt;
diff --git a/cde/lib/csa/rtable3.x b/cde/lib/csa/rtable3.x
index d22b38b84..6580f7e92 100644
--- a/cde/lib/csa/rtable3.x
+++ b/cde/lib/csa/rtable3.x
@@ -161,8 +161,8 @@ struct Access_Args_3 {
 };
 
 struct Range_3 {
-	long key1;		/* lower bound tick */
-	long key2;		/* upper bound tick */
+	time_t key1;		/* lower bound tick */
+	time_t key2;		/* upper bound tick */
 	struct Range_3 *next;
 };
 
diff --git a/cde/lib/csa/rtable4.h b/cde/lib/csa/rtable4.h
index 9fc2f92c8..502a09334 100644
--- a/cde/lib/csa/rtable4.h
+++ b/cde/lib/csa/rtable4.h
@@ -264,8 +264,8 @@ struct Access_Args_4 {
 typedef struct Access_Args_4 Access_Args_4;
 
 struct Range_4 {
-	long key1;
-	long key2;
+	time_t key1;
+	time_t key2;
 	struct Range_4 *next;
 };
 typedef struct Range_4 Range_4;
diff --git a/cde/lib/csa/rtable4.x b/cde/lib/csa/rtable4.x
index 2080d9c6a..5087c4d11 100644
--- a/cde/lib/csa/rtable4.x
+++ b/cde/lib/csa/rtable4.x
@@ -168,8 +168,8 @@ struct Access_Args_4 {
 };
 
 struct Range_4 {
-	long key1;		/* lower bound tick */
-	long key2;		/* upper bound tick */
+	time_t key1;		/* lower bound tick */
+	time_t key2;		/* upper bound tick */
 	struct Range_4 *next;
 };