diff --git a/app/iscsi_tgt/Makefile b/app/iscsi_tgt/Makefile
index 83359112c..22329f11a 100644
--- a/app/iscsi_tgt/Makefile
+++ b/app/iscsi_tgt/Makefile
@@ -38,8 +38,6 @@ include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk
 
 APP = iscsi_tgt
 
-CFLAGS += $(ENV_CFLAGS)
-
 # Add iSCSI library directory to include path
 # TODO: remove this once iSCSI has a public API header
 CFLAGS += -I$(SPDK_ROOT_DIR)/lib
diff --git a/app/nvmf_tgt/Makefile b/app/nvmf_tgt/Makefile
index 365298e3a..2f9982fe7 100644
--- a/app/nvmf_tgt/Makefile
+++ b/app/nvmf_tgt/Makefile
@@ -38,8 +38,6 @@ include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk
 
 APP = nvmf_tgt
 
-CFLAGS += $(ENV_CFLAGS)
-
 C_SRCS := conf.c nvmf_main.c nvmf_tgt.c nvmf_rpc.c
 
 SPDK_LIB_LIST = event_bdev event_copy
diff --git a/app/trace/Makefile b/app/trace/Makefile
index 9958efe7c..219b97892 100644
--- a/app/trace/Makefile
+++ b/app/trace/Makefile
@@ -35,7 +35,6 @@ 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
 
 APP = spdk_trace
diff --git a/app/vhost/Makefile b/app/vhost/Makefile
index 0e5282ca4..22b0bd277 100644
--- a/app/vhost/Makefile
+++ b/app/vhost/Makefile
@@ -38,8 +38,6 @@ include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk
 
 APP = vhost
 
-CFLAGS += $(ENV_CFLAGS)
-
 C_SRCS := vhost.c
 
 SPDK_LIB_LIST = event_bdev event_copy event_net event_scsi event_vhost
diff --git a/examples/bdev/fio_plugin/Makefile b/examples/bdev/fio_plugin/Makefile
index 2b42f10c6..1dd2e2a5a 100644
--- a/examples/bdev/fio_plugin/Makefile
+++ b/examples/bdev/fio_plugin/Makefile
@@ -40,7 +40,7 @@ include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk
 APP := fio_plugin
 
 C_SRCS = fio_plugin.c
-CFLAGS += -I. $(ENV_CFLAGS) -I$(FIO_SOURCE_DIR)
+CFLAGS += -I$(FIO_SOURCE_DIR)
 LDFLAGS += -shared -rdynamic
 
 SPDK_LIB_LIST +=  util bdev conf copy rpc jsonrpc json log
diff --git a/lib/bdev/Makefile b/lib/bdev/Makefile
index ea90da6c2..78652dbb7 100644
--- a/lib/bdev/Makefile
+++ b/lib/bdev/Makefile
@@ -34,7 +34,6 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
-CFLAGS += $(ENV_CFLAGS) -I.
 ifeq ($(CONFIG_VTUNE),y)
 CFLAGS += -I$(VTUNE_SOURCE_DIR)/include -I$(VTUNE_SOURCE_DIR)/sdk/src/ittnotify
 endif
diff --git a/lib/bdev/error/Makefile b/lib/bdev/error/Makefile
index a4eee5986..2ae218d94 100644
--- a/lib/bdev/error/Makefile
+++ b/lib/bdev/error/Makefile
@@ -34,7 +34,7 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
-CFLAGS += $(ENV_CFLAGS) -I$(SPDK_ROOT_DIR)/lib/bdev/
+CFLAGS += -I$(SPDK_ROOT_DIR)/lib/bdev/
 C_SRCS = vbdev_error.c vbdev_error_rpc.c
 LIBNAME = vbdev_error
 
diff --git a/lib/bdev/gpt/Makefile b/lib/bdev/gpt/Makefile
index 10aa78af1..7d38d9e7b 100644
--- a/lib/bdev/gpt/Makefile
+++ b/lib/bdev/gpt/Makefile
@@ -34,7 +34,7 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
-CFLAGS += $(ENV_CFLAGS) -I$(SPDK_ROOT_DIR)/lib/bdev/
+CFLAGS += -I$(SPDK_ROOT_DIR)/lib/bdev/
 C_SRCS = gpt.c vbdev_gpt.c
 LIBNAME = vbdev_gpt
 
