diff --git a/include/util/taoserror.h b/include/util/taoserror.h
index 7b42f3fea0fc46beeeae63aa6e4f53f32de89926..2663084103afc0c0c77c2486558505abd0b43b35 100644
--- a/include/util/taoserror.h
+++ b/include/util/taoserror.h
@@ -13,8 +13,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _TD_UTIL_TAOS_ERROR_H_
-#define _TD_UTIL_TAOS_ERROR_H_
+#ifndef _TD_UTIL_ERROR_H_
+#define _TD_UTIL_ERROR_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -469,4 +469,4 @@ int32_t* taosGetErrno();
 }
 #endif
 
-#endif /*_TD_UTIL_TAOS_ERROR_H_*/
+#endif /*_TD_UTIL_ERROR_H_*/
diff --git a/include/util/tarray.h b/include/util/tarray.h
index 14794997fe30943e103e7c061ec89e1cb51d1ad6..3d6ca246531d57c3250e5863902c396a365c755c 100644
--- a/include/util/tarray.h
+++ b/include/util/tarray.h
@@ -16,7 +16,6 @@
 #ifndef _TD_UTIL_ARRAY_H
 #define _TD_UTIL_ARRAY_H
 
-#include "os.h"
 #include "talgo.h"
 
 #ifdef __cplusplus
diff --git a/include/util/tbuffer.h b/include/util/tbuffer.h
index f57103c738dd80d5288f3da3ef56d9ae210fde7f..c0c3fd59aadae162f9b7186261ccd4a829ea6a7f 100644
--- a/include/util/tbuffer.h
+++ b/include/util/tbuffer.h
@@ -13,8 +13,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _TD_UTIL_BUFFER_H
-#define _TD_UTIL_BUFFER_H
+#ifndef _TD_UTIL_BUFFER_H_
+#define _TD_UTIL_BUFFER_H_
 
 #include "os.h"
 
@@ -87,12 +87,10 @@ typedef struct SBufferWriter {
   void* (*allocator)(void*, size_t);
 } SBufferWriter;
 
-////////////////////////////////////////////////////////////////////////////////
 // common functions & macros for both reader & writer
 
 #define tbufTell(buf) ((buf)->pos)
 
-////////////////////////////////////////////////////////////////////////////////
 /* ------------------------ BUFFER WRITER FUNCTIONS AND MACROS ------------------------ */
 // *Allocator*, function to allocate memory, will use 'realloc' if NULL
 // *Endian*, if true, writer functions of primitive types will do 'hton' automatically
@@ -167,4 +165,4 @@ double      tbufReadDouble(SBufferReader* buf);
 }
 #endif
 
-#endif /*_TD_UTIL_BUFFER_H*/
+#endif /*_TD_UTIL_BUFFER_H_*/
diff --git a/source/util/src/tbuffer.c b/source/util/src/tbuffer.c
index 751184abdfe94866d7044104c04b79d1e19b086d..dc8c4b70c5107358a742e16ceef67584a111ff69 100644
--- a/source/util/src/tbuffer.c
+++ b/source/util/src/tbuffer.c
@@ -14,11 +14,8 @@
  */
 
 #define _DEFAULT_SOURCE
-
 #include "tbuffer.h"
 #include "texception.h"
-#include "os.h"
-//#include "taoserror.h"
 
 typedef union Un4B {
   uint32_t ui;