diff --git a/cde/programs/dtcm/dtcm/calendar.h b/cde/programs/dtcm/dtcm/calendar.h
index 096a3a4c9..e602a7c5e 100644
--- a/cde/programs/dtcm/dtcm/calendar.h
+++ b/cde/programs/dtcm/dtcm/calendar.h
@@ -54,6 +54,7 @@
 
 #include <X11/Intrinsic.h>
 #include <csa.h>
+#include <iso8601.h>
 #include <Dt/MsgCatP.h>
 #include <Xm/Xm.h>
 #include "util.h"
@@ -305,8 +306,6 @@ typedef struct {
 } Calendar;
 
 extern Calendar	*calendar;
-extern int _csa_iso8601_to_tick(char *, time_t*);
-extern int _csa_tick_to_iso8601(time_t, char *);
 
 #define MAXBUFLEN               4096
 
diff --git a/cde/programs/dtcm/dtcm/format.c b/cde/programs/dtcm/dtcm/format.c
index 6c7c3f2dd..902edc464 100644
--- a/cde/programs/dtcm/dtcm/format.c
+++ b/cde/programs/dtcm/dtcm/format.c
@@ -59,6 +59,7 @@ static char sccsid[] = "@(#)format.c 1.27 95/01/19 Copyr 1991 Sun Microsystems,
 #endif
 #include <Xm/Xm.h>
 #include <csa.h>
+#include <iso8601.h>
 #include "util.h"
 #include "cm_tty.h"
 #include "timeops.h"
diff --git a/cde/programs/dtcm/dtcm/group_editor.c b/cde/programs/dtcm/dtcm/group_editor.c
index 75bb93638..d37b59c69 100644
--- a/cde/programs/dtcm/dtcm/group_editor.c
+++ b/cde/programs/dtcm/dtcm/group_editor.c
@@ -71,7 +71,6 @@
 #endif /* SVR4 */
 
 #define ACCESS_NAME_LEN 25
-extern	int _csa_duration_to_iso8601(int, char *);
 extern void scrub_attr_list(Dtcm_appointment *);
 extern boolean_t compare_repeat_info(Dtcm_appointment *, RFP *, CSA_session_handle, int);
 extern void change_rule_for_this_one_only(Calendar *, Dtcm_appointment *, Dtcm_appointment *);
diff --git a/cde/programs/dtcm/dtcm/reminders.c b/cde/programs/dtcm/dtcm/reminders.c
index ae99eb849..bdf4d0202 100644
--- a/cde/programs/dtcm/dtcm/reminders.c
+++ b/cde/programs/dtcm/dtcm/reminders.c
@@ -60,15 +60,13 @@
 #include <Xm/Text.h>
 #include <Xm/ToggleBG.h>
 #include <Xm/ToggleB.h>
+#include <iso8601.h>
 #include "reminders.h"
 #include "props.h"
 #include "help.h"
 #include "props_pu.h"
 #include "util.h"
 
-extern	int _csa_duration_to_iso8601(int, char *);
-extern	int _csa_iso8601_to_duration(char *, int*);
-
 /*******************************************************************************
 **
 **  Static functions local to reminders.c only
diff --git a/cde/programs/dtcm/dtcm/reminders.h b/cde/programs/dtcm/dtcm/reminders.h
index 0adcd7dd6..10ae57bf7 100644
--- a/cde/programs/dtcm/dtcm/reminders.h
+++ b/cde/programs/dtcm/dtcm/reminders.h
@@ -79,7 +79,7 @@ typedef enum {
 typedef struct {
 	Boolean			selected;
 	Time_scope_menu_op	scope;
-	int			scope_val;
+	time_t			scope_val;
 } Reminders_val;
 
 typedef struct {
diff --git a/cde/programs/dtcm/libDtCmP/cm_tty.c b/cde/programs/dtcm/libDtCmP/cm_tty.c
index ae2401e26..1c39aaf43 100644
--- a/cde/programs/dtcm/libDtCmP/cm_tty.c
+++ b/cde/programs/dtcm/libDtCmP/cm_tty.c
@@ -60,6 +60,7 @@ static  char sccsid[] = "@(#)cm_tty.c 1.91 95/07/27 Copyr 1993 Sun Microsystems,
 #include <Dt/MsgCatP.h>
 #include <sys/param.h>
 #include <sys/types.h>
+#include <iso8601.h>
 #include "cm_tty.h"
 #include "getdate.h"
 #include "util.h"
@@ -157,11 +158,6 @@ nl_catd catd_global;
 static char *new_appt_begin_delimiter = NULL;
 static char *new_appt_end_delimiter = NULL;
 
-extern int _csa_iso8601_to_tick(char *, time_t*);
-extern int _csa_tick_to_iso8601(time_t, char *);
-extern int _csa_iso8601_to_duration(char *, int*);
-extern int _csa_duration_to_iso8601(int, char *);
-
 /*******************************************************************************
 **
 **  Static functions
diff --git a/cde/programs/dtcm/libDtCmP/util.c b/cde/programs/dtcm/libDtCmP/util.c
index 6de4739de..dc8b62c45 100644
--- a/cde/programs/dtcm/libDtCmP/util.c
+++ b/cde/programs/dtcm/libDtCmP/util.c
@@ -84,8 +84,7 @@ extern int errno;
 #include "util.h"
 #include "cm_tty.h"
 
-extern int _csa_tick_to_iso8601(time_t, char *);
-extern int _csa_iso8601_to_tick(char *, time_t*);
+#include <iso8601.h>
 
 extern FILE 	*popen(const char *, const char *);
 extern int   	pclose(FILE *);