diff --git a/lib/bdev/malloc/Makefile b/lib/bdev/malloc/Makefile
index a434755de..56d76421d 100644
--- a/lib/bdev/malloc/Makefile
+++ b/lib/bdev/malloc/Makefile
@@ -34,7 +34,7 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
-CFLAGS += $(ENV_CFLAGS) -I$(SPDK_ROOT_DIR)/lib/bdev/
+CFLAGS += -I$(SPDK_ROOT_DIR)/lib/bdev/
 C_SRCS = bdev_malloc.c bdev_malloc_rpc.c
 LIBNAME = bdev_malloc
 
diff --git a/lib/bdev/null/Makefile b/lib/bdev/null/Makefile
index 6dca7acec..004d3b095 100644
--- a/lib/bdev/null/Makefile
+++ b/lib/bdev/null/Makefile
@@ -34,7 +34,7 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
-CFLAGS += $(ENV_CFLAGS) -I$(SPDK_ROOT_DIR)/lib/bdev/
+CFLAGS += -I$(SPDK_ROOT_DIR)/lib/bdev/
 C_SRCS = bdev_null.c bdev_null_rpc.c
 LIBNAME = bdev_null
 
diff --git a/lib/bdev/nvme/Makefile b/lib/bdev/nvme/Makefile
index 9b259be3d..472c7583a 100644
--- a/lib/bdev/nvme/Makefile
+++ b/lib/bdev/nvme/Makefile
@@ -34,7 +34,7 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
-CFLAGS += $(ENV_CFLAGS) -I$(SPDK_ROOT_DIR)/lib/bdev/
+CFLAGS += -I$(SPDK_ROOT_DIR)/lib/bdev/
 C_SRCS = bdev_nvme.c bdev_nvme_rpc.c
 LIBNAME = bdev_nvme
 
diff --git a/lib/bdev/pmem/Makefile b/lib/bdev/pmem/Makefile
index 6a6da5ecc..b01f092c2 100644
--- a/lib/bdev/pmem/Makefile
+++ b/lib/bdev/pmem/Makefile
@@ -34,7 +34,7 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
-CFLAGS += $(ENV_CFLAGS) -I$(SPDK_ROOT_DIR)/lib/bdev/
+CFLAGS += -I$(SPDK_ROOT_DIR)/lib/bdev/
 C_SRCS = bdev_pmem.c bdev_pmem_rpc.c
 LIBNAME = bdev_pmem
 
diff --git a/lib/bdev/split/Makefile b/lib/bdev/split/Makefile
index fe81db9ca..cc9c13901 100644
--- a/lib/bdev/split/Makefile
+++ b/lib/bdev/split/Makefile
@@ -34,7 +34,7 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
-CFLAGS += $(ENV_CFLAGS) -I$(SPDK_ROOT_DIR)/lib/bdev/
+CFLAGS += -I$(SPDK_ROOT_DIR)/lib/bdev/
 C_SRCS = vbdev_split.c
 LIBNAME = vbdev_split
 
diff --git a/lib/bdev/virtio/Makefile b/lib/bdev/virtio/Makefile
index e91f2e9a1..8a365c0e8 100644
--- a/lib/bdev/virtio/Makefile
+++ b/lib/bdev/virtio/Makefile
@@ -34,7 +34,6 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
-CFLAGS += $(ENV_CFLAGS)
 C_SRCS = bdev_virtio_scsi.c bdev_virtio_rpc.c
 LIBNAME = bdev_virtio
 
diff --git a/lib/blob/Makefile b/lib/blob/Makefile
index 4a6970f4e..bd1b5c9d3 100644
--- a/lib/blob/Makefile
+++ b/lib/blob/Makefile
@@ -34,7 +34,6 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
-CFLAGS += $(ENV_CFLAGS)
 C_SRCS = blobstore.c request.c
 LIBNAME = blob
 
diff --git a/lib/copy/Makefile b/lib/copy/Makefile
index b940502ea..31f983b53 100644
--- a/lib/copy/Makefile
+++ b/lib/copy/Makefile
@@ -34,7 +34,6 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
-CFLAGS += $(ENV_CFLAGS)
 LIBNAME = copy
 C_SRCS = copy_engine.c
 
