diff --git a/make/defs.mk b/make/defs.mk
index dee9257f..a4942339 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -59,22 +59,26 @@ endif
 OS_TUPLE              ?= $(shell $(GET_OS_SH) tuple)
 
 ifneq ($(TARGET_TUPLE),)
-  TARGET_ARCH         ?= $(word 1,$(TARGET_TUPLE))
-  TARGET_VENDOR       ?= $(word 2,$(TARGET_TUPLE))
-  TARGET_OS           ?= $(word 3,$(TARGET_TUPLE))
-  TARGET_ABI          ?= $(word 4,$(TARGET_TUPLE))
+  TARGET_TUPLE_WORDS  ?= $(subst -, ,$(TARGET_TUPLE))
+  TARGET_ARCH         ?= $(word 1,$(TARGET_TUPLE_WORDS))
+  TARGET_VENDOR       ?= $(word 2,$(TARGET_TUPLE_WORDS))
+  TARGET_OS           ?= $(word 3,$(TARGET_TUPLE_WORDS))
+  TARGET_ABI          ?= $(word 4,$(TARGET_TUPLE_WORDS))
   TARGET_TRIPLET      ?= $(TARGET_ARCH)-$(TARGET_OS)-$(TARGET_ABI)
 else ifneq ($(TARGET_TRIPLET),)
-  TARGET_ARCH         ?= $(word 1,$(TARGET_TRIPLET))
+  TARGET_TRIPLET_WORDS  ?= $(subst -, ,$(TARGET_TRIPLET))
+  TARGET_ARCH         ?= $(word 1,$(TARGET_TRIPLET_WORDS))
   TARGET_VENDOR       ?= unknown
-  TARGET_OS           ?= $(word 2,$(TARGET_TRIPLET))
-  TARGET_ABI          ?= $(word 3,$(TARGET_TRIPLET))
+  TARGET_OS           ?= $(word 2,$(TARGET_TRIPLET_WORDS))
+  TARGET_ABI          ?= $(word 3,$(TARGET_TRIPLET_WORDS))
   TARGET_TUPLE        ?= $(TARGET_ARCH)-$(TARGET_VENDOR)-$(TARGET_OS)-$(TARGET_ABI)
 else
   TARGET_TUPLE        ?= $(OS_TUPLE)
-  TARGET_VENDOR       ?= $(word 2,$(TARGET_TUPLE))
-  TARGET_OS           ?= $(word 3,$(TARGET_TUPLE))
-  TARGET_ABI          ?= $(word 4,$(TARGET_TUPLE))
+  TARGET_TUPLE_WORDS  ?= $(subst -, ,$(TARGET_TUPLE))
+  TARGET_ARCH         ?= $(word 1,$(TARGET_TUPLE_WORDS))
+  TARGET_VENDOR       ?= $(word 2,$(TARGET_TUPLE_WORDS))
+  TARGET_OS           ?= $(word 3,$(TARGET_TUPLE_WORDS))
+  TARGET_ABI          ?= $(word 4,$(TARGET_TUPLE_WORDS))
   TARGET_TRIPLET      ?= $(TARGET_ARCH)-$(TARGET_OS)-$(TARGET_ABI)
 endif
 
@@ -1055,6 +1059,7 @@ endif
 
 INCLUDE                   += $(LOCAL_INCLUDE)
 
+HDRDIR_SCOPE_SUFFIX      ?= $(PROJECT)
 # force use of double quotes, allow header namespaces
 ifeq ($(HDRDIR_SCOPE_SUFFIX),)
   INCLUDE                 += -I.