transient and unnecessary includes

pclsync/pdiff.c

@@ -38,6 +38,7 @@
 #include <mbedtls/ssl.h>
 #include <pthread.h>
 #include <stddef.h>
+#include <unistd.h>
 
 #include "paccountevents.h"
 #include "papi.h"

pclsync/pdownload.c

@@ -31,6 +31,7 @@
 #include <errno.h>
 #include <pthread.h>
 #include <stddef.h>
+#include <sys/stat.h>
 
 #include "pqevent.h"
 #include "pdownload.h"
@@ -48,6 +49,7 @@
 #include "ptimer.h"
 #include "pupload.h"
 #include "ppath.h"
+#include "pfile.h"
 
 extern const unsigned char pfile_invalid_chars[];
 

pclsync/pdownload.h

@@ -33,7 +33,7 @@
 #define _PSYNC_DOWNLOAD_H
 
 #include "psettings.h"
-#include "psynclib.h"
+#include "pfoldersync.h"
 
 typedef unsigned char psync_hex_hash[PSYNC_HASH_DIGEST_HEXLEN];
 

pclsync/pfolder.c

@@ -42,6 +42,7 @@
 #include "pnetlibs.h"
 #include "psys.h"
 #include "ppath.h"
+#include "pfile.h"
 
 #include <stddef.h>
 #include <string.h>

pclsync/pfs.h

@@ -41,7 +41,7 @@
 #include "pintervaltree.h"
 #include "plibs.h"
 #include "psettings.h"
-#include "psynclib.h"
+#include "pfoldersync.h"
 #include "ptimer.h"
 #include "ptree.h"
 

pclsync/pfstasks.h

@@ -36,9 +36,9 @@
 #include <string.h>
 #include <time.h>
 
+#include "pfoldersync.h"
 #include "pfsfolder.h"
 #include "plibs.h"
-#include "psynclib.h"
 #include "ptree.h"
 
 #define PSYNC_FS_TASK_MKDIR 1

pclsync/pfsupload.c

@@ -42,6 +42,7 @@
 
 #include "pcache.h"
 #include "pdiff.h"
+#include "pfile.h"
 #include "pfileops.h"
 #include "pfscrypto.h"
 #include "pfstasks.h"

pclsync/pfsupload.h

@@ -32,7 +32,7 @@
 #ifndef _PSYNC_FSUPLOAD_H
 #define _PSYNC_FSUPLOAD_H
 
-#include "psynclib.h"
+#include <stdint.h>
 
 void psync_fsupload_init();
 void psync_fsupload_wake();

pclsync/pfsxattr.h

@@ -32,8 +32,9 @@
 #ifndef _PSYNC_FSXATTR_H
 #define _PSYNC_FSXATTR_H
 
-#include "pfile.h"
+#include <stddef.h>
-#include "psynclib.h"
+
+#include "pfoldersync.h"
 
 #define PFS_XATTR_IGN
 

pclsync/plibs.c

@@ -42,6 +42,8 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <string.h>
+#include <sys/stat.h>
+#include "pfile.h"
 
 // required by psync_debug
 extern PSYNC_THREAD const char *psync_thread_name; 

pclsync/plibs.h

@@ -35,10 +35,12 @@
 #include <pthread.h>
 
 #include "pcompiler.h"
+#include "pstatus.h"
 #include "putil.h"
-#include "psynclib.h"
+#include "psynclib.h" // need for macros...
 
 #include <sqlite3.h>
+#include <stdint.h>
 #include <string.h>
 
 #define D_NONE 0

pclsync/plocalnotify.h

@@ -32,7 +32,7 @@
 #ifndef _PSYNC_LOCALNOTIFY_H
 #define _PSYNC_LOCALNOTIFY_H
 
-#include "psynclib.h"
+#include "pfoldersync.h"
 
 int psync_localnotify_init();
 void psync_localnotify_add_sync(psync_syncid_t syncid);

pclsync/plocalscan.h

@@ -32,7 +32,7 @@
 #ifndef _PSYNC_LOCALSCAN_H
 #define _PSYNC_LOCALSCAN_H
 
-#include "psynclib.h"
+#include "pfoldersync.h"
 
 void psync_localscan_init();
 void psync_wake_localscan();

pclsync/pnetlibs.c

@@ -36,13 +36,6 @@
 #include <stdarg.h>
 #include <stdio.h>
 
-#include <mbedtls/ctr_drbg.h>
-#include <mbedtls/debug.h>
-#include <mbedtls/entropy.h>
-#include <mbedtls/pkcs5.h>
-#include <mbedtls/sha1.h>
-#include <mbedtls/ssl.h>
-
 #include "papi.h"
 #include "pcache.h"
 #include "pdevice.h"
@@ -56,6 +49,7 @@
 #include "ppath.h"
 #include "psys.h"
 #include "ptree.h"
+#include "pfile.h"
 
 // required by psync_send_debug
 extern PSYNC_THREAD const char *psync_thread_name; 

pclsync/pnetlibs.h

@@ -33,9 +33,8 @@
 #define _PSYNC_NETLIBS_H
 
 #include "papi.h"
-#include "pfile.h"
 #include "plist.h"
-#include "psynclib.h"
+#include "pfoldersync.h"
 
 #define senddebug(str, ...)                                                    \
   do {                                                                         \

pclsync/pnotify.c

@@ -33,10 +33,10 @@
 #include "plibs.h"
 #include "pnetlibs.h"
 #include "psettings.h"
-#include "ptimer.h"
 #include "ptree.h"
 #include "ppath.h"
 #include "prun.h"
+#include "pfile.h"
 
 
 typedef struct {

pclsync/ppagecache.c

@@ -49,6 +49,7 @@
 #include "ppath.h"
 #include "psys.h"
 #include "putil.h"
+#include "pfile.h"
 
 #include "pstatus.h"
 #include "ptimer.h"

pclsync/ptask.h

@@ -32,6 +32,8 @@
 #ifndef _PSYNC_TASKS_H
 #define _PSYNC_TASKS_H
 
+#include <stdint.h>
+
 #include "pfoldersync.h"
 
 #define PSYNC_ASYNC_ERR_FLAG_PERM                                              \

pclsync/ptools.c

@@ -47,6 +47,7 @@
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/types.h>
+#include <unistd.h>
 
 char *ptools_get_mac_addr() {
   char buffer[128];