diff --git a/include/os/osAtomic.h b/include/os/osAtomic.h
index 9fd00cefb4..52be7200bf 100644
--- a/include/os/osAtomic.h
+++ b/include/os/osAtomic.h
@@ -20,6 +20,8 @@
 extern "C" {
 #endif
 
+#include "tdef.h"
+
 // If the error is in a third-party library, place this header file under the third-party library header file.
 // When you want to use this feature, you should find or add the same function in the following section.
 #ifndef ALLOW_FORBID_FUNC
diff --git a/source/libs/monitorfw/src/taos_metric_formatter.c b/source/libs/monitorfw/src/taos_metric_formatter.c
index 8d1b44c149..6c6f1974eb 100644
--- a/source/libs/monitorfw/src/taos_metric_formatter.c
+++ b/source/libs/monitorfw/src/taos_metric_formatter.c
@@ -28,7 +28,6 @@
 #include "taos_metric_t.h"
 #include "taos_string_builder_i.h"
 
-#include <sys/time.h>
 
 taos_metric_formatter_t *taos_metric_formatter_new() {
   taos_metric_formatter_t *self = (taos_metric_formatter_t *)taos_malloc(sizeof(taos_metric_formatter_t));
diff --git a/source/libs/monitorfw/src/taos_metric_sample.c b/source/libs/monitorfw/src/taos_metric_sample.c
index 10f626ba16..e784712c3f 100644
--- a/source/libs/monitorfw/src/taos_metric_sample.c
+++ b/source/libs/monitorfw/src/taos_metric_sample.c
@@ -13,7 +13,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdatomic.h>
+//#include <stdatomic.h>
 
 // Public
 #include "taos_alloc.h"
@@ -30,7 +30,7 @@ taos_metric_sample_t *taos_metric_sample_new(taos_metric_type_t type, const char
   taos_metric_sample_t *self = (taos_metric_sample_t *)taos_malloc(sizeof(taos_metric_sample_t));
   self->type = type;
   self->l_value = taos_strdup(l_value);
-  self->r_value = ATOMIC_VAR_INIT(r_value);
+  self->r_value = 0;
   return self;
 }