diff --git a/test/hal/tool/src/CameraHalMock.cpp b/test/hal/tool/src/CameraHalMock.cpp
index 2531b05..bb868ea 100644
--- a/test/hal/tool/src/CameraHalMock.cpp
+++ b/test/hal/tool/src/CameraHalMock.cpp
@@ -13,8 +13,10 @@
  * limitations under the License.
  */
 #include "CameraHalMock.h"
-#include "HalCppMock.h"
+#include "IHalCpp.h"
 #include "ILog.h"
+#include "StatusCode.h"
+#include <memory>
 CameraHalTest::CameraHalTest(const CameraType &cameraType) : mCameraType(cameraType)
 {
 }
diff --git a/test/hal/tool/src/HalCppMock.cpp b/test/hal/tool/src/HalCppMock.cpp
index 0c17208..a6f6ba7 100644
--- a/test/hal/tool/src/HalCppMock.cpp
+++ b/test/hal/tool/src/HalCppMock.cpp
@@ -13,7 +13,13 @@
  * limitations under the License.
  */
 #include "HalCppMock.h"
+#include "HalCpp.h"
+#include "IHalCpp.h"
 #include "ILog.h"
+#include "StatusCode.h"
+#include <map>
+#include <memory>
+#include <string>
 StatusCode HalCppTest::GetAllLeds(std::map<std::string, std::shared_ptr<VLedHal>> &allLeds)
 {
     LogInfo("HalCppTest::GetAllLeds\n");
diff --git a/test/hal/tool/src/HalMakePtrTest.cpp b/test/hal/tool/src/HalMakePtrTest.cpp
index 2e6454a..2ec6d8d 100644
--- a/test/hal/tool/src/HalMakePtrTest.cpp
+++ b/test/hal/tool/src/HalMakePtrTest.cpp
@@ -13,7 +13,15 @@
  * limitations under the License.
  */
 #include "HalMakePtrTest.h"
+#include "HalCppMock.h"
+#include "HalMakePtr.h"
+#include "IHalCpp.h"
 #include "ILog.h"
+#include "KeyControl.h"
+#include "SdCardHalMock.h"
+#include "StatusCode.h"
+#include <memory>
+#include <vector>
 void OverrideHalMakePtrObject(std::shared_ptr<HalCppMock> &halMock, std::shared_ptr<SdCardHalMock> &sdCardHalMock)
 {
     std::shared_ptr<HalMakePtr> impl = std::make_shared<HalMakePtrTest>();
diff --git a/test/hal/tool/src/HalTestTool.cpp b/test/hal/tool/src/HalTestTool.cpp
index 0db7f51..28929c0 100644
--- a/test/hal/tool/src/HalTestTool.cpp
+++ b/test/hal/tool/src/HalTestTool.cpp
@@ -14,15 +14,25 @@
  */
 #include "HalTestTool.h"
 #include "CameraHalMock.h"
+#include "GtestUsing.h"
 #include "HalCppMock.h"
+#include "HalMakePtr.h"
 #include "HalMakePtrTest.h"
+#include "IHalCpp.h"
 #include "ILog.h"
 #include "KeyControl.h"
 #include "KeyControlMock.h"
+#include "LedControl.h"
 #include "LedControlMock.h"
+#include "LinuxApiMock.h"
 #include "SdCardHalMock.h"
+#include "StatusCode.h"
 #include "WifiHalMock.h"
-#include <thread>
+#include <gmock/gmock-spec-builders.h>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
 void HalTestTool::Init(void)
 {
     mHalMock = std::make_shared<HalCppMock>();
diff --git a/test/hal/tool/src/KeyControlMock.cpp b/test/hal/tool/src/KeyControlMock.cpp
index 6bb42aa..787b641 100644
--- a/test/hal/tool/src/KeyControlMock.cpp
+++ b/test/hal/tool/src/KeyControlMock.cpp
@@ -13,7 +13,16 @@
  * limitations under the License.
  */
 #include "KeyControlMock.h"
+#include "GtestUsing.h"
+#include "IHalCpp.h"
 #include "ILog.h"
+#include "KeyControl.h"
+#include "StatusCode.h"
+#include <chrono>
+#include <gmock/gmock-spec-builders.h>
+#include <memory>
+#include <string>
+#include <thread>
 unsigned int KeyControlTest::GetStatusCheckPeriodMs(void)
 {
     return PERIPHERAL_CHECK_PERIOD_MS;
diff --git a/test/hal/tool/src/LedControlMock.cpp b/test/hal/tool/src/LedControlMock.cpp
index 87fb0de..0079f58 100644
--- a/test/hal/tool/src/LedControlMock.cpp
+++ b/test/hal/tool/src/LedControlMock.cpp
@@ -13,7 +13,14 @@
  * limitations under the License.
  */
 #include "LedControlMock.h"
+#include "GtestUsing.h"
+#include "IHalCpp.h"
 #include "ILog.h"
+#include "LedControl.h"
+#include "StatusCode.h"
+#include <gmock/gmock-spec-builders.h>
+#include <memory>
+#include <string>
 LedControlTest::LedControlTest(const std::string &ledName) : mLedName(ledName)
 {
 }
diff --git a/test/hal/tool/src/SdCardHalMock.cpp b/test/hal/tool/src/SdCardHalMock.cpp
index d332901..847957d 100644
--- a/test/hal/tool/src/SdCardHalMock.cpp
+++ b/test/hal/tool/src/SdCardHalMock.cpp
@@ -13,7 +13,13 @@
  * limitations under the License.
  */
 #include "SdCardHalMock.h"
-#include "ILog.h"
+#include "GtestUsing.h"
+// #include "ILog.h"
+#include "LinuxApiMock.h"
+#include <gmock/gmock-spec-builders.h>
+#include <memory>
+#include <sys/stat.h>
+#include <unistd.h>
 extern const char *SD_CARD_DEVICE;
 constexpr int FSTAT_SUCCESS = 0;
 constexpr int FILE_EXIST = 0;
diff --git a/test/hal/tool/src/WifiHalMock.cpp b/test/hal/tool/src/WifiHalMock.cpp
index ff1a404..e7fa428 100644
--- a/test/hal/tool/src/WifiHalMock.cpp
+++ b/test/hal/tool/src/WifiHalMock.cpp
@@ -12,5 +12,5 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "HalCppMock.h"
-#include "ILog.h"
\ No newline at end of file
+// #include "HalCppMock.h"
+// #include "ILog.h"
\ No newline at end of file