diff --git a/autosave.Makefile b/autosave.Makefile
index 57075dcacc5b4eb18f546bda48ded56c56337ca2..0a2ab176375c2cde3a7464b7065d7a15046bea46 100644
--- a/autosave.Makefile
+++ b/autosave.Makefile
@@ -31,7 +31,7 @@
 
 where_am_I := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
 include ${E3_REQUIRE_TOOLS}/driver.makefile
-include $(E3_REQUIRE_CONFIG)/DECOUPLE_FLAGS
+
 
 
 # To enable autosaveBuild, use dbLoadRecordsHookRegister.  (But it doesn't
@@ -115,8 +115,6 @@ $(ASVERIFY): $(ASVERIFY_SOURCES:.c=.o)
 
 
 
-.PHONY: db
-db:
 #
 .PHONY: vlibs
 vlibs:
diff --git a/configure/CONFIG b/configure/CONFIG
index 2b63d799534642f6668381add1905aa03dce47c7..8772be7505d5eb1af55d86c2f74542cbffe5e1e6 100644
--- a/configure/CONFIG
+++ b/configure/CONFIG
@@ -14,7 +14,7 @@ include $(TOP)/configure/CONFIG_MODULE
 endif
 
 E3_REQUIRE_LOCATION := $(EPICS_BASE)/$(E3_REQUIRE_NAME)/$(E3_REQUIRE_VERSION)
-REQUIRE_CONFIG := $(E3_REQUIRE_LOCATION)/configure
 
-include $(REQUIRE_CONFIG)/CONFIG
+
+include $(E3_REQUIRE_LOCATION)/configure/CONFIG
 
diff --git a/configure/RULES b/configure/RULES
index 978c976f8d298955277c6cd5ad14c7cda98db013..96cc1d180eecd24481bf84947a41d983b4b7bab6 100644
--- a/configure/RULES
+++ b/configure/RULES
@@ -1,5 +1,5 @@
 
-include $(REQUIRE_CONFIG)/RULES_SITEMODS
+include $(E3_REQUIRE_CONFIG)/RULES_SITEMODS
 
 include $(TOP)/configure/module/RULES_MODULE
 -include $(TOP)/configure/module/RULES_DKMS_L