diff --git a/base_c/include/embb/base/c/log.h b/base_c/include/embb/base/c/log.h
index 68419c4..06cfb46 100644
--- a/base_c/include/embb/base/c/log.h
+++ b/base_c/include/embb/base/c/log.h
@@ -28,6 +28,7 @@
 #define EMBB_BASE_C_LOG_H_
 
 #include <embb/base/c/internal/config.h>
+#include <stdarg.h>
 
 /**
  * \defgroup C_LOG Logging
@@ -197,6 +198,13 @@ void embb_log_error(
                                             \c message */
   );
 
+/* function for internal use only */
+void embb_log_write_internal(
+  char const * channel,
+  embb_log_level_t log_level,
+  char const * message,
+  va_list argp);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/base_cpp/src/log.cc b/base_cpp/src/log.cc
index 7bf80fc..2cefe3a 100644
--- a/base_cpp/src/log.cc
+++ b/base_cpp/src/log.cc
@@ -27,14 +27,6 @@
 #include <embb/base/log.h>
 #include <embb/base/c/internal/unused.h>
 
-#include <cstdarg>
-
-extern "C" void embb_log_write_internal(
-  char const * channel,
-  embb_log_level_t log_level,
-  char const * message,
-  va_list argp);
-
 namespace embb {
 namespace base {
 
diff --git a/mtapi_c/src/embb_mtapi_scheduler_t.c b/mtapi_c/src/embb_mtapi_scheduler_t.c
index 2cdef50..daa82fe 100644
--- a/mtapi_c/src/embb_mtapi_scheduler_t.c
+++ b/mtapi_c/src/embb_mtapi_scheduler_t.c
@@ -398,7 +398,7 @@ mtapi_boolean_t embb_mtapi_scheduler_wait_for_task(
     node->scheduler);
 
   /* now wait and schedule new tasks if we are on a worker */
-  mtapi_task_state_t task_state = embb_atomic_load_int(&task->state);
+  mtapi_task_state_t task_state = (mtapi_task_state_t)embb_atomic_load_int(&task->state);
   while (
     (MTAPI_TASK_SCHEDULED == task_state) ||
     (MTAPI_TASK_RUNNING == task_state) ||
@@ -418,7 +418,7 @@ mtapi_boolean_t embb_mtapi_scheduler_wait_for_task(
       node,
       context);
 
-    task_state = embb_atomic_load_int(&task->state);
+    task_state = (mtapi_task_state_t)embb_atomic_load_int(&task->state);
   }
 
   return MTAPI_TRUE;
diff --git a/mtapi_c/src/embb_mtapi_task_context_t.c b/mtapi_c/src/embb_mtapi_task_context_t.c
index 1af899f..91a14b5 100644
--- a/mtapi_c/src/embb_mtapi_task_context_t.c
+++ b/mtapi_c/src/embb_mtapi_task_context_t.c
@@ -187,7 +187,7 @@ mtapi_task_state_t mtapi_context_taskstate_get(
         &(task_context->thread_context->tss_id));
 
     if (local_context == task_context->thread_context) {
-      task_state = embb_atomic_load_int(&task_context->task->state);
+      task_state = (mtapi_task_state_t)embb_atomic_load_int(&task_context->task->state);
       local_status = MTAPI_SUCCESS;
     } else {
       local_status = MTAPI_ERR_CONTEXT_OUTOFCONTEXT;