diff --git a/cde/config/cf/FreeBSD.cf b/cde/config/cf/FreeBSD.cf
index b77e31bfe..faf94894c 100644
--- a/cde/config/cf/FreeBSD.cf
+++ b/cde/config/cf/FreeBSD.cf
@@ -232,6 +232,7 @@ ICONVSYSLIB != if test -f /usr/local/include/iconv.h; then echo -liconv; else ec
 #define DefaultSystemPath	/sbin:/usr/sbin:/bin:/usr/bin:$(BINDIR)
 
 #define TroffCmd		groff -Tps
+#define M4Cmd			/usr/bin/m4
 #define SetTtyGroup		YES
 #define HasNdbm			YES
 #define HasShm			YES
diff --git a/cde/config/cf/NetBSD.cf b/cde/config/cf/NetBSD.cf
index 7d0cc593f..627c46666 100644
--- a/cde/config/cf/NetBSD.cf
+++ b/cde/config/cf/NetBSD.cf
@@ -185,6 +185,7 @@ XCOMM operating system:  OSName
 #define NeqnCmd			neqn -Tlatin1
 #define	EqnCmd 			eqn -Tps
 #define TroffCmd        	groff -Tps
+#define M4Cmd			/usr/bin/m4
 
 /*
  * To use the NetBSD Aperture driver
diff --git a/cde/config/cf/OpenBSD.cf b/cde/config/cf/OpenBSD.cf
index 2d9120181..a3b12533e 100644
--- a/cde/config/cf/OpenBSD.cf
+++ b/cde/config/cf/OpenBSD.cf
@@ -277,6 +277,8 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 # define TblCmd			cat
 #endif
 
+#define M4Cmd			/usr/bin/m4
+
 #define HasGroff		YES
 
 #ifndef HasCookieMaker
diff --git a/cde/config/cf/linux.cf b/cde/config/cf/linux.cf
index bfe2c0be1..15136b8d1 100644
--- a/cde/config/cf/linux.cf
+++ b/cde/config/cf/linux.cf
@@ -87,6 +87,7 @@ XCOMM binutils:  (LinuxBinUtilsMajorVersion)
 #define HasMakefileSafeInclude  YES
 #define DependFileName          .depend
 #define DependCmd               $(CC) -E -MM -MG
+#define M4Cmd			/usr/bin/m4
 
 #ifdef IncludeMakefile
 # undef IncludeMakefile
diff --git a/cde/include/EUSCompat.h b/cde/include/EUSCompat.h
index f73afb298..7e63b2bfc 100644
--- a/cde/include/EUSCompat.h
+++ b/cde/include/EUSCompat.h
@@ -106,13 +106,6 @@ typedef enum {B_FALSE, B_TRUE} boolean_t;
 #if defined(__linux__) || defined(CSRG_BASED)
 typedef enum {B_FALSE, B_TRUE} boolean_t;
 #define MAXNAMELEN      	256
-
-#if !defined(CSRG_BASED)
-#define iconv_t			int
-#define iconv_open(a, b) 	((iconv_t) -1)
-#define iconv(a, b, c, d, e)	((size_t) 0)
-#define iconv_close(a)		(0)
-#endif
 #endif
 
 
diff --git a/cde/programs/dtcalc/motif.c b/cde/programs/dtcalc/motif.c
index 722574776..753456c23 100644
--- a/cde/programs/dtcalc/motif.c
+++ b/cde/programs/dtcalc/motif.c
@@ -3295,7 +3295,8 @@ static void
 modelineValueChanged(Widget widget, XtPointer client_data, XtPointer call_data)
 {
   Arg args[1];
-  int val, choice;
+  int choice;
+  XtArgVal val;
 
   X->mtype = (enum menu_type) client_data ;
   XtSetArg (args[0], XmNuserData, &val);
diff --git a/cde/programs/dtcm/dtcm/RFCMIME.c b/cde/programs/dtcm/dtcm/RFCMIME.c
index b0291d8bb..f6b9119cf 100644
--- a/cde/programs/dtcm/dtcm/RFCMIME.c
+++ b/cde/programs/dtcm/dtcm/RFCMIME.c
@@ -56,10 +56,7 @@ static char sccsid[] = "$TOG: RFCMIME.c /main/11 1999/06/30 12:08:55 mgreess $";
 #include <assert.h>
 #include <RFCMIME.h>
 
-/* Iconv not defined for linux.  Use the EUSCompat stubs instead. */
-#if !defined(__linux__)
-#  include <iconv.h>
-#endif
+#include <iconv.h>
 #include <EUSCompat.h>
 #include <locale.h>
 #include <LocaleXlate.h>
