diff --git a/hal/src/HalMakePtr.h b/hal/src/HalMakePtr.h
index 4278a2e..6001ed2 100644
--- a/hal/src/HalMakePtr.h
+++ b/hal/src/HalMakePtr.h
@@ -16,9 +16,9 @@
 #define HALMAKEPTR_H
 #include "IHal.h"
 #include "IHalCpp.h"
-#include "StatusCode.h"
 #include "KeyControl.h"
 #include "LedControl.h"
+#include "StatusCode.h"
 #include <memory>
 class HalMakePtr
 {
diff --git a/hal/src/SdCardHal.h b/hal/src/SdCardHal.h
index 5aabdb7..6050c67 100644
--- a/hal/src/SdCardHal.h
+++ b/hal/src/SdCardHal.h
@@ -23,7 +23,8 @@ public:
     virtual ~SdCardHal() = default;
     void SetSdCardMonitor(std::shared_ptr<VSdCardHalMonitor> &monitor) override;
     SdCardHalStatus GetSdCardStatus(void) override;
-    StatusCode GetCapacity(unsigned long long &totalSizeMB, unsigned long long &freeSizeMB, unsigned long long &usedSizeMB) override;
+    StatusCode GetCapacity(unsigned long long &totalSizeMB, unsigned long long &freeSizeMB,
+                           unsigned long long &usedSizeMB) override;
     void Init(void);
     void UnInit(void);
     void DevDetectingThread(void);
diff --git a/middleware/AppManager/src/AppClient.cpp b/middleware/AppManager/src/AppClient.cpp
index 5398321..50328db 100644
--- a/middleware/AppManager/src/AppClient.cpp
+++ b/middleware/AppManager/src/AppClient.cpp
@@ -13,9 +13,12 @@
  * limitations under the License.
  */
 #include "AppClient.h"
+#include "IAppManager.h"
 #include "IAppProtocolHandle.h"
 #include "ILog.h"
 #include "TcpModule.h"
+#include <memory>
+#include <string>
 AppClient::AppClient(const void *clientObject) : mClientObject(clientObject)
 {
 }
diff --git a/middleware/AppManager/src/AppManager.cpp b/middleware/AppManager/src/AppManager.cpp
index ad0d9b0..2cd7163 100644
--- a/middleware/AppManager/src/AppManager.cpp
+++ b/middleware/AppManager/src/AppManager.cpp
@@ -15,10 +15,15 @@
 #include "AppManager.h"
 #include "AppClient.h"
 #include "AppManagerMakePtr.h"
+#include "IAppManager.h"
+#include "IAppProtocolHandle.h"
 #include "IHalCpp.h"
 #include "ILog.h"
+#include "StatusCode.h"
 #include "TcpModule.h"
 #include "WebServer.h"
+#include <memory>
+#include <sys/types.h>
 AppManager::AppManager() : mTcpServer(nullptr), mInitRuning(false)
 {
 }
diff --git a/middleware/AppManager/src/AppManagerMakePtr.cpp b/middleware/AppManager/src/AppManagerMakePtr.cpp
index d65d978..afb73fb 100644
--- a/middleware/AppManager/src/AppManagerMakePtr.cpp
+++ b/middleware/AppManager/src/AppManagerMakePtr.cpp
@@ -14,7 +14,11 @@
  */
 #include "AppManagerMakePtr.h"
 #include "AppManager.h"
+#include "IAppManager.h"
+#include "IAppProtocolHandle.h"
 #include "ILog.h"
+#include "StatusCode.h"
+#include <memory>
 // extern bool CreateProtocolHandleImpl();
 bool CreateAppManagerModule(void)
 {
diff --git a/middleware/AppManager/src/IAppManager.cpp b/middleware/AppManager/src/IAppManager.cpp
index 950f955..aba2ba6 100644
--- a/middleware/AppManager/src/IAppManager.cpp
+++ b/middleware/AppManager/src/IAppManager.cpp
@@ -14,6 +14,10 @@
  */
 #include "IAppManager.h"
 #include "ILog.h"
+#include "StatusCode.h"
+#include <memory>
+#include <string>
+#include <vector>
 app_get_product_info::app_get_product_info()
 {
 }
diff --git a/middleware/AppManager/src/IAppProtocolHandle.cpp b/middleware/AppManager/src/IAppProtocolHandle.cpp
index 7c435ff..a8a3d09 100644
--- a/middleware/AppManager/src/IAppProtocolHandle.cpp
+++ b/middleware/AppManager/src/IAppProtocolHandle.cpp
@@ -13,7 +13,12 @@
  * limitations under the License.
  */
 #include "IAppProtocolHandle.h"
+#include "IAppManager.h"
 #include "ILog.h"
+#include "WebServer.h"
+#include <cstdlib>
+#include <memory>
+#include <string>
 protocol_packet::~protocol_packet()
 {
     if (nullptr != mData) {
diff --git a/middleware/AppManager/src/Protocol/SixFrame/SixFrameHandle.cpp b/middleware/AppManager/src/Protocol/SixFrame/SixFrameHandle.cpp
index 704e407..7f35fd4 100644
--- a/middleware/AppManager/src/Protocol/SixFrame/SixFrameHandle.cpp
+++ b/middleware/AppManager/src/Protocol/SixFrame/SixFrameHandle.cpp
@@ -13,11 +13,21 @@
  * limitations under the License.
  */
 #include "SixFrameHandle.h"
+#include "IAppManager.h"
+#include "IAppProtocolHandle.h"
 #include "ILog.h"
+#include <WebServer.h>
+#include <cJSON.h>
+#include <cstdlib>
 #include <cstring>
+#include <functional>
+#include <map>
+#include <memory>
 #include <sstream>
 #include <stdio.h>
+#include <string>
 #include <time.h>
+#include <vector>
 using std::placeholders::_1;
 using std::placeholders::_2;
 using std::placeholders::_3;
@@ -1004,10 +1014,8 @@ std::shared_ptr<ProtocolPacket> SixFrameHandle::MakePacket(const cJSON *json)
     if (nullptr != resultStr) {
         return std::make_shared<ProtocolPacket>(resultStr, strlen(resultStr));
     }
-    else {
-        LogError("MakePacket failed.\n");
-        return std::make_shared<ProtocolPacket>();
-    }
+    LogError("MakePacket failed.\n");
+    return std::make_shared<ProtocolPacket>();
 }
 void SixFrameHandle::SetAppMonitor(std::shared_ptr<VAppMonitor> &monitor)
 {
diff --git a/middleware/AppManager/src/Protocol/SixFrame/SixFrameMakePtr.cpp b/middleware/AppManager/src/Protocol/SixFrame/SixFrameMakePtr.cpp
index b64e824..b01b67a 100644
--- a/middleware/AppManager/src/Protocol/SixFrame/SixFrameMakePtr.cpp
+++ b/middleware/AppManager/src/Protocol/SixFrame/SixFrameMakePtr.cpp
@@ -13,8 +13,12 @@
  * limitations under the License.
  */
 #include "SixFrameMakePtr.h"
+#include "AppManagerMakePtr.h"
+#include "IAppProtocolHandle.h"
 #include "ILog.h"
 #include "SixFrameHandle.h"
+#include "StatusCode.h"
+#include <memory>
 bool CreateProtocolHandleImpl(void)
 {
     LogInfo("CreateProtocolHandleImpl SixFrameMakePtr.\n");
diff --git a/utils/WebServer/src/WebServer.cpp b/utils/WebServer/src/WebServer.cpp
index d1cfdcc..e20b982 100644
--- a/utils/WebServer/src/WebServer.cpp
+++ b/utils/WebServer/src/WebServer.cpp
@@ -14,9 +14,16 @@
  */
 #include "WebServer.h"
 #include "ILog.h"
+#include "StatusCode.h"
 #include "goahead.h"
-#include "js.h"
+#include "osdep.h"
+#include <errno.h>
 #include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
 static int finished = 0;
 static HttpHandleCallback gHttpHandle = NULL;
 constexpr int UNKNOWN_LENGTH = -1;