diff --git a/App/tools/driver.makefile b/App/tools/driver.makefile
index e6e4aba..8d4288d 100644
--- a/App/tools/driver.makefile
+++ b/App/tools/driver.makefile
@@ -893,9 +893,8 @@ vpath menu%.dbd ${DBD_PATH}
 
 # Find header files to install.
 # Order is important! First OS dependent, then os default, then others
-vpath %.h $(foreach path, os/${OS_CLASS} ${POSIX_{POSIX}} os/default, $(sort $(filter %/${path}/,$(dir ${HDRS})))) $(sort $(dir ${HDRS} $(filter-out /%,${SRCS})))
-vpath %.hpp $(foreach path, os/${OS_CLASS} ${POSIX_{POSIX}} os/default, $(sort $(filter %/${path}/,$(dir ${HDRS})))) $(sort $(dir ${HDRS} $(filter-out /%,${SRCS})))
-vpath %.H $(foreach path, os/${OS_CLASS} ${POSIX_{POSIX}} os/default, $(sort $(filter %/${path}/,$(dir ${HDRS})))) $(sort $(dir ${HDRS} $(filter-out /%,${SRCS})))
+# Allow any header extention the user comes up with (.h, .H, .hpp, .hxx, ...)
+$(foreach ext, $(sort $(suffix ${HDRS})), $(eval vpath %.${ext} $(foreach path, os/${OS_CLASS} ${POSIX_{POSIX}} os/default, $(sort $(filter %/${path}/,$(dir ${HDRS})))) $(sort $(dir ${HDRS} $(filter-out /%,${SRCS})))))
 
 PRODUCTS = ${MODULELIB} ${MODULEDBD} ${DEPFILE}
 MODULEINFOS: