diff --git a/app/iscsi_top/Makefile b/app/iscsi_top/Makefile
index 62771944f..079a7f13a 100644
--- a/app/iscsi_top/Makefile
+++ b/app/iscsi_top/Makefile
@@ -39,8 +39,8 @@ APP = iscsi_top
 
 SPDK_LIB_LIST = jsonrpc json rpc log util
 
-CXXFLAGS += -I$(SPDK_ROOT_DIR)/lib
+CFLAGS += -I$(SPDK_ROOT_DIR)/lib
 
-CXX_SRCS := iscsi_top.cpp
+C_SRCS := iscsi_top.c
 
-include $(SPDK_ROOT_DIR)/mk/spdk.app_cxx.mk
+include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
diff --git a/app/iscsi_top/iscsi_top.cpp b/app/iscsi_top/iscsi_top.c
similarity index 98%
rename from app/iscsi_top/iscsi_top.cpp
rename to app/iscsi_top/iscsi_top.c
index 190ba4fbf..c49160928 100644
--- a/app/iscsi_top/iscsi_top.cpp
+++ b/app/iscsi_top/iscsi_top.c
@@ -33,19 +33,14 @@
 
 #include "spdk/stdinc.h"
 
-#include <algorithm>
-#include <map>
-#include <vector>
-
-extern "C" {
 #include "spdk/event.h"
 #include "spdk/jsonrpc.h"
 #include "spdk/rpc.h"
+#include "spdk/string.h"
 #include "spdk/trace.h"
 #include "spdk/util.h"
 
 #include "iscsi/conn.h"
-}
 
 static char *exe_name;
 static int g_shm_id = 0;
@@ -162,7 +157,7 @@ int main(int argc, char **argv)
 	while ((op = getopt(argc, argv, "i:r:")) != -1) {
 		switch (op) {
 		case 'i':
-			g_shm_id = atoi(optarg);
+			g_shm_id = spdk_strtol(optarg, 10);
 			break;
 		case 'r':
 			rpc_socket_path = optarg;