diff --git a/CMakeLists.txt b/CMakeLists.txt
index efb92b114f..ccad9e7a2d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,8 +48,8 @@ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC -gdwarf-2 -msse4.2 -mfma")
 add_subdirectory(deps)
 
 # api
-aux_source_directory(include/client API_SRC)
-add_library(api INTERFACE ${API_SRC})
+add_library(api INTERFACE)
+target_include_directories(api INTERFACE "include/client")
 
 # src
 add_subdirectory(source)
diff --git a/include/client/taos.h b/include/client/taos.h
index 635ca3c774..edb1552b81 100644
--- a/include/client/taos.h
+++ b/include/client/taos.h
@@ -31,23 +31,21 @@ typedef void   TAOS_SUB;
 typedef void **TAOS_ROW;
 
 // Data type definition
-#ifndef TSDB_DATA_TYPE_NULL
-  #define TSDB_DATA_TYPE_NULL       0     // 1 bytes
-  #define TSDB_DATA_TYPE_BOOL       1     // 1 bytes
-  #define TSDB_DATA_TYPE_TINYINT    2     // 1 byte
-  #define TSDB_DATA_TYPE_SMALLINT   3     // 2 bytes
-  #define TSDB_DATA_TYPE_INT        4     // 4 bytes
-  #define TSDB_DATA_TYPE_BIGINT     5     // 8 bytes
-  #define TSDB_DATA_TYPE_FLOAT      6     // 4 bytes
-  #define TSDB_DATA_TYPE_DOUBLE     7     // 8 bytes
-  #define TSDB_DATA_TYPE_BINARY     8     // string
-  #define TSDB_DATA_TYPE_TIMESTAMP  9     // 8 bytes
-  #define TSDB_DATA_TYPE_NCHAR      10    // unicode string
-  #define TSDB_DATA_TYPE_UTINYINT   11    // 1 byte
-  #define TSDB_DATA_TYPE_USMALLINT  12    // 2 bytes
-  #define TSDB_DATA_TYPE_UINT       13    // 4 bytes
-  #define TSDB_DATA_TYPE_UBIGINT    14    // 8 bytes
-#endif
+#define TSDB_DATA_TYPE_NULL       0     // 1 bytes
+#define TSDB_DATA_TYPE_BOOL       1     // 1 bytes
+#define TSDB_DATA_TYPE_TINYINT    2     // 1 byte
+#define TSDB_DATA_TYPE_SMALLINT   3     // 2 bytes
+#define TSDB_DATA_TYPE_INT        4     // 4 bytes
+#define TSDB_DATA_TYPE_BIGINT     5     // 8 bytes
+#define TSDB_DATA_TYPE_FLOAT      6     // 4 bytes
+#define TSDB_DATA_TYPE_DOUBLE     7     // 8 bytes
+#define TSDB_DATA_TYPE_BINARY     8     // string
+#define TSDB_DATA_TYPE_TIMESTAMP  9     // 8 bytes
+#define TSDB_DATA_TYPE_NCHAR      10    // unicode string
+#define TSDB_DATA_TYPE_UTINYINT   11    // 1 byte
+#define TSDB_DATA_TYPE_USMALLINT  12    // 2 bytes
+#define TSDB_DATA_TYPE_UINT       13    // 4 bytes
+#define TSDB_DATA_TYPE_UBIGINT    14    // 8 bytes
 
 typedef enum {
   TSDB_OPTION_LOCALE,
diff --git a/include/common/taoserror.h b/include/util/taoserror.h
similarity index 100%
rename from include/common/taoserror.h
rename to include/util/taoserror.h
diff --git a/source/common/CMakeLists.txt b/source/common/CMakeLists.txt
index 4a8dffb433..d03231fcfb 100644
--- a/source/common/CMakeLists.txt
+++ b/source/common/CMakeLists.txt
@@ -9,4 +9,5 @@ target_link_libraries(
     common
     PUBLIC os
     PUBLIC util
+    INTERFACE api
 )
\ No newline at end of file
diff --git a/source/util/CMakeLists.txt b/source/util/CMakeLists.txt
index ffe84c63e8..09b877ea8e 100644
--- a/source/util/CMakeLists.txt
+++ b/source/util/CMakeLists.txt
@@ -10,6 +10,7 @@ target_link_libraries(
     PRIVATE os
     PUBLIC zlib
     PUBLIC lz4_static
+    PUBLIC api
 )
 
 CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/src/version.c.in" "${CMAKE_CURRENT_SOURCE_DIR}/src/version.c")