From a3bd6e55413794d671f68e126f413ae9beaf7c9b Mon Sep 17 00:00:00 2001
From: Levi Neely <141506390+lneely@users.noreply.github.com>
Date: Tue, 18 Mar 2025 19:50:16 +0100
Subject: [PATCH] cleanup includes

---
 pclsync/pcache.c        |  8 +-------
 pclsync/pcrypto.c       | 17 +++++------------
 pclsync/pcryptofolder.c | 10 +---------
 pclsync/pdeflate.c      |  5 ++++-
 pclsync/pdevice.c       |  5 +++--
 pclsync/pdevmon.c       |  8 +++-----
 pclsync/pdiff.c         |  6 ------
 pclsync/pfile.c         |  7 +++----
 pclsync/pfolder.c       |  5 ++---
 pclsync/pfs.c           |  6 ++----
 pclsync/pfsstatic.c     |  1 -
 pclsync/pfstasks.c      |  4 ++--
 pclsync/pfsupload.c     |  7 +++----
 pclsync/pintervaltree.c |  2 +-
 pclsync/plist.c         |  6 +++---
 pclsync/plocalnotify.c  |  7 ++++---
 pclsync/plocalscan.c    |  8 ++++----
 pclsync/pmem.c          |  4 ++--
 pclsync/pnetlibs.c      |  8 ++++----
 pclsync/pnotify.c       |  8 ++++----
 pclsync/pp2p.c          |  4 ++--
 pclsync/ppagecache.c    | 14 +++++++-------
 pclsync/ppassword.c     | 16 +++++-----------
 pclsync/ppath.c         |  1 +
 pclsync/ppathstatus.c   |  4 ++--
 pclsync/pqevent.c       |  5 +++--
 pclsync/prand.c         |  3 ++-
 pclsync/prpc.c          | 12 ++++++------
 pclsync/prun.c          |  2 --
 pclsync/psettings.c     |  6 +++---
 pclsync/pshm.c          |  2 +-
 pclsync/psock.c         |  5 +++--
 pclsync/psql.c          | 10 ++++++----
 pclsync/pstatus.c       |  5 +++--
 pclsync/psuggest.c      |  9 +++++----
 pclsync/psyncer.c       |  5 ++---
 pclsync/psys.c          |  1 +
 pclsync/ptask.c         |  3 +--
 pclsync/ptevent.c       |  4 ++--
 pclsync/ptimer.c        |  5 ++---
 pclsync/ptools.c        | 10 ++++++----
 pclsync/ptree.c         |  5 +++--
 pclsync/publiclinks.c   |  5 +++--
 pclsync/pupload.c       |  8 ++++----
 pclsync/putil.c         |  3 ++-
 45 files changed, 126 insertions(+), 153 deletions(-)

diff --git a/pclsync/pcache.c b/pclsync/pcache.c
index c394bea..d55e0d6 100644
--- a/pclsync/pcache.c
+++ b/pclsync/pcache.c
@@ -29,20 +29,14 @@
 */
 
 
-#include <mbedtls/ctr_drbg.h>
-#include <mbedtls/debug.h>
-#include <mbedtls/entropy.h>
-#include <mbedtls/pkcs5.h>
-#include <mbedtls/ssl.h>
 #include <pthread.h>
+#include <string.h>
 
 #include "pcache.h"
 #include "plibs.h"
 #include "plist.h"
-#include "psynclib.h"
 #include "psys.h"
 #include "ptimer.h"
-#include <string.h>
 
 // required by psync_cache_get
 extern PSYNC_THREAD const char *psync_thread_name; 
diff --git a/pclsync/pcrypto.c b/pclsync/pcrypto.c
index c226c5e..9930fa5 100644
--- a/pclsync/pcrypto.c
+++ b/pclsync/pcrypto.c
@@ -29,22 +29,15 @@
    DAMAGE.
 */
 
-#include <mbedtls/ctr_drbg.h>
-#include <mbedtls/debug.h>
-#include <mbedtls/entropy.h>
-#include <mbedtls/pkcs5.h>
-#include <mbedtls/ssl.h>
 #include <pthread.h>
-
-#include "pcompiler.h"
-
-#include "pssl.h"
-
-#include "pcrypto.h"
-#include "plibs.h"
 #include <stddef.h>
 #include <string.h>
 
