diff --git a/cmd/pcloudcc/control_tools.cpp b/cmd/pcloudcc/control_tools.cpp
index c75a268..245ed82 100644
--- a/cmd/pcloudcc/control_tools.cpp
+++ b/cmd/pcloudcc/control_tools.cpp
@@ -25,11 +25,11 @@
   USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
   DAMAGE.
 */
+#include <iostream>
+#include <string>
 
 #include <fcntl.h>
-#include <iostream>
 #include <stdlib.h>
-#include <string>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <syslog.h>
@@ -37,6 +37,8 @@
 
 #include "control_tools.h"
 #include "overlay_client.h"
+#include "pclsync_lib_c.h"
+
 #include "pclsync_lib.h"
 
 namespace cc = console_client;
diff --git a/cmd/pcloudcc/control_tools.h b/cmd/pcloudcc/control_tools.h
index 0727048..73404c7 100644
--- a/cmd/pcloudcc/control_tools.h
+++ b/cmd/pcloudcc/control_tools.h
@@ -30,11 +30,13 @@
 #define CONTROL_TOOLS_H
 
 namespace control_tools {
+
 int start_crypto(const char *pass);
 int stop_crypto();
 int finalize();
 int daemonize(bool do_commands);
 void process_commands();
+
 } // namespace control_tools
 
 #endif // CONTROL_TOOLS_H
diff --git a/cmd/pcloudcc/main.cpp b/cmd/pcloudcc/main.cpp
index e022a4b..f737316 100644
--- a/cmd/pcloudcc/main.cpp
+++ b/cmd/pcloudcc/main.cpp
@@ -25,11 +25,15 @@
   USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
   DAMAGE.
 */
+#include <iostream>
+#include <string>
+
+#include <boost/program_options.hpp>
 
 #include "control_tools.h"
+#include "pclsync_lib_c.h"
+
 #include "pclsync_lib.h"
-#include <boost/program_options.hpp>
-#include <iostream>
 
 namespace po = boost::program_options;
 namespace ct = control_tools;
diff --git a/cmd/pcloudcc/pclsync_lib.cpp b/cmd/pcloudcc/pclsync_lib.cpp
index e5b9473..23f2589 100644
--- a/cmd/pcloudcc/pclsync_lib.cpp
+++ b/cmd/pcloudcc/pclsync_lib.cpp
@@ -26,19 +26,19 @@
   DAMAGE.
 */
 
-#include "pclsync_lib.h"
-#include "pcompat.h"
-#include "psynclib.h"
-
+#include <cstring>
 #include <iostream>
-
-#include <iostream>
-#include <stdio.h>
-#include <string.h>
 #include <string>
+
+#include <stdio.h>
 #include <termios.h>
 #include <unistd.h>
 
+#include "pclsync_lib_c.h"
+#include "psynclib.h"
+
+#include "pclsync_lib.h"
+
 namespace cc = console_client;
 namespace clib = cc::clibrary;
 
diff --git a/cmd/pcloudcc/pclsync_lib.h b/cmd/pcloudcc/pclsync_lib.h
index b43bbdc..4319477 100644
--- a/cmd/pcloudcc/pclsync_lib.h
+++ b/cmd/pcloudcc/pclsync_lib.h
@@ -26,12 +26,15 @@
   DAMAGE.
 */
 
+/*
+  Dependencies:
+  - <string>
+  - pclsync_lib_c.h
+*/
+
 #ifndef PCLSYNC_LIB_H
 #define PCLSYNC_LIB_H
 
-#include "pclsync_lib_c.h"
-#include <string>
-
 struct pstatus_struct_;
 
 namespace console_client {
diff --git a/cmd/pcloudcc/pclsync_lib_c.cpp b/cmd/pcloudcc/pclsync_lib_c.cpp
index f714406..ccb9e65 100644
--- a/cmd/pcloudcc/pclsync_lib_c.cpp
+++ b/cmd/pcloudcc/pclsync_lib_c.cpp
@@ -26,7 +26,10 @@
   DAMAGE.
 */
 
+#include <string>
+
 #include "pclsync_lib_c.h"
+
 #include "pclsync_lib.h"
 
 #ifdef __cplusplus