diff --git a/src/Makefile b/src/Makefile
index 1ab2ac1..a8a07fd 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -70,6 +70,9 @@ LIB_LIBS += $(EPICS_BASE_IOC_LIBS)
 
 INC += devStream.h
 
+# switch off annoying rset warnings in 3.16+
+CPPFLAGS += -DUSE_TYPED_RSET
+
 include $(TOP)/configure/RULES
 
 # Update version string (contains __DATE__ and __TIME__)
diff --git a/streamApp/Makefile b/streamApp/Makefile
index 023cd5e..4e790c5 100644
--- a/streamApp/Makefile
+++ b/streamApp/Makefile
@@ -18,7 +18,9 @@ streamApp_DBD += base.dbd
 
 # In 3.14.12 aaiRecord.dbd and aaoRecord.dbd are part of base.dbd
 # In earlier versions, these records are buggy and not included by default
+ifndef BASE_3_15
 streamApp_DBD += aaiRecord.dbd aaoRecord.dbd
+endif
 
 PROD_SRCS += streamApp_registerRecordDeviceDriver.cpp
 PROD_SRCS_DEFAULT = streamAppMain.cc
@@ -62,9 +64,16 @@ PROD_LIBS += $(EPICS_BASE_IOC_LIBS)
 # If unset output goes to stdout
 CPPFLAGS += -DDEBUGFILE=StreamDebug.log
 
+# switch off annoying rset warnings in 3.16+
+CPPFLAGS += -DUSE_TYPED_RSET
+
 include $(TOP)/configure/RULES
 
+ifdef BASE_3_15
+clean:
+else
 clean::
+endif
 	$(RM) core* StreamDebug.log
 
 endif