diff --git a/lib/pclsync/paccountevents.h b/lib/pclsync/paccountevents.h
index a536999..974114f 100644
--- a/lib/pclsync/paccountevents.h
+++ b/lib/pclsync/paccountevents.h
@@ -43,5 +43,6 @@ typedef uint32_t psync_changetype_t;
  */
 
 typedef void (*paccount_cache_callback_t)(void *event);
+void do_register_account_events_callback(paccount_cache_callback_t callback);
 
 #endif //_PACCOUNTEVENTS_H
diff --git a/lib/pclsync/pdiff.c b/lib/pclsync/pdiff.c
index 56f4563..5575e38 100644
--- a/lib/pclsync/pdiff.c
+++ b/lib/pclsync/pdiff.c
@@ -30,6 +30,7 @@
 */
 
 #include "pdiff.h"
+#include "paccountevents.h"
 #include "papi.h"
 #include "pbusinessaccount.h"
 #include "pcache.h"
diff --git a/lib/pclsync/pdiff.h b/lib/pclsync/pdiff.h
index b888060..f4bc6ae 100644
--- a/lib/pclsync/pdiff.h
+++ b/lib/pclsync/pdiff.h
@@ -32,7 +32,6 @@
 #ifndef _PSYNC_DIFF_H
 #define _PSYNC_DIFF_H
 
-#include "paccountevents.h"
 #include "papi.h"
 
 void psync_diff_init();
@@ -44,9 +43,6 @@ void psync_diff_update_file(const binresult *meta);
 void psync_diff_delete_file(const binresult *meta);
 void psync_diff_update_folder(const binresult *meta);
 void psync_diff_delete_folder(const binresult *meta);
-
-void do_register_account_events_callback(paccount_cache_callback_t callback);
-
 void psync_delete_cached_crypto_keys();
 
 #endif
diff --git a/lib/pclsync/pfs.c b/lib/pclsync/pfs.c
index 8bd6d9d..7d9c1ab 100644
--- a/lib/pclsync/pfs.c
+++ b/lib/pclsync/pfs.c
@@ -32,7 +32,6 @@
 #define _FILE_OFFSET_BITS 64
 
 #include "pfs.h"
-#include "pcache.h"
 #include "pcloudcrypto.h"
 #include "pcompat.h"
 #include "pfolder.h"
@@ -52,9 +51,11 @@
 #include <errno.h>
 #include <fuse.h>
 #include <pthread.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 
 #ifndef FUSE_STAT
 #define FUSE_STAT stat