diff --git a/utils/UartDevice/src/UartDevice.cpp b/utils/UartDevice/src/UartDevice.cpp
index dae1279..44a4c3b 100644
--- a/utils/UartDevice/src/UartDevice.cpp
+++ b/utils/UartDevice/src/UartDevice.cpp
@@ -16,6 +16,9 @@
 #include "ILog.h"
 #include "StatusCode.h"
 #include "UartDeviceImpl.h"
+#include <cstddef>
+// #include <sys/types.h>
+
 void *CreateUartDevice(const UartInfo info)
 {
     return NewUartDeviceImpl(info);
diff --git a/utils/UartDevice/src/UartDeviceImpl.cpp b/utils/UartDevice/src/UartDeviceImpl.cpp
index 419ccbd..62f8b7c 100644
--- a/utils/UartDevice/src/UartDeviceImpl.cpp
+++ b/utils/UartDevice/src/UartDeviceImpl.cpp
@@ -15,15 +15,21 @@
 #include "UartDeviceImpl.h"
 #include "ILog.h"
 #include "LinuxApi.h"
+#include "StatusCode.h"
+#include "UartDevice.h"
+#include <chrono>
+#include <cstddef>
 #include <cstdlib>
 #include <cstring>
-#include <errno.h>
 #include <fcntl.h>
+#include <memory>
 #include <stdio.h>
-#include <sys/types.h>
+#include <sys/select.h>
+// #include <sys/time.h>
 #include <termios.h>
 #include <thread>
 #include <unistd.h>
+
 constexpr int INVALID_FD = -1;
 static const char *UART_DEVICE_NAME = "uart_device";
 const char *GetUartDeviceModuleName(void)