diff --git a/libdmabufheap/src/dmabuf_alloc.c b/libdmabufheap/src/dmabuf_alloc.c
index 02dec9d783b5d5e7c35d05b29d442b94e79afdc5..3db38512e700fc6ee8ac0487311f5563fdbaff2b 100644
--- a/libdmabufheap/src/dmabuf_alloc.c
+++ b/libdmabufheap/src/dmabuf_alloc.c
@@ -32,8 +32,9 @@
 
 static bool IsHeapNameValid(const char *heapName)
 {
-    if ((heapName == NULL) || (strlen(heapName) == 0) ||
-        (strlen(heapName) > HEAP_NAME_MAX_LEN)) {
+    size_t len = strlen(heapName);
+    if ((heapName == NULL) || (len == 0) ||
+        (len > HEAP_NAME_MAX_LEN)) {
         return false;
     }
 
diff --git a/libpurgeablemem/c/src/purgeable_memory.c b/libpurgeablemem/c/src/purgeable_memory.c
index b0cf21b303445adf2c2b6f65d0b7a928fa22e79f..918a6161acf468388871270dbfb0f0f6eaefc763 100644
--- a/libpurgeablemem/c/src/purgeable_memory.c
+++ b/libpurgeablemem/c/src/purgeable_memory.c
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "pthread.h"
+#include <pthread.h>
 
 #include "purgeable_mem_builder_c.h"
 #include "purgeable_mem_c.h"