diff --git a/cde/programs/Imakefile b/cde/programs/Imakefile
index f6b18353c..b3a591494 100644
--- a/cde/programs/Imakefile
+++ b/cde/programs/Imakefile
@@ -6,7 +6,7 @@ XCOMM $XConsortium: Imakefile /main/17 1996/10/06 17:13:20 rws $
 NSGMLSDIR = nsgmls
 #endif
 EXTRADIRS = types localized tttypes $(NSGMLSDIR)
-#if !defined(OpenBSDArchitecture)
+#if !defined(OpenBSDArchitecture) && !defined(FreeBSDArchitecture)
 EXTRADIRS += util
 #endif
 
diff --git a/cde/programs/dtcm/dtcm/Imakefile b/cde/programs/dtcm/dtcm/Imakefile
index b6fe1bc7b..9d508a53a 100644
--- a/cde/programs/dtcm/dtcm/Imakefile
+++ b/cde/programs/dtcm/dtcm/Imakefile
@@ -16,7 +16,7 @@ LOCAL_LIBRARIES = ../libDtCmP/libDtCmP.a $(CSALIB) DtClientLibs
 	-DRELMAJOR="$(OSMAJORVERSION)" -DRELMINOR="$(OSMINORVERSION)" \
 	$(ICONV_INBUF_DEFINE)
 
-#if defined(RsArchitecture) || defined(USLArchitecture) || defined(UXPArchitecture) || defined(LinuxArchitecture) || defined(OpenBSDArchitecture)
+#if defined(RsArchitecture) || defined(USLArchitecture) || defined(UXPArchitecture) || defined(LinuxArchitecture) || defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture)
 TTY_LIBRARIES = $(LOCAL_LIBRARIES) 
 #elif defined(AlphaArchitecture)
 TTY_LIBRARIES = $(DTCMPLIB) $(CSALIB) $(DTSVCLIB) $(XTOOLLIB) $(XLIB)
diff --git a/cde/programs/dtlogin/Imakefile b/cde/programs/dtlogin/Imakefile
index 47936d91e..6bcab1785 100644
--- a/cde/programs/dtlogin/Imakefile
+++ b/cde/programs/dtlogin/Imakefile
@@ -120,16 +120,19 @@ SYS_LIBRARIES = -ls
 SYS_LIBRARIES = -lm -lXdmcp
 #endif
 
-#ifdef LinuxArchitecture
+#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture)
 SYS_LIBRARIES = -lm -lcrypt
-/* On Linux, just use the system provided Xau and Xdmcp*/
+/* just use the system provided Xau and Xdmcp*/
 DEPXAUTHLIB = 
 DEPXDMCPLIB = 
+#endif
+
 /* Add in freetype header locations, required for modern Motif libs */
+#ifdef LinuxArchitecture
 INCLUDES = -I/usr/include/freetype2
 #endif
 
-#ifdef OpenBSDArchitecture
+#if defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture)
 INCLUDES = -I$(XPROJECTROOT)/include/freetype2
 #endif
 
diff --git a/cde/programs/dtmail/libDtMail/Common/Imakefile b/cde/programs/dtmail/libDtMail/Common/Imakefile
index f5b308320..266df2c16 100644
--- a/cde/programs/dtmail/libDtMail/Common/Imakefile
+++ b/cde/programs/dtmail/libDtMail/Common/Imakefile
@@ -12,7 +12,7 @@ DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
 
 #include <Threads.tmpl>
 
-INCLUDES = -I. -I../../include -I../../include/utils -I$(CDELIBSRC)
+INCLUDES = -I. -I../../include -I../../include/utils -I$(CDELIBSRC) $(STD_INCLUDES)
 
 #if HasVFork
 VFORK_DEFINES = -DHAS_VFORK
diff --git a/cde/programs/dtmail/libDtMail/RFC/Imakefile b/cde/programs/dtmail/libDtMail/RFC/Imakefile
index 2b0ca1957..dda75020a 100644
--- a/cde/programs/dtmail/libDtMail/RFC/Imakefile
+++ b/cde/programs/dtmail/libDtMail/RFC/Imakefile
@@ -12,7 +12,7 @@ DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
 
 #include <Threads.tmpl>
 
-INCLUDES = -I. -I../Common -I../../include -I../../include/utils -I$(CDELIBSRC)
+INCLUDES = -I. -I../Common -I../../include -I../../include/utils -I$(CDELIBSRC) $(STD_INCLUDES)
 
 #if HasVFork
 VFORK_DEFINES = -DHAS_VFORK
diff --git a/cde/programs/dtpdmd/Imakefile b/cde/programs/dtpdmd/Imakefile
index 6f346ad74..1eaa2e1ad 100644
--- a/cde/programs/dtpdmd/Imakefile
+++ b/cde/programs/dtpdmd/Imakefile
@@ -36,7 +36,7 @@ OBJS = 	dispatch.o	dtpdmd.o	mailbox.o \
 	manager.o	records.o	setup.o \
 	util.o		nlmsg.o
 
-#ifdef LinuxArchitecture
+#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture)
 /* On Linux, just use the system provided Xau */
 DEPXAUTHLIB =
 #endif