diff --git a/cde/lib/csa/convert4-5.c b/cde/lib/csa/convert4-5.c
index 344c4a2ae..c7c0463b8 100644
--- a/cde/lib/csa/convert4-5.c
+++ b/cde/lib/csa/convert4-5.c
@@ -144,12 +144,12 @@ _DtCm_appt4_to_attrs(
 		ptr2 = (ptr1 ? strchr(ptr1, '.') : NULL);
 
 		if (ptr1) {
-			snprintf(buf, sizeof buf, "%d:%s%s%s", a4->appt_id.key, calname,
+			snprintf(buf, sizeof buf, "%ld:%s%s%s", a4->appt_id.key, calname,
 				(ptr2 == NULL ? "." : ""),
 				(ptr2 == NULL ? _DtCmGetLocalDomain(ptr1+1) :
 				""));
 		} else {
-			snprintf(buf, sizeof buf, "%d:%s@%s", a4->appt_id.key, calname,
+			snprintf(buf, sizeof buf, "%ld:%s@%s", a4->appt_id.key, calname,
 				_DtCmGetHostAtDomain());
 		}
 		opq.size = strlen(buf);
diff --git a/cde/lib/csa/reparser.y b/cde/lib/csa/reparser.y
index 4c2a19a2d..927af5438 100644
--- a/cde/lib/csa/reparser.y
+++ b/cde/lib/csa/reparser.y
@@ -9,6 +9,8 @@
 
 #include <EUSCompat.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <ctype.h>
 #include <time.h>
 #include "rerule.h"