diff --git a/cde/include/EUSCompat.h b/cde/include/EUSCompat.h
index 31c43b00e..3d85398aa 100644
--- a/cde/include/EUSCompat.h
+++ b/cde/include/EUSCompat.h
@@ -110,7 +110,7 @@ typedef enum {B_FALSE, B_TRUE} boolean_t;
 
 #endif	/* HPUX */
 
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
 typedef enum {B_FALSE, B_TRUE} boolean_t;
 #define MAXNAMELEN      	256
 
diff --git a/cde/lib/DtPrint/PrintSetupB.c b/cde/lib/DtPrint/PrintSetupB.c
index 0c1eb86a5..97cf56187 100644
--- a/cde/lib/DtPrint/PrintSetupB.c
+++ b/cde/lib/DtPrint/PrintSetupB.c
@@ -46,7 +46,11 @@
 #endif
 
 #include <stdlib.h>
+#if defined(CSRG_BASED)
+#define MAXINT INT_MAX
+#else
 #include <values.h>
+#endif
 #include <stdio.h>
 
 #include <Xm/XmAll.h>
@@ -60,6 +64,7 @@
 #include <Dt/PsubUtilI.h>
 #include <Dt/PrintI.h>
 
+
 /*
  * ------------------------------------------------------------------------
  * Constant Definitions
diff --git a/cde/lib/csa/agent.wrapbegin b/cde/lib/csa/agent.wrapbegin
index b1cdb339f..b11af6a21 100644
--- a/cde/lib/csa/agent.wrapbegin
+++ b/cde/lib/csa/agent.wrapbegin
@@ -5,7 +5,7 @@
 #include <rpc/types.h>
 #endif /* HPUX */
 
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
 # if defined __STDC__
 #  define REDEFINE_STDC
 #  undef __STDC__
diff --git a/cde/lib/csa/lutil.c b/cde/lib/csa/lutil.c
index 279483231..1191c8617 100644
--- a/cde/lib/csa/lutil.c
+++ b/cde/lib/csa/lutil.c
@@ -29,6 +29,7 @@
  *  (c) Copyright 1993, 1994 Sun Microsystems, Inc.
  */
 
+#include <sys/param.h>
 #include <EUSCompat.h>
 #include <stdio.h>
 #include <stdlib.h>