diff --git a/lib/copy/ioat/Makefile b/lib/copy/ioat/Makefile
index f26b26da6..dda418796 100644
--- a/lib/copy/ioat/Makefile
+++ b/lib/copy/ioat/Makefile
@@ -34,7 +34,6 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
-CFLAGS += $(ENV_CFLAGS)
 LIBNAME = copy_ioat
 C_SRCS = copy_engine_ioat.c
 
diff --git a/lib/event/Makefile b/lib/event/Makefile
index 34e975395..659b85e94 100644
--- a/lib/event/Makefile
+++ b/lib/event/Makefile
@@ -34,7 +34,6 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
-CFLAGS += $(ENV_CFLAGS)
 LIBNAME = event
 C_SRCS = app.c reactor.c rpc.c subsystem.c
 
diff --git a/lib/event/subsystems/bdev/Makefile b/lib/event/subsystems/bdev/Makefile
index 29087fa96..58c514190 100644
--- a/lib/event/subsystems/bdev/Makefile
+++ b/lib/event/subsystems/bdev/Makefile
@@ -34,7 +34,6 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
-CFLAGS += $(ENV_CFLAGS) -I.
 C_SRCS = bdev.c
 LIBNAME = event_bdev
 
diff --git a/lib/event/subsystems/copy/Makefile b/lib/event/subsystems/copy/Makefile
index f243bd070..691eee2a1 100644
--- a/lib/event/subsystems/copy/Makefile
+++ b/lib/event/subsystems/copy/Makefile
@@ -34,7 +34,6 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
-CFLAGS += $(ENV_CFLAGS) -I.
 C_SRCS = copy.c
 LIBNAME = event_copy
 
diff --git a/lib/event/subsystems/iscsi/Makefile b/lib/event/subsystems/iscsi/Makefile
index 0d0c5a9ff..d57f59467 100644
--- a/lib/event/subsystems/iscsi/Makefile
+++ b/lib/event/subsystems/iscsi/Makefile
@@ -34,7 +34,7 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
-CFLAGS += $(ENV_CFLAGS) -I. -I$(SPDK_ROOT_DIR)/lib
+CFLAGS += -I$(SPDK_ROOT_DIR)/lib
 C_SRCS = iscsi.c
 LIBNAME = event_iscsi
 
diff --git a/lib/event/subsystems/nbd/Makefile b/lib/event/subsystems/nbd/Makefile
index 0c678e77c..92d99f154 100644
--- a/lib/event/subsystems/nbd/Makefile
+++ b/lib/event/subsystems/nbd/Makefile
@@ -34,7 +34,6 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
-CFLAGS += $(ENV_CFLAGS) -I.
 C_SRCS = nbd.c
 LIBNAME = event_nbd
 
diff --git a/lib/event/subsystems/net/Makefile b/lib/event/subsystems/net/Makefile
index e2b7e7dfd..cf81f07b6 100644
--- a/lib/event/subsystems/net/Makefile
+++ b/lib/event/subsystems/net/Makefile
@@ -34,7 +34,6 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
-CFLAGS += $(ENV_CFLAGS) -I.
 C_SRCS = net.c
 LIBNAME = event_net
 
diff --git a/lib/event/subsystems/scsi/Makefile b/lib/event/subsystems/scsi/Makefile
index 13ca75d46..12bf15e30 100644
--- a/lib/event/subsystems/scsi/Makefile
+++ b/lib/event/subsystems/scsi/Makefile
@@ -34,7 +34,6 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
-CFLAGS += $(ENV_CFLAGS) -I.
 C_SRCS = scsi.c
 LIBNAME = event_scsi
 
diff --git a/lib/event/subsystems/vhost/Makefile b/lib/event/subsystems/vhost/Makefile
index e3f655020..2e0d61fe0 100644
--- a/lib/event/subsystems/vhost/Makefile
+++ b/lib/event/subsystems/vhost/Makefile
@@ -34,7 +34,6 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
-CFLAGS += $(ENV_CFLAGS) -I.
 C_SRCS = vhost.c
 LIBNAME = event_vhost
 
diff --git a/lib/ioat/Makefile b/lib/ioat/Makefile
index aa835a2f8..d59d607f3 100644
--- a/lib/ioat/Makefile
+++ b/lib/ioat/Makefile
@@ -34,7 +34,6 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
-CFLAGS += $(ENV_CFLAGS)
 C_SRCS = ioat.c
 LIBNAME = ioat
 
