diff --git a/configure/Makefile b/configure/Makefile
index 128cc96..0e3ee92 100644
--- a/configure/Makefile
+++ b/configure/Makefile
@@ -17,11 +17,6 @@ install: $(TOP)/configure/CONFIG_SITE.Common.$(T_A)
 $(TOP)/configure/CONFIG_SITE.Common.$(T_A): toolchain.c
 	$(PREPROCESS.cpp)
 
-else
-clean: cleanToolchain
-
-.PHONY: cleanToolchain
-cleanToolchain:
-	$(RM) $(wildcard CONFIG_SITE.Common.*)
+CLEANS += ../CONFIG_SITE.Common.$(T_A)
 
 endif
diff --git a/src/log.cpp b/src/log.cpp
index 16a80f1..a4790bf 100644
--- a/src/log.cpp
+++ b/src/log.cpp
@@ -20,7 +20,6 @@
 #include <envDefs.h>
 #include <dbDefs.h>
 #include <osiSock.h>
-#include <epicsStackTrace.h>
 #include <epicsString.h>
 #include <cantProceed.h>
 #include <epicsStdio.h>
@@ -29,9 +28,18 @@
 #include <epicsGuard.h>
 #include <epicsTime.h>
 
+#if EPICS_VERSION_INT>=VERSION_INT(3,15,0,0)
+#  include <epicsStackTrace.h>
+#  define USE_STACKTRACE
+#endif
+
 #include "evhelper.h"
 #include "utilpvt.h"
 
+#ifndef USE_STACKTRACE
+static void epicsStackTrace() {}
+#endif
+
 typedef epicsGuard<epicsMutex> Guard;
 
 namespace pvxs {
diff --git a/src/pvaproto.h b/src/pvaproto.h
index f4260a0..21cb4e1 100644
--- a/src/pvaproto.h
+++ b/src/pvaproto.h
@@ -21,6 +21,7 @@
 
 #include <event2/buffer.h>
 #include <pvxs/version.h>
+#include "utilpvt.h"
 
 namespace pvxs {namespace impl {
 
diff --git a/src/pvxs/version.h b/src/pvxs/version.h
index 85a9874..5979ee5 100644
--- a/src/pvxs/version.h
+++ b/src/pvxs/version.h
@@ -6,6 +6,8 @@
 #ifndef PVXS_VERSION_H
 #define PVXS_VERSION_H
 
+#include <epicsVersion.h>
+
 #if defined(_WIN32) || defined(__CYGWIN__)
 
 #  if defined(PVXS_API_BUILDING) && defined(EPICS_BUILD_DLL)
@@ -36,6 +38,10 @@
 #  define VERSION_INT(V,R,M,P) ( ((V)<<24) | ((R)<<16) | ((M)<<8) | (P))
 #endif
 
+#ifndef EPICS_VERSION_INT
+#  define EPICS_VERSION_INT VERSION_INT(EPICS_VERSION, EPICS_REVISION, EPICS_MODIFICATION, EPICS_PATCH_LEVEL)
+#endif
+
 //! Current library version
 #define PVXS_VERSION VERSION_INT(PVXS_MAJOR_VERSION, PVXS_MINOR_VERSION, PVXS_MAINTENANCE_VERSION, 0)
 
diff --git a/src/sharedarray.cpp b/src/sharedarray.cpp
index 2bec7d0..cc9b65b 100644
--- a/src/sharedarray.cpp
+++ b/src/sharedarray.cpp
@@ -7,6 +7,7 @@
 #include <string.h>
 
 #include <epicsStdlib.h>
+#include <epicsTypes.h>
 
 #include <pvxs/sharedArray.h>
 #include <pvxs/data.h>
diff --git a/src/utilpvt.h b/src/utilpvt.h
index 485ee08..da1740a 100644
--- a/src/utilpvt.h
+++ b/src/utilpvt.h
@@ -27,6 +27,14 @@
 #include <pvxs/version.h>
 #include <pvxs/util.h>
 
+#ifndef EPICS_ALWAYS_INLINE
+#  if __GNUC__
+#    define EPICS_ALWAYS_INLINE __inline__ __attribute__((always_inline))
+#  else
+#    define EPICS_ALWAYS_INLINE inline
+#  endif
+#endif
+
 namespace pvxs {namespace impl {
 
 //! in-line string builder (eg. for exception messages)