diff --git a/cde/lib/tt/bin/ttdbserverd/db_server_svc.C b/cde/lib/tt/bin/ttdbserverd/db_server_svc.C
index dd6355b66..67b1ce0a1 100644
--- a/cde/lib/tt/bin/ttdbserverd/db_server_svc.C
+++ b/cde/lib/tt/bin/ttdbserverd/db_server_svc.C
@@ -217,7 +217,7 @@ main(int argc, char** argv, char **envp)
 #if defined(DEC) || defined(sun) || defined(HPUX)
  	int asize = sizeof(struct sockaddr);
 #else
-# if defined(linux)
+# if defined(linux) || defined(CSRG_BASED)
  	socklen_t asize;
 # else
  	size_t asize = sizeof(struct sockaddr);
@@ -484,7 +484,7 @@ main(int argc, char** argv, char **envp)
 		if (!_tt_debug_mode) {
 			if (0!=fork()) exit(0);
 
-#ifdef __osf__
+#if defined(__osf__) || defined(CSRG_BASED)
 			setsid();
 #else
  			setpgrp();
diff --git a/cde/lib/tt/lib/mp/mp_stream_socket.C b/cde/lib/tt/lib/mp/mp_stream_socket.C
index f604f68e7..fb2ba5af3 100644
--- a/cde/lib/tt/lib/mp/mp_stream_socket.C
+++ b/cde/lib/tt/lib/mp/mp_stream_socket.C
@@ -172,8 +172,12 @@ init(int init_as_source)
 			    t_strerror( t_errno ) );
 		return 0;
 	}
+#else
+#if defined(linux) || defined(CSRG_BASED)
+	socklen_t	len;
 #else
 	int		len;
+#endif
 	int		optval;
 	_sock = socket(AF_INET, SOCK_STREAM, 0);
 	if (_sock < 0) {
@@ -439,7 +443,11 @@ accept()
 {
 	if (_msgsock == -1) {
 #ifndef OPT_TLI
+#if defined(linux) || defined(CSRG_BASED)
+		socklen_t		addrlen = sizeof(sockaddr_in);
+#else
 		int			addrlen = sizeof(sockaddr_in);
+#endif
 		sockaddr_in		saddr;
 
 #if defined(_AIX) && (OSMAJORVERSION==4) && (OSMINORVERSION==2)
diff --git a/cde/lib/tt/slib/mp_rpc_server.C b/cde/lib/tt/slib/mp_rpc_server.C
index 0b038cbe4..1ed95468c 100644
--- a/cde/lib/tt/slib/mp_rpc_server.C
+++ b/cde/lib/tt/slib/mp_rpc_server.C
@@ -355,7 +355,11 @@ gettransient(int proto, int vers, int *sockp)
 #ifndef OPT_TLI
 	int			found;
 	int			s;
+#if defined(linux) || defined(CSRG_BASED)
+	socklen_t		len;
+#else
 	int			len;
+#endif
 	int			socktype;
 	sockaddr_in		addr;
 	sockaddr_in		tport;