diff --git a/app/iscsi_top/Makefile b/app/iscsi_top/Makefile
index 3475336bb..40b03d0ef 100644
--- a/app/iscsi_top/Makefile
+++ b/app/iscsi_top/Makefile
@@ -33,6 +33,7 @@
 
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
+include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
 
 CXXFLAGS += $(ENV_CXXFLAGS)
 CXXFLAGS += -I$(SPDK_ROOT_DIR)/lib
diff --git a/app/trace/Makefile b/app/trace/Makefile
index 2b49ce0b0..9958efe7c 100644
--- a/app/trace/Makefile
+++ b/app/trace/Makefile
@@ -33,6 +33,7 @@
 
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
+include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
 
 CXXFLAGS += $(ENV_CFLAGS)
 CXX_SRCS := trace.cpp
diff --git a/examples/ioat/kperf/Makefile b/examples/ioat/kperf/Makefile
index ba1d8e8c6..869a3312e 100644
--- a/examples/ioat/kperf/Makefile
+++ b/examples/ioat/kperf/Makefile
@@ -33,6 +33,7 @@
 
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
+include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
 
 APP = ioat_kperf
 
diff --git a/test/cpp_headers/Makefile b/test/cpp_headers/Makefile
index 76e77469e..4bd35c95a 100644
--- a/test/cpp_headers/Makefile
+++ b/test/cpp_headers/Makefile
@@ -33,6 +33,7 @@
 
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
+include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
 
 HEADERS := $(wildcard $(SPDK_ROOT_DIR)/include/spdk/*.h)
 CXX_SRCS := $(patsubst %.h,%.cpp,$(notdir $(HEADERS)))
diff --git a/test/lib/env/pci/Makefile b/test/lib/env/pci/Makefile
index c8fad943e..764b35d73 100644
--- a/test/lib/env/pci/Makefile
+++ b/test/lib/env/pci/Makefile
@@ -33,6 +33,7 @@
 
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
+include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
 
 APP = pci_ut
 
diff --git a/test/lib/env/vtophys/Makefile b/test/lib/env/vtophys/Makefile
index d73e0a936..9861556d2 100644
--- a/test/lib/env/vtophys/Makefile
+++ b/test/lib/env/vtophys/Makefile
@@ -33,6 +33,7 @@
 
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
+include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
 
 APP = vtophys
 
diff --git a/test/unit/lib/log/log.c/Makefile b/test/unit/lib/log/log.c/Makefile
index 9b365bf9b..e840ff343 100644
--- a/test/unit/lib/log/log.c/Makefile
+++ b/test/unit/lib/log/log.c/Makefile
@@ -33,6 +33,7 @@
 
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
+include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
 
 APP = log_ut
 
diff --git a/test/unit/lib/util/bit_array.c/Makefile b/test/unit/lib/util/bit_array.c/Makefile
index e18a45438..b1ad03892 100644
--- a/test/unit/lib/util/bit_array.c/Makefile
+++ b/test/unit/lib/util/bit_array.c/Makefile
@@ -33,6 +33,7 @@
 
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
+include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
 
 CFLAGS += -I$(SPDK_ROOT_DIR)/test
 CFLAGS += -I$(SPDK_ROOT_DIR)/lib/util
diff --git a/test/unit/lib/util/crc32_ieee.c/Makefile b/test/unit/lib/util/crc32_ieee.c/Makefile
index 288878026..6d3253394 100644
--- a/test/unit/lib/util/crc32_ieee.c/Makefile
+++ b/test/unit/lib/util/crc32_ieee.c/Makefile
@@ -33,6 +33,7 @@
 
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
+include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
 
 CFLAGS += -I$(SPDK_ROOT_DIR)/test
 CFLAGS += -I$(SPDK_ROOT_DIR)/lib/util
diff --git a/test/unit/lib/util/crc32c.c/Makefile b/test/unit/lib/util/crc32c.c/Makefile
index b7342a7c7..cef781d15 100644
--- a/test/unit/lib/util/crc32c.c/Makefile
+++ b/test/unit/lib/util/crc32c.c/Makefile
@@ -33,6 +33,7 @@
 
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
+include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
 
 CFLAGS += -I$(SPDK_ROOT_DIR)/test
 CFLAGS += -I$(SPDK_ROOT_DIR)/lib/util
diff --git a/test/unit/lib/util/string.c/Makefile b/test/unit/lib/util/string.c/Makefile
index 8cf82e5b6..c23b64efd 100644
--- a/test/unit/lib/util/string.c/Makefile
+++ b/test/unit/lib/util/string.c/Makefile
@@ -33,6 +33,7 @@
 
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
+include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
 
 CFLAGS += -I$(SPDK_ROOT_DIR)/test
 CFLAGS += -I$(SPDK_ROOT_DIR)/lib/util