diff --git a/cde/programs/dtcm/dtcm/cm_i18n.c b/cde/programs/dtcm/dtcm/cm_i18n.c
index dbb7beda2..f9a0d01ad 100644
--- a/cde/programs/dtcm/dtcm/cm_i18n.c
+++ b/cde/programs/dtcm/dtcm/cm_i18n.c
@@ -70,10 +70,7 @@ should be fixed in the future.
 #include <Xm/Xm.h>
 
 #include <langinfo.h>
-/* Iconv not defined for linux.  Use the EUSCompat stubs instead. */
-#if !defined(__linux__)
-#  include <iconv.h>
-#endif
+#include <iconv.h>
 #include <EUSCompat.h>
 
 #include "util.h"
diff --git a/cde/programs/dthelp/dthelpprint/PrintTopics.c b/cde/programs/dthelp/dthelpprint/PrintTopics.c
index 0e926668d..0d9959b98 100644
--- a/cde/programs/dthelp/dthelpprint/PrintTopics.c
+++ b/cde/programs/dthelp/dthelpprint/PrintTopics.c
@@ -53,12 +53,7 @@ $COPYRIGHT$:
 #include <langinfo.h>
 #endif
 
-/* Iconv not defined for linux.  Use the EUSCompat stubs instead. */
-#if !defined(__linux__)
-#  include <iconv.h>
-#else
-#  include <EUSCompat.h>
-#endif
+#include <iconv.h>
 #include <errno.h>
 
 #include <time.h>
diff --git a/cde/programs/dtmail/libDtMail/Common/Session.C b/cde/programs/dtmail/libDtMail/Common/Session.C
index ac1d1c8d8..f36916c50 100644
--- a/cde/programs/dtmail/libDtMail/Common/Session.C
+++ b/cde/programs/dtmail/libDtMail/Common/Session.C
@@ -86,12 +86,7 @@
 extern "C" {
 #endif
 
-#if !defined(__linux__)
-#  include <iconv.h>
-#else
-   // Iconv not defined for linux.  Use the EUSCompat stubs instead.
-#  include <EUSCompat.h>
-#endif
+#include <iconv.h>
 
 #if defined(SunOS) && (SunOS < 55)
 }
diff --git a/cde/programs/dtmail/libDtMail/RFC/RFCBodyPart.C b/cde/programs/dtmail/libDtMail/RFC/RFCBodyPart.C
index 3bd91306c..ad180ee3d 100644
--- a/cde/programs/dtmail/libDtMail/RFC/RFCBodyPart.C
+++ b/cde/programs/dtmail/libDtMail/RFC/RFCBodyPart.C
@@ -81,13 +81,7 @@
 extern "C" {
 #endif
 
-#if !defined(__linux__)
-   // Iconv not defined for linux.  Use the EUSCompat stubs instead. */
-#  include <iconv.h>
-#else
-#  include <EUSCompat.h>
-#endif
-
+#include <iconv.h>
 
 #if defined(SunOS) && (SunOS < 55)
 }
diff --git a/cde/programs/nsgmls/Imakefile b/cde/programs/nsgmls/Imakefile
index 5d3527648..1cb96f39c 100644
--- a/cde/programs/nsgmls/Imakefile
+++ b/cde/programs/nsgmls/Imakefile
@@ -82,7 +82,7 @@ CXXOPTIONS = \
  */
 CXXTEMPLATEFLAGS = $(NOIMPLTEMPLATES)
 
-M4 = /usr/bin/m4
+M4 = M4Cmd
 
 #endif