diff --git a/lib/iscsi/Makefile b/lib/iscsi/Makefile
index 7dfd51dd2..20edbe19a 100644
--- a/lib/iscsi/Makefile
+++ b/lib/iscsi/Makefile
@@ -34,7 +34,7 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
-CFLAGS += $(ENV_CFLAGS) -I$(SPDK_ROOT_DIR)/lib
+CFLAGS += -I$(SPDK_ROOT_DIR)/lib
 C_SRCS = acceptor.c conn.c \
 	 init_grp.c iscsi.c md5.c param.c portal_grp.c \
 	 tgt_node.c iscsi_subsystem.c \
diff --git a/lib/lvol/Makefile b/lib/lvol/Makefile
index ee3f0e437..49076fbac 100644
--- a/lib/lvol/Makefile
+++ b/lib/lvol/Makefile
@@ -34,7 +34,6 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
-CFLAGS += $(ENV_CFLAGS)
 C_SRCS = lvol.c
 LIBNAME = lvol
 
diff --git a/lib/nvme/Makefile b/lib/nvme/Makefile
index caf4f7eeb..fe04ad68b 100644
--- a/lib/nvme/Makefile
+++ b/lib/nvme/Makefile
@@ -34,7 +34,6 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
-CFLAGS += $(ENV_CFLAGS)
 C_SRCS = nvme_ctrlr_cmd.c nvme_ctrlr.c nvme_ns_cmd.c nvme_ns.c nvme_pcie.c nvme_qpair.c nvme.c nvme_quirks.c nvme_transport.c nvme_uevent.c
 C_SRCS-$(CONFIG_RDMA) += nvme_rdma.c
 LIBNAME = nvme
diff --git a/lib/nvmf/Makefile b/lib/nvmf/Makefile
index 01b1cca20..9432d3fc7 100644
--- a/lib/nvmf/Makefile
+++ b/lib/nvmf/Makefile
@@ -34,7 +34,6 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
-CFLAGS += $(ENV_CFLAGS)
 LIBNAME = nvmf
 
 C_SRCS = ctrlr.c ctrlr_discovery.c ctrlr_bdev.c \
diff --git a/lib/rpc/Makefile b/lib/rpc/Makefile
index c9e5ecb69..024d7a04a 100644
--- a/lib/rpc/Makefile
+++ b/lib/rpc/Makefile
@@ -34,7 +34,6 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
-CFLAGS += $(ENV_CFLAGS)
 C_SRCS = rpc.c
 LIBNAME = rpc
 
diff --git a/lib/scsi/Makefile b/lib/scsi/Makefile
index c394bf3fa..6d747f571 100644
--- a/lib/scsi/Makefile
+++ b/lib/scsi/Makefile
@@ -34,7 +34,6 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
-CFLAGS += $(ENV_CFLAGS)
 C_SRCS = dev.c lun.c lun_db.c port.c scsi.c scsi_bdev.c scsi_rpc.c task.c
 LIBNAME = scsi
 
diff --git a/lib/util/Makefile b/lib/util/Makefile
index f9448e579..cf2379fe2 100644
--- a/lib/util/Makefile
+++ b/lib/util/Makefile
@@ -34,7 +34,6 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
-CFLAGS += $(ENV_CFLAGS)
 C_SRCS = bit_array.c crc16.c crc32.c crc32c.c crc32_ieee.c fd.c io_channel.c string.c
 LIBNAME = util
 
diff --git a/mk/nvme.libtest.mk b/mk/nvme.libtest.mk
index 39c18c399..833d6e15e 100644
--- a/mk/nvme.libtest.mk
+++ b/mk/nvme.libtest.mk
@@ -38,8 +38,6 @@ include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
 
 C_SRCS = $(APP:%=%.c)
 
-CFLAGS += -I. $(ENV_CFLAGS)
-
 SPDK_LIB_LIST = nvme util log
 
 LIBS += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS)
diff --git a/test/app/bdev_svc/Makefile b/test/app/bdev_svc/Makefile
index 67d631ef4..522ab84bf 100644
--- a/test/app/bdev_svc/Makefile
+++ b/test/app/bdev_svc/Makefile
@@ -38,8 +38,6 @@ include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk
 
 APP = bdev_svc
 
-CFLAGS += $(ENV_CFLAGS)
-
 C_SRCS := bdev_svc.c
 
 SPDK_LIB_LIST = event_bdev event_copy