+#include "pcompiler.h"
+#include "pcrypto.h"
+#include "pdbg.h"
+#include "pssl.h"
+
 typedef struct {
   psync_sha512_ctx sha1ctx;
   unsigned char final[PSYNC_SHA512_BLOCK_LEN + PSYNC_SHA512_DIGEST_LEN];
diff --git a/pclsync/pcryptofolder.c b/pclsync/pcryptofolder.c
index 4cafbde..80547a4 100644
--- a/pclsync/pcryptofolder.c
+++ b/pclsync/pcryptofolder.c
@@ -29,15 +29,8 @@
    DAMAGE.
 */
 
-#include <mbedtls/ctr_drbg.h>
-#include <mbedtls/debug.h>
-#include <mbedtls/entropy.h>
-#include <mbedtls/pk.h>
-#include <mbedtls/pkcs5.h>
-#include <mbedtls/sha1.h>
-#include <mbedtls/sha256.h>
-#include <mbedtls/ssl.h>
 #include <pthread.h>
+#include <string.h>
 
 #include "papi.h"
 #include "pcache.h"
@@ -55,7 +48,6 @@
 #include "ptask.h"
 #include "psql.h"
 
-#include <string.h>
 
 #define PSYNC_CRYPTO_API_ERR_INTERNAL -511
 
diff --git a/pclsync/pdeflate.c b/pclsync/pdeflate.c
index 7266938..67bf034 100644
--- a/pclsync/pdeflate.c
+++ b/pclsync/pdeflate.c
@@ -29,10 +29,13 @@
    DAMAGE.
 */
 
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
 #include <zlib.h>
 
 #include "pdeflate.h"
-#include "plibs.h"
+#include "pdbg.h"
 
 #define BUFFER_SIZE (4 * 1024)
 
diff --git a/pclsync/pdevice.c b/pclsync/pdevice.c
index b3d88a9..2249dad 100644
--- a/pclsync/pdevice.c
+++ b/pclsync/pdevice.c
@@ -31,12 +31,13 @@
 
 #include <dirent.h>
 #include <fcntl.h>
+#include <string.h>
 #include <unistd.h>
 
 #include "pdevice.h"
-#include "plibs.h"
 #include "psettings.h"
-#include "psynclib.h"
+#include "putil.h"
+
 
 static const char *psync_os_name = NULL;
 static const char *psync_software_name = PSYNC_LIB_VERSION;
diff --git a/pclsync/pdevmon.c b/pclsync/pdevmon.c
index 31ce584..2c6f65d 100644
--- a/pclsync/pdevmon.c
+++ b/pclsync/pdevmon.c
@@ -34,13 +34,11 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "plibs.h"
-#include "psynclib.h"
-#include "prun.h"
-
-
 #include "pdevmon.h"
+#include "plibs.h"
 #include "plocalscan.h"
+#include "prun.h"
+#include "psynclib.h"
 #include "ptimer.h"
 
 #define DEV_MONITOR_ACTIVITY_TIMER_INT 20
diff --git a/pclsync/pdiff.c b/pclsync/pdiff.c
index 6664994..3e46045 100644
--- a/pclsync/pdiff.c
+++ b/pclsync/pdiff.c
@@ -31,12 +31,6 @@
 
 #include <errno.h>
 #include <ctype.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 <pthread.h>
 #include <stddef.h>
 #include <unistd.h>
diff --git a/pclsync/pfile.c b/pclsync/pfile.c
index 3025ca1..0226394 100644
--- a/pclsync/pfile.c
+++ b/pclsync/pfile.c
@@ -33,8 +33,6 @@
 #include <fcntl.h>
 #include <grp.h>
 #include <ifaddrs.h>
-#include <net/if.h>
-#include <netinet/tcp.h>
 #include <pthread.h>
 #include <pwd.h>
 #include <stddef.h>
@@ -44,6 +42,8 @@
 #include <unistd.h>
 #include <utime.h>
 
+#include <net/if.h>
+#include <netinet/tcp.h>
 #include <sys/ioctl.h>
 #include <sys/resource.h>
 #include <sys/stat.h>
@@ -53,11 +53,10 @@
 #include <sys/utsname.h>
 #include <sys/wait.h>
 
+#include "pdbg.h"
 #include "pfile.h"
-#include "plibs.h"
 #include "prun.h"
 #include "psettings.h"
-#include "psynclib.h"
 #include "psys.h"
 
 extern char **environ;
diff --git a/pclsync/pfolder.c b/pclsync/pfolder.c
index 51d50fe..f15dfc9 100644
--- a/pclsync/pfolder.c
+++ b/pclsync/pfolder.c
@@ -31,6 +31,8 @@
 
 #include <pthread.h>
 #include <stddef.h>
+#include <stddef.h>
+#include <string.h>
 
 #include "papi.h"
 #include "pcryptofolder.h"
@@ -45,9 +47,6 @@
 #include "pfile.h"
 #include "psql.h"
 
-#include <stddef.h>
-#include <string.h>
-
 #define INITIAL_NAME_BUFF 2000
 #define INITIAL_ENTRY_CNT 128
 
diff --git a/pclsync/pfs.c b/pclsync/pfs.c
index 5c0e608..fd55857 100644
--- a/pclsync/pfs.c
+++ b/pclsync/pfs.c
@@ -43,7 +43,6 @@
 #include "pcryptofolder.h"
 #include "pfile.h"
 #include "pfoldersync.h"
-
 #include "pfs.h"
 #include "pfscrypto.h"
 #include "pfsfolder.h"
@@ -51,18 +50,17 @@
 #include "pfstasks.h"
 #include "pfsupload.h"
 #include "pfsxattr.h"
-
 #include "plibs.h"
 #include "pnetlibs.h"
 #include "ppagecache.h"
+#include "ppath.h"
 #include "prun.h"
 #include "psettings.h"
+#include "psql.h"
 #include "pssl.h"
 #include "pstatus.h"
 #include "psys.h"
-#include "ppath.h"
 #include "ptimer.h"
-#include "psql.h"
 
 
 #ifndef FUSE_STAT
diff --git a/pclsync/pfsstatic.c b/pclsync/pfsstatic.c
index b4769cb..7f23c29 100644
--- a/pclsync/pfsstatic.c
+++ b/pclsync/pfsstatic.c
@@ -33,7 +33,6 @@
 
 #include "pfsstatic.h"
 #include "pfstasks.h"
-#include "plibs.h"
 
 static const char *rootdir = "[Desktop Entry]\nIcon=./.pcloudicon.png\n";
 
diff --git a/pclsync/pfstasks.c b/pclsync/pfstasks.c
index 3e29f99..e9704fd 100644
--- a/pclsync/pfstasks.c
+++ b/pclsync/pfstasks.c
@@ -37,7 +37,6 @@
 
 #include "pcache.h"
 #include "pcryptofolder.h"
-#include "putil.h"
 #include "pfoldersync.h"
 #include "pfs.h"
 #include "pfstasks.h"
@@ -45,8 +44,9 @@
 #include "plibs.h"
 #include "ppathstatus.h"
 #include "psettings.h"
-#include "ptimer.h"
 #include "psql.h"
+#include "ptimer.h"
+#include "putil.h"
 
 
 typedef struct {
diff --git a/pclsync/pfsupload.c b/pclsync/pfsupload.c
index 20dc8ff..0ac2c66 100644
--- a/pclsync/pfsupload.c
+++ b/pclsync/pfsupload.c
@@ -46,16 +46,15 @@
 #include "plist.h"
 #include "pnetlibs.h"
 #include "ppagecache.h"
+#include "pqevent.h"
 #include "prun.h"
 #include "psettings.h"
-#include "psys.h"
+#include "psql.h"
 #include "pstatus.h"
+#include "psys.h"
 #include "ptimer.h"
 #include "pupload.h"
 #include "putil.h"
-#include "psql.h"
-
-#include "pqevent.h"
 
 
 typedef struct {
diff --git a/pclsync/pintervaltree.c b/pclsync/pintervaltree.c
index d043eaf..f4d18a4 100644
--- a/pclsync/pintervaltree.c
+++ b/pclsync/pintervaltree.c
@@ -30,7 +30,7 @@
 */
 
 #include "pintervaltree.h"
-#include "plibs.h"
+#include "pdbg.h"
 
 static psync_interval_tree_t *psync_interval_tree_new(uint64_t from,
                                                       uint64_t to) {
diff --git a/pclsync/plist.c b/pclsync/plist.c
index 163d140..cf86f7f 100644
--- a/pclsync/plist.c
+++ b/pclsync/plist.c
@@ -29,12 +29,12 @@
    DAMAGE.
 */
 
-#include "plist.h"
-#include "pdbg.h"
-#include "pfile.h"
 #include <stdlib.h>
 #include <string.h>
 
+#include "plist.h"
+#include "pdbg.h"
+
 /* Fairly simple in-place merge sort with constant storage requirements.
  *
  * Recursive approach might would use O(log N) storage on the stack but may
diff --git a/pclsync/plocalnotify.c b/pclsync/plocalnotify.c
index 30fb76d..4a0b28f 100644
--- a/pclsync/plocalnotify.c
+++ b/pclsync/plocalnotify.c
@@ -33,18 +33,19 @@
 #include <errno.h>
 #include <stddef.h>
 #include <string.h>
+#include <unistd.h>
+
 #include <sys/epoll.h>
 #include <sys/inotify.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <unistd.h>
 
-#include "plocalnotify.h"
 #include "pfoldersync.h"
 #include "plibs.h"
-#include "prun.h"
 #include "plist.h"
+#include "plocalnotify.h"
 #include "plocalscan.h"
+#include "prun.h"
 #include "psql.h"
 
 #define NOTIFY_MSG_ADD 0
diff --git a/pclsync/plocalscan.c b/pclsync/plocalscan.c
index 6e5566b..836ed3c 100644
--- a/pclsync/plocalscan.c
+++ b/pclsync/plocalscan.c
@@ -29,30 +29,30 @@
    DAMAGE.
 */
 
-#include <pthread.h>
 #include <ctype.h>
+#include <pthread.h>
 #include <string.h>
 
 #include "pdevice.h"
 #include "pfile.h"
 #include "pfoldersync.h"
 #include "plibs.h"
-#include "prun.h"
 #include "plist.h"
 #include "plocalnotify.h"
 #include "plocalscan.h"
+#include "ppath.h"
 #include "ppathstatus.h"
+#include "prun.h"
 #include "prunthrottled.h"
 #include "psettings.h"
+#include "psql.h"
 #include "pssl.h"
 #include "pstatus.h"
 #include "psys.h"
 #include "ptask.h"
 #include "ptimer.h"
 #include "pupload.h"
-#include "ppath.h"
 #include "putil.h"
-#include "psql.h"
 
 
 typedef struct {
diff --git a/pclsync/pmem.c b/pclsync/pmem.c
index d70287b..5dec1b1 100644
--- a/pclsync/pmem.c
+++ b/pclsync/pmem.c
@@ -1,9 +1,9 @@
+#include <sys/mman.h>
+
 #include "pcompiler.h"
 #include "psql.h"
 #include "pdbg.h"
 
-#include <sys/mman.h>
-
 void *pmem_mmap(size_t size) {
 #if defined(MAP_ANONYMOUS)
   return mmap(NULL, size, PROT_READ | PROT_WRITE,
diff --git a/pclsync/pnetlibs.c b/pclsync/pnetlibs.c
index 51f5eb1..4fd5608 100644
--- a/pclsync/pnetlibs.c
+++ b/pclsync/pnetlibs.c
@@ -39,18 +39,18 @@
 #include "papi.h"
 #include "pcache.h"
 #include "pdevice.h"
+#include "pfile.h"
 #include "plibs.h"
 #include "pnetlibs.h"
+#include "ppath.h"
 #include "prun.h"
 #include "psettings.h"
+#include "psql.h"
 #include "pssl.h"
 #include "pstatus.h"
-#include "ptimer.h"
-#include "ppath.h"
 #include "psys.h"
+#include "ptimer.h"
 #include "ptree.h"
-#include "psql.h"
-#include "pfile.h"
 
 // required by psync_send_debug
 extern PSYNC_THREAD const char *psync_thread_name; 
diff --git a/pclsync/pnotify.c b/pclsync/pnotify.c
index 10d2536..845ad8b 100644
--- a/pclsync/pnotify.c
+++ b/pclsync/pnotify.c
@@ -29,14 +29,14 @@
    DAMAGE.
 */
 
-#include "pnotify.h"
+#include "pfile.h"
 #include "plibs.h"
 #include "pnetlibs.h"
-#include "psettings.h"
-#include "ptree.h"
+#include "pnotify.h"
 #include "ppath.h"
 #include "prun.h"
-#include "pfile.h"
+#include "psettings.h"
+#include "ptree.h"
 
 
 typedef struct {
diff --git a/pclsync/pp2p.c b/pclsync/pp2p.c
index 357bbf9..7888a7a 100644
--- a/pclsync/pp2p.c
+++ b/pclsync/pp2p.c
@@ -34,21 +34,21 @@
 #include <string.h>
 
 #include "papi.h"
-#include "pfile.h"
 #include "pcrypto.h"
 #include "pdownload.h"
+#include "pfile.h"
 #include "pfoldersync.h"
 #include "plibs.h"
 #include "pnetlibs.h"
 #include "pp2p.h"
 #include "prun.h"
 #include "psettings.h"
+#include "psql.h"
 #include "pssl.h"
 #include "pstatus.h"
 #include "psys.h"
 #include "ptimer.h"
 #include "putil.h"
-#include "psql.h"
 
 #define P2P_ENCTYPE_RSA_AES 0
 
diff --git a/pclsync/ppagecache.c b/pclsync/ppagecache.c
index 76c3383..1264c0a 100644
--- a/pclsync/ppagecache.c
+++ b/pclsync/ppagecache.c
@@ -29,28 +29,28 @@
    DAMAGE.
 */
 
-#include <pthread.h>
 #include <errno.h>
+#include <pthread.h>
 #include <stdio.h>
 #include <string.h>
 
 #include "pcache.h"
 #include "pcrc32c.h"
+#include "pfile.h"
 #include "pfscrypto.h"
 #include "pfsupload.h"
 #include "plibs.h"
 #include "pmem.h"
 #include "pnetlibs.h"
 #include "ppagecache.h"
+#include "ppath.h"
 #include "prun.h"
 #include "psettings.h"
-#include "ppath.h"
-#include "psys.h"
-#include "putil.h"
-#include "pfile.h"
-#include "pstatus.h"
-#include "ptimer.h"
 #include "psql.h"
+#include "pstatus.h"
+#include "psys.h"
+#include "ptimer.h"
+#include "putil.h"
 
 #define CACHE_PAGES (PSYNC_FS_MEMORY_CACHE / PSYNC_FS_PAGE_SIZE)
 #define CACHE_HASH (CACHE_PAGES / 2)
diff --git a/pclsync/ppassword.c b/pclsync/ppassword.c
index 3e2f855..5404c35 100644
--- a/pclsync/ppassword.c
+++ b/pclsync/ppassword.c
@@ -28,21 +28,15 @@
   DAMAGE.
 */
 
-#include <mbedtls/ctr_drbg.h>
-#include <mbedtls/debug.h>
-#include <mbedtls/entropy.h>
-#include <mbedtls/pkcs5.h>
-#include <mbedtls/ssl.h>
 #include <pthread.h>
-
-#include "plibs.h"
-#include "ppassword.h"
-#include "ppassworddict.h"
-#include "pssl.h"
-#include "putil.h"
 #include <ctype.h>
 #include <string.h>
 
+#include "ppassword.h"
+#include "pdbg.h"
+#include "ppassworddict.h"
+#include "putil.h"
+
 static int find_in_dict(const unsigned char *pwd, size_t len) {
   size_t hi, lo, med, l;
   int c;
diff --git a/pclsync/ppath.c b/pclsync/ppath.c
index c398007..2669fe6 100644
--- a/pclsync/ppath.c
+++ b/pclsync/ppath.c
@@ -1,6 +1,7 @@
 #include <dirent.h>
 #include <pwd.h>
 #include <stddef.h>
+
 #include <sys/statvfs.h>
 
 #include "pcompiler.h"
diff --git a/pclsync/ppathstatus.c b/pclsync/ppathstatus.c
index 85b4f5e..3468749 100644
--- a/pclsync/ppathstatus.c
+++ b/pclsync/ppathstatus.c
@@ -34,14 +34,14 @@
 
 #include "pcryptofolder.h"
 #include "pfoldersync.h"
+#include "pfstasks.h"
 #include "plibs.h"
 #include "plist.h"
 #include "ppathstatus.h"
+#include "psql.h"
 #include "pstatus.h"
 #include "ptask.h"
 #include "ptree.h"
-#include "psql.h"
-#include "pfstasks.h"
 
 #define PATH_CACHE_SIZE 512
 #define PATH_HASH_SIZE 512
diff --git a/pclsync/pqevent.c b/pclsync/pqevent.c
index f346cb4..ab5fd77 100644
--- a/pclsync/pqevent.c
+++ b/pclsync/pqevent.c
@@ -27,13 +27,14 @@
    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "pqevent.h"
+#include <string.h>
+
 #include "pfoldersync.h"
 #include "plibs.h"
 #include "plist.h"
+#include "pqevent.h"
 #include "prun.h"
 #include "psys.h"
-#include <string.h>
 
 #define MAX_STATUS_STR_LEN 64
 #define DONT_SHOW_TIME_IF_SEC_OVER (2 * 86400)
diff --git a/pclsync/prand.c b/pclsync/prand.c
index 7ed05be..d4b3a34 100644
--- a/pclsync/prand.c
+++ b/pclsync/prand.c
@@ -1,8 +1,9 @@
+#include <unistd.h>
+
 #include <sys/stat.h>
 #include <sys/statvfs.h>
 #include <sys/sysinfo.h>
 #include <sys/utsname.h>
-#include <unistd.h>
 
 #include "plibs.h"
 #include "ppath.h"
diff --git a/pclsync/prpc.c b/pclsync/prpc.c
index 64e6a85..faea6dc 100644
--- a/pclsync/prpc.c
+++ b/pclsync/prpc.c
@@ -39,17 +39,17 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/un.h>
 #include <time.h>
 #include <unistd.h>
 
-#include "prpc.h"
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/un.h>
+
+#include "pdbg.h"
 #include "ppath.h"
 #include "ppathstatus.h"
-
-#include "plibs.h"
+#include "prpc.h"
 #include "prun.h"
 
 #define POVERLAY_BUFSIZE 512
diff --git a/pclsync/prun.c b/pclsync/prun.c
index 38744e1..99ce7c5 100644
--- a/pclsync/prun.c
+++ b/pclsync/prun.c
@@ -1,8 +1,6 @@
 #include <pthread.h>
 
-#include "plibs.h"
 #include "psettings.h"
-#include "psynclib.h"
 #include "prun.h"
 
 // required by thread_entry
diff --git a/pclsync/psettings.c b/pclsync/psettings.c
index cde1a95..62b1b89 100644
--- a/pclsync/psettings.c
+++ b/pclsync/psettings.c
@@ -29,8 +29,8 @@
    DAMAGE.
 */
 
-#include <pthread.h>
 #include <ctype.h>
+#include <pthread.h>
 #include <string.h>
 
 #include "pfs.h"
@@ -38,10 +38,10 @@
 #include "plocalscan.h"
 #include "pp2p.h"
 #include "ppagecache.h"
-#include "psettings.h"
 #include "ppath.h"
-#include "ptimer.h"
+#include "psettings.h"
 #include "psql.h"
+#include "ptimer.h"
 
 typedef void (*setting_callback)();
 typedef void (*filter_callback)(void *);
diff --git a/pclsync/pshm.c b/pclsync/pshm.c
index 75d77b6..e625e57 100644
--- a/pclsync/pshm.c
+++ b/pclsync/pshm.c
@@ -7,9 +7,9 @@
 #include <stdbool.h>
 #include <errno.h>
 
+#include "pdbg.h"
 #include "pshm.h"
 #include "ppath.h"
-#include "plibs.h"
 
 static key_t get_key() {
     char path[PATH_MAX];
diff --git a/pclsync/psock.c b/pclsync/psock.c
index 1756c9f..e8e153a 100644
--- a/pclsync/psock.c
+++ b/pclsync/psock.c
@@ -31,16 +31,17 @@
 #include <errno.h>
 #include <ifaddrs.h>
 #include <netdb.h>
-#include <netinet/tcp.h>
 #include <pthread.h>
 #include <unistd.h>
 
+#include <netinet/tcp.h>
+
 #include "plibs.h"
 #include "psettings.h"
 #include "psock.h"
-#include "ptimer.h"
 #include "psql.h"
 #include "ptask.h"
+#include "ptimer.h"
 
 #define PROXY_NONE 0
 #define PROXY_CONNECT 1
diff --git a/pclsync/psql.c b/pclsync/psql.c
index 50653f3..c0bdce4 100644
--- a/pclsync/psql.c
+++ b/pclsync/psql.c
@@ -1,14 +1,16 @@
+#include <sqlite3.h>
+
+#include <sys/stat.h>
+
+#include "pcache.h"
 #include "pdatabase.h"
 #include "pdbg.h"
 #include "plocks.h"
+#include "pnetlibs.h"
 #include "prun.h"
 #include "psettings.h"
 #include "psql.h"
-#include "pcache.h"
 #include "psys.h"
-#include "pnetlibs.h"
-#include <sqlite3.h>
-#include <sys/stat.h>
 
 #define SQL_NO_LOCK 0
 #define SQL_READ_LOCK 1
diff --git a/pclsync/pstatus.c b/pclsync/pstatus.c
index a8d0164..1b5ec78 100644
--- a/pclsync/pstatus.c
+++ b/pclsync/pstatus.c
@@ -28,18 +28,19 @@
    USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
    DAMAGE.
 */
+
 #include <stdarg.h>
 #include <string.h>
 
 #include "pfile.h"
-#include "pstatus.h"
 #include "pfstasks.h"
 #include "plibs.h"
 #include "prunthrottled.h"
 #include "psettings.h"
+#include "psql.h"
+#include "pstatus.h"
 #include "ptask.h"
 #include "putil.h"
-#include "psql.h"
 
 static uint32_t statuses[PSTATUS_NUM_STATUSES] = {
     PSTATUS_INVALID,     PSTATUS_ONLINE_OFFLINE,
diff --git a/pclsync/psuggest.c b/pclsync/psuggest.c
index 4d4bd31..8806a88 100644
--- a/pclsync/psuggest.c
+++ b/pclsync/psuggest.c
@@ -29,15 +29,16 @@
    DAMAGE.
 */
 
-#include "psuggest.h"
+#include <stdio.h>
+#include <string.h>
+
 #include "pfile.h"
 #include "plibs.h"
 #include "plist.h"
-#include "pscanexts.h"
 #include "ppath.h"
+#include "pscanexts.h"
 #include "psettings.h"
-#include <stdio.h>
-#include <string.h>
+#include "psuggest.h"
 
 typedef struct {
   psync_list nextfolder;
diff --git a/pclsync/psyncer.c b/pclsync/psyncer.c
index 058d089..d7f6d3d 100644
--- a/pclsync/psyncer.c
+++ b/pclsync/psyncer.c
@@ -33,6 +33,7 @@
 #include <stddef.h>
 #include <string.h>
 
+#include "pdbg.h"
 #include "pdownload.h"
 #include "pfile.h"
 #include "pfoldersync.h"
@@ -41,13 +42,11 @@
 #include "plocalscan.h"
 #include "ppathstatus.h"
 #include "prun.h"
+#include "psql.h"
 #include "pstatus.h"
-#include "pfoldersync.h"
 #include "ptask.h"
 #include "ptree.h"
 #include "putil.h"
-#include "pdbg.h"
-#include "psql.h"
 
 
 extern const unsigned char pfile_invalid_chars[];
diff --git a/pclsync/psys.c b/pclsync/psys.c
index b52c66e..75128a0 100644
--- a/pclsync/psys.c
+++ b/pclsync/psys.c
@@ -1,6 +1,7 @@
 #include <errno.h>
 #include <signal.h>
 #include <unistd.h>
+
 #include <sys/resource.h>
 
 #include "pdbg.h"
diff --git a/pclsync/ptask.c b/pclsync/ptask.c
index e0481e3..7fde0a9 100644
--- a/pclsync/ptask.c
+++ b/pclsync/ptask.c
@@ -32,7 +32,6 @@
 #include <errno.h>
 #include <pthread.h>
 #include <stddef.h>
-#include <pthread.h>
 
 #include "papi.h"
 #include "pdeflate.h"
@@ -43,13 +42,13 @@
 #include "ppathstatus.h"
 #include "prun.h"
 #include "psettings.h"
+#include "psql.h"
 #include "pssl.h"
 #include "pstatus.h"
 #include "psys.h"
 #include "ptask.h"
 #include "ptree.h"
 #include "pupload.h"
-#include "psql.h"
 
 #define get_len(t) (sizeof(t) - offsetof(t, request))
 
diff --git a/pclsync/ptevent.c b/pclsync/ptevent.c
index 3795bc9..7e6d7a9 100644
--- a/pclsync/ptevent.c
+++ b/pclsync/ptevent.c
@@ -1,6 +1,6 @@
-#include "ptevent.h"
-#include "plibs.h"
+#include "pdbg.h"
 #include "prun.h"
+#include "ptevent.h"
 
 data_event_callback data_event_fptr = NULL;
 
diff --git a/pclsync/ptimer.c b/pclsync/ptimer.c
index 3f2d448..2b0f703 100644
--- a/pclsync/ptimer.c
+++ b/pclsync/ptimer.c
@@ -29,13 +29,12 @@
    DAMAGE.
 */
 
-#include "ptimer.h"
 #include "pcache.h"
 #include "pcompiler.h"
-#include "prun.h"
 #include "plibs.h"
+#include "prun.h"
 #include "psys.h"
-#include "psynclib.h"
+#include "ptimer.h"
 
 /* Maximum timeout possible is TIMER_ARRAY_SIZE^TIMER_LEVELS seconds, in the
  * worst case TIMER_LEVELS operations will be preformed for each timer to
diff --git a/pclsync/ptools.c b/pclsync/ptools.c
index 54150e2..ada94b2 100644
--- a/pclsync/ptools.c
+++ b/pclsync/ptools.c
@@ -33,20 +33,22 @@
 */
 
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
 #include <net/if.h>
+
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/types.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
 
 #include "papi.h"
 #include "plibs.h"
 #include "pnetlibs.h"
 #include "psettings.h"
-#include "ptools.h"
 #include "psql.h"
+#include "ptools.h"
 
 char *ptools_get_mac_addr() {
   char buffer[128];
diff --git a/pclsync/ptree.c b/pclsync/ptree.c
index 738a05d..d5e53ec 100644
--- a/pclsync/ptree.c
+++ b/pclsync/ptree.c
@@ -29,11 +29,12 @@
    DAMAGE.
 */
 
-#include "ptree.h"
-#include "pdbg.h"
 #include <assert.h>
 #include <string.h>
 
+#include "pdbg.h"
+#include "ptree.h"
+
 static inline long int ptree_max(long int a, long int b) {
   return a > b ? a : b;
 }
diff --git a/pclsync/publiclinks.c b/pclsync/publiclinks.c
index a0efe21..22f2073 100644
--- a/pclsync/publiclinks.c
+++ b/pclsync/publiclinks.c
@@ -26,17 +26,18 @@
    USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
    DAMAGE.
 */
+
 #include <stdio.h>
 #include <string.h>
 
-#include "publiclinks.h"
 #include "papi.h"
 #include "pfsfolder.h"
 #include "plibs.h"
 #include "pnetlibs.h"
 #include "prun.h"
-#include "ptimer.h"
 #include "psql.h"
+#include "ptimer.h"
+#include "publiclinks.h"
 
 #define FOLDERID_ENTRY_SIZE 18
 
diff --git a/pclsync/pupload.c b/pclsync/pupload.c
index 054a703..2d1bb91 100644
--- a/pclsync/pupload.c
+++ b/pclsync/pupload.c
@@ -33,10 +33,9 @@
 #include <stddef.h>
 
 #include "papi.h"
-#include "ptevent.h"
-#include "pfile.h"
 #include "pcompiler.h"
 #include "pdiff.h"
+#include "pfile.h"
 #include "pfileops.h"
 #include "pfoldersync.h"
 #include "plibs.h"
@@ -45,14 +44,15 @@
 #include "ppathstatus.h"
 #include "prun.h"
 #include "psettings.h"
-#include "psys.h"
+#include "psql.h"
 #include "pstatus.h"
+#include "psys.h"
 #include "ptask.h"
+#include "ptevent.h"
 #include "ptimer.h"
 #include "ptools.h"
 #include "pupload.h"
 #include "putil.h"
-#include "psql.h"
 
 extern const unsigned char pfile_invalid_chars[];
 
diff --git a/pclsync/putil.c b/pclsync/putil.c
index 61012f4..9f41445 100644
--- a/pclsync/putil.c
+++ b/pclsync/putil.c
@@ -4,8 +4,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <time.h>
+#include <unistd.h>
+
 #include <sys/random.h>
 
 #include "pdbg.h"