diff --git a/cde/configure.ac b/cde/configure.ac
index 0dd10634d..750147034 100644
--- a/cde/configure.ac
+++ b/cde/configure.ac
@@ -185,7 +185,7 @@ dnl headers
 AC_HEADER_STDC
 
 dnl libraries
-AC_CHECK_LIB(tirpc, main, [TIRPCINC=-I/usr/include/tirpc; TIRPCLIB=-ltirpc])
+AC_CHECK_LIB(tirpc, main, [TIRPCINC="-DOPT_TIRPC -I/usr/include/tirpc"; TIRPCLIB=-ltirpc])
 AC_SUBST(TIRPCINC)
 AC_SUBST(TIRPCLIB)
 
diff --git a/cde/lib/tt/mini_isam/Makefile.am b/cde/lib/tt/mini_isam/Makefile.am
index 8d302761d..a8a8901c8 100644
--- a/cde/lib/tt/mini_isam/Makefile.am
+++ b/cde/lib/tt/mini_isam/Makefile.am
@@ -1,6 +1,6 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-include ../tooltalk.tmpl
+include ../tooltalk.inc
 
 noinst_LIBRARIES= libisam.a
 
diff --git a/cde/lib/tt/tooltalk.inc b/cde/lib/tt/tooltalk.inc
new file mode 100644
index 000000000..a27ce50fe
--- /dev/null
+++ b/cde/lib/tt/tooltalk.inc
@@ -0,0 +1,13 @@
+# This file is imbedded near the top of  every ToolTalk Imakefile.
+# It contains definitions and redefinitions that are common to all
+# of ToolTalk but which aren't referred to anywhere else in the
+# build. 
+
+# It should match tooltalk.tmpl in terms of definitions...
+
+# TT_VERSION defines the version string which is imbedded in all the 
+# binaries and shipped libraries.
+
+TT_VERSION = "CDE Version 2.3.0a"
+TT_VERSION_DEFINE = -DTT_VERSION_STRING=\"$(TT_VERSION)\"
+