diff --git a/pclsync/pcontacts.c b/pclsync/pcontacts.c
index fbba923..22bb4fc 100644
--- a/pclsync/pcontacts.c
+++ b/pclsync/pcontacts.c
@@ -31,6 +31,7 @@
 #include "papi.h"
 #include "pfileops.h"
 #include "plibs.h"
+#include "pmem.h"
 #include "pnetlibs.h"
 #include "psql.h"
 
@@ -70,7 +71,7 @@ int do_call_contactlist(result_visitor vis, void *param) {
   contacts = papi_find_result2(bres, "contacts", PARAM_ARRAY);
 
   if (!contacts->length) {
-    free(bres);
+    pmem_free(PMEM_SUBSYS_API, bres);
     pdbg_logf(D_WARNING, "Account_users returned empty result!\n");
     return -2;
   } else {
@@ -81,7 +82,7 @@ int do_call_contactlist(result_visitor vis, void *param) {
     psql_commit();
   }
 
-  free(bres);
+  pmem_free(PMEM_SUBSYS_API, bres);
   return 0;
 }
 
@@ -362,7 +363,7 @@ void cache_shares() {
     pdbg_logf(D_WARNING, "command listshares returned error code %u message %s",
           (unsigned)result, errorret);
     psync_process_api_error(result);
-    free(bres);
+    pmem_free(PMEM_SUBSYS_API, bres);
     return;
   }
 
@@ -407,5 +408,5 @@ void cache_shares() {
 
   psql_commit();
 
-  free(bres);
+  pmem_free(PMEM_SUBSYS_API, bres);
 }
diff --git a/pclsync/pdevice.c b/pclsync/pdevice.c
index 386f0df..98a48e7 100644
--- a/pclsync/pdevice.c
+++ b/pclsync/pdevice.c
@@ -61,7 +61,7 @@ char *pdevice_id() {
         path =
             putil_strcat("/sys/class/power_supply/", de->d_name, "/type", NULL);
         fd = open(path, O_RDONLY);
-        free(path);
+        pmem_free(PMEM_SUBSYS_OTHER, path);
         if (fd == -1)
           continue;
         if (read(fd, buf, 7) == 7 && !memcmp(buf, "Battery", 7)) {
@@ -81,7 +81,7 @@ char *pdevice_id() {
 char *pdevice_name() {
   char *osname = pdevice_get_os();
   char *ret = putil_strcat(osname, ", ", psync_software_name, NULL);
-  free(osname);
+  pmem_free(PMEM_SUBSYS_OTHER, osname);
   return ret;
 }
 
diff --git a/pclsync/pfsxattr.c b/pclsync/pfsxattr.c
index f294bae..d56071b 100644
--- a/pclsync/pfsxattr.c
+++ b/pclsync/pfsxattr.c
@@ -40,6 +40,7 @@
 #include "pfstasks.h"
 #include "psql.h"
 #include "plibs.h"
+#include "pmem.h"
 
 // needed by pfs_xatr_set_thread_name
 extern PSYNC_THREAD const char *psync_thread_name; 
@@ -144,7 +145,7 @@ static int64_t xattr_get_object_id_locked(const char *path) {
   if (folder) {
     mk = pfs_task_find_mkdir(folder, fspath->name, 0);
     if (mk) {
-      free(fspath);
+      pmem_free(PMEM_SUBSYS_OTHER, fspath);
       pdbg_assertw(mk->folderid != 0);
       if (mk->folderid > 0)
         return folderid_to_objid(mk->folderid);
@@ -153,7 +154,7 @@ static int64_t xattr_get_object_id_locked(const char *path) {
     }
     cr = pfs_task_find_creat(folder, fspath->name, 0);
     if (cr) {
-      free(fspath);
+      pmem_free(PMEM_SUBSYS_OTHER, fspath);
       if (cr->fileid > 0)
         return fileid_to_objid(cr->fileid);
       else if (cr->fileid == 0)
@@ -183,7 +184,7 @@ static int64_t xattr_get_object_id_locked(const char *path) {
     checkfile = !pfs_task_find_unlink(folder, fspath->name, 0);
   }
   if (fspath->folderid < 0) {
-    free(fspath);
+    pmem_free(PMEM_SUBSYS_OTHER, fspath);
     pdbg_logf(D_NOTICE, "path %s not found in temporary folder", path);
     return -1;
   }
@@ -198,7 +199,7 @@ static int64_t xattr_get_object_id_locked(const char *path) {
       ret = -1;
     psql_free(res);
     if (ret != -1) {
-      free(fspath);
+      pmem_free(PMEM_SUBSYS_OTHER, fspath);
       return ret;
     }
   }
@@ -213,11 +214,11 @@ static int64_t xattr_get_object_id_locked(const char *path) {
       ret = -1;
     psql_free(res);
     if (ret != -1) {
-      free(fspath);
+      pmem_free(PMEM_SUBSYS_OTHER, fspath);
       return ret;
     }
   }
-  free(fspath);
+  pmem_free(PMEM_SUBSYS_OTHER, fspath);
   pdbg_logf(D_NOTICE, "path %s not found", path);
   return -1;
 }
diff --git a/pclsync/pstatus.c b/pclsync/pstatus.c
index 31270d2..9b29956 100644
--- a/pclsync/pstatus.c
+++ b/pclsync/pstatus.c
@@ -36,6 +36,7 @@
 #include "pfile.h"
 #include "pfstasks.h"
 #include "plibs.h"
+#include "pmem.h"
 #include "prunthrottled.h"
 #include "psettings.h"
 #include "psql.h"
@@ -228,7 +229,7 @@ void pstatus_upload_recalc() {
       else
         bytestou += fsize;
     }
-    free(filename);
+    pmem_free(PMEM_SUBSYS_OTHER, filename);
   }
   psql_free(res);
   __atomic_store_n(&psync_status.filestoupload, filestou, __ATOMIC_RELAXED);