diff --git a/configure/CONFIG_COMMON b/configure/CONFIG_COMMON
index 15f534dd7..dffee2236 100644
--- a/configure/CONFIG_COMMON
+++ b/configure/CONFIG_COMMON
@@ -321,29 +321,25 @@ PREPROCESS.cpp = $(CPP) $(CPPFLAGS) $(INCLUDES) $< > $@
 #--------------------------------------------------
 # Header dependency file generation
 
-HDEPENDS = YES
-HDEPENDS_METHOD = CMD
+HDEPENDS_METHOD = MKMF
 
 HDEPENDS_INCLUDES = $(subst -I,,$(INCLUDES))
 HDEPENDSFLAGS = -m $*$(DEP) $(HDEPENDS_INCLUDES) $@ $<
 
-HDEPENDS_CMD_NO = $(ECHO) ""
-HDEPENDS_CMD_YES = $(MKMF) $(HDEPENDS_FLAGS) $(HDEPENDSFLAGS)
+HDEPENDS_MKMF = $(MKMF) $(HDEPENDS_FLAGS) $(HDEPENDSFLAGS)
 
 HDEPENDSCFLAGS = -MM > $*$(DEP)
 HDEPSUFFIX = $(if $(filter .c,$(suffix $<)),.c,.cpp)
-HDEPENDS_CFLAGS_NO = $(ECHO) ""
-HDEPENDS_CFLAGS_YES = $(COMPILE$(HDEPSUFFIX)) $(HDEPENDSCFLAGS) $<
+HDEPENDS_CFLAGS = $(COMPILE$(HDEPSUFFIX)) $(HDEPENDSCFLAGS) $<
 
-HDEPENDS_CMD = $(HDEPENDS_$(HDEPENDS_METHOD)_$(HDEPENDS))
+HDEPENDS_CMD = $(HDEPENDS_$(HDEPENDS_METHOD))
 
 #--------------------------------------------------
 # depends definition
 
 TARGET_SRCS = $(foreach name, $(TESTPROD) $(PROD) $(TESTLIBRARY) $(LIBRARY) $(LOADABLE_LIBRARY), $($(name)_SRCS))
 SRC_FILES = $(LIB_SRCS) $(LIBSRCS) $(SRCS) $(USR_SRCS) $(PROD_SRCS) $(TARGET_SRCS)
-HDEPENDS_FILES_YES = $(addsuffix $(DEP),$(notdir $(basename $(SRC_FILES))))
-HDEPENDS_FILES = $(HDEPENDS_FILES_$(HDEPENDS))
+HDEPENDS_FILES = $(addsuffix $(DEP),$(notdir $(basename $(SRC_FILES))))
 
 #---------------------------------------------------------------
 # Names of installed items
diff --git a/configure/CONFIG_SITE b/configure/CONFIG_SITE
index ce25d5d9e..71c10f668 100644
--- a/configure/CONFIG_SITE
+++ b/configure/CONFIG_SITE
@@ -126,10 +126,6 @@ SHARED_LIBRARIES=YES
 #  Must be either YES or NO.
 STATIC_BUILD=NO
 
-# Generate header dependancy files for each C/C++ object file.
-#  Must be either YES or NO.
-HDEPENDS=YES
-
 # Host build optimization.
 #  Must be either YES or NO.
 HOST_OPT=YES
diff --git a/configure/os/CONFIG.Common.iosCommon b/configure/os/CONFIG.Common.iosCommon
index e33d016ab..d7bc301ad 100644
--- a/configure/os/CONFIG.Common.iosCommon
+++ b/configure/os/CONFIG.Common.iosCommon
@@ -100,8 +100,7 @@ vpath %.m $(USR_VPATH) $(ALL_SRC_DIRS)
 # Use compiler when ARCH_CLASS is a single arch value
 # otherwise use perl script command
 SINGLE_ARCH=$(filter 1,$(words $(ARCH_CLASS)))