diff --git a/test/app/stub/Makefile b/test/app/stub/Makefile
index e1c94ab12..21fcbfa45 100644
--- a/test/app/stub/Makefile
+++ b/test/app/stub/Makefile
@@ -37,8 +37,6 @@ include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
 
 APP = stub
 
-CFLAGS += $(ENV_CFLAGS)
-
 C_SRCS := stub.c
 
 SPDK_LIB_LIST = event conf nvme util log trace rpc jsonrpc json
diff --git a/test/lib/bdev/bdevio/Makefile b/test/lib/bdev/bdevio/Makefile
index 8d68bd9c2..7f447359f 100644
--- a/test/lib/bdev/bdevio/Makefile
+++ b/test/lib/bdev/bdevio/Makefile
@@ -40,8 +40,6 @@ APP = bdevio
 
 C_SRCS := bdevio.c
 
-CFLAGS += -I. $(ENV_CFLAGS)
-
 SPDK_LIB_LIST = event_bdev event_copy
 SPDK_LIB_LIST += bdev copy event trace log conf util rpc jsonrpc json
 
diff --git a/test/lib/bdev/bdevperf/Makefile b/test/lib/bdev/bdevperf/Makefile
index 3c4bb3af6..3bedb8e5d 100644
--- a/test/lib/bdev/bdevperf/Makefile
+++ b/test/lib/bdev/bdevperf/Makefile
@@ -40,8 +40,6 @@ APP = bdevperf
 
 C_SRCS := bdevperf.c
 
-CFLAGS += -I. $(ENV_CFLAGS)
-
 SPDK_LIB_LIST = event_bdev event_copy
 SPDK_LIB_LIST += bdev copy event trace log conf util rpc jsonrpc json
 
diff --git a/test/lib/bdev/nbd/Makefile b/test/lib/bdev/nbd/Makefile
index 6e7a0722e..caedc4b03 100644
--- a/test/lib/bdev/nbd/Makefile
+++ b/test/lib/bdev/nbd/Makefile
@@ -40,8 +40,6 @@ APP = nbd
 
 C_SRCS := nbd.c
 
-CFLAGS += -I. $(ENV_CFLAGS)
-
 SPDK_LIB_LIST = event_bdev event_copy event_nbd
 SPDK_LIB_LIST += bdev bdev_rpc copy event trace log log_rpc conf util rpc jsonrpc json nbd
 
diff --git a/test/lib/env/pci/Makefile b/test/lib/env/pci/Makefile
index 764b35d73..dde3fb5e3 100644
--- a/test/lib/env/pci/Makefile
+++ b/test/lib/env/pci/Makefile
@@ -39,8 +39,6 @@ APP = pci_ut
 
 C_SRCS = pci_ut.c
 
-CFLAGS += $(ENV_CFLAGS)
-
 LIBS += $(ENV_LINKER_ARGS) -lcunit
 
 all: $(APP)
diff --git a/test/lib/env/vtophys/Makefile b/test/lib/env/vtophys/Makefile
index 9861556d2..bd414ff8c 100644
--- a/test/lib/env/vtophys/Makefile
+++ b/test/lib/env/vtophys/Makefile
@@ -39,8 +39,6 @@ APP = vtophys
 
 C_SRCS = vtophys.c
 
-CFLAGS += $(ENV_CFLAGS)
-
 LIBS += $(SPDK_LIBS) $(ENV_LINKER_ARGS)
 
 all: $(APP)
diff --git a/test/lib/event/reactor/Makefile b/test/lib/event/reactor/Makefile
index f9fb73dc8..331e94530 100644
--- a/test/lib/event/reactor/Makefile
+++ b/test/lib/event/reactor/Makefile
@@ -35,7 +35,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
-CFLAGS += $(ENV_CFLAGS)
 APP = reactor
 C_SRCS := reactor.c
 
diff --git a/test/lib/event/reactor_perf/Makefile b/test/lib/event/reactor_perf/Makefile
index 68e3e8c91..ff9da0225 100644
--- a/test/lib/event/reactor_perf/Makefile
+++ b/test/lib/event/reactor_perf/Makefile
@@ -35,7 +35,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
-CFLAGS += $(ENV_CFLAGS)
 APP = reactor_perf
 C_SRCS := reactor_perf.c
 
