diff --git a/cde/lib/csa/debug.c b/cde/lib/csa/debug.c
index 07ce1814d..0a3131467 100644
--- a/cde/lib/csa/debug.c
+++ b/cde/lib/csa/debug.c
@@ -32,7 +32,14 @@
 
 #define X_INCLUDE_TIME_H
 #define XOS_USE_NO_LOCKING
+
+#if defined(linux)
+#undef SVR4
+#endif
 #include <X11/Xos_r.h>
+#if defined(linux)
+#define SVR4
+#endif
 
 #include <syslog.h>
 
diff --git a/cde/lib/csa/lutil.c b/cde/lib/csa/lutil.c
index 99657aca2..a5faff9fc 100644
--- a/cde/lib/csa/lutil.c
+++ b/cde/lib/csa/lutil.c
@@ -41,7 +41,13 @@
 #endif
 #define X_INCLUDE_PWD_H
 #define XOS_USE_XT_LOCKING
+#if defined(linux)
+#undef SVR4
+#endif
 #include <X11/Xos_r.h>
+#if defined(linux)
+#define SVR4
+#endif
 
 extern char * strdup(const char *);