diff --git a/src/bodydata.cpp b/src/bodydata.cpp
index 5079a13..4b7184a 100644
--- a/src/bodydata.cpp
+++ b/src/bodydata.cpp
@@ -20,9 +20,9 @@
 
 #include <cstdio>
 #include <cstdlib>
+#include <cstring>
 
-#include "common.h"
-#include "s3fs.h"
+#include "s3fs_logger.h"
 #include "bodydata.h"
 
 //-------------------------------------------------------------------
diff --git a/src/cache.cpp b/src/cache.cpp
index 22bcd31..c2de444 100644
--- a/src/cache.cpp
+++ b/src/cache.cpp
@@ -18,14 +18,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include <cerrno>
-#include <cstdio>
-#include <cstdlib>
-
 #include <algorithm>
+#include <cerrno>
+#include <cstdlib>
+#include <vector>
 
-#include "common.h"
 #include "s3fs.h"
+#include "s3fs_logger.h"
 #include "s3fs_util.h"
 #include "cache.h"
 #include "autolock.h"
@@ -571,7 +570,7 @@ bool StatCache::TruncateCache()
             erase_iters.push_back(iter);
         }
         if(erase_count < erase_iters.size()){
-            sort(erase_iters.begin(), erase_iters.end(), sort_statiterlist());
+            std::sort(erase_iters.begin(), erase_iters.end(), sort_statiterlist());
             while(erase_count < erase_iters.size()){
                 erase_iters.pop_back();
             }
diff --git a/src/cache.h b/src/cache.h
index 18fc9c8..4a7e1d7 100644
--- a/src/cache.h
+++ b/src/cache.h
@@ -21,6 +21,8 @@
 #ifndef S3FS_CACHE_H_
 #define S3FS_CACHE_H_
 
+#include <cstring>
+
 #include "metaheader.h"
 
 //-------------------------------------------------------------------
diff --git a/src/common.h b/src/common.h
index e561e13..e6bbe10 100644
--- a/src/common.h
+++ b/src/common.h
@@ -21,11 +21,10 @@
 #ifndef S3FS_COMMON_H_
 #define S3FS_COMMON_H_
 
-#include <fcntl.h>
+#include <sys/types.h>
 
 #include "../config.h"
 #include "types.h"
-#include "s3fs_logger.h"
 
 //-------------------------------------------------------------------
 // Global variables
diff --git a/src/common_auth.cpp b/src/common_auth.cpp
index 7b6ad5b..b9067f1 100644
--- a/src/common_auth.cpp
+++ b/src/common_auth.cpp
@@ -21,8 +21,6 @@
 #include <cstdio>
 #include <string>
 
-#include "common.h"
-#include "s3fs.h"
 #include "s3fs_auth.h"
 #include "string_util.h"
 
diff --git a/src/curl.cpp b/src/curl.cpp
index a778d80..2fa641f 100644
--- a/src/curl.cpp
+++ b/src/curl.cpp
@@ -29,11 +29,14 @@
 
 #include "common.h"
 #include "s3fs.h"
+#include "s3fs_logger.h"
 #include "curl.h"
 #include "curl_multi.h"
 #include "curl_util.h"
 #include "s3fs_auth.h"
 #include "autolock.h"
+#include "curl_handlerpool.h"
+#include "s3fs_cred.h"
 #include "s3fs_util.h"
 #include "string_util.h"
 #include "addhead.h"
diff --git a/src/curl.h b/src/curl.h
index 9988003..cb442e3 100644
--- a/src/curl.h
+++ b/src/curl.h
@@ -26,12 +26,10 @@
 #include <map>
 #include <vector>
 
-#include "common.h"
-#include "curl_handlerpool.h"
+#include "autolock.h"
 #include "bodydata.h"
 #include "metaheader.h"
 #include "fdcache_page.h"
-#include "s3fs_cred.h"
 
 //----------------------------------------------
 // Avoid dependency on libcurl version
@@ -76,6 +74,8 @@ typedef std::map<CURL*, progress_t> curlprogress_t;
 //----------------------------------------------
 // class S3fsCurl
 //----------------------------------------------
+class CurlHandlerPool;
+class S3fsCred;
 class S3fsCurl;
 class Semaphore;
 
diff --git a/src/curl_handlerpool.cpp b/src/curl_handlerpool.cpp
index 58cb522..e3dd24a 100644
--- a/src/curl_handlerpool.cpp
+++ b/src/curl_handlerpool.cpp
@@ -20,8 +20,7 @@
 
 #include <cstdio>
 
-#include "common.h"
-#include "s3fs.h"
+#include "s3fs_logger.h"
 #include "curl_handlerpool.h"
 #include "autolock.h"
 
diff --git a/src/curl_multi.cpp b/src/curl_multi.cpp
index 76f2c24..c30fc30 100644
--- a/src/curl_multi.cpp
+++ b/src/curl_multi.cpp
@@ -21,9 +21,10 @@
 #include <cstdio>
 #include <cstdlib>
 #include <cerrno>
+#include <vector>
 
-#include "common.h"
 #include "s3fs.h"
+#include "s3fs_logger.h"
 #include "curl_multi.h"
 #include "curl.h"
 #include "autolock.h"
diff --git a/src/curl_util.cpp b/src/curl_util.cpp
index 2340233..50cfeb1 100644
--- a/src/curl_util.cpp
+++ b/src/curl_util.cpp
@@ -23,7 +23,7 @@
 #include <curl/curl.h>
 
 #include "common.h"
-#include "s3fs.h"
+#include "s3fs_logger.h"
 #include "curl_util.h"
 #include "string_util.h"
 #include "s3fs_auth.h"
diff --git a/src/fdcache.cpp b/src/fdcache.cpp
index 3171140..fad87b8 100644
--- a/src/fdcache.cpp
+++ b/src/fdcache.cpp
@@ -23,13 +23,12 @@
 #include <cerrno>
 #include <climits>
 #include <unistd.h>
-#include <sys/types.h>
 #include <dirent.h>
+#include <sys/stat.h>
+#include <sys/statvfs.h>
 
-#include "common.h"
-#include "s3fs.h"
 #include "fdcache.h"
-#include "fdcache_pseudofd.h"
+#include "fdcache_stat.h"
 #include "s3fs_util.h"
 #include "s3fs_logger.h"
 #include "s3fs_cred.h"
diff --git a/src/fdcache_auto.cpp b/src/fdcache_auto.cpp
index 935a927..8358a24 100644
--- a/src/fdcache_auto.cpp
+++ b/src/fdcache_auto.cpp
@@ -20,8 +20,7 @@
 
 #include <cstdio>
 
-#include "common.h"
-#include "s3fs.h"
+#include "s3fs_logger.h"
 #include "fdcache_auto.h"
 #include "fdcache.h"
 
diff --git a/src/fdcache_auto.h b/src/fdcache_auto.h
index 9b2daca..1474e35 100644
--- a/src/fdcache_auto.h
+++ b/src/fdcache_auto.h
@@ -21,8 +21,12 @@
 #ifndef S3FS_FDCACHE_AUTO_H_
 #define S3FS_FDCACHE_AUTO_H_
 
+#include <fcntl.h>
+
 #include "autolock.h"
-#include "fdcache_entity.h"
+#include "metaheader.h"
+
+class FdEntity;
 
 //------------------------------------------------
 // class AutoFdEntity
diff --git a/src/fdcache_entity.cpp b/src/fdcache_entity.cpp
index 8c2b530..e55ecaa 100644
--- a/src/fdcache_entity.cpp
+++ b/src/fdcache_entity.cpp
@@ -23,16 +23,19 @@
 #include <cerrno>
 #include <unistd.h>
 #include <limits.h>
-#include <sys/time.h>
+#include <sys/stat.h>
 
 #include "common.h"
-#include "s3fs.h"
 #include "fdcache_entity.h"
+#include "fdcache_stat.h"
+#include "fdcache_untreated.h"
 #include "fdcache.h"
 #include "string_util.h"
+#include "s3fs_logger.h"
 #include "s3fs_util.h"
 #include "autolock.h"
 #include "curl.h"
+#include "s3fs_cred.h"
 
 //------------------------------------------------
 // Symbols
diff --git a/src/fdcache_entity.h b/src/fdcache_entity.h
index 2942fbc..86559e5 100644
--- a/src/fdcache_entity.h
+++ b/src/fdcache_entity.h
@@ -21,6 +21,8 @@
 #ifndef S3FS_FDCACHE_ENTITY_H_
 #define S3FS_FDCACHE_ENTITY_H_
 
+#include <fcntl.h>
+
 #include "autolock.h"
 #include "fdcache_page.h"
 #include "fdcache_fdinfo.h"
diff --git a/src/fdcache_fdinfo.cpp b/src/fdcache_fdinfo.cpp
index 99759ba..b033f5d 100644
--- a/src/fdcache_fdinfo.cpp
+++ b/src/fdcache_fdinfo.cpp
@@ -21,10 +21,11 @@
 #include <cstdio>
 #include <cstdlib>
 #include <errno.h>
+#include <sys/stat.h>
 #include <unistd.h>
 
 #include "common.h"
-#include "s3fs.h"
+#include "s3fs_logger.h"
 #include "fdcache_fdinfo.h"
 #include "fdcache_pseudofd.h"
 #include "fdcache_entity.h"
diff --git a/src/fdcache_fdinfo.h b/src/fdcache_fdinfo.h
index 4813286..8299360 100644
--- a/src/fdcache_fdinfo.h
+++ b/src/fdcache_fdinfo.h
@@ -21,12 +21,13 @@
 #ifndef S3FS_FDCACHE_FDINFO_H_
 #define S3FS_FDCACHE_FDINFO_H_
 
-#include "fdcache_untreated.h"
 #include "psemaphore.h"
 #include "metaheader.h"
 #include "autolock.h"
+#include "types.h"
 
 class FdEntity;
+class UntreatedParts;
 
 //------------------------------------------------
 // Structure of parameters to pass to thread
diff --git a/src/fdcache_page.cpp b/src/fdcache_page.cpp
index 3d44be4..98f35fb 100644
--- a/src/fdcache_page.cpp
+++ b/src/fdcache_page.cpp
@@ -22,10 +22,12 @@
 #include <cerrno>
 #include <unistd.h>
 #include <sstream>
+#include <sys/stat.h>
 
 #include "common.h"
-#include "s3fs.h"
+#include "s3fs_logger.h"
 #include "fdcache_page.h"
+#include "fdcache_stat.h"
 #include "string_util.h"
 
 //------------------------------------------------
diff --git a/src/fdcache_page.h b/src/fdcache_page.h
index b726fb7..c7a5484 100644
--- a/src/fdcache_page.h
+++ b/src/fdcache_page.h
@@ -24,8 +24,6 @@
 #include <list>
 #include <sys/types.h>
 
-#include "fdcache_stat.h"
-
 //------------------------------------------------
 // Symbols
 //------------------------------------------------
@@ -68,6 +66,7 @@ typedef std::list<struct fdpage> fdpage_list_t;
 //------------------------------------------------
 // Class PageList
 //------------------------------------------------
+class CacheFileStat;
 class FdEntity;
 
 // cppcheck-suppress copyCtorAndEqOperator
diff --git a/src/fdcache_pseudofd.cpp b/src/fdcache_pseudofd.cpp
index d6af2f1..459257d 100644
--- a/src/fdcache_pseudofd.cpp
+++ b/src/fdcache_pseudofd.cpp
@@ -18,11 +18,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include <cstdlib>
 #include <algorithm>
+#include <cstdlib>
+#include <vector>
 
-#include "common.h"
-#include "s3fs.h"
+#include "s3fs_logger.h"
 #include "fdcache_pseudofd.h"
 #include "autolock.h"
 
diff --git a/src/fdcache_stat.cpp b/src/fdcache_stat.cpp
index 0f82ec1..b57dc9c 100644
--- a/src/fdcache_stat.cpp
+++ b/src/fdcache_stat.cpp
@@ -21,9 +21,9 @@
 #include <cerrno>
 #include <unistd.h>
 #include <sys/file.h>
+#include <sys/stat.h>
 
-#include "common.h"
-#include "s3fs.h"
+#include "s3fs_logger.h"
 #include "fdcache_stat.h"
 #include "fdcache.h"
 #include "s3fs_util.h"
diff --git a/src/fdcache_untreated.cpp b/src/fdcache_untreated.cpp
index 53517dc..c8ac6ee 100644
--- a/src/fdcache_untreated.cpp
+++ b/src/fdcache_untreated.cpp
@@ -20,8 +20,7 @@
 
 #include <cstdlib>
 
-#include "common.h"
-#include "s3fs.h"
+#include "s3fs_logger.h"
 #include "fdcache_untreated.h"
 #include "autolock.h"
 
diff --git a/src/gnutls_auth.cpp b/src/gnutls_auth.cpp
index ee5025f..d13f517 100644
--- a/src/gnutls_auth.cpp
+++ b/src/gnutls_auth.cpp
@@ -41,6 +41,7 @@
 #include "common.h"
 #include "s3fs.h"
 #include "s3fs_auth.h"
+#include "s3fs_logger.h"
 
 //-------------------------------------------------------------------
 // Utility Function for version
diff --git a/src/metaheader.cpp b/src/metaheader.cpp
index f60e6b3..7804a67 100644
--- a/src/metaheader.cpp
+++ b/src/metaheader.cpp
@@ -19,10 +19,10 @@
  */
 
 #include <unistd.h>
+#include <sys/stat.h>
 #include <sys/types.h>
 
 #include "common.h"
-#include "s3fs.h"
 #include "metaheader.h"
 #include "string_util.h"
 
diff --git a/src/metaheader.h b/src/metaheader.h
index 93dcfcf..5f78a42 100644
--- a/src/metaheader.h
+++ b/src/metaheader.h
@@ -22,6 +22,7 @@
 #define S3FS_METAHEADER_H_
 
 #include <string>
+#include <strings.h>
 #include <map>
 
 //-------------------------------------------------------------------
diff --git a/src/mpu_util.cpp b/src/mpu_util.cpp
index d4ea0a6..3a8dace 100644
--- a/src/mpu_util.cpp
+++ b/src/mpu_util.cpp
@@ -21,8 +21,8 @@
 #include <cstdio>
 #include <cstdlib>
 
-#include "common.h"
 #include "s3fs.h"
+#include "s3fs_logger.h"
 #include "mpu_util.h"
 #include "curl.h"
 #include "s3fs_xml.h"
diff --git a/src/mvnode.cpp b/src/mvnode.cpp
index 3472445..dc03e14 100644
--- a/src/mvnode.cpp
+++ b/src/mvnode.cpp
@@ -20,8 +20,8 @@
 
 #include <cstdio>
 #include <cstdlib>
+#include <cstring>
 
-#include "common.h"
 #include "s3fs.h"
 #include "mvnode.h"
 
diff --git a/src/nss_auth.cpp b/src/nss_auth.cpp
index 3206aec..f1bf142 100644
--- a/src/nss_auth.cpp
+++ b/src/nss_auth.cpp
@@ -37,6 +37,7 @@
 #include "common.h"
 #include "s3fs.h"
 #include "s3fs_auth.h"
+#include "s3fs_logger.h"
 
 //-------------------------------------------------------------------
 // Utility Function for version
diff --git a/src/openssl_auth.cpp b/src/openssl_auth.cpp
index 389b9a8..c06d6cb 100644
--- a/src/openssl_auth.cpp
+++ b/src/openssl_auth.cpp
@@ -23,12 +23,7 @@
 #include <cerrno>
 #include <pthread.h>
 #include <unistd.h>
-#include <syslog.h>
-#include <sys/types.h>
 #include <sys/stat.h>
-#include <cstring>
-#include <openssl/bio.h>
-#include <openssl/buffer.h>
 #include <openssl/evp.h>
 #include <openssl/hmac.h>
 #include <openssl/md5.h>
@@ -36,11 +31,9 @@
 #include <openssl/crypto.h>
 #include <openssl/err.h>
 #include <string>
-#include <map>
 
-#include "common.h"
-#include "s3fs.h"
 #include "s3fs_auth.h"
+#include "s3fs_logger.h"
 
 //-------------------------------------------------------------------
 // Utility Function for version
diff --git a/src/s3fs.cpp b/src/s3fs.cpp
index 5fba324..38e1f55 100644
--- a/src/s3fs.cpp
+++ b/src/s3fs.cpp
@@ -23,15 +23,16 @@
 #include <errno.h>
 #include <unistd.h>
 #include <dirent.h>
-#include <pwd.h>
 #include <sys/types.h>
 #include <getopt.h>
 
 #include "common.h"
 #include "s3fs.h"
+#include "s3fs_logger.h"
 #include "metaheader.h"
 #include "fdcache.h"
 #include "fdcache_auto.h"
+#include "fdcache_stat.h"
 #include "curl.h"
 #include "curl_multi.h"
 #include "s3objlist.h"
@@ -40,9 +41,9 @@
 #include "addhead.h"
 #include "sighandlers.h"
 #include "s3fs_xml.h"
-#include "s3fs_util.h"
 #include "string_util.h"
 #include "s3fs_auth.h"
+#include "s3fs_cred.h"
 #include "s3fs_help.h"
 #include "s3fs_util.h"
 #include "mpu_util.h"
diff --git a/src/s3fs_cred.cpp b/src/s3fs_cred.cpp
index 2de2bae..0ecf55e 100644
--- a/src/s3fs_cred.cpp
+++ b/src/s3fs_cred.cpp
@@ -21,13 +21,14 @@
 #include <errno.h>
 #include <unistd.h>
 #include <pwd.h>
+#include <sys/stat.h>
 #include <sys/types.h>
 #include <fstream>
 #include <sstream>
 
 #include "common.h"
-#include "s3fs.h"
 #include "s3fs_cred.h"
+#include "s3fs_logger.h"
 #include "curl.h"
 #include "string_util.h"
 #include "metaheader.h"
diff --git a/src/s3fs_global.cpp b/src/s3fs_global.cpp
index 40e2dfc..6139f30 100644
--- a/src/s3fs_global.cpp
+++ b/src/s3fs_global.cpp
@@ -18,7 +18,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include <sys/types.h>
 #include <string>
 
 //-------------------------------------------------------------------
diff --git a/src/s3fs_help.cpp b/src/s3fs_help.cpp
index e7ccecf..30c8149 100644
--- a/src/s3fs_help.cpp
+++ b/src/s3fs_help.cpp
@@ -23,7 +23,6 @@
 #include <string>
 
 #include "common.h"
-#include "s3fs.h"
 #include "s3fs_help.h"
 #include "s3fs_auth.h"
 
diff --git a/src/s3fs_logger.h b/src/s3fs_logger.h
index 670b930..9ecf891 100644
--- a/src/s3fs_logger.h
+++ b/src/s3fs_logger.h
@@ -27,6 +27,8 @@
 #include <syslog.h>
 #include <sys/time.h>
 
+#include "common.h"
+
 #ifdef CLOCK_MONOTONIC_COARSE
 #define S3FS_CLOCK_MONOTONIC    CLOCK_MONOTONIC_COARSE
 #else
diff --git a/src/s3fs_util.cpp b/src/s3fs_util.cpp
index fe4d888..7939967 100644
--- a/src/s3fs_util.cpp
+++ b/src/s3fs_util.cpp
@@ -26,14 +26,13 @@
 #include <pwd.h>
 #include <libgen.h>
 #include <dirent.h>
-#include <sys/types.h>
+#include <sys/stat.h>
 #include <sys/utsname.h>
 
 #include <string>
 #include <sstream>
 
-#include "common.h"
-#include "s3fs.h"
+#include "s3fs_logger.h"
 #include "s3fs_util.h"
 #include "string_util.h"
 #include "s3fs_help.h"
diff --git a/src/s3fs_xml.cpp b/src/s3fs_xml.cpp
index dee930c..8aae1e3 100644
--- a/src/s3fs_xml.cpp
+++ b/src/s3fs_xml.cpp
@@ -24,6 +24,7 @@
 
 #include "common.h"
 #include "s3fs.h"
+#include "s3fs_logger.h"
 #include "s3fs_xml.h"
 #include "s3fs_util.h"
 #include "s3objlist.h"
diff --git a/src/sighandlers.cpp b/src/sighandlers.cpp
index f3aa161..4bf7350 100644
--- a/src/sighandlers.cpp
+++ b/src/sighandlers.cpp
@@ -22,8 +22,7 @@
 #include <csignal>
 #include <pthread.h>
 
-#include "common.h"
-#include "s3fs.h"
+#include "s3fs_logger.h"
 #include "sighandlers.h"
 #include "fdcache.h"
 
diff --git a/src/string_util.cpp b/src/string_util.cpp
index 1c71dcb..98423a2 100644
--- a/src/string_util.cpp
+++ b/src/string_util.cpp
@@ -18,7 +18,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include <cstdio>
 #include <cstdlib>
 #include <cstring>
 #include <cerrno>
@@ -27,8 +26,7 @@
 
 #include <sstream>
 
-#include "common.h"
-#include "s3fs.h"
+#include "s3fs_logger.h"
 #include "string_util.h"
 
 //-------------------------------------------------------------------
diff --git a/src/string_util.h b/src/string_util.h
index 54c629a..da25a90 100644
--- a/src/string_util.h
+++ b/src/string_util.h
@@ -21,6 +21,8 @@
 #ifndef S3FS_STRING_UTIL_H_
 #define S3FS_STRING_UTIL_H_
 
+#include <cstring>
+
 //
 // A collection of string utilities for manipulating URLs and HTTP responses.
 //
diff --git a/src/test_page_list.cpp b/src/test_page_list.cpp
index 234adfe..6b6a026 100644
--- a/src/test_page_list.cpp
+++ b/src/test_page_list.cpp
@@ -18,7 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include "fdcache.h"
+#include "fdcache_page.h"
+#include "fdcache_stat.h"
 #include "test_util.h"
 
 bool CacheFileStat::Open() { return false; }
diff --git a/src/test_string_util.cpp b/src/test_string_util.cpp
index 5382324..6e6e5b0 100644
--- a/src/test_string_util.cpp
+++ b/src/test_string_util.cpp
@@ -23,8 +23,7 @@
 #include <stdint.h>
 #include <string>
 
-#include "common.h"
-#include "s3fs.h"
+#include "s3fs_logger.h"
 #include "string_util.h"
 #include "test_util.h"
 
diff --git a/src/threadpoolman.cpp b/src/threadpoolman.cpp
index bed3826..46de268 100644
--- a/src/threadpoolman.cpp
+++ b/src/threadpoolman.cpp
@@ -21,9 +21,9 @@
 #include <cstdio>
 #include <cstdlib>
 #include <errno.h>
+#include <stdint.h>
 
-#include "common.h"
-#include "s3fs.h"
+#include "s3fs_logger.h"
 #include "threadpoolman.h"
 #include "autolock.h"