diff --git a/tool/pldm_base_cmd.cpp b/tool/pldm_base_cmd.cpp
index d60e302..0758c8d 100644
--- a/tool/pldm_base_cmd.cpp
+++ b/tool/pldm_base_cmd.cpp
@@ -2,11 +2,6 @@
 
 #include "pldm_cmd_helper.hpp"
 
-#include <map>
-#include <memory>
-#include <string>
-#include <vector>
-
 #include "libpldm/utils.h"
 
 namespace pldmtool
diff --git a/tool/pldm_bios_cmd.cpp b/tool/pldm_bios_cmd.cpp
index fdcc721..752018e 100644
--- a/tool/pldm_bios_cmd.cpp
+++ b/tool/pldm_bios_cmd.cpp
@@ -2,12 +2,6 @@
 
 #include "pldm_cmd_helper.hpp"
 
-#include <map>
-#include <memory>
-#include <string>
-#include <typeinfo>
-#include <vector>
-
 #include "libpldm/utils.h"
 
 namespace pldmtool
diff --git a/tool/pldm_platform_cmd.cpp b/tool/pldm_platform_cmd.cpp
index da6605d..ddf30fd 100644
--- a/tool/pldm_platform_cmd.cpp
+++ b/tool/pldm_platform_cmd.cpp
@@ -1,8 +1,5 @@
 #include "pldm_cmd_helper.hpp"
 
-#include <string>
-#include <vector>
-
 namespace pldmtool
 {