diff --git a/configure/CONFIG_BASE b/configure/CONFIG_BASE
index a522a0eaa..f1c342f3a 100644
--- a/configure/CONFIG_BASE
+++ b/configure/CONFIG_BASE
@@ -5,17 +5,6 @@ endif
 #---------------------------------------------------------------
 # Epics base directories
 
-EPICS_BASE_HOST_BIN = $(EPICS_BASE)/bin/$(EPICS_HOST_ARCH)
-EPICS_BASE_HOST_LIB = $(EPICS_BASE)/lib/$(EPICS_HOST_ARCH)
-EPICS_EXTENSIONS_HOST_BIN = $(EPICS_EXTENSIONS)/bin/$(EPICS_HOST_ARCH)
-EPICS_EXTENSIONS_HOST_LIB = $(EPICS_EXTENSIONS)/lib/$(EPICS_HOST_ARCH)
-EPICS_BASE_INCLUDE  = $(EPICS_BASE)/include
-
-ifdef T_A
-EPICS_BASE_LIB      = $(EPICS_BASE)/lib/$(T_A)
-EPICS_BASE_BIN      = $(EPICS_BASE)/bin/$(T_A)
-endif
-
 #Definitions for extensions convenience
 Com_DIR             = $(EPICS_BASE_LIB)
 asHost_DIR          = $(EPICS_BASE_LIB)
@@ -39,18 +28,6 @@ softDevIocObj_DIR   = $(EPICS_BASE_LIB)
 testDevIocObj_DIR   = $(EPICS_BASE_LIB)
 iocCore_DIR         = $(EPICS_BASE_LIB)
 
-#---------------------------------------------------------------
-# For applications and extensions
-
-# add epics/base include directories
-ifneq ($(strip $(EPICS_BASE)),$(strip $(TOP)))
-ifneq ($(strip $(EPICS_BASE)),$(strip $(INSTALL_LOCATION)))
-INSTALL_INCLUDES += \
-       -I$(EPICS_BASE_INCLUDE)/os/$(OS_CLASS) \
-       -I$(EPICS_BASE_INCLUDE)
-endif
-endif
-
 #---------------------------------------------------------------
 # Version number for base shared libraries (and win32 products)
 
@@ -83,7 +60,8 @@ REGISTERRECORDDEVICEDRIVER = $(PERL) $(EPICS_BASE_HOST_BIN)/registerRecordDevice
 
 # private versions of lex/yacc from EPICS
 EYACC = $(EPICS_BASE_HOST_BIN)/antelope$(HOSTEXE)
-ELEX = $(EPICS_BASE_HOST_BIN)/e_flex$(HOSTEXE) -S$(EPICS_BASE_INCLUDE)/flex.skel.static
+ELEX = $(EPICS_BASE_HOST_BIN)/e_flex$(HOSTEXE) -S$(EPICS_BASE)/include/flex.skel.static
+
 YACC  = $(EYACC)
 LEX   = $(ELEX)
 
diff --git a/configure/CONFIG_COMMON b/configure/CONFIG_COMMON
index 32e33c7a2..7d4cdadeb 100644
--- a/configure/CONFIG_COMMON
+++ b/configure/CONFIG_COMMON
@@ -204,8 +204,8 @@ STATIC_LDLIBS = $(STATIC_LDLIBS_$(STATIC_BUILD))
 #--------------------------------------------------
 # Flags
 
-INCLUDES = -I. $(GENERIC_SRC_INCLUDES) $(INSTALL_INCLUDES) $(TARGET_INCLUDES)\
- $(USR_INCLUDES) $(OP_SYS_INCLUDES) $(CROSS_INCLUDES)
+INCLUDES = -I. $(GENERIC_SRC_INCLUDES) $(INSTALL_INCLUDES) $(RELEASE_INCLUDES)\
+ $(TARGET_INCLUDES) $(USR_INCLUDES) $(OP_SYS_INCLUDES) $(CROSS_INCLUDES)
 
 CFLAGS = $(CONFORM_CFLAGS) $(CROSS_CFLAGS) $(OPT_CFLAGS) $(DEBUG_CFLAGS)\
  $(WARN_CFLAGS) $(TARGET_CFLAGS) $(USR_CFLAGS) $(ARCH_DEP_CFLAGS)\
diff --git a/configure/RULES.Db b/configure/RULES.Db
index 177aebb72..410ae1dfb 100644
--- a/configure/RULES.Db
+++ b/configure/RULES.Db
@@ -12,7 +12,7 @@ vpath %.edf $(USR_VPATH) $(GENERIC_SRC_DIRS) $(COMMON_DIR)
 
 # dbExpand
 INSTALL_DBDFLAGS += -I $(INSTALL_LOCATION)/dbd
-DBDFLAGS = $(USR_DBDFLAGS) -I . -I .. $(INSTALL_DBDFLAGS)
+DBDFLAGS = $(USR_DBDFLAGS) -I . -I .. $(INSTALL_DBDFLAGS) $(RELEASE_DBDFLAGS)
 
 #####################################################  Targets