diff --git a/test/unit/lib/iscsi/init_grp.c/Makefile b/test/unit/lib/iscsi/init_grp.c/Makefile
index def11a373..aa59354a1 100644
--- a/test/unit/lib/iscsi/init_grp.c/Makefile
+++ b/test/unit/lib/iscsi/init_grp.c/Makefile
@@ -37,7 +37,6 @@ include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
 
 SPDK_LIB_LIST = log conf util cunit
 
-CFLAGS += $(ENV_CFLAGS)
 CFLAGS += -I$(SPDK_ROOT_DIR)/test
 CFLAGS += -I$(SPDK_ROOT_DIR)/lib
 LIBS += $(SPDK_LIB_LINKER_ARGS)
diff --git a/test/unit/lib/iscsi/iscsi.c/Makefile b/test/unit/lib/iscsi/iscsi.c/Makefile
index 04a189dfe..76b095e7a 100644
--- a/test/unit/lib/iscsi/iscsi.c/Makefile
+++ b/test/unit/lib/iscsi/iscsi.c/Makefile
@@ -37,7 +37,6 @@ include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
 
 SPDK_LIB_LIST = log util cunit trace conf
 
-CFLAGS += $(ENV_CFLAGS)
 CFLAGS += -I$(SPDK_ROOT_DIR)/test
 CFLAGS += -I$(SPDK_ROOT_DIR)/lib
 LIBS += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS)
diff --git a/test/unit/lib/iscsi/param.c/Makefile b/test/unit/lib/iscsi/param.c/Makefile
index b1840ed34..48a666cb7 100644
--- a/test/unit/lib/iscsi/param.c/Makefile
+++ b/test/unit/lib/iscsi/param.c/Makefile
@@ -37,7 +37,6 @@ include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
 
 SPDK_LIB_LIST = log util cunit
 
-CFLAGS += $(ENV_CFLAGS)
 CFLAGS += -I$(SPDK_ROOT_DIR)/test
 CFLAGS += -I$(SPDK_ROOT_DIR)/lib
 LIBS += $(SPDK_LIB_LINKER_ARGS)
diff --git a/test/unit/lib/iscsi/tgt_node.c/Makefile b/test/unit/lib/iscsi/tgt_node.c/Makefile
index 4222ed50c..bf019aec7 100644
--- a/test/unit/lib/iscsi/tgt_node.c/Makefile
+++ b/test/unit/lib/iscsi/tgt_node.c/Makefile
@@ -37,7 +37,6 @@ include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
 
 SPDK_LIB_LIST = log conf util cunit
 
-CFLAGS += $(ENV_CFLAGS)
 CFLAGS += -I$(SPDK_ROOT_DIR)/test
 CFLAGS += -I$(SPDK_ROOT_DIR)/lib
 LIBS += $(SPDK_LIB_LINKER_ARGS)
diff --git a/test/unit/lib/scsi/scsi.c/Makefile b/test/unit/lib/scsi/scsi.c/Makefile
index 754c87a83..b62a36940 100644
--- a/test/unit/lib/scsi/scsi.c/Makefile
+++ b/test/unit/lib/scsi/scsi.c/Makefile
@@ -37,7 +37,7 @@ include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
 
 SPDK_LIB_LIST = log conf trace util
 
-CFLAGS += -I$(SPDK_ROOT_DIR)/lib/scsi $(ENV_CFLAGS)
+CFLAGS += -I$(SPDK_ROOT_DIR)/lib/scsi
 CFLAGS += -I$(SPDK_ROOT_DIR)/test
 LIBS += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS)
 LIBS += -lcunit
diff --git a/test/unit/lib/util/io_channel.c/Makefile b/test/unit/lib/util/io_channel.c/Makefile
index 10ff42913..384efb2d4 100644
--- a/test/unit/lib/util/io_channel.c/Makefile
+++ b/test/unit/lib/util/io_channel.c/Makefile
@@ -38,7 +38,6 @@ include $(SPDK_ROOT_DIR)/mk/spdk.mock.unittest.mk
 
 SPDK_LIB_LIST = log cunit spdk_mock
 
-CFLAGS += $(ENV_CFLAGS)
 CFLAGS += -I$(SPDK_ROOT_DIR)/test
 CFLAGS += -I$(SPDK_ROOT_DIR)/lib
 LIBS += $(SPDK_LIB_LINKER_ARGS)