diff --git a/cde/lib/DtTerm/Term/Makefile.am b/cde/lib/DtTerm/Term/Makefile.am
index e1130d2d1..08499bbcf 100644
--- a/cde/lib/DtTerm/Term/Makefile.am
+++ b/cde/lib/DtTerm/Term/Makefile.am
@@ -2,13 +2,9 @@ MAINTAINERCLEANFILES = Makefile.in
 
 CLEANFILES = TermLineData.c
 
-dtdir = ${includedir}/Dt
-
-dt_HEADERS = Term.h
-
 noinst_LTLIBRARIES = libTerm.la
 
-libTerm_la_CFLAGS = -I../TermPrim
+libTerm_la_CFLAGS = -I../TermPrim @DT_INCDIR@
 
 TermLineData.c: TermLineData.data
 	$(RM) $@
@@ -28,3 +24,4 @@ libTerm_la_SOURCES = \
         TermParse.c \
         TermParseTable.c \
         TermVersion.c
+
diff --git a/cde/lib/DtTerm/TermPrim/Makefile.am b/cde/lib/DtTerm/TermPrim/Makefile.am
index 452b3c850..ff78b6c82 100644
--- a/cde/lib/DtTerm/TermPrim/Makefile.am
+++ b/cde/lib/DtTerm/TermPrim/Makefile.am
@@ -2,6 +2,8 @@ MAINTAINERCLEANFILES = Makefile.in
 
 noinst_LTLIBRARIES = libTermPrim.la
 
+AM_CPPFLAGS = @DT_INCDIR@
+
 libTermPrim_la_SOURCES = TermPrim.c \
         TermPrimAction.c \
         TermPrimBuffer.c \
@@ -29,12 +31,27 @@ libTermPrim_la_SOURCES = TermPrim.c \
         TermPrimVersion.c \
         TermPrimWMProtocols.c
 
+# JET there may be some more missing here...
+
 if AIX
 libTermPrim_la_SOURCES += TermPrimGetPty-clone.c
-else
- if BSD
- libTermPrim_la_SOURCES += TermPrimGetPty-bsd.c
- else
- libTermPrim_la_SOURCES += TermPrimGetPty-svr4.c
- endif
+endif
+
+if SOLARIS
+libTermPrim_la_SOURCES += TermPrimGetPty-svr4.c
+AM_CPPFLAGS += -DSUN_ARCHITECTURE
+endif
+
+# uses CSRG_BASED...
+if BSD
+libTermPrim_la_SOURCES += TermPrimGetPty-bsd.c
+endif
+
+if OPENBSD
+AM_CPPFLAGS += -DOPENBSD_ARCHITECTURE
+endif
+
+if LINUX
+libTermPrim_la_SOURCES += TermPrimGetPty-svr4.c
+AM_CPPFLAGS += -DLINUX_ARCHITECTURE
 endif
diff --git a/cde/lib/DtTerm/TermView/Makefile.am b/cde/lib/DtTerm/TermView/Makefile.am
index 92d77c859..e615fa1e3 100644
--- a/cde/lib/DtTerm/TermView/Makefile.am
+++ b/cde/lib/DtTerm/TermView/Makefile.am
@@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in
 
 noinst_LTLIBRARIES = libTermView.la
 
-libTermView_la_CFLAGS = -I../TermPrim -I../Term
+libTermView_la_CFLAGS = -I../TermPrim -I../Term @DT_INCDIR@
 
 libTermView_la_SOURCES = TermView.c \
 			 TermViewMenu.c \