diff --git a/app/iscsi_top/Makefile b/app/iscsi_top/Makefile
index d0e0a727c..0d66fcfb2 100644
--- a/app/iscsi_top/Makefile
+++ b/app/iscsi_top/Makefile
@@ -33,21 +33,13 @@
 
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
-include $(SPDK_ROOT_DIR)/mk/spdk.app_cxx.mk
-
-CXXFLAGS += $(ENV_CXXFLAGS)
-CXXFLAGS += -I$(SPDK_ROOT_DIR)/lib
-CXX_SRCS = iscsi_top.cpp
+include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk
 
 APP = iscsi_top
 
-all: $(APP)
-	@:
+CXXFLAGS += $(ENV_CXXFLAGS)
+CXXFLAGS += -I$(SPDK_ROOT_DIR)/lib
 
-$(APP) : $(OBJS)
-	$(LINK_CXX)
+CXX_SRCS := iscsi_top.cpp
 
-clean:
-	$(CLEAN_C) $(APP)
-
-include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk
+include $(SPDK_ROOT_DIR)/mk/spdk.app_cxx.mk
diff --git a/app/trace/Makefile b/app/trace/Makefile
index 0466590c2..92df0857f 100644
--- a/app/trace/Makefile
+++ b/app/trace/Makefile
@@ -33,19 +33,10 @@
 
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
-include $(SPDK_ROOT_DIR)/mk/spdk.app_cxx.mk
-
-CXX_SRCS := trace.cpp
+include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk
 
 APP = spdk_trace
 
-all: $(APP)
-	@:
+CXX_SRCS := trace.cpp
 
-$(APP): $(OBJS) $(SPDK_LIBS)
-	$(LINK_CXX)
-
-clean:
-	$(CLEAN_C) $(APP)
-
-include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk
+include $(SPDK_ROOT_DIR)/mk/spdk.app_cxx.mk
diff --git a/mk/spdk.app_cxx.mk b/mk/spdk.app_cxx.mk
index ac89609a9..1222c6998 100644
--- a/mk/spdk.app_cxx.mk
+++ b/mk/spdk.app_cxx.mk
@@ -30,10 +30,27 @@
 #  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 #  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-
 include $(SPDK_ROOT_DIR)/mk/spdk.app_vars.mk
 
+LIBS += $(SPDK_LIB_LINKER_ARGS)
+
+CLEAN_FILES = $(APP)
+
+all : $(APP)
+	@:
+
 install: all
 
-uninstall:
+# To avoid overwriting warning
+empty_uninstall_rule:
 	@:
+
+uninstall: empty_uninstall_rule
+
+$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS)
+	$(LINK_CXX)
+
+clean :
+	$(CLEAN_C) $(CLEAN_FILES)
+
+include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk