diff --git a/lib/conf/Makefile b/lib/conf/Makefile
index 5ffa79f0b..0cdfda1d9 100644
--- a/lib/conf/Makefile
+++ b/lib/conf/Makefile
@@ -32,6 +32,7 @@
 #
 
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
+include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
 C_SRCS = conf.c
 LIBNAME = conf
diff --git a/lib/cunit/Makefile b/lib/cunit/Makefile
index b89f6c973..659d784d7 100644
--- a/lib/cunit/Makefile
+++ b/lib/cunit/Makefile
@@ -32,6 +32,7 @@
 #
 
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
+include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
 CFLAGS += -I$(SPDK_ROOT_DIR)/test
 C_SRCS = spdk_cunit.c
diff --git a/lib/event/Makefile b/lib/event/Makefile
index c8fda6594..af9a0218b 100644
--- a/lib/event/Makefile
+++ b/lib/event/Makefile
@@ -32,6 +32,7 @@
 #
 
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
+include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
 CFLAGS += $(DPDK_INC)
 LIBNAME = event
diff --git a/lib/event/rpc/Makefile b/lib/event/rpc/Makefile
index cd72861d5..75e67d75c 100644
--- a/lib/event/rpc/Makefile
+++ b/lib/event/rpc/Makefile
@@ -32,6 +32,7 @@
 #
 
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
+include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
 C_SRCS = app_rpc.c
 LIBNAME = app_rpc
diff --git a/lib/ioat/Makefile b/lib/ioat/Makefile
index 53b943636..ee14992dd 100644
--- a/lib/ioat/Makefile
+++ b/lib/ioat/Makefile
@@ -32,6 +32,7 @@
 #
 
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
+include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
 CFLAGS += $(DPDK_INC) -include $(CONFIG_IOAT_IMPL)
 C_SRCS = ioat.c
diff --git a/lib/json/Makefile b/lib/json/Makefile
index f3a11d704..8808df9e1 100644
--- a/lib/json/Makefile
+++ b/lib/json/Makefile
@@ -32,6 +32,7 @@
 #
 
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
+include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
 C_SRCS = json_parse.c json_util.c json_write.c
 LIBNAME = json
diff --git a/lib/jsonrpc/Makefile b/lib/jsonrpc/Makefile
index 2ddcffa1d..84e2e0612 100644
--- a/lib/jsonrpc/Makefile
+++ b/lib/jsonrpc/Makefile
@@ -32,6 +32,7 @@
 #
 
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
+include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
 LIBNAME = jsonrpc
 C_SRCS = jsonrpc_server.c jsonrpc_server_tcp.c
diff --git a/lib/log/Makefile b/lib/log/Makefile
index 7630f87bc..170d563cb 100644
--- a/lib/log/Makefile
+++ b/lib/log/Makefile
@@ -32,6 +32,7 @@
 #
 
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
+include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
 C_SRCS = log.c
 LIBNAME = log
diff --git a/lib/log/rpc/Makefile b/lib/log/rpc/Makefile
index 7e0fc91f0..bf53a64c5 100644
--- a/lib/log/rpc/Makefile
+++ b/lib/log/rpc/Makefile
@@ -32,6 +32,7 @@
 #
 
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
+include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
 C_SRCS = log_rpc.c
 LIBNAME = log_rpc
diff --git a/lib/memory/Makefile b/lib/memory/Makefile
index df0642a4e..367a40e05 100644
--- a/lib/memory/Makefile
+++ b/lib/memory/Makefile
@@ -32,6 +32,7 @@
 #
 
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
+include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
 CFLAGS += $(DPDK_INC)
 C_SRCS = vtophys.c
diff --git a/lib/nvme/Makefile b/lib/nvme/Makefile
index 1b2a1dfb4..4c3a3d609 100644
--- a/lib/nvme/Makefile
+++ b/lib/nvme/Makefile
@@ -32,6 +32,7 @@
 #
 
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
+include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
 CFLAGS += $(DPDK_INC) -include $(CONFIG_NVME_IMPL)
 C_SRCS = nvme_ctrlr_cmd.c nvme_ctrlr.c nvme_ns_cmd.c nvme_ns.c nvme_qpair.c nvme.c nvme_intel.c
diff --git a/lib/nvmf/Makefile b/lib/nvmf/Makefile
index 178396f36..d1d392c9e 100644
--- a/lib/nvmf/Makefile
+++ b/lib/nvmf/Makefile
@@ -32,7 +32,7 @@
 #
 
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
-include $(SPDK_ROOT_DIR)/CONFIG
+include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
 CFLAGS += $(DPDK_INC)
 LIBNAME = nvmf
diff --git a/lib/rpc/Makefile b/lib/rpc/Makefile
index d750818c7..62315bf80 100644
--- a/lib/rpc/Makefile
+++ b/lib/rpc/Makefile
@@ -32,6 +32,7 @@
 #
 
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
+include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
 CFLAGS += $(DPDK_INC)
 C_SRCS = rpc.c
diff --git a/lib/trace/Makefile b/lib/trace/Makefile
index d3f913342..0d401dbf2 100644
--- a/lib/trace/Makefile
+++ b/lib/trace/Makefile
@@ -32,6 +32,7 @@
 #
 
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
+include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
 CFLAGS += $(DPDK_INC)
 C_SRCS = trace.c
diff --git a/lib/util/Makefile b/lib/util/Makefile
index 840b36cda..a3275fa8b 100644
--- a/lib/util/Makefile
+++ b/lib/util/Makefile
@@ -32,6 +32,7 @@
 #
 
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
+include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
 CFLAGS += $(DPDK_INC)
 C_SRCS = file.c string.c pci.c