-HDEPENDS_CFLAGS = $(if $(SINGLE_ARCH),$(HDEPENDS_CFLAGS_$(HDEPENDS)))
-HDEPENDS_METHOD = $(if $(SINGLE_ARCH),CFLAGS,CMD)
+HDEPENDS_METHOD = $(if $(SINGLE_ARCH),CFLAGS,MKMF)
 
 #--------------------------------------------------
 # Allow site overrides
diff --git a/configure/os/CONFIG.darwinCommon.darwinCommon b/configure/os/CONFIG.darwinCommon.darwinCommon
index a330190ed..1a18f63b9 100644
--- a/configure/os/CONFIG.darwinCommon.darwinCommon
+++ b/configure/os/CONFIG.darwinCommon.darwinCommon
@@ -91,11 +91,10 @@ vpath %.m $(USR_VPATH) $(ALL_SRC_DIRS)
 #
 # Header dependency file generation
 #
-# Use GNU compiler flags when ARCH_CLASS is a single arch value
+# Use compiler when ARCH_CLASS is a single arch value
 # otherwise use perl script command
 SINGLE_ARCH=$(filter 1,$(words $(ARCH_CLASS)))
-HDEPENDS_CFLAGS = $(if $(SINGLE_ARCH),$(HDEPENDS_CFLAGS_$(HDEPENDS)))
-HDEPENDS_METHOD = $(if $(SINGLE_ARCH),CFLAGS,CMD)
+HDEPENDS_METHOD = $(if $(SINGLE_ARCH),CFLAGS,MKMF)
 
 #--------------------------------------------------
 # Allow site overrides
diff --git a/configure/os/CONFIG.win32-x86-borland.win32-x86-borland b/configure/os/CONFIG.win32-x86-borland.win32-x86-borland
index 42e9396dd..eeff488fb 100644
--- a/configure/os/CONFIG.win32-x86-borland.win32-x86-borland
+++ b/configure/os/CONFIG.win32-x86-borland.win32-x86-borland
@@ -268,7 +268,7 @@ LINK.cpp += , $@ ,,$(LINKLIBS)  $(subst /,\\,$(PROD_LDLIBS))
 #--------------------------------------------------
 
 # override of CONFIG_COMMON
-HDEPENDS_INCLUDES_MKMF = $(filter-out $(BORLAND_INC),$(subst -I,,$(INCLUDES)))
+HDEPENDS_INCLUDES = $(filter-out $(BORLAND_INC),$(subst -I,,$(INCLUDES)))
 
 
 TDS = $(addsuffix .tds,$(basename $(PROD) $(TESTPROD) $(BUILD_LIBRARY) $(TESTBUILD_LIBRARY)))
diff --git a/configure/os/CONFIG.win32-x86.win32-x86 b/configure/os/CONFIG.win32-x86.win32-x86
index 873aad327..328a5c140 100644
--- a/configure/os/CONFIG.win32-x86.win32-x86
+++ b/configure/os/CONFIG.win32-x86.win32-x86
@@ -35,7 +35,7 @@ CC = cl
 
 # Override CONFIG.gnuCommon for cross builds.
 GNU = NO
-HDEPENDS_METHOD = CMD
+HDEPENDS_METHOD = MKMF
 
 #
 # /W<N> use warning level N
diff --git a/configure/os/CONFIG.win32-x86.win32-x86-debug b/configure/os/CONFIG.win32-x86.win32-x86-debug
index ed6e79654..a4949dde7 100644
--- a/configure/os/CONFIG.win32-x86.win32-x86-debug
+++ b/configure/os/CONFIG.win32-x86.win32-x86-debug
@@ -14,7 +14,7 @@
 
 GNU = NO
 
-HDEPENDS_METHOD = CMD
+HDEPENDS_METHOD = MKMF
 BUILD_CLASS = HOST
 
 HOST_